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

Set IP before starting NMRP loop

Browse source
This commit is contained in:
Joseph C. Lehner 2016-11-13 08:28:22 +01:00
parent 644a9ce55f
commit 3b292714ff
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
nmrp.c
View file

@ -490,6 +490,14 @@ int nmrp_do(struct nmrpd_args *args)
} }
goto out; goto out;
} }
} else {
if (verbosity) {
printf("Adding %s to interface %s.\n", args->ipaddr_intf, args->intf);
}
if (ethsock_ip_add(sock, intf_addr, ipconf.mask.s_addr, &gundo) != 0) {
goto out;
}
} }
if (ethsock_set_timeout(sock, args->rx_timeout)) { if (ethsock_set_timeout(sock, args->rx_timeout)) {
@ -583,12 +591,6 @@ int nmrp_do(struct nmrpd_args *args)
memcpy(arpmac, rx.eh.ether_shost, 6); memcpy(arpmac, rx.eh.ether_shost, 6);
memcpy(&arpip, &ipconf.addr, sizeof(ipconf.addr)); memcpy(&arpip, &ipconf.addr, sizeof(ipconf.addr));
if (autoip) {
if (ethsock_ip_add(sock, intf_addr, ipconf.mask.s_addr, &gundo) != 0) {
goto out;
}
}
if (ethsock_arp_add(sock, arpmac, &arpip) != 0) { if (ethsock_arp_add(sock, arpmac, &arpip) != 0) {
goto out; goto out;
} }