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

Allow receive of short dhcp packets over raw listen sockets.

Browse Source
This commit is contained in:
Nicholas J. Kain 2010-12-26 15:03:14 -05:00
parent 08301a7053
commit 8b97107b8d
1 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ndhc/dhcpmsg.c
View File

@ -227,23 +227,12 @@ int get_raw_packet(struct dhcpMessage *payload, int fd)
memset(&packet, 0, packet_size); memset(&packet, 0, packet_size);
int len = safe_read(fd, (char *)&packet, packet_size); int len = safe_read(fd, (char *)&packet, packet_size);
if (len == -1) { if (len == -1 && errno != EAGAIN && errno != EWOULDBLOCK) {
log_line("get_raw_packet: read error %s", strerror(errno)); log_line("get_raw_packet: read error %s", strerror(errno));
usleep(500000); /* possible down interface, looping condition */ usleep(500000); /* possible down interface, looping condition */
return -1; return -1;
} }
if (len < header_size) {
log_line("Message too short to contain IP + UDP headers, ignoring");
sleep(1);
return -2;
}
if (len < ntohs(packet.ip.tot_len)) {
log_line("Truncated packet");
return -2;
}
/* ignore any extra garbage bytes */ /* ignore any extra garbage bytes */
len = ntohs(packet.ip.tot_len); len = ntohs(packet.ip.tot_len);