From: Joseph C. Lehner <joseph.c.lehner@gmail.com>
Date: Tue, 2 Feb 2016 12:19:05 +0000 (+0200)
Subject: More Windows fixes
X-Git-Tag: v0.9~65
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=36c9e97ad1672fa6f741db2145ff2da1c9a1c86d;p=oweals%2Fnmrpflash.git

More Windows fixes
---

diff --git a/ethsock.c b/ethsock.c
index f1e9bdf..ca1e790 100644
--- a/ethsock.c
+++ b/ethsock.c
@@ -94,7 +94,14 @@ static bool get_hwaddr(uint8_t *hwaddr, const char *intf)
 				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) {
 					for (i = 0; i != 6; ++i) {
 						hwaddr[i] = adapter->Address[i];
@@ -310,10 +317,6 @@ int ethsock_list_all(void)
 	memset(hwaddr, 0, 6);
 
 	for (dev = devs; dev; dev = dev->next) {
-		if (dev->flags & PCAP_IF_LOOPBACK) {
-			continue;
-		}
-
 		if (!is_ethernet(dev->name)) {
 			continue;
 		}