Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/networking/udhcp/packet.c

Timestamp:

Nov 4, 2007, 3:16:40 AM (17 years ago)

Author:

Bruno Cornec

Message:

Update to busybox 1.7.2

File:

• branches/2.2.5/mindi-busybox/networking/udhcp/packet.c (modified) (10 diffs)

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

@@ -1 @@
-#include <unistd.h>
-#include <string.h>
+/* vi: set sw=4 ts=4: */
+
 #include <netinet/in.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <features.h>
-#if (__GLIBC__ >= 2 && __GLIBC_MINOR >= 1) || defined _NEWLIB_VERSION
+#if (defined(__GLIBC__) && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1) || defined _NEWLIB_VERSION
 #include <netpacket/packet.h>
 #include <net/ethernet.h>
@@ -13 +10 @@
 #include <linux/if_ether.h>
 #endif
-#include <errno.h>
 
 #include "common.h"
-#include "packet.h"
 #include "dhcpd.h"
 #include "options.h"
@@ -47 +42 @@
 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;
-
-    memset(packet, 0, sizeof(struct dhcpMessage));
-    bytes = read(fd, packet, sizeof(struct dhcpMessage));
+    unsigned char *vendor;
+
+    memset(packet, 0, sizeof(*packet));
+    bytes = read(fd, packet, sizeof(*packet));
     if (bytes < 0) {
-        DEBUG(LOG_INFO, "couldn't read on listening socket, ignoring");
+        DEBUG("cannot read on listening socket, ignoring");
         return -1;
     }
 
     if (ntohl(packet->cookie) != DHCP_MAGIC) {
-        LOG(LOG_ERR, "received bogus message, ignoring");
+        bb_error_msg("received bogus message, ignoring");
         return -2;
     }
-    DEBUG(LOG_INFO, "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])) {
-                DEBUG(LOG_INFO, "broken client (%s), forcing broadcast",
-                    broken_vendors[i]);
+    DEBUG("Received a packet");
+
+    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", "MSFT 98");
                 packet->flags |= htons(BROADCAST_FLAG);
             }
+#endif
         }
     }
@@ -88 +98 @@
      *         beginning at location "addr".
      */
-    register int32_t sum = 0;
+    int32_t sum = 0;
     uint16_t *source = (uint16_t *) addr;
 
@@ -114 +124 @@
 
 /* Construct a ip/udp header for a packet, and specify the source and dest hardware address */
-int udhcp_raw_packet(struct dhcpMessage *payload, uint32_t source_ip, int source_port,
-           uint32_t dest_ip, int dest_port, uint8_t *dest_arp, int ifindex)
+void BUG_sizeof_struct_udp_dhcp_packet_must_be_576(void);
+int udhcp_raw_packet(struct dhcpMessage *payload,
+        uint32_t source_ip, int source_port,
+        uint32_t dest_ip, int dest_port, const uint8_t *dest_arp, int ifindex)
 {
     int fd;
@@ -122 +134 @@
     struct udp_dhcp_packet packet;
 
-    if ((fd = socket(PF_PACKET, SOCK_DGRAM, htons(ETH_P_IP))) < 0) {
-        DEBUG(LOG_ERR, "socket call failed: %m");
+    fd = socket(PF_PACKET, SOCK_DGRAM, htons(ETH_P_IP));
+    if (fd < 0) {
+        bb_perror_msg("socket");
         return -1;
     }
@@ -136 +149 @@
     memcpy(dest.sll_addr, dest_arp, 6);
     if (bind(fd, (struct sockaddr *)&dest, sizeof(struct sockaddr_ll)) < 0) {
-        DEBUG(LOG_ERR, "bind call failed: %m");
+        bb_perror_msg("bind");
         close(fd);
         return -1;
@@ -157 +170 @@
     packet.ip.check = udhcp_checksum(&(packet.ip), sizeof(packet.ip));
 
-    result = sendto(fd, &packet, sizeof(struct udp_dhcp_packet), 0, (struct sockaddr *) &dest, sizeof(dest));
+    if (sizeof(struct udp_dhcp_packet) != 576)
+        BUG_sizeof_struct_udp_dhcp_packet_must_be_576();
+
+    result = sendto(fd, &packet, sizeof(struct udp_dhcp_packet), 0,
+            (struct sockaddr *) &dest, sizeof(dest));
     if (result <= 0) {
-        DEBUG(LOG_ERR, "write on socket failed: %m");
+        bb_perror_msg("sendto");
     }
     close(fd);
@@ -167 +184 @@
 
 /* Let the kernel do all the work for packet generation */
-int udhcp_kernel_packet(struct dhcpMessage *payload, uint32_t source_ip, int source_port,
-           uint32_t dest_ip, int dest_port)
-{
-    int n = 1;
+int udhcp_kernel_packet(struct dhcpMessage *payload,
+        uint32_t source_ip, int source_port,
+        uint32_t dest_ip, int dest_port)
+{
     int fd, result;
     struct sockaddr_in client;
 
-    if ((fd = socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0)
-        return -1;
-
-    if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (char *) &n, sizeof(n)) == -1) {
-        close(fd);
-        return -1;
-    }
+    fd = socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP);
+    if (fd < 0)
+        return -1;
+
+    setsockopt_reuseaddr(fd);
 
     memset(&client, 0, sizeof(client));
@@ -187 +202 @@
     client.sin_addr.s_addr = source_ip;
 
-    if (bind(fd, (struct sockaddr *)&client, sizeof(struct sockaddr)) == -1) {
+    if (bind(fd, (struct sockaddr *)&client, sizeof(client)) == -1) {
         close(fd);
         return -1;