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

Remove a Win98 DHCP client bug workaround from get_packet().

Browse Source
This commit is contained in:
Nicholas J. Kain 2010-11-14 01:12:32 -05:00
parent 0661f4371b
commit 8401d175a1
1 changed files with 3 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ndhc/packet.c
View File

@ -14,44 +14,24 @@
#include "dhcpd.h" #include "dhcpd.h"
#include "options.h" #include "options.h"
/* read a packet from socket fd, return -1 on read error, -2 on packet error */ /* Read a packet from socket fd, return -1 on read error, -2 on packet error */
int get_packet(struct dhcpMessage *packet, int fd) int get_packet(struct dhcpMessage *packet, int fd)
{ {
int bytes; int bytes;
int i;
const char broken_vendors[][8] = {
"MSFT 98",
""
};
unsigned char *vendor;
memset(packet, 0, sizeof(struct dhcpMessage)); memset(packet, 0, sizeof(struct dhcpMessage));
bytes = safe_read(fd, (char *)packet, sizeof(struct dhcpMessage)); bytes = safe_read(fd, (char *)packet, sizeof(struct dhcpMessage));
if (bytes == -1) { if (bytes == -1) {
log_line("read on listen socket failed: %s", strerror(errno)); log_line("Read on listen socket failed: %s", strerror(errno));
return -1; return -1;
} }
if (ntohl(packet->cookie) != DHCP_MAGIC) { if (ntohl(packet->cookie) != DHCP_MAGIC) {
log_error("received bogus message, ignoring."); log_error("Packet with bad magic number, ignoring.");
return -2; return -2;
} }
log_line("Received a packet"); log_line("Received a packet");
if (packet->op == BOOTREQUEST
&& (vendor = get_option(packet, DHCP_VENDOR)))
{
for (i = 0; broken_vendors[i][0]; i++) {
if (vendor[OPT_LEN - 2] == (unsigned char)strlen(broken_vendors[i])
&& !strncmp((char *)vendor, broken_vendors[i],
vendor[OPT_LEN - 2]))
{
log_line("broken client (%s), forcing broadcast",
broken_vendors[i]);
packet->flags |= htons(BROADCAST_FLAG);
}
}
}
return bytes; return bytes;
} }