Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/networking/udhcp/socket.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/socket.c (modified) (5 diffs)

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

@@ -23 +23 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+#include "common.h"
 #include <net/if.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"
 
 int FAST_FUNC udhcp_read_interface(const char *interface, int *ifindex, uint32_t *nip, uint8_t *mac)
 {
+    /* char buffer instead of bona-fide struct avoids aliasing warning */
+    char ifr_buf[sizeof(struct ifreq)];
+    struct ifreq *const ifr = (void *)ifr_buf;
+
     int fd;
-    struct ifreq ifr;
     struct sockaddr_in *our_ip;
 
-    memset(&ifr, 0, sizeof(ifr));
+    memset(ifr, 0, sizeof(*ifr));
     fd = xsocket(AF_INET, SOCK_RAW, IPPROTO_RAW);
 
-    ifr.ifr_addr.sa_family = AF_INET;
-    strncpy_IFNAMSIZ(ifr.ifr_name, interface);
+    ifr->ifr_addr.sa_family = AF_INET;
+    strncpy_IFNAMSIZ(ifr->ifr_name, interface);
     if (nip) {
-        if (ioctl_or_perror(fd, SIOCGIFADDR, &ifr,
+        if (ioctl_or_perror(fd, SIOCGIFADDR, ifr,
             "is interface %s up and configured?", interface)
         ) {
@@ -53 +47 @@
             return -1;
         }
-        our_ip = (struct sockaddr_in *) &ifr.ifr_addr;
+        our_ip = (struct sockaddr_in *) &ifr->ifr_addr;
         *nip = our_ip->sin_addr.s_addr;
         log1("IP %s", inet_ntoa(our_ip->sin_addr));
@@ -59 +53 @@
 
     if (ifindex) {
-        if (ioctl_or_warn(fd, SIOCGIFINDEX, &ifr) != 0) {
+        if (ioctl_or_warn(fd, SIOCGIFINDEX, ifr) != 0) {
             close(fd);
             return -1;
         }
-        log1("Adapter index %d", ifr.ifr_ifindex);
-        *ifindex = ifr.ifr_ifindex;
+        log1("Adapter index %d", ifr->ifr_ifindex);
+        *ifindex = ifr->ifr_ifindex;
     }
 
     if (mac) {
-        if (ioctl_or_warn(fd, SIOCGIFHWADDR, &ifr) != 0) {
+        if (ioctl_or_warn(fd, SIOCGIFHWADDR, ifr) != 0) {
             close(fd);
             return -1;
         }
-        memcpy(mac, ifr.ifr_hwaddr.sa_data, 6);
+        memcpy(mac, ifr->ifr_hwaddr.sa_data, 6);
         log1("MAC %02x:%02x:%02x:%02x:%02x:%02x",
             mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
@@ -87 +81 @@
     int fd;
     struct sockaddr_in addr;
+    char *colon;
 
     log1("Opening listen socket on *:%d %s", port, inf);
@@ -95 +90 @@
         bb_perror_msg_and_die("SO_BROADCAST");
 
-    /* NB: bug 1032 says this doesn't work on ethernet aliases (ethN:M) */
+    /* SO_BINDTODEVICE doesn't work on ethernet aliases (ethN:M) */
+    colon = strrchr(inf, ':');
+    if (colon)
+        *colon = '\0';
+
     if (setsockopt_bindtodevice(fd, inf))
         xfunc_die(); /* warning is already printed */
+
+    if (colon)
+        *colon = ':';
 
     memset(&addr, 0, sizeof(addr));