Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/networking/udhcp/socket.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/networking/udhcp/socket.c (modified) (7 diffs)

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

@@ -1 +1 @@
 /* vi: set sw=4 ts=4: */
 /*
- * socket.c -- DHCP server client/server socket creation
+ * DHCP server client/server socket creation
  *
  * udhcp client/server
@@ -23 +23 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-
 #include <net/if.h>
-#include <features.h>
 #if (defined(__GLIBC__) && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1) || defined _NEWLIB_VERSION
-#include <netpacket/packet.h>
-#include <net/ethernet.h>
+# include <netpacket/packet.h>
+# include <net/ethernet.h>
 #else
-#include <asm/types.h>
-#include <linux/if_packet.h>
-#include <linux/if_ether.h>
+# include <asm/types.h>
+# include <linux/if_packet.h>
+# include <linux/if_ether.h>
 #endif
 
 #include "common.h"
 
-
-int read_interface(const char *interface, int *ifindex, uint32_t *addr, uint8_t *arp)
+int FAST_FUNC udhcp_read_interface(const char *interface, int *ifindex, uint32_t *nip, uint8_t *mac)
 {
     int fd;
@@ -48 +45 @@
 
     ifr.ifr_addr.sa_family = AF_INET;
-    strncpy(ifr.ifr_name, interface, sizeof(ifr.ifr_name));
-    if (addr) {
+    strncpy_IFNAMSIZ(ifr.ifr_name, interface);
+    if (nip) {
         if (ioctl_or_perror(fd, SIOCGIFADDR, &ifr,
             "is interface %s up and configured?", interface)
@@ -57 +54 @@
         }
         our_ip = (struct sockaddr_in *) &ifr.ifr_addr;
-        *addr = our_ip->sin_addr.s_addr;
-        DEBUG("%s (our ip) = %s", ifr.ifr_name, inet_ntoa(our_ip->sin_addr));
+        *nip = our_ip->sin_addr.s_addr;
+        log1("IP %s", inet_ntoa(our_ip->sin_addr));
     }
 
@@ -66 +63 @@
             return -1;
         }
-        DEBUG("adapter index %d", ifr.ifr_ifindex);
+        log1("Adapter index %d", ifr.ifr_ifindex);
         *ifindex = ifr.ifr_ifindex;
     }
 
-    if (arp) {
+    if (mac) {
         if (ioctl_or_warn(fd, SIOCGIFHWADDR, &ifr) != 0) {
             close(fd);
             return -1;
         }
-        memcpy(arp, ifr.ifr_hwaddr.sa_data, 6);
-        DEBUG("adapter hardware address %02x:%02x:%02x:%02x:%02x:%02x",
-            arp[0], arp[1], arp[2], arp[3], arp[4], arp[5]);
+        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]);
     }
 
@@ -86 +83 @@
 /* 1. None of the callers expects it to ever fail */
 /* 2. ip was always INADDR_ANY */
-int listen_socket(/*uint32_t ip,*/ int port, const char *inf)
+int FAST_FUNC udhcp_listen_socket(/*uint32_t ip,*/ int port, const char *inf)
 {
     int fd;
-    struct ifreq interface;
     struct sockaddr_in addr;
 
-    DEBUG("Opening listen socket on *:%d %s", port, inf);
+    log1("Opening listen socket on *:%d %s", port, inf);
     fd = xsocket(PF_INET, SOCK_DGRAM, IPPROTO_UDP);
 
@@ -99 +95 @@
         bb_perror_msg_and_die("SO_BROADCAST");
 
-    strncpy(interface.ifr_name, inf, IFNAMSIZ);
-    if (setsockopt(fd, SOL_SOCKET, SO_BINDTODEVICE, &interface, sizeof(interface)) == -1)
-        bb_perror_msg_and_die("SO_BINDTODEVICE");
+    /* NB: bug 1032 says this doesn't work on ethernet aliases (ethN:M) */
+    if (setsockopt_bindtodevice(fd, inf))
+        xfunc_die(); /* warning is already printed */
 
     memset(&addr, 0, sizeof(addr));