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

Populate ethsock_ip_undo on Windows

Browse source
This commit is contained in:
Joseph C. Lehner 2020-09-10 17:36:28 +02:00
parent 31cf42fae5
commit d91338f906
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
ethsock.c
View file

@ -1055,7 +1055,8 @@ static int ethsock_ip_add_del(struct ethsock *sock, uint32_t ipaddr, uint32_t ip
return -1; return -1;
} }
memset(*undo, 0, sizeof(**undo)); (*undo)->ip[0] = ipaddr;
(*undo)->ip[1] = ipmask;
} }
ret = -1; ret = -1;
@ -1067,11 +1068,6 @@ static int ethsock_ip_add_del(struct ethsock *sock, uint32_t ipaddr, uint32_t ip
#ifndef NMRPFLASH_WINDOWS #ifndef NMRPFLASH_WINDOWS
#ifdef NMRPFLASH_LINUX #ifdef NMRPFLASH_LINUX
if (add) {
(*undo)->ip[0] = ipaddr;
(*undo)->ip[1] = ipmask;
}
if (!intf_add_del_ip(sock->intf, (*undo)->ip[0], (*undo)->ip[1], add)) { if (!intf_add_del_ip(sock->intf, (*undo)->ip[0], (*undo)->ip[1], add)) {
goto out; goto out;
} }
@ -1104,13 +1100,17 @@ static int ethsock_ip_add_del(struct ethsock *sock, uint32_t ipaddr, uint32_t ip
memset(&row, 0, sizeof(row)); memset(&row, 0, sizeof(row));
row.InterfaceIndex = sock->index; row.InterfaceIndex = sock->index;
row.PrefixOrigin = IpPrefixOriginManual;
row.SuffixOrigin = IpPrefixOriginManual;
row.OnLinkPrefixLength = bitcount(ipmask);
row.SkipAsSource = false;
row.PreferredLifetime = 0xffffffff;
row.ValidLifetime = 0xffffffff;
set_addr(&row.Address.Ipv4, ipaddr); set_addr(&row.Address.Ipv4, ipaddr);
row.Address.si_family = AF_INET;
if (add) {
row.PrefixOrigin = IpPrefixOriginManual;
row.SuffixOrigin = IpPrefixOriginManual;
row.OnLinkPrefixLength = bitcount(ipmask);
row.SkipAsSource = false;
row.PreferredLifetime = 0xffffffff;
row.ValidLifetime = 0xffffffff;
}
DWORD err; DWORD err;