diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2007-07-03 15:47:50 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2007-07-03 15:47:50 +0000 |
| commit | 42b3dea9bfb8ac595c71089ee23012f44dd43eb2 (patch) | |
| tree | b7b86d06a574d2af72bc79536d399905b5619959 /networking/udhcp/packet.c | |
| parent | 54e19da86d5496ec5f5787b85a2b6342be1d63d4 (diff) | |
| download | busybox-42b3dea9bfb8ac595c71089ee23012f44dd43eb2.tar.gz | |
udhcp: many small fixes:
* arpping(): smaller and even probably fixed
* lots of variables/params converted: ulong -> uint32_t
* uptime() nuked in favor of monotonic_sec()
* udhcp_get_packet(): only one "bad vendor", simplify
function old new delta
reservedIp 36 35 -1
udhcpc_main 2462 2460 -2
addStaticLease 64 62 -2
static.broken_vendors 16 - -16
uptime 19 - -19
udhcpd_main 1273 1238 -35
udhcp_get_packet 223 184 -39
.rodata 144162 144106 -56
arpping 690 609 -81
------------------------------------------------------------------------------
(add/remove: 0/2 grow/shrink: 0/7 up/down: 0/-251) Total: -251 bytes
text data bss dec hex filename
734241 3028 14400 751669 b7835 busybox_old
734005 3028 14400 751433 b7749 busybox_unstripped
Diffstat (limited to 'networking/udhcp/packet.c')
| -rw-r--r-- | networking/udhcp/packet.c | 34 |
1 files changed, 24 insertions, 10 deletions
diff --git a/networking/udhcp/packet.c b/networking/udhcp/packet.c index da3807773..272e79df1 100644 --- a/networking/udhcp/packet.c +++ b/networking/udhcp/packet.c @@ -41,16 +41,17 @@ void udhcp_init_header(struct dhcpMessage *packet, char type) /* read a packet from socket fd, return -1 on read error, -2 on packet error */ int udhcp_get_packet(struct dhcpMessage *packet, int fd) { +#if 0 static const char broken_vendors[][8] = { "MSFT 98", "" }; +#endif int bytes; - int i; - char unsigned *vendor; + unsigned char *vendor; - memset(packet, 0, sizeof(struct dhcpMessage)); - bytes = read(fd, packet, sizeof(struct dhcpMessage)); + memset(packet, 0, sizeof(*packet)); + bytes = read(fd, packet, sizeof(*packet)); if (bytes < 0) { DEBUG("cannot read on listening socket, ignoring"); return -1; @@ -62,15 +63,28 @@ int udhcp_get_packet(struct dhcpMessage *packet, int fd) } DEBUG("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] == (uint8_t)strlen(broken_vendors[i]) - && !strncmp((char*)vendor, broken_vendors[i], vendor[OPT_LEN - 2]) + if (packet->op == BOOTREQUEST) { + vendor = get_option(packet, DHCP_VENDOR); + if (vendor) { +#if 0 + int i; + for (i = 0; broken_vendors[i][0]; i++) { + if (vendor[OPT_LEN - 2] == (uint8_t)strlen(broken_vendors[i]) + && !strncmp((char*)vendor, broken_vendors[i], vendor[OPT_LEN - 2]) + ) { + DEBUG("broken client (%s), forcing broadcast", + broken_vendors[i]); + packet->flags |= htons(BROADCAST_FLAG); + } + } +#else + if (vendor[OPT_LEN - 2] == (uint8_t)(sizeof("MSFT 98")-1) + && memcmp(vendor, "MSFT 98", sizeof("MSFT 98")-1) == 0 ) { - DEBUG("broken client (%s), forcing broadcast", - broken_vendors[i]); + DEBUG("broken client (%s), forcing broadcast", "MSFT 98"); packet->flags |= htons(BROADCAST_FLAG); } +#endif } } |