Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/networking/udhcp/packet.c

Timestamp:

Jan 1, 2014, 12:47:38 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.21.1

File:

• branches/3.2/mindi-busybox/networking/udhcp/packet.c (modified) (9 diffs)

branches/3.2/mindi-busybox/networking/udhcp/packet.c

@@ -7 +7 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
-#include <netinet/in.h>
-#if (defined(__GLIBC__) && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1) || defined _NEWLIB_VERSION
-# include <netpacket/packet.h>
-# include <net/ethernet.h>
-#else
-# include <asm/types.h>
-# include <linux/if_packet.h>
-# include <linux/if_ether.h>
-#endif
-
 #include "common.h"
 #include "dhcpd.h"
+#include <netinet/in.h>
+#include <netinet/if_ether.h>
+#include <netpacket/packet.h>
 
 void FAST_FUNC udhcp_init_header(struct dhcp_packet *packet, char type)
@@ -89 +82 @@
 {
     int bytes;
-    unsigned char *vendor;
 
     memset(packet, 0, sizeof(*packet));
@@ -98 +90 @@
     }
 
-    if (packet->cookie != htonl(DHCP_MAGIC)) {
+    if (bytes < offsetof(struct dhcp_packet, options)
+     || packet->cookie != htonl(DHCP_MAGIC)
+    ) {
         bb_info_msg("Packet with bad magic, ignoring");
         return -2;
@@ -105 +99 @@
     udhcp_dump_packet(packet);
 
-    if (packet->op == BOOTREQUEST) {
-        vendor = udhcp_get_option(packet, DHCP_VENDOR);
-        if (vendor) {
-#if 0
-            static const char broken_vendors[][8] = {
-                "MSFT 98",
-                ""
-            };
-            int i;
-            for (i = 0; broken_vendors[i][0]; i++) {
-                if (vendor[OPT_LEN - OPT_DATA] == (uint8_t)strlen(broken_vendors[i])
-                 && strncmp((char*)vendor, broken_vendors[i], vendor[OPT_LEN - OPT_DATA]) == 0
-                ) {
-                    log1("Broken client (%s), forcing broadcast replies",
-                        broken_vendors[i]);
-                    packet->flags |= htons(BROADCAST_FLAG);
-                }
-            }
-#else
-            if (vendor[OPT_LEN - OPT_DATA] == (uint8_t)(sizeof("MSFT 98")-1)
-             && memcmp(vendor, "MSFT 98", sizeof("MSFT 98")-1) == 0
-            ) {
-                log1("Broken client (%s), forcing broadcast replies", "MSFT 98");
-                packet->flags |= htons(BROADCAST_FLAG);
-            }
-#endif
-        }
-    }
-
     return bytes;
-}
-
-uint16_t FAST_FUNC udhcp_checksum(void *addr, int count)
-{
-    /* Compute Internet Checksum for "count" bytes
-     * beginning at location "addr".
-     */
-    int32_t sum = 0;
-    uint16_t *source = (uint16_t *) addr;
-
-    while (count > 1)  {
-        /*  This is the inner loop */
-        sum += *source++;
-        count -= 2;
-    }
-
-    /*  Add left-over byte, if any */
-    if (count > 0) {
-        /* Make sure that the left-over byte is added correctly both
-         * with little and big endian hosts */
-        uint16_t tmp = 0;
-        *(uint8_t*)&tmp = *(uint8_t*)source;
-        sum += tmp;
-    }
-    /*  Fold 32-bit sum to 16 bits */
-    while (sum >> 16)
-        sum = (sum & 0xffff) + (sum >> 16);
-
-    return ~sum;
 }
 
@@ -220 +156 @@
     /* for UDP checksumming, ip.len is set to UDP packet len */
     packet.ip.tot_len = packet.udp.len;
-    packet.udp.check = udhcp_checksum(&packet, IP_UDP_DHCP_SIZE - padding);
+    packet.udp.check = inet_cksum((uint16_t *)&packet,
+            IP_UDP_DHCP_SIZE - padding);
     /* but for sending, it is set to IP packet len */
     packet.ip.tot_len = htons(IP_UDP_DHCP_SIZE - padding);
@@ -226 +163 @@
     packet.ip.version = IPVERSION;
     packet.ip.ttl = IPDEFTTL;
-    packet.ip.check = udhcp_checksum(&packet.ip, sizeof(packet.ip));
+    packet.ip.check = inet_cksum((uint16_t *)&packet.ip, sizeof(packet.ip));
 
     udhcp_dump_packet(dhcp_pkt);
@@ -246 +183 @@
         uint32_t dest_nip, int dest_port)
 {
-    struct sockaddr_in client;
+    struct sockaddr_in sa;
     unsigned padding;
     int fd;
@@ -259 +196 @@
     setsockopt_reuseaddr(fd);
 
-    memset(&client, 0, sizeof(client));
-    client.sin_family = AF_INET;
-    client.sin_port = htons(source_port);
-    client.sin_addr.s_addr = source_nip;
-    if (bind(fd, (struct sockaddr *)&client, sizeof(client)) == -1) {
+    memset(&sa, 0, sizeof(sa));
+    sa.sin_family = AF_INET;
+    sa.sin_port = htons(source_port);
+    sa.sin_addr.s_addr = source_nip;
+    if (bind(fd, (struct sockaddr *)&sa, sizeof(sa)) == -1) {
         msg = "bind(%s)";
         goto ret_close;
     }
 
-    memset(&client, 0, sizeof(client));
-    client.sin_family = AF_INET;
-    client.sin_port = htons(dest_port);
-    client.sin_addr.s_addr = dest_nip;
-    if (connect(fd, (struct sockaddr *)&client, sizeof(client)) == -1) {
+    memset(&sa, 0, sizeof(sa));
+    sa.sin_family = AF_INET;
+    sa.sin_port = htons(dest_port);
+    sa.sin_addr.s_addr = dest_nip;
+    if (connect(fd, (struct sockaddr *)&sa, sizeof(sa)) == -1) {
         msg = "connect";
         goto ret_close;
@@ -278 +215 @@
 
     udhcp_dump_packet(dhcp_pkt);
-
     padding = DHCP_OPTIONS_BUFSIZE - 1 - udhcp_end_option(dhcp_pkt->options);
     result = safe_write(fd, dhcp_pkt, DHCP_SIZE - padding);