Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/networking/udhcp/clientsocket.c

Timestamp:

Nov 4, 2007, 3:16:40 AM (17 years ago)

Author:

Bruno Cornec

Message:

Update to busybox 1.7.2

File:

• branches/2.2.5/mindi-busybox/networking/udhcp/clientsocket.c (modified) (4 diffs)

branches/2.2.5/mindi-busybox/networking/udhcp/clientsocket.c

@@ +1 @@
+/* vi: set sw=4 ts=4: */
 /*
  * clientsocket.c -- DHCP client socket creation
@@ -21 +22 @@
  */
 
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <unistd.h>
-#include <netinet/in.h>
 #include <features.h>
-#if (__GLIBC__ >= 2 && __GLIBC_MINOR >= 1) || defined _NEWLIB_VERSION
+#if (defined(__GLIBC__) && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1) || defined(_NEWLIB_VERSION)
 #include <netpacket/packet.h>
 #include <net/ethernet.h>
@@ -35 +32 @@
 #endif
 
-#include "clientsocket.h"
 #include "common.h"
 
@@ -44 +40 @@
     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;
-    }
+    DEBUG("Opening raw socket on ifindex %d", ifindex);
+    fd = xsocket(PF_PACKET, SOCK_DGRAM, htons(ETH_P_IP));
 
     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;
-    }
+    xbind(fd, (struct sockaddr *) &sock, sizeof(sock));
 
     return fd;