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

Use CreateUnicastIpAddressEntry instead of AddIPAddress on Windows

Browse source
This commit is contained in:
Joseph C. Lehner 2020-08-17 14:23:09 +02:00
parent 63de99cfbc
commit 2f37b8b7b1
1 changed files with 40 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
ethsock.c
View file

@ -73,11 +73,7 @@ struct ethsock_arp_undo
struct ethsock_ip_undo struct ethsock_ip_undo
{ {
#ifndef NMRPFLASH_WINDOWS
uint32_t ip[2]; uint32_t ip[2];
#else
ULONG context;
#endif
}; };
static int x_pcap_findalldevs(pcap_if_t **devs) static int x_pcap_findalldevs(pcap_if_t **devs)
@ -508,6 +504,12 @@ static const char *intf_get_pretty_name(const char *intf)
RegCloseKey(hkey); RegCloseKey(hkey);
return intf; return intf;
} }
void init_unicast_row(MIB_UNICASTIPADDRESS_ROW* row, DWORD index, uint32_t ipaddr, uint32_t ipmask)
{
}
#endif #endif
inline uint8_t *ethsock_get_hwaddr(struct ethsock *sock) inline uint8_t *ethsock_get_hwaddr(struct ethsock *sock)
@ -520,7 +522,7 @@ 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;
struct ethsock *sock; struct ethsock *sock;
bool is_bridge; bool is_bridge = false;
int err; int err;
#ifdef NMRPFLASH_WINDOWS #ifdef NMRPFLASH_WINDOWS
@ -1021,27 +1023,44 @@ static int ethsock_ip_add_del(struct ethsock *sock, uint32_t ipaddr, uint32_t ip
#endif #endif
#else // NMRPFLASH_WINDOWS #else // NMRPFLASH_WINDOWS
struct sockaddr_in sin; MIB_UNICASTIPADDRESS_ROW row;
ULONG instance;
(*undo)->context = 0; memset(&row, 0, sizeof(row));
DWORD err = AddIPAddress(ipaddr, ipmask, sock->index, &(*undo)->context, &instance); row.InterfaceIndex = sock->index;
if (err != NO_ERROR && err != ERROR_DUP_DOMAINNAME && err != ERROR_OBJECT_ALREADY_EXISTS) { row.PrefixOrigin = IpPrefixOriginManual;
win_perror2("AddIPAddress", err); row.SuffixOrigin = IpPrefixOriginManual;
goto out; row.OnLinkPrefixLength = bitcount(ipmask);
} row.SkipAsSource = false;
row.PreferredLifetime = 0xffffffff;
row.ValidLifetime = 0xffffffff;
set_addr(&row.Address.Ipv4, ipaddr);
set_addr(&sin, ipaddr); DWORD err;
time_t beg = time_monotonic();
/* Wait until the new IP has actually been added */ if (add) {
err = CreateUnicastIpAddressEntry(&row);
if (err != NO_ERROR && err != ERROR_OBJECT_ALREADY_EXISTS) {
win_perror2("CreateUnicastIpAddressEntry", err);
goto out;
}
while (bind(fd, (struct sockaddr*)&sin, sizeof(sin)) != 0) { time_t beg = time_monotonic();
if ((time_monotonic() - beg) >= 5) {
fprintf(stderr, "Failed to bind after 5 seconds: "); /* Wait until the new IP has actually been added */
sock_perror("bind");
DeleteIPAddress((*undo)->context); while (bind(fd, (struct sockaddr*)&row.Address.Ipv4, sizeof(row.Address.Ipv4)) != 0) {
if ((time_monotonic() - beg) >= 5) {
fprintf(stderr, "Failed to bind after 5 seconds: ");
sock_perror("bind");
DeleteUnicastIpAddressEntry(&row);
goto out;
}
}
} else {
err = DeleteUnicastIpAddressEntry(&row);
if (err != NO_ERROR) {
win_perror2("DeleteUnicastIpAddressEntry", err);
goto out; goto out;
} }
} }
@ -1075,15 +1094,11 @@ int ethsock_ip_del(struct ethsock *sock, struct ethsock_ip_undo **undo)
int ret; int ret;
#ifndef NMRPFLASH_WINDOWS
if ((*undo)->ip[0] != INADDR_NONE) { if ((*undo)->ip[0] != INADDR_NONE) {
ret = ethsock_ip_add_del(sock, (*undo)->ip[0], (*undo)->ip[1], undo, false); ret = ethsock_ip_add_del(sock, (*undo)->ip[0], (*undo)->ip[1], undo, false);
} else { } else {
ret = 0; ret = 0;
} }
#else
ret = DeleteIPAddress((*undo)->context) ? 0 : -1;
#endif
free(*undo); free(*undo);
*undo = NULL; *undo = NULL;