*: declare strings with ALIGN1, as appropriate

[oweals/busybox.git] / networking / udhcp / socket.c

diff --git a/networking/udhcp/socket.c b/networking/udhcp/socket.c
index be5985f88cb488e6ee3c685539dc686410ae67a5..a5220ba74263732d69add1d986658fa0ca1e66ee 100644 (file)
--- a/networking/udhcp/socket.c
+++ b/networking/udhcp/socket.c
@@ -1,6 +1,6 @@
 /* vi: set sw=4 ts=4: */
 /*
- * socket.c -- DHCP server client/server socket creation
+ * DHCP server client/server socket creation
  *
  * udhcp client/server
  * Copyright (C) 1999 Matthew Ramsay <matthewr@moreton.com.au>
@@ -22,106 +22,81 @@
  * along with this program; if not, write to the Free Software
  * 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>
-#else
-#include <asm/types.h>
-#include <linux/if_packet.h>
-#include <linux/if_ether.h>
-#endif
-
 #include "common.h"
+#include <net/if.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)
 {
+       /* 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));
-       fd = socket(AF_INET, SOCK_RAW, IPPROTO_RAW);
-       if (fd < 0) {
-               bb_perror_msg("socket failed");
-               return -1;
-       }
+       memset(ifr, 0, sizeof(*ifr));
+       fd = xsocket(AF_INET, SOCK_RAW, IPPROTO_RAW);
 
-       ifr.ifr_addr.sa_family = AF_INET;
-       strncpy(ifr.ifr_name, interface, sizeof(ifr.ifr_name));
-       if (addr) {
-               if (ioctl(fd, SIOCGIFADDR, &ifr) != 0) {
-                       bb_perror_msg("SIOCGIFADDR failed (is interface %s "
-                                       "up and configured?)", interface);
+       ifr->ifr_addr.sa_family = AF_INET;
+       strncpy_IFNAMSIZ(ifr->ifr_name, interface);
+       if (nip) {
+               if (ioctl_or_perror(fd, SIOCGIFADDR, ifr,
+                       "is interface %s up and configured?", interface)
+               ) {
                        close(fd);
                        return -1;
                }
-               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));
+               our_ip = (struct sockaddr_in *) &ifr->ifr_addr;
+               *nip = our_ip->sin_addr.s_addr;
+               log1("IP %s", inet_ntoa(our_ip->sin_addr));
        }
 
        if (ifindex) {
-               if (ioctl(fd, SIOCGIFINDEX, &ifr) != 0) {
-                       bb_perror_msg("SIOCGIFINDEX failed");
+               if (ioctl_or_warn(fd, SIOCGIFINDEX, ifr) != 0) {
                        close(fd);
                        return -1;
                }
-               DEBUG("adapter index %d", ifr.ifr_ifindex);
-               *ifindex = ifr.ifr_ifindex;
+               log1("Adapter index %d", ifr->ifr_ifindex);
+               *ifindex = ifr->ifr_ifindex;
        }
 
-       if (arp) {
-               if (ioctl(fd, SIOCGIFHWADDR, &ifr) != 0) {
-                       bb_perror_msg("SIOCGIFHWADDR failed");
+       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]);
        }
 
+       close(fd);
        return 0;
 }
 
-
-int listen_socket(uint32_t ip, int port, const char *inf)
+/* 1. None of the callers expects it to ever fail */
+/* 2. ip was always INADDR_ANY */
+int FAST_FUNC udhcp_listen_socket(/*uint32_t ip,*/ int port, const char *inf)
 {
-       struct ifreq interface;
        int fd;
        struct sockaddr_in addr;
 
-       DEBUG("Opening listen socket on 0x%08x:%d %s", ip, port, inf);
+       log1("Opening listen socket on *:%d %s", port, inf);
        fd = xsocket(PF_INET, SOCK_DGRAM, IPPROTO_UDP);
 
+       setsockopt_reuseaddr(fd);
+       if (setsockopt_broadcast(fd) == -1)
+               bb_perror_msg_and_die("SO_BROADCAST");
+
+       /* 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));
        addr.sin_family = AF_INET;
        addr.sin_port = htons(port);
-       addr.sin_addr.s_addr = ip;
-
-       if (setsockopt_reuseaddr(fd) == -1) {
-               close(fd);
-               return -1;
-       }
-       if (setsockopt_broadcast(fd) == -1) {
-               close(fd);
-               return -1;
-       }
-
-       strncpy(interface.ifr_name, inf, IFNAMSIZ);
-       if (setsockopt(fd, SOL_SOCKET, SO_BINDTODEVICE, &interface, sizeof(interface)) < 0) {
-               close(fd);
-               return -1;
-       }
-
-       if (bind(fd, (struct sockaddr *)&addr, sizeof(addr)) == -1) {
-               close(fd);
-               return -1;
-       }
+       /* addr.sin_addr.s_addr = ip; - all-zeros is INADDR_ANY */
+       xbind(fd, (struct sockaddr *)&addr, sizeof(addr));
 
        return fd;
 }