From 8401d175a16584560348c780a95cbfc0136b8ff5 Mon Sep 17 00:00:00 2001 From: "Nicholas J. Kain" Date: Sun, 14 Nov 2010 01:12:32 -0500 Subject: [PATCH] Remove a Win98 DHCP client bug workaround from get_packet(). --- ndhc/packet.c | 26 +++----------------------- 1 file changed, 3 insertions(+), 23 deletions(-) diff --git a/ndhc/packet.c b/ndhc/packet.c index dfb7549..dd77b9b 100644 --- a/ndhc/packet.c +++ b/ndhc/packet.c @@ -14,44 +14,24 @@ #include "dhcpd.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 bytes; - int i; - const char broken_vendors[][8] = { - "MSFT 98", - "" - }; - unsigned char *vendor; memset(packet, 0, sizeof(struct dhcpMessage)); bytes = safe_read(fd, (char *)packet, sizeof(struct dhcpMessage)); 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; } if (ntohl(packet->cookie) != DHCP_MAGIC) { - log_error("received bogus message, ignoring."); + log_error("Packet with bad magic number, ignoring."); return -2; } 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; }