Various cleanups I made while going through Erik Hovland's patch submissions,

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

diff --git a/networking/udhcp/socket.c b/networking/udhcp/socket.c
index f12fa929099e759e78850901d8274adda9e8abcf..6417267ec37130f973466d234033ad071d180d96 100644 (file)
--- a/networking/udhcp/socket.c
+++ b/networking/udhcp/socket.c
@@ -32,7 +32,7 @@
 #include <net/if.h>
 #include <errno.h>
 #include <features.h>
-#if __GLIBC__ >=2 && __GLIBC_MINOR >= 1
+#if (__GLIBC__ >= 2 && __GLIBC_MINOR >= 1) || defined _NEWLIB_VERSION
 #include <netpacket/packet.h>
 #include <net/ethernet.h>
 #else
@@ -42,8 +42,9 @@
 #endif
 
 #include "common.h"
+#include "socket.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;
@@ -54,22 +55,24 @@ int read_interface(char *interface, int *ifindex, u_int32_t *addr, unsigned char
                ifr.ifr_addr.sa_family = AF_INET;
                strcpy(ifr.ifr_name, interface);
 
-               if (addr) { 
+               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");
+                               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");
+                       close(fd);
                        return -1;
                }
                if (ioctl(fd, SIOCGIFHWADDR, &ifr) == 0) {
@@ -78,6 +81,7 @@ int read_interface(char *interface, int *ifindex, u_int32_t *addr, unsigned char
                                arp[0], arp[1], arp[2], arp[3], arp[4], arp[5]);
                } else {
                        LOG(LOG_ERR, "SIOCGIFHWADDR failed!: %m");
+                       close(fd);
                        return -1;
                }
        } else {
@@ -89,7 +93,7 @@ int read_interface(char *interface, int *ifindex, u_int32_t *addr, unsigned char
 }
 
 
-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;
@@ -101,7 +105,7 @@ int listen_socket(unsigned int ip, int port, char *inf)
                DEBUG(LOG_ERR, "socket call failed: %m");
                return -1;
        }
-       
+
        memset(&addr, 0, sizeof(addr));
        addr.sin_family = AF_INET;
        addr.sin_port = htons(port);
@@ -116,7 +120,7 @@ int listen_socket(unsigned int ip, int port, char *inf)
                return -1;
        }
 
-       strncpy(interface.ifr_ifrn.ifrn_name, inf, IFNAMSIZ);
+       strncpy(interface.ifr_name, inf, IFNAMSIZ);
        if (setsockopt(fd, SOL_SOCKET, SO_BINDTODEVICE,(char *)&interface, sizeof(interface)) < 0) {
                close(fd);
                return -1;
@@ -126,30 +130,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;
 }