Changeset 3306 in MondoRescue

Timestamp:

Jul 2, 2014, 10:34:07 PM (10 years ago)

Author:

Bruno Cornec

Message:

• Fix busybox 1.21.1 to support back old distributions such as RHEL3 and RHEL4 or SLES9 by avoiding usgae of the struct tpacket_auxdata

File:

• branches/3.2/mindi-busybox/networking/udhcp/dhcpc.c (modified) (8 diffs)

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

@@ -26 +26 @@
 #include "dhcpc.h"
 
-#include <netinet/if_ether.h>
+#include <asm/types.h>
+#if (defined(__GLIBC__) && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1) || defined(_NEWLIB_VERSION)
+# include <netpacket/packet.h>
+# include <net/ethernet.h>
+#else
+# include <linux/if_packet.h>
+# include <linux/if_ether.h>
+#endif
 #include <linux/filter.h>
-#include <linux/if_packet.h>
 
 /* "struct client_config_t client_config" is in bb_common_bufsiz1 */
@@ -837 +843 @@
     struct ip_udp_dhcp_packet packet;
     uint16_t check;
+#ifdef PACKET_AUXDATA
     unsigned char cmsgbuf[CMSG_LEN(sizeof(struct tpacket_auxdata))];
+    struct cmsghdr *cmsg;
+#endif
     struct iovec iov;
     struct msghdr msg;
-    struct cmsghdr *cmsg;
-
+
+#ifdef PACKET_AUXDATA
     /* used to use just safe_read(fd, &packet, sizeof(packet))
      * but we need to check for TP_STATUS_CSUMNOTREADY :(
@@ -863 +872 @@
         break;
     }
+#else
+    memset(&packet, 0, sizeof(packet));
+    bytes = safe_read(fd, &packet, sizeof(packet));
+    if (bytes < 0) {
+        log1("Packet read error, ignoring");
+        /* NB: possible down interface, etc. Caller should pause. */
+        return bytes; /* returns -1 */
+    }
+#endif
 
     if (bytes < (int) (sizeof(packet.ip) + sizeof(packet.udp))) {
@@ -898 +916 @@
     }
 
+#ifdef PACKET_AUXDATA
     for (cmsg = CMSG_FIRSTHDR(&msg); cmsg; cmsg = CMSG_NXTHDR(&msg, cmsg)) {
         if (cmsg->cmsg_level == SOL_PACKET
@@ -911 +930 @@
         }
     }
+#endif
 
     /* verify UDP checksum. IP header has to be modified for this */
@@ -922 +942 @@
         return -2;
     }
+#ifdef PACKET_AUXDATA
  skip_udp_sum_check:
+#endif
 
     if (packet.data.cookie != htonl(DHCP_MAGIC)) {
@@ -1033 +1055 @@
     }
 
+#ifdef PACKET_AUXDATA
     if (setsockopt(fd, SOL_PACKET, PACKET_AUXDATA,
             &const_int_1, sizeof(int)) < 0
@@ -1039 +1062 @@
             log1("Can't set PACKET_AUXDATA on raw socket");
     }
+#else
+    sock.sll_family = AF_PACKET;
+    sock.sll_protocol = htons(ETH_P_IP);
+    sock.sll_ifindex = ifindex;
+    xbind(fd, (struct sockaddr *) &sock, sizeof(sock));
+#endif
 
     log1("Created raw socket");