tls: can download kernels now :)

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

diff --git a/networking/udhcp/socket.c b/networking/udhcp/socket.c
index 39f1cec5452e5caa5641a7e8d718b223e02730ea..4fd79f4238440a67e80c2fabe512d7514daffabb 100644 (file)
--- a/networking/udhcp/socket.c
+++ b/networking/udhcp/socket.c
@@ -22,17 +22,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-#include <net/if.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 FAST_FUNC udhcp_read_interface(const char *interface, int *ifindex, uint32_t *nip, uint8_t *mac)
 {
@@ -65,7 +56,7 @@ int FAST_FUNC udhcp_read_interface(const char *interface, int *ifindex, uint32_t
                        close(fd);
                        return -1;
                }
-               log1("Adapter index %d", ifr->ifr_ifindex);
+               log1("adapter index %d", ifr->ifr_ifindex);
                *ifindex = ifr->ifr_ifindex;
        }
 
@@ -89,18 +80,26 @@ int FAST_FUNC udhcp_listen_socket(/*uint32_t ip,*/ int port, const char *inf)
 {
        int fd;
        struct sockaddr_in addr;
+       char *colon;
 
-       log1("Opening listen socket on *:%d %s", 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) */
+       /* SO_BINDTODEVICE doesn't work on ethernet aliases (ethN:M) */
+       colon = strrchr(inf, ':');
+       if (colon)
+               *colon = '\0';
+
        if (setsockopt_bindtodevice(fd, inf))
                xfunc_die(); /* warning is already printed */
 
+       if (colon)
+               *colon = ':';
+
        memset(&addr, 0, sizeof(addr));
        addr.sin_family = AF_INET;
        addr.sin_port = htons(port);