emo/ndhc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

The ip4 protocol change broke on the send side; fix it by explicitly

Browse Source 
zeroing the send buffer.  It's less finicky than special-casing the
ip4 command to use strnkcpy instead of strnkcat.

At the same time, centralize the command print code on the send side.
It can just live in pipewrite() rather than the callers.
This commit is contained in:
Nicholas J. Kain 2014-03-15 04:32:44 -04:00
parent 19d009891a
commit 7627298c07
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ndhc/ifchange.c
View File

@ -157,8 +157,11 @@ static int ifchd_cmd(char *buf, size_t buflen, uint8_t *optdata,
static void pipewrite(const char *buf, size_t count)
{
if (safe_write(pToIfchW, buf, count) == -1)
if (safe_write(pToIfchW, buf, count) == -1) {
log_error("pipewrite: write failed: %s", strerror(errno));
return;
}
log_line("Sent to ifchd: %s", buf);
}
void ifchange_deconfig(void)
@ -229,7 +232,6 @@ static size_t send_client_ip(char *out, size_t olen, struct dhcpmsg *packet)
}
strnkcat(out, ipb, olen);
log_line("Sent to ifchd: %s", ipb);
return strlen(ipb);
}
@ -253,7 +255,6 @@ static size_t send_cmd(char *out, size_t olen, struct dhcpmsg *packet,
if (ifchd_cmd(buf, sizeof buf, optdata, optlen, code) == -1)
return 0;
strnkcat(out, buf, olen);
log_line("Sent to ifchd: %s", buf);
return strlen(buf);
}
@ -265,6 +266,7 @@ void ifchange_bind(struct dhcpmsg *packet)
if (!packet)
return;
memset(buf, 0, sizeof buf);
tbs |= send_client_ip(buf, sizeof buf, packet);
tbs |= send_cmd(buf, sizeof buf, packet, DCODE_ROUTER);
tbs |= send_cmd(buf, sizeof buf, packet, DCODE_DNS);