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

More Windows fixes

Browse source
This commit is contained in:
Joseph C. Lehner 2016-02-02 14:19:05 +02:00
parent 6b04109fce
commit 36c9e97ad1
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
ethsock.c
View file

@ -94,7 +94,14 @@ static bool get_hwaddr(uint8_t *hwaddr, const char *intf)
continue; continue;
} }
if (!strcmp(adapter->AdapterName, intf)) { #ifndef NMRPFLASH_WINDOWS
if (!strcmp(intf, adapter->AdapterName))
#else
/* Interface names from WinPcap are "\Device\NPF_{GUID}", while
* AdapterName from GetAdaptersInfo is just "{GUID}".*/
if (strstr(intf, adapter->AdapterName))
#endif
{
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];
@ -310,10 +317,6 @@ int ethsock_list_all(void)
memset(hwaddr, 0, 6); memset(hwaddr, 0, 6);
for (dev = devs; dev; dev = dev->next) { for (dev = devs; dev; dev = dev->next) {
if (dev->flags & PCAP_IF_LOOPBACK) {
continue;
}
if (!is_ethernet(dev->name)) { if (!is_ethernet(dev->name)) {
continue; continue;
} }