Implement optional syslog logging using ordinary

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

diff --git a/networking/udhcp/socket.c b/networking/udhcp/socket.c
index 582f0fce57453d2b3102ff1c4787f27d4e4dabfb..3f481c33ca65fd35b6dfa086409db21ac62e7264 100644 (file)
--- a/networking/udhcp/socket.c
+++ b/networking/udhcp/socket.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
  * socket.c -- DHCP server client/server socket creation
  *
@@ -32,7 +33,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
@@ -41,8 +42,8 @@
 #include <linux/if_ether.h>
 #endif
 
-#include "socket.h"
 #include "common.h"
+#include "socket.h"
 
 int read_interface(char *interface, int *ifindex, uint32_t *addr, uint8_t *arp)
 {
@@ -55,34 +56,37 @@ int read_interface(char *interface, int *ifindex, uint32_t *addr, uint8_t *arp)
                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));
+                               DEBUG("%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");
+                               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);
+                       DEBUG("adapter index %d", ifr.ifr_ifindex);
                        *ifindex = ifr.ifr_ifindex;
                } else {
-                       LOG(LOG_ERR, "SIOCGIFINDEX failed!: %m");
+                       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",
+                       DEBUG("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");
+                       bb_perror_msg("SIOCGIFHWADDR failed");
+                       close(fd);
                        return -1;
                }
        } else {
-               LOG(LOG_ERR, "socket failed!: %m");
+               bb_perror_msg("socket failed");
                return -1;
        }
        close(fd);
@@ -97,12 +101,12 @@ int listen_socket(uint32_t ip, int port, char *inf)
        struct sockaddr_in addr;
        int n = 1;
 
-       DEBUG(LOG_INFO, "Opening listen socket on 0x%08x:%d %s", ip, port, inf);
+       DEBUG("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");
+               bb_perror_msg("socket");
                return -1;
        }
-       
+
        memset(&addr, 0, sizeof(addr));
        addr.sin_family = AF_INET;
        addr.sin_port = htons(port);
@@ -117,7 +121,7 @@ int listen_socket(uint32_t 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;
@@ -127,6 +131,6 @@ int listen_socket(uint32_t ip, int port, char *inf)
                close(fd);
                return -1;
        }
-       
+
        return fd;
 }