pogmommy/nmrpflash
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix silly naming clash on MinGW

Browse source
This commit is contained in:
Joseph C. Lehner 2016-02-02 11:43:20 +02:00
parent 7fcca928fb
commit 48a02f28c0
2 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
ethsock.c
View file

@ -43,7 +43,7 @@ struct ethsock
}; };
#ifndef NMRPFLASH_WINDOWS #ifndef NMRPFLASH_WINDOWS
static bool get_hwaddr(uint8_t *hwaddr, const char *interface) static bool get_hwaddr(uint8_t *hwaddr, const char *intf)
{ {
struct ifaddrs *ifas, *ifa; struct ifaddrs *ifas, *ifa;
void *src; void *src;
@ -57,7 +57,7 @@ static bool get_hwaddr(uint8_t *hwaddr, const char *interface)
found = false; found = false;
for (ifa = ifas; ifa; ifa = ifa->ifa_next) { for (ifa = ifas; ifa; ifa = ifa->ifa_next) {
if (!strcmp(ifa->ifa_name, interface)) { if (!strcmp(ifa->ifa_name, intf)) {
#ifdef NMRPFLASH_LINUX #ifdef NMRPFLASH_LINUX
if (ifa->ifa_addr->sa_family != AF_PACKET) { if (ifa->ifa_addr->sa_family != AF_PACKET) {
continue; continue;
@ -79,7 +79,7 @@ static bool get_hwaddr(uint8_t *hwaddr, const char *interface)
return found; return found;
} }
#else #else
static bool get_hwaddr(uint8_t *hwaddr, const char *interface) static bool get_hwaddr(uint8_t *hwaddr, const char *intf)
{ {
PIP_ADAPTER_INFO adapters, adapter; PIP_ADAPTER_INFO adapters, adapter;
DWORD ret; DWORD ret;
@ -103,7 +103,7 @@ static bool get_hwaddr(uint8_t *hwaddr, const char *interface)
continue; continue;
} }
if (!strcmp(adapter->AdapterName, interface)) { if (!strcmp(adapter->AdapterName, intf)) {
if (adapter->AddressLength == 6) { if (adapter->AddressLength == 6) {
for (i = 0; i != 6; ++i) { for (i = 0; i != 6; ++i) {
hwaddr[i] = adapter->Address[i]; hwaddr[i] = adapter->Address[i];
@ -129,7 +129,7 @@ inline uint8_t *ethsock_get_hwaddr(struct ethsock *sock)
return sock->hwaddr; return sock->hwaddr;
} }
struct ethsock *ethsock_create(const char *interface, uint16_t protocol) struct ethsock *ethsock_create(const char *intf, uint16_t protocol)
{ {
char buf[PCAP_ERRBUF_SIZE]; char buf[PCAP_ERRBUF_SIZE];
struct bpf_program fp; struct bpf_program fp;
@ -144,7 +144,7 @@ struct ethsock *ethsock_create(const char *interface, uint16_t protocol)
buf[0] = '\0'; buf[0] = '\0';
sock->pcap = pcap_open_live(interface, BUFSIZ, 1, 1, buf); sock->pcap = pcap_open_live(intf, BUFSIZ, 1, 1, buf);
if (!sock->pcap) { if (!sock->pcap) {
fprintf(stderr, "%s.\n", buf); fprintf(stderr, "%s.\n", buf);
goto cleanup_malloc; goto cleanup_malloc;
@ -155,12 +155,12 @@ struct ethsock *ethsock_create(const char *interface, uint16_t protocol)
} }
if (pcap_datalink(sock->pcap) != DLT_EN10MB) { if (pcap_datalink(sock->pcap) != DLT_EN10MB) {
fprintf(stderr, "Interface %s is not an ethernet interface.\n", fprintf(stderr, "%s is not an ethernet interface.\n",
interface); intf);
goto cleanup_pcap; goto cleanup_pcap;
} }
if (!get_hwaddr(sock->hwaddr, interface)) { if (!get_hwaddr(sock->hwaddr, intf)) {
fprintf(stderr, "Failed to get MAC address of interface.\n"); fprintf(stderr, "Failed to get MAC address of interface.\n");
goto cleanup_malloc; goto cleanup_malloc;
} }
@ -261,13 +261,13 @@ int ethsock_set_timeout(struct ethsock *sock, unsigned msec)
return 0; return 0;
} }
static bool is_ethernet(const char *interface) static bool is_ethernet(const char *intf)
{ {
pcap_t *pcap; pcap_t *pcap;
char errbuf[PCAP_ERRBUF_SIZE]; char errbuf[PCAP_ERRBUF_SIZE];
bool ret = false; bool ret = false;
if ((pcap = pcap_create(interface, errbuf))) { if ((pcap = pcap_create(intf, errbuf))) {
if (pcap_activate(pcap) == 0) { if (pcap_activate(pcap) == 0) {
ret = (pcap_datalink(pcap) == DLT_EN10MB); ret = (pcap_datalink(pcap) == DLT_EN10MB);
} }

3
ethsock.h
View file

@ -1,8 +1,9 @@
#include <inttypes.h>
#include <stdint.h> #include <stdint.h>
struct ethsock; struct ethsock;
struct ethsock *ethsock_create(const char *interface, uint16_t protocol); struct ethsock *ethsock_create(const char *intf, uint16_t protocol);
int ethsock_close(struct ethsock *sock); int ethsock_close(struct ethsock *sock);
int ethsock_send(struct ethsock *sock, void *buf, size_t len); int ethsock_send(struct ethsock *sock, void *buf, size_t len);
ssize_t ethsock_recv(struct ethsock *sock, void *buf, size_t len); ssize_t ethsock_recv(struct ethsock *sock, void *buf, size_t len);