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

Blind mode improvements

Browse source
This commit is contained in:
Joseph C. Lehner 2020-03-01 21:48:18 +01:00
parent 0ab6b37b9c
commit ccd4b0204b
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
nmrp.c
View file

@ -492,6 +492,8 @@ int nmrp_do(struct nmrpd_args *args)
status = pkt_recv(sock, &rx); status = pkt_recv(sock, &rx);
if (status == 0) { if (status == 0) {
if (memcmp(rx.eh.ether_dhost, src, 6) == 0) { if (memcmp(rx.eh.ether_dhost, src, 6) == 0) {
// set the destination MAC for all subsequent packages
memcpy(tx.eh.ether_dhost, rx.eh.ether_shost, 6);
break; break;
} else if (verbosity) { } else if (verbosity) {
printf("\nIgnoring bogus response: %s -> %s.\n", printf("\nIgnoring bogus response: %s -> %s.\n",
@ -509,7 +511,10 @@ int nmrp_do(struct nmrpd_args *args)
printf("Bailing out.\n"); printf("Bailing out.\n");
goto out; goto out;
} else { } else {
printf("Continuing blindly."); // we're blind, so fake a response from the MAC specified by -m
memcpy(rx.eh.ether_dhost, dest, 6);
msg_init(&rx.msg, NMRP_C_CONF_REQ);
printf("Faking one.");
break; break;
} }
} }
@ -518,8 +523,6 @@ 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) { if (ethsock_arp_add(sock, rx.eh.ether_shost, ipaddr.s_addr, &arp_undo) != 0) {
goto out; goto out;
} }
@ -677,15 +680,17 @@ int nmrp_do(struct nmrpd_args *args)
status = pkt_recv(sock, &rx); status = pkt_recv(sock, &rx);
if (status) { if (status) {
if (status == 2) { if (status == 2) {
fprintf(stderr, "Timeout while waiting for %s.\n", fprintf(stderr, "Timeout while waiting for %s. ",
msg_code_str(expect)); msg_code_str(expect));
} }
if (!args->blind) { if (!args->blind) {
printf("\n");
goto out; goto out;
} else { } else {
// fake a response printf("Faking response.\n");
msg_init(&rx.msg, expect); msg_init(&rx.msg, expect);
memcpy(rx.eh.ether_shost, tx.eh.ether_dhost, 6);
} }
} }