- use xlisten/xsocket some more. Saves .25 kB
[oweals/busybox.git] / networking / udhcp / socket.c
index f12fa929099e759e78850901d8274adda9e8abcf..8138f5a86b31f3ec502e00447ffe998b958639a4 100644 (file)
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
  * socket.c -- DHCP server client/server socket creation
  *
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/ioctl.h>
-#include <netinet/in.h>
-#include <unistd.h>
-#include <string.h>
-#include <arpa/inet.h>
 #include <net/if.h>
-#include <errno.h>
 #include <features.h>
-#if __GLIBC__ >=2 && __GLIBC_MINOR >= 1
+#if (defined(__GLIBC__) && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1) || defined _NEWLIB_VERSION
 #include <netpacket/packet.h>
 #include <net/ethernet.h>
 #else
 
 #include "common.h"
 
-int read_interface(char *interface, int *ifindex, u_int32_t *addr, unsigned char *arp)
+
+int read_interface(char *interface, int *ifindex, uint32_t *addr, uint8_t *arp)
 {
        int fd;
        struct ifreq ifr;
        struct sockaddr_in *our_ip;
 
        memset(&ifr, 0, sizeof(struct ifreq));
-       if((fd = socket(AF_INET, SOCK_RAW, IPPROTO_RAW)) >= 0) {
-               ifr.ifr_addr.sa_family = AF_INET;
-               strcpy(ifr.ifr_name, interface);
-
-               if (addr) { 
-                       if (ioctl(fd, SIOCGIFADDR, &ifr) == 0) {
-                               our_ip = (struct sockaddr_in *) &ifr.ifr_addr;
-                               *addr = our_ip->sin_addr.s_addr;
-                               DEBUG(LOG_INFO, "%s (our ip) = %s", ifr.ifr_name, inet_ntoa(our_ip->sin_addr));
-                       } else {
-                               LOG(LOG_ERR, "SIOCGIFADDR failed, is the interface up and configured?: %m");
-                               return -1;
-                       }
+       fd = socket(AF_INET, SOCK_RAW, IPPROTO_RAW);
+       if (fd < 0) {
+               bb_perror_msg("socket failed");
+               return -1;
+       }
+
+       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 the interface up and configured?");
+                       close(fd);
+                       return -1;
                }
-               
-               if (ioctl(fd, SIOCGIFINDEX, &ifr) == 0) {
-                       DEBUG(LOG_INFO, "adapter index %d", ifr.ifr_ifindex);
-                       *ifindex = ifr.ifr_ifindex;
-               } else {
-                       LOG(LOG_ERR, "SIOCGIFINDEX failed!: %m");
+               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));
+       }
+
+       if (ifindex) {
+               if (ioctl(fd, SIOCGIFINDEX, &ifr) != 0) {
+                       bb_perror_msg("SIOCGIFINDEX failed");
+                       close(fd);
                        return -1;
                }
-               if (ioctl(fd, SIOCGIFHWADDR, &ifr) == 0) {
-                       memcpy(arp, ifr.ifr_hwaddr.sa_data, 6);
-                       DEBUG(LOG_INFO, "adapter hardware address %02x:%02x:%02x:%02x:%02x:%02x",
-                               arp[0], arp[1], arp[2], arp[3], arp[4], arp[5]);
-               } else {
-                       LOG(LOG_ERR, "SIOCGIFHWADDR failed!: %m");
+               DEBUG("adapter index %d", ifr.ifr_ifindex);
+               *ifindex = ifr.ifr_ifindex;
+       }
+
+       if (arp) {
+               if (ioctl(fd, SIOCGIFHWADDR, &ifr) != 0) {
+                       bb_perror_msg("SIOCGIFHWADDR failed");
+                       close(fd);
                        return -1;
                }
-       } else {
-               LOG(LOG_ERR, "socket failed!: %m");
-               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]);
        }
-       close(fd);
+
        return 0;
 }
 
 
-int listen_socket(unsigned int ip, int port, char *inf)
+int listen_socket(uint32_t ip, int port, char *inf)
 {
        struct ifreq interface;
        int fd;
        struct sockaddr_in addr;
-       int n = 1;
 
-       DEBUG(LOG_INFO, "Opening listen socket on 0x%08x:%d %s", ip, port, inf);
-       if ((fd = socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0) {
-               DEBUG(LOG_ERR, "socket call failed: %m");
-               return -1;
-       }
-       
+       DEBUG("Opening listen socket on 0x%08x:%d %s", ip, port, inf);
+       fd = xsocket(PF_INET, SOCK_DGRAM, IPPROTO_UDP);
+
        memset(&addr, 0, sizeof(addr));
        addr.sin_family = AF_INET;
        addr.sin_port = htons(port);
        addr.sin_addr.s_addr = ip;
 
-       if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (char *) &n, sizeof(n)) == -1) {
+       if (setsockopt_reuseaddr(fd) == -1) {
                close(fd);
                return -1;
        }
-       if (setsockopt(fd, SOL_SOCKET, SO_BROADCAST, (char *) &n, sizeof(n)) == -1) {
+       if (setsockopt_broadcast(fd) == -1) {
                close(fd);
                return -1;
        }
 
-       strncpy(interface.ifr_ifrn.ifrn_name, inf, IFNAMSIZ);
-       if (setsockopt(fd, SOL_SOCKET, SO_BINDTODEVICE,(char *)&interface, sizeof(interface)) < 0) {
+       strncpy(interface.ifr_name, inf, IFNAMSIZ);
+       if (setsockopt(fd, SOL_SOCKET, SO_BINDTODEVICE, (char *)&interface, sizeof(interface)) < 0) {
                close(fd);
                return -1;
        }
@@ -126,30 +121,6 @@ int listen_socket(unsigned int ip, int port, char *inf)
                close(fd);
                return -1;
        }
-       
-       return fd;
-}
-
-
-int raw_socket(int ifindex)
-{
-       int fd;
-       struct sockaddr_ll sock;
-
-       DEBUG(LOG_INFO, "Opening raw socket on ifindex %d", ifindex);
-       if ((fd = socket(PF_PACKET, SOCK_DGRAM, htons(ETH_P_IP))) < 0) {
-               DEBUG(LOG_ERR, "socket call failed: %m");
-               return -1;
-       }
-       
-       sock.sll_family = AF_PACKET;
-       sock.sll_protocol = htons(ETH_P_IP);
-       sock.sll_ifindex = ifindex;
-       if (bind(fd, (struct sockaddr *) &sock, sizeof(sock)) < 0) {
-               DEBUG(LOG_ERR, "bind call failed: %m");
-               close(fd);
-               return -1;
-       }
 
        return fd;
 }