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

Fix windows device naming issues

Browse source
This commit is contained in:
Joseph C. Lehner 2020-09-10 17:03:12 +02:00
parent 657a3f5c98
commit 9e563293db
1 changed files with 53 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
ethsock.c
View file

@ -440,9 +440,11 @@ static const char *intf_name_to_wpcap(const char *intf)
NET_LUID luid; NET_LUID luid;
GUID guid; GUID guid;
index = if_nametoindex(intf); if (sscanf(intf, "net%d", &index) != 1) {
if (!index) { index = if_nametoindex(intf);
break; if (!index) {
break;
}
} }
err = ConvertInterfaceIndexToLuid(index, &luid); err = ConvertInterfaceIndexToLuid(index, &luid);
@ -450,7 +452,6 @@ static const char *intf_name_to_wpcap(const char *intf)
if (verbosity) { if (verbosity) {
win_perror2("ConvertInterfaceIndexToLuid", err); win_perror2("ConvertInterfaceIndexToLuid", err);
} }
break; break;
} }
@ -459,10 +460,11 @@ static const char *intf_name_to_wpcap(const char *intf)
if (verbosity) { if (verbosity) {
win_perror2("ConvertInterfaceLuidToGuid", err); win_perror2("ConvertInterfaceLuidToGuid", err);
} }
break;
} }
snprintf(buf, sizeof(buf), snprintf(buf, sizeof(buf),
"\\Device\\NPF{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", "\\Device\\NPF_{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}",
guid.Data1, guid.Data2, guid.Data3, guid.Data1, guid.Data2, guid.Data3,
guid.Data4[0], guid.Data4[1], guid.Data4[2], guid.Data4[0], guid.Data4[1], guid.Data4[2],
guid.Data4[3], guid.Data4[4], guid.Data4[5], guid.Data4[3], guid.Data4[4], guid.Data4[5],
@ -518,6 +520,46 @@ static const char *intf_get_pretty_name(const char *intf)
return intf; return intf;
} }
NET_IFINDEX intf_get_index(const char* intf)
{
const char* p;
GUID guid;
NET_LUID luid;
DWORD err;
NET_IFINDEX ret;
int n;
p = strstr(intf, "NPF_{");
if (!p) {
return 0;
}
sscanf(p + 5,
"%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X%n",
&guid.Data1, &guid.Data2, &guid.Data3,
&guid.Data4[0], &guid.Data4[1], &guid.Data4[2],
&guid.Data4[3], &guid.Data4[4], &guid.Data4[5],
&guid.Data4[6], &guid.Data4[7], &n);
if (n != 36) {
return 0;
}
err = ConvertInterfaceGuidToLuid(&guid, &luid);
if (err) {
win_perror2("ConvertInterfaceGuidToLuid", err);
return 0;
}
err = ConvertInterfaceLuidToIndex(&luid, &ret);
if (err) {
win_perror2("ConvertInterfaceLuidToIndex", err);
return 0;
}
return ret;
}
#endif #endif
inline uint8_t *ethsock_get_hwaddr(struct ethsock *sock) inline uint8_t *ethsock_get_hwaddr(struct ethsock *sock)
@ -850,7 +892,9 @@ int ethsock_list_all(void)
uint8_t hwaddr[6]; uint8_t hwaddr[6];
unsigned dev_num = 0, dev_ok = 0; unsigned dev_num = 0, dev_ok = 0;
#ifdef NMRPFLASH_WINDOWS #ifdef NMRPFLASH_WINDOWS
char buf[IF_MAX_STRING_SIZE];
const char *pretty; const char *pretty;
NET_IFINDEX index;
#endif #endif
if (x_pcap_findalldevs(&devs) != 0) { if (x_pcap_findalldevs(&devs) != 0) {
@ -880,12 +924,12 @@ int ethsock_list_all(void)
#else #else
/* Call this here so *_perror() calls don't happen within a line */ /* Call this here so *_perror() calls don't happen within a line */
pretty = intf_get_pretty_name(dev->name); pretty = intf_get_pretty_name(dev->name);
index = intf_get_index(dev->name);
if (!verbosity) { if (!verbosity && index) {
char buf[IF_MAX_STRING_SIZE]; printf("net%-2d", index);
printf("%-15s", if_indextoname(dev->index, buf));
} else { } else {
printf("%s", dev->name); printf("%-15s", dev->name);
} }
#endif #endif