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

Send ADVERTISE and CONFIG_ACK in one go

Browse source
This commit is contained in:
Joseph C. Lehner 2020-02-29 21:41:15 +01:00
parent 46c56b75e2
commit f301e1727e
1 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
nmrp.c
View file

@ -472,7 +472,6 @@ int nmrp_do(struct nmrpd_args *args)
memcpy(tx.eh.ether_dhost, dest, 6); memcpy(tx.eh.ether_dhost, dest, 6);
tx.eh.ether_type = htons(ETH_P_NMRP); tx.eh.ether_type = htons(ETH_P_NMRP);
msg_mkadvertise(&tx.msg, "NTGR");
i = 0; i = 0;
upload_ok = 0; upload_ok = 0;
@ -484,8 +483,13 @@ int nmrp_do(struct nmrpd_args *args)
fflush(stdout); fflush(stdout);
i = (i + 1) & 3; i = (i + 1) & 3;
msg_mkadvertise(&tx.msg, "NTGR");
if (pkt_send(sock, &tx) < 0) {
goto out;
}
msg_mkconfack(&tx.msg, ipaddr.s_addr, ipmask.s_addr, region);
if (pkt_send(sock, &tx) < 0) { if (pkt_send(sock, &tx) < 0) {
xperror("sendto");
goto out; goto out;
} }
@ -510,8 +514,15 @@ int nmrp_do(struct nmrpd_args *args)
} }
} }
printf("\n"); printf("\n");
memcpy(tx.eh.ether_dhost, rx.eh.ether_shost, 6);
if (ethsock_arp_add(sock, rx.eh.ether_shost, ipaddr.s_addr, &arp_undo) != 0) {
goto out;
}
expect = NMRP_C_CONF_REQ; expect = NMRP_C_CONF_REQ;
ulreqs = 0; ulreqs = 0;
kareqs = 0; kareqs = 0;
@ -539,15 +550,9 @@ int nmrp_do(struct nmrpd_args *args)
printf("Received configuration request from %s.\n", printf("Received configuration request from %s.\n",
mac_to_str(rx.eh.ether_shost)); mac_to_str(rx.eh.ether_shost));
memcpy(tx.eh.ether_dhost, rx.eh.ether_shost, 6);
printf("Sending configuration: %s/%d.\n", printf("Sending configuration: %s/%d.\n",
args->ipaddr, bitcount(ipmask.s_addr)); args->ipaddr, bitcount(ipmask.s_addr));
if (ethsock_arp_add(sock, rx.eh.ether_shost, ipaddr.s_addr, &arp_undo) != 0) {
goto out;
}
break; break;
case NMRP_C_TFTP_UL_REQ: case NMRP_C_TFTP_UL_REQ:
if (!upload_ok) { if (!upload_ok) {
@ -651,7 +656,6 @@ int nmrp_do(struct nmrpd_args *args)
if (tx.msg.code != NMRP_C_NONE) { if (tx.msg.code != NMRP_C_NONE) {
if (pkt_send(sock, &tx) < 0) { if (pkt_send(sock, &tx) < 0) {
xperror("sendto");
goto out; goto out;
} }