Merge branch 'busybox' into merge

30 files changed, 176 insertions, 88 deletions

diff --git a/networking/ifconfig.c b/networking/ifconfig.c
index d1e9c58dc..61d91788a 100644
--- a/networking/ifconfig.c
+++ b/networking/ifconfig.c
@@ -1,18 +1,17 @@
 /* vi: set sw=4 ts=4: */
-/* ifconfig
+/*
+ * ifconfig
  *
  * Similar to the standard Unix ifconfig, but with only the necessary
  * parts for AF_INET, and without any printing of if info (for now).
  *
  * Bjorn Wesen, Axis Communications AB
  *
- *
  * Authors of the original ifconfig was:
  *              Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
  *
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
-
 /*
  * Heavily modified by Manuel Novoa III       Mar 6, 2001
  *
diff --git a/networking/ifupdown.c b/networking/ifupdown.c
index 5521e8a5a..534c9f0c7 100644
--- a/networking/ifupdown.c
+++ b/networking/ifupdown.c
@@ -1,18 +1,18 @@
 /* vi: set sw=4 ts=4: */
 /*
- *  ifup/ifdown for busybox
- *  Copyright (c) 2002 Glenn McGrath
- *  Copyright (c) 2003-2004 Erik Andersen <andersen@codepoet.org>
+ * ifup/ifdown for busybox
+ * Copyright (c) 2002 Glenn McGrath
+ * Copyright (c) 2003-2004 Erik Andersen <andersen@codepoet.org>
  *
- *  Based on ifupdown v 0.6.4 by Anthony Towns
- *  Copyright (c) 1999 Anthony Towns <aj@azure.humbug.org.au>
+ * Based on ifupdown v 0.6.4 by Anthony Towns
+ * Copyright (c) 1999 Anthony Towns <aj@azure.humbug.org.au>
  *
- *  Changes to upstream version
- *  Remove checks for kernel version, assume kernel version 2.2.0 or better.
- *  Lines in the interfaces file cannot wrap.
- *  To adhere to the FHS, the default state file is /var/run/ifstate
- *  (defined via CONFIG_IFUPDOWN_IFSTATE_PATH) and can be overridden by build
- *  configuration.
+ * Changes to upstream version
+ * Remove checks for kernel version, assume kernel version 2.2.0 or better.
+ * Lines in the interfaces file cannot wrap.
+ * To adhere to the FHS, the default state file is /var/run/ifstate
+ * (defined via CONFIG_IFUPDOWN_IFSTATE_PATH) and can be overridden by build
+ * configuration.
  *
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
diff --git a/networking/interface.c b/networking/interface.c
index 119185881..89427f2f4 100644
--- a/networking/interface.c
+++ b/networking/interface.c
@@ -30,7 +30,6 @@
  *          20001008 - Bernd Eckenfels, Patch from RH for setting mtu
  *                      (default AF was wrong)
  */
-
 #include "libbb.h"
 #include "inet_common.h"
 #include <net/if.h>
diff --git a/networking/libiproute/ip_parse_common_args.c b/networking/libiproute/ip_parse_common_args.c
index 1a298f738..d693c54fa 100644
--- a/networking/libiproute/ip_parse_common_args.c
+++ b/networking/libiproute/ip_parse_common_args.c
@@ -11,7 +11,6 @@
  *
  * Rani Assaf <rani@magic.metawire.com> 980929: resolve addresses
  */
-
 #include "ip_common.h"  /* #include "libbb.h" is inside */
 #include "utils.h"
 
diff --git a/networking/libiproute/ipaddress.c b/networking/libiproute/ipaddress.c
index 36d6b65c6..921ecf0d9 100644
--- a/networking/libiproute/ipaddress.c
+++ b/networking/libiproute/ipaddress.c
@@ -7,7 +7,6 @@
  * Changes:
  * Laszlo Valko <valko@linux.karinthy.hu> 990223: address label must be zero terminated
  */
-
 #include <fnmatch.h>
 #include <net/if.h>
 #include <net/if_arp.h>
diff --git a/networking/libiproute/ipneigh.c b/networking/libiproute/ipneigh.c
index 2a1c20e20..1cd90d707 100644
--- a/networking/libiproute/ipneigh.c
+++ b/networking/libiproute/ipneigh.c
@@ -6,7 +6,6 @@
  *
  * Ported to Busybox by:  Curt Brune <curt@cumulusnetworks.com>
  */
-
 #include "ip_common.h"  /* #include "libbb.h" is inside */
 #include "common_bufsiz.h"
 #include "rt_names.h"
diff --git a/networking/libiproute/iproute.c b/networking/libiproute/iproute.c
index 6a41b8331..95dafe183 100644
--- a/networking/libiproute/iproute.c
+++ b/networking/libiproute/iproute.c
@@ -9,12 +9,16 @@
  * Rani Assaf <rani@magic.metawire.com> 980929: resolve addresses
  * Kunihiro Ishiguro <kunihiro@zebra.org> 001102: rtnh_ifindex was not initialized
  */
-
 #include "ip_common.h"  /* #include "libbb.h" is inside */
 #include "common_bufsiz.h"
 #include "rt_names.h"
 #include "utils.h"
 
+#include <linux/version.h>
+/* RTA_TABLE is not a define, can't test with ifdef. */
+/* As a proxy, test which kernels toolchain expects: */
+#define HAVE_RTA_TABLE (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19))
+
 #ifndef RTAX_RTTVAR
 #define RTAX_RTTVAR RTAX_HOPS
 #endif
@@ -82,9 +86,11 @@ static int FAST_FUNC print_route(const struct sockaddr_nl *who UNUSED_PARAM,
         memset(tb, 0, sizeof(tb));
         parse_rtattr(tb, RTA_MAX, RTM_RTA(r), len);
 
+#if HAVE_RTA_TABLE
         if (tb[RTA_TABLE])
                 tid = *(uint32_t *)RTA_DATA(tb[RTA_TABLE]);
         else
+#endif
                 tid = r->rtm_table;
 
         if (r->rtm_family == AF_INET6)
@@ -460,12 +466,13 @@ IF_FEATURE_IP_RULE(ARG_table,)
                         NEXT_ARG();
                         if (rtnl_rttable_a2n(&tid, *argv))
                                 invarg_1_to_2(*argv, keyword_table);
-                        if (tid < 256)
-                                req.r.rtm_table = tid;
-                        else {
+#if HAVE_RTA_TABLE
+                        if (tid > 255) {
                                 req.r.rtm_table = RT_TABLE_UNSPEC;
                                 addattr32(&req.n, sizeof(req), RTA_TABLE, tid);
-                        }
+                        } else
+#endif
+                                req.r.rtm_table = tid;
 #endif
                 } else if (arg == ARG_dev || arg == ARG_oif) {
                         NEXT_ARG();
diff --git a/networking/libiproute/iprule.c b/networking/libiproute/iprule.c
index 1bb5e759e..53b11e16c 100644
--- a/networking/libiproute/iprule.c
+++ b/networking/libiproute/iprule.c
@@ -12,7 +12,6 @@
  * Rani Assaf <rani@magic.metawire.com> 980929: resolve addresses
  * initially integrated into busybox by Bernhard Reutner-Fischer
  */
-
 #include <netinet/in.h>
 #include <netinet/ip.h>
 #include <arpa/inet.h>
@@ -25,6 +24,11 @@
 #include "rt_names.h"
 #include "utils.h"
 
+#include <linux/version.h>
+/* RTA_TABLE is not a define, can't test with ifdef. */
+/* As a proxy, test which kernels toolchain expects: */
+#define HAVE_RTA_TABLE (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19))
+
 /* If you add stuff here, update iprule_full_usage */
 static const char keywords[] ALIGN1 =
         "from\0""to\0""preference\0""order\0""priority\0"
@@ -121,9 +125,12 @@ static int FAST_FUNC print_rule(const struct sockaddr_nl *who UNUSED_PARAM,
                 printf("iif %s ", (char*)RTA_DATA(tb[RTA_IIF]));
         }
 
+#if HAVE_RTA_TABLE
         if (tb[RTA_TABLE])
                 printf("lookup %s ", rtnl_rttable_n2a(*(uint32_t*)RTA_DATA(tb[RTA_TABLE])));
-        else if (r->rtm_table)
+        else
+#endif
+        if (r->rtm_table)
                 printf("lookup %s ", rtnl_rttable_n2a(r->rtm_table));
 
         if (tb[FRA_SUPPRESS_PREFIXLEN]) {
@@ -267,12 +274,15 @@ static int iprule_modify(int cmd, char **argv)
                         NEXT_ARG();
                         if (rtnl_rttable_a2n(&tid, *argv))
                                 invarg_1_to_2(*argv, "table ID");
-                        if (tid < 256)
-                                req.r.rtm_table = tid;
-                        else {
+
+#if HAVE_RTA_TABLE
+                        if (tid > 255) {
                                 req.r.rtm_table = RT_TABLE_UNSPEC;
                                 addattr32(&req.n, sizeof(req), RTA_TABLE, tid);
-                        }
+                        } else
+#endif
+                                req.r.rtm_table = tid;
+
                         table_ok = 1;
                 } else if (key == ARG_suppress_prefixlength) {
                         int prefix_length;
diff --git a/networking/libiproute/iptunnel.c b/networking/libiproute/iptunnel.c
index eb136e435..4002feb78 100644
--- a/networking/libiproute/iptunnel.c
+++ b/networking/libiproute/iptunnel.c
@@ -10,7 +10,6 @@
  * Rani Assaf <rani@magic.metawire.com> 980930: do not allow key for ipip/sit
  * Phil Karn <karn@ka9q.ampr.org>       990408: "pmtudisc" flag
  */
-
 #include <netinet/ip.h>
 #include <net/if.h>
 #include <net/if_arp.h>
diff --git a/networking/libiproute/libnetlink.c b/networking/libiproute/libnetlink.c
index 7e0ff1b6c..3f0f70326 100644
--- a/networking/libiproute/libnetlink.c
+++ b/networking/libiproute/libnetlink.c
@@ -7,7 +7,6 @@
  *
  * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
  */
-
 #include <sys/socket.h>
 #include <sys/uio.h>
 
diff --git a/networking/libiproute/ll_addr.c b/networking/libiproute/ll_addr.c
index 33a54ea6c..afdd81ffb 100644
--- a/networking/libiproute/ll_addr.c
+++ b/networking/libiproute/ll_addr.c
@@ -7,14 +7,12 @@
  *
  * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
  */
-
 #include <net/if_arp.h>
 
 #include "libbb.h"
 #include "rt_names.h"
 #include "utils.h"
 
-
 const char* FAST_FUNC ll_addr_n2a(unsigned char *addr, int alen, int type, char *buf, int blen)
 {
         int i;
diff --git a/networking/libiproute/ll_map.c b/networking/libiproute/ll_map.c
index af9eb46f7..be88a04e8 100644
--- a/networking/libiproute/ll_map.c
+++ b/networking/libiproute/ll_map.c
@@ -7,7 +7,6 @@
  *
  * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
  */
-
 #include <net/if.h>  /* struct ifreq and co. */
 
 #include "libbb.h"
diff --git a/networking/libiproute/ll_proto.c b/networking/libiproute/ll_proto.c
index 4c32ae574..7d46221ac 100644
--- a/networking/libiproute/ll_proto.c
+++ b/networking/libiproute/ll_proto.c
@@ -7,7 +7,6 @@
  *
  * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
  */
-
 #include "libbb.h"
 #include "rt_names.h"
 #include "utils.h"
diff --git a/networking/libiproute/rtm_map.c b/networking/libiproute/rtm_map.c
index c763da049..e94c99ab6 100644
--- a/networking/libiproute/rtm_map.c
+++ b/networking/libiproute/rtm_map.c
@@ -7,7 +7,6 @@
  *
  * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
  */
-
 #include "libbb.h"
 #include "rt_names.h"
 #include "utils.h"
@@ -44,7 +43,6 @@ const char* FAST_FUNC rtnl_rtntype_n2a(int id)
         }
 }
 
-
 int FAST_FUNC rtnl_rtntype_a2n(int *id, char *arg)
 {
         static const char keywords[] ALIGN1 =
diff --git a/networking/libiproute/utils.c b/networking/libiproute/utils.c
index fca167ac6..bf053a54b 100644
--- a/networking/libiproute/utils.c
+++ b/networking/libiproute/utils.c
@@ -8,7 +8,6 @@
  *
  * Rani Assaf <rani@magic.metawire.com> 980929: resolve addresses
  */
-
 #include "libbb.h"
 #include "utils.h"
 #include "inet_common.h"
diff --git a/networking/nc.c b/networking/nc.c
index 4b8f9c13a..de02ccc9d 100644
--- a/networking/nc.c
+++ b/networking/nc.c
@@ -1,5 +1,6 @@
 /* vi: set sw=4 ts=4: */
-/* nc: mini-netcat - built from the ground up for LRP
+/*
+ * nc: mini-netcat - built from the ground up for LRP
  *
  * Copyright (C) 1998, 1999  Charles P. Wright
  * Copyright (C) 1998  Dave Cinege
diff --git a/networking/ntpd.c b/networking/ntpd.c
index 4f881eaf9..0b60d003b 100644
--- a/networking/ntpd.c
+++ b/networking/ntpd.c
@@ -71,7 +71,7 @@
 //usage:        "[-dnqNw"IF_FEATURE_NTPD_SERVER("l -I IFACE")"] [-S PROG] [-p PEER]..."
 //usage:#define ntpd_full_usage "\n\n"
 //usage:       "NTP client/server\n"
-//usage:     "\n        -d      Verbose"
+//usage:     "\n        -d      Verbose (may be repeated)"
 //usage:     "\n        -n      Do not daemonize"
 //usage:     "\n        -q      Quit after clock is set"
 //usage:     "\n        -N      Run at high priority"
@@ -155,7 +155,8 @@
 #define RETRY_INTERVAL    32    /* on send/recv error, retry in N secs (need to be power of 2) */
 #define NOREPLY_INTERVAL 512    /* sent, but got no reply: cap next query by this many seconds */
 #define RESPONSE_INTERVAL 16    /* wait for reply up to N secs */
-#define HOSTNAME_INTERVAL  5    /* hostname lookup failed. Wait N secs for next try */
+#define HOSTNAME_INTERVAL  4    /* hostname lookup failed. Wait N * peer->dns_errors secs for next try */
+#define DNS_ERRORS_CAP  0x3f    /* peer->dns_errors is in [0..63] */
 
 /* Step threshold (sec). std ntpd uses 0.128.
  */
@@ -301,6 +302,7 @@ typedef struct {
         uint8_t          lastpkt_status;
         uint8_t          lastpkt_stratum;
         uint8_t          reachable_bits;
+        uint8_t          dns_errors;
         /* when to send new query (if p_fd == -1)
          * or when receive times out (if p_fd >= 0): */
         double           next_action_time;
@@ -802,10 +804,10 @@ resolve_peer_hostname(peer_t *p)
                 p->p_dotted = xmalloc_sockaddr2dotted_noport(&lsa->u.sa);
                 VERB1 if (strcmp(p->p_hostname, p->p_dotted) != 0)
                         bb_error_msg("'%s' is %s", p->p_hostname, p->p_dotted);
-        } else {
-                /* error message is emitted by host2sockaddr() */
-                set_next(p, HOSTNAME_INTERVAL);
+                p->dns_errors = 0;
+                return lsa;
         }
+        p->dns_errors = ((p->dns_errors << 1) | 1) & DNS_ERRORS_CAP;
         return lsa;
 }
 
@@ -866,10 +868,8 @@ do_sendto(int fd,
 static void
 send_query_to_peer(peer_t *p)
 {
-        if (!p->p_lsa) {
-                if (!resolve_peer_hostname(p))
-                        return;
-        }
+        if (!p->p_lsa)
+                return;
 
         /* Why do we need to bind()?
          * See what happens when we don't bind:
@@ -2441,13 +2441,42 @@ int ntpd_main(int argc UNUSED_PARAM, char **argv)
  did_poll:
                 gettime1900d(); /* sets G.cur_time */
                 if (nfds <= 0) {
-                        if (!bb_got_signal /* poll wasn't interrupted by a signal */
-                         && G.cur_time - G.last_script_run > 11*60
-                        ) {
+                        double ct;
+                        int dns_error;
+
+                        if (bb_got_signal)
+                                break; /* poll was interrupted by a signal */
+
+                        if (G.cur_time - G.last_script_run > 11*60) {
                                 /* Useful for updating battery-backed RTC and such */
                                 run_script("periodic", G.last_update_offset);
                                 gettime1900d(); /* sets G.cur_time */
                         }
+
+                        /* Resolve peer names to IPs, if not resolved yet.
+                         * We do it only when poll timed out:
+                         * this way, we almost never overlap DNS resolution with
+                         * "request-reply" packet round trip.
+                         */
+                        dns_error = 0;
+                        ct = G.cur_time;
+                        for (item = G.ntp_peers; item != NULL; item = item->link) {
+                                peer_t *p = (peer_t *) item->data;
+                                if (p->next_action_time <= ct && !p->p_lsa) {
+                                        /* This can take up to ~10 sec per each DNS query */
+                                        dns_error |= (!resolve_peer_hostname(p));
+                                }
+                        }
+                        if (!dns_error)
+                                goto check_unsync;
+                        /* Set next time for those which are still not resolved */
+                        gettime1900d(); /* sets G.cur_time (needed for set_next()) */
+                        for (item = G.ntp_peers; item != NULL; item = item->link) {
+                                peer_t *p = (peer_t *) item->data;
+                                if (p->next_action_time <= ct && !p->p_lsa) {
+                                        set_next(p, HOSTNAME_INTERVAL * p->dns_errors);
+                                }
+                        }
                         goto check_unsync;
                 }
 
diff --git a/networking/ping.c b/networking/ping.c
index 774f8f3e0..d1d59d545 100644
--- a/networking/ping.c
+++ b/networking/ping.c
@@ -135,6 +135,14 @@
 # define ICMP_ADDRESSREPLY   18  /* Address Mask Reply    */
 #endif
 
+/* Some operating systems, like GNU/Hurd, don't define SOL_RAW, but do have
+ * IPPROTO_RAW. Since the IPPROTO definitions are also valid to use for
+ * setsockopt (and take the same value as their corresponding SOL definitions,
+ * if they exist), we can just fall back on IPPROTO_RAW. */
+#ifndef SOL_RAW
+# define SOL_RAW IPPROTO_RAW
+#endif
+
 #if ENABLE_PING6
 # include <netinet/icmp6.h>
 /* I see RENUMBERED constants in bits/in.h - !!?
diff --git a/networking/route.c b/networking/route.c
index 32789eecc..6edc0f6d7 100644
--- a/networking/route.c
+++ b/networking/route.c
@@ -1,5 +1,6 @@
 /* vi: set sw=4 ts=4: */
-/* route
+/*
+ * route
  *
  * Similar to the standard Unix route, but with only the necessary
  * parts for AF_INET and AF_INET6
@@ -18,7 +19,6 @@
  *
  * IPV6 support added by Bart Visscher <magick@linux-fan.com>
  */
-
 /* 2004/03/09  Manuel Novoa III <mjn3@codepoet.org>
  *
  * Rewritten to fix several bugs, add additional error checking, and
diff --git a/networking/telnet.c b/networking/telnet.c
index 1f8a44466..8b0df7f5c 100644
--- a/networking/telnet.c
+++ b/networking/telnet.c
@@ -18,7 +18,6 @@
  * <jam@ltsp.org>
  * Modified 2004/02/11 to add ability to pass the USER variable to remote host
  * by Fernando Silveira <swrh@gmx.net>
- *
  */
 //config:config TELNET
 //config:       bool "telnet (8.7 kb)"
diff --git a/networking/traceroute.c b/networking/traceroute.c
index 8b6247482..a027b928a 100644
--- a/networking/traceroute.c
+++ b/networking/traceroute.c
@@ -311,6 +311,9 @@
 # ifndef SOL_IPV6
 #  define SOL_IPV6 IPPROTO_IPV6
 # endif
+# if defined(IPV6_PKTINFO) && !defined(IPV6_RECVPKTINFO)
+#  define IPV6_RECVPKTINFO IPV6_PKTINFO
+# endif
 #endif
 
 #include "libbb.h"
@@ -323,6 +326,14 @@
 # define IPPROTO_IP 0
 #endif
 
+/* Some operating systems, like GNU/Hurd, don't define SOL_RAW, but do have
+ * IPPROTO_RAW. Since the IPPROTO definitions are also valid to use for
+ * setsockopt (and take the same value as their corresponding SOL definitions,
+ * if they exist), we can just fall back on IPPROTO_RAW. */
+#ifndef SOL_RAW
+# define SOL_RAW IPPROTO_RAW
+#endif
+
 
 #define OPT_STRING \
         "FIlnrdvxt:i:m:p:q:s:w:z:f:" \
@@ -698,6 +709,9 @@ packet_ok(int read_len, len_and_sockaddr *from_lsa,
 
 # if ENABLE_FEATURE_TRACEROUTE_VERBOSE
         if (verbose) {
+#  ifndef MAXHOSTNAMELEN
+#   define MAXHOSTNAMELEN 80
+#  endif
                 unsigned char *p;
                 char pa1[MAXHOSTNAMELEN];
                 char pa2[MAXHOSTNAMELEN];
@@ -903,12 +917,7 @@ common_traceroute_main(int op, char **argv)
 #if ENABLE_TRACEROUTE6
         if (af == AF_INET6) {
                 xmove_fd(xsocket(AF_INET6, SOCK_RAW, IPPROTO_ICMPV6), rcvsock);
-# ifdef IPV6_RECVPKTINFO
                 setsockopt_1(rcvsock, SOL_IPV6, IPV6_RECVPKTINFO);
-                setsockopt_1(rcvsock, SOL_IPV6, IPV6_2292PKTINFO);
-# else
-                setsockopt_1(rcvsock, SOL_IPV6, IPV6_PKTINFO);
-# endif
         } else
 #endif
         {
diff --git a/networking/udhcp/common.h b/networking/udhcp/common.h
index a9c23a186..04939e707 100644
--- a/networking/udhcp/common.h
+++ b/networking/udhcp/common.h
@@ -308,7 +308,9 @@ int udhcp_send_raw_packet(struct dhcp_packet *dhcp_pkt,
 
 int udhcp_send_kernel_packet(struct dhcp_packet *dhcp_pkt,
                 uint32_t source_nip, int source_port,
-                uint32_t dest_nip, int dest_port) FAST_FUNC;
+                uint32_t dest_nip, int dest_port,
+                int send_flags
+) FAST_FUNC;
 
 void udhcp_sp_setup(void) FAST_FUNC;
 void udhcp_sp_fd_set(struct pollfd *pfds, int extra_fd) FAST_FUNC;
diff --git a/networking/udhcp/d6_dhcpc.c b/networking/udhcp/d6_dhcpc.c
index 714555fa8..37ffd064d 100644
--- a/networking/udhcp/d6_dhcpc.c
+++ b/networking/udhcp/d6_dhcpc.c
@@ -702,13 +702,15 @@ static NOINLINE int send_d6_renew(uint32_t xid, struct in6_addr *server_ipv6, st
         opt_ptr = add_d6_client_options(opt_ptr);
 
         bb_error_msg("sending %s", "renew");
-        if (server_ipv6)
+        if (server_ipv6) {
                 return d6_send_kernel_packet(
                         &packet, (opt_ptr - (uint8_t*) &packet),
                         our_cur_ipv6, CLIENT_PORT6,
                         server_ipv6, SERVER_PORT6,
                         client_config.ifindex
+                        /* TODO? send_flags: MSG_DONTROUTE (see IPv4 code for reason why) */
                 );
+        }
         return d6_mcast_from_client_config_ifindex(&packet, opt_ptr);
 }
 
@@ -881,9 +883,14 @@ static int d6_raw_socket(int ifindex)
         fd = xsocket(PF_PACKET, SOCK_DGRAM, htons(ETH_P_IPV6));
         log2("got raw socket fd %d", fd);
 
+        memset(&sock, 0, sizeof(sock)); /* let's be deterministic */
         sock.sll_family = AF_PACKET;
         sock.sll_protocol = htons(ETH_P_IPV6);
         sock.sll_ifindex = ifindex;
+        /*sock.sll_hatype = ARPHRD_???;*/
+        /*sock.sll_pkttype = PACKET_???;*/
+        /*sock.sll_halen = ???;*/
+        /*sock.sll_addr[8] = ???;*/
         xbind(fd, (struct sockaddr *) &sock, sizeof(sock));
 
 #if 0
@@ -1425,7 +1432,7 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
                                 len = d6_recv_raw_packet(&srv6_buf, &packet, sockfd);
                         if (len == -1) {
                                 /* Error is severe, reopen socket */
-                                bb_error_msg("read error: %s, reopening socket", strerror(errno));
+                                bb_error_msg("read error: "STRERROR_FMT", reopening socket" STRERROR_ERRNO);
                                 sleep(discover_timeout); /* 3 seconds by default */
                                 change_listen_mode(listen_mode); /* just close and reopen */
                         }
diff --git a/networking/udhcp/d6_packet.c b/networking/udhcp/d6_packet.c
index 79a0ac8a8..493943d72 100644
--- a/networking/udhcp/d6_packet.c
+++ b/networking/udhcp/d6_packet.c
@@ -18,7 +18,7 @@ void FAST_FUNC d6_dump_packet(struct d6_packet *packet)
                 return;
 
         bb_error_msg(
-                "xid %x"
+                " xid %x"
                 , packet->d6_xid32
         );
         //*bin2hex(buf, (void *) packet->chaddr, sizeof(packet->chaddr)) = '\0';
@@ -75,6 +75,8 @@ int FAST_FUNC d6_send_raw_packet(
         dest_sll.sll_family = AF_PACKET;
         dest_sll.sll_protocol = htons(ETH_P_IPV6);
         dest_sll.sll_ifindex = ifindex;
+        /*dest_sll.sll_hatype = ARPHRD_???;*/
+        /*dest_sll.sll_pkttype = PACKET_???;*/
         dest_sll.sll_halen = 6;
         memcpy(dest_sll.sll_addr, dest_arp, 6);
 
diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c
index 99d91bf70..55f21c187 100644
--- a/networking/udhcp/dhcpc.c
+++ b/networking/udhcp/dhcpc.c
@@ -1,7 +1,6 @@
 /* vi: set sw=4 ts=4: */
 /*
  * udhcp client
- *
  * Russ Dill <Russ.Dill@asu.edu> July 2001
  *
  * This program is free software; you can redistribute it and/or modify
@@ -694,10 +693,16 @@ static int raw_bcast_from_client_config_ifindex(struct dhcp_packet *packet, uint
 
 static int bcast_or_ucast(struct dhcp_packet *packet, uint32_t ciaddr, uint32_t server)
 {
-        if (server)
+        if (server) {
+                /* Without MSG_DONTROUTE, the packet was seen routed over
+                 * _other interface_ if server ID is bogus (example: 1.1.1.1).
+                 */
                 return udhcp_send_kernel_packet(packet,
                         ciaddr, CLIENT_PORT,
-                        server, SERVER_PORT);
+                        server, SERVER_PORT,
+                        /*send_flags: "to hosts only on directly connected networks" */ MSG_DONTROUTE
+                );
+        }
         return raw_bcast_from_client_config_ifindex(packet, ciaddr);
 }
 
@@ -735,7 +740,7 @@ static NOINLINE int send_discover(uint32_t xid, uint32_t requested)
 static NOINLINE int send_select(uint32_t xid, uint32_t server, uint32_t requested)
 {
         struct dhcp_packet packet;
-        struct in_addr addr;
+        struct in_addr temp_addr;
 
 /*
  * RFC 2131 4.3.2 DHCPREQUEST message
@@ -766,8 +771,8 @@ static NOINLINE int send_select(uint32_t xid, uint32_t server, uint32_t requeste
          */
         add_client_options(&packet);
 
-        addr.s_addr = requested;
-        bb_error_msg("sending select for %s", inet_ntoa(addr));
+        temp_addr.s_addr = requested;
+        bb_error_msg("sending select for %s", inet_ntoa(temp_addr));
         return raw_bcast_from_client_config_ifindex(&packet, INADDR_ANY);
 }
 
@@ -776,6 +781,7 @@ static NOINLINE int send_select(uint32_t xid, uint32_t server, uint32_t requeste
 static NOINLINE int send_renew(uint32_t xid, uint32_t server, uint32_t ciaddr)
 {
         struct dhcp_packet packet;
+        struct in_addr temp_addr;
 
 /*
  * RFC 2131 4.3.2 DHCPREQUEST message
@@ -806,7 +812,8 @@ static NOINLINE int send_renew(uint32_t xid, uint32_t server, uint32_t ciaddr)
          */
         add_client_options(&packet);
 
-        bb_error_msg("sending %s", "renew");
+        temp_addr.s_addr = server;
+        bb_error_msg("sending renew to %s", inet_ntoa(temp_addr));
         return bcast_or_ucast(&packet, ciaddr, server);
 }
 
@@ -1010,9 +1017,14 @@ static int udhcp_raw_socket(int ifindex)
          */
         log2("got raw socket fd");
 
+        memset(&sock, 0, sizeof(sock)); /* let's be deterministic */
         sock.sll_family = AF_PACKET;
         sock.sll_protocol = htons(ETH_P_IP);
         sock.sll_ifindex = ifindex;
+        /*sock.sll_hatype = ARPHRD_???;*/
+        /*sock.sll_pkttype = PACKET_???;*/
+        /*sock.sll_halen = ???;*/
+        /*sock.sll_addr[8] = ???;*/
         xbind(fd, (struct sockaddr *) &sock, sizeof(sock));
 
 #if 0 /* Several users reported breakage when BPF filter is used */
@@ -1519,11 +1531,24 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
                          * Anyway, it does recover by eventually failing through
                          * into INIT_SELECTING state.
                          */
-                                        send_renew(xid, server_addr, requested_ip);
-                                        timeout >>= 1;
-                                        continue;
+                                        if (send_renew(xid, server_addr, requested_ip) >= 0) {
+                                                timeout >>= 1;
+//TODO: the timeout to receive an answer for our renew should not be selected
+//with "timeout = lease_seconds / 2; ...; timeout = timeout / 2": it is often huge.
+//Waiting e.g. 4*3600 seconds for a reply does not make sense
+//(if reply isn't coming, we keep an open socket for hours),
+//it should be something like 10 seconds.
+//Also, it's probably best to try sending renew in kernel mode a few (3-5) times
+//and fall back to raw mode if it does not work.
+                                                continue;
+                                        }
+                                        /* else: error sending.
+                                         * example: ENETUNREACH seen with server
+                                         * which gave us bogus server ID 1.1.1.1
+                                         * which wasn't reachable (and probably did not exist).
+                                         */
                                 }
-                                /* Timed out, enter rebinding state */
+                                /* Timed out or error, enter rebinding state */
                                 log1("entering rebinding state");
                                 state = REBINDING;
                                 /* fall right through */
@@ -1605,7 +1630,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
                                 len = udhcp_recv_raw_packet(&packet, sockfd);
                         if (len == -1) {
                                 /* Error is severe, reopen socket */
-                                bb_error_msg("read error: %s, reopening socket", strerror(errno));
+                                bb_error_msg("read error: "STRERROR_FMT", reopening socket" STRERROR_ERRNO);
                                 sleep(discover_timeout); /* 3 seconds by default */
                                 change_listen_mode(listen_mode); /* just close and reopen */
                         }
diff --git a/networking/udhcp/dhcpd.c b/networking/udhcp/dhcpd.c
index 05ddc8649..238542bb0 100644
--- a/networking/udhcp/dhcpd.c
+++ b/networking/udhcp/dhcpd.c
@@ -588,7 +588,9 @@ static void send_packet_to_relay(struct dhcp_packet *dhcp_pkt)
 
         udhcp_send_kernel_packet(dhcp_pkt,
                         server_config.server_nip, SERVER_PORT,
-                        dhcp_pkt->gateway_nip, SERVER_PORT);
+                        dhcp_pkt->gateway_nip, SERVER_PORT,
+                        /*send_flags:*/ 0
+        );
 }
 
 static void send_packet(struct dhcp_packet *dhcp_pkt, int force_broadcast)
@@ -946,7 +948,7 @@ int udhcpd_main(int argc UNUSED_PARAM, char **argv)
                 if (bytes < 0) {
                         /* bytes can also be -2 ("bad packet data") */
                         if (bytes == -1 && errno != EINTR) {
-                                log1("read error: %s, reopening socket", strerror(errno));
+                                log1("read error: "STRERROR_FMT", reopening socket" STRERROR_ERRNO);
                                 close(server_socket);
                                 server_socket = -1;
                         }
diff --git a/networking/udhcp/dhcprelay.c b/networking/udhcp/dhcprelay.c
index ea84c0dd7..4d5644093 100644
--- a/networking/udhcp/dhcprelay.c
+++ b/networking/udhcp/dhcprelay.c
@@ -1,5 +1,6 @@
 /* vi: set sw=4 ts=4: */
-/* Port to Busybox Copyright (C) 2006 Jesse Dutton <jessedutton@gmail.com>
+/*
+ * Port to Busybox Copyright (C) 2006 Jesse Dutton <jessedutton@gmail.com>
  *
  * Licensed under GPLv2, see file LICENSE in this source tree.
  *
diff --git a/networking/udhcp/domain_codec.c b/networking/udhcp/domain_codec.c
index 5a923cc2c..b7a3a5353 100644
--- a/networking/udhcp/domain_codec.c
+++ b/networking/udhcp/domain_codec.c
@@ -1,6 +1,6 @@
 /* vi: set sw=4 ts=4: */
-
-/* RFC1035 domain compression routines (C) 2007 Gabriel Somlo <somlo at cmu.edu>
+/*
+ * RFC1035 domain compression routines (C) 2007 Gabriel Somlo <somlo at cmu.edu>
  *
  * Loosely based on the isc-dhcpd implementation by dhankins@isc.org
  *
diff --git a/networking/udhcp/packet.c b/networking/udhcp/packet.c
index 9e1b46d2f..fc2bb5416 100644
--- a/networking/udhcp/packet.c
+++ b/networking/udhcp/packet.c
@@ -41,7 +41,7 @@ void FAST_FUNC udhcp_dump_packet(struct dhcp_packet *packet)
                 return;
 
         bb_error_msg(
-                //"op %x"
+                //" op %x"
                 //" htype %x"
                 " hlen %x"
                 //" hops %x"
@@ -52,7 +52,6 @@ void FAST_FUNC udhcp_dump_packet(struct dhcp_packet *packet)
                 " yiaddr %x"
                 " siaddr %x"
                 " giaddr %x"
-                //" chaddr %s"
                 //" sname %s"
                 //" file %s"
                 //" cookie %x"
@@ -68,14 +67,13 @@ void FAST_FUNC udhcp_dump_packet(struct dhcp_packet *packet)
                 , packet->yiaddr
                 , packet->siaddr_nip
                 , packet->gateway_nip
-                //, packet->chaddr[16]
                 //, packet->sname[64]
                 //, packet->file[128]
                 //, packet->cookie
                 //, packet->options[]
         );
         *bin2hex(buf, (void *) packet->chaddr, sizeof(packet->chaddr)) = '\0';
-        bb_error_msg("chaddr %s", buf);
+        bb_error_msg(" chaddr %s", buf);
 }
 #endif
 
@@ -129,6 +127,8 @@ int FAST_FUNC udhcp_send_raw_packet(struct dhcp_packet *dhcp_pkt,
         dest_sll.sll_family = AF_PACKET;
         dest_sll.sll_protocol = htons(ETH_P_IP);
         dest_sll.sll_ifindex = ifindex;
+        /*dest_sll.sll_hatype = ARPHRD_???;*/
+        /*dest_sll.sll_pkttype = PACKET_???;*/
         dest_sll.sll_halen = 6;
         memcpy(dest_sll.sll_addr, dest_arp, 6);
 
@@ -189,7 +189,8 @@ int FAST_FUNC udhcp_send_raw_packet(struct dhcp_packet *dhcp_pkt,
 /* Let the kernel do all the work for packet generation */
 int FAST_FUNC udhcp_send_kernel_packet(struct dhcp_packet *dhcp_pkt,
                 uint32_t source_nip, int source_port,
-                uint32_t dest_nip, int dest_port)
+                uint32_t dest_nip, int dest_port,
+                int send_flags)
 {
         struct sockaddr_in sa;
         unsigned padding;
@@ -226,8 +227,8 @@ int FAST_FUNC udhcp_send_kernel_packet(struct dhcp_packet *dhcp_pkt,
         padding = DHCP_OPTIONS_BUFSIZE - 1 - udhcp_end_option(dhcp_pkt->options);
         if (padding > DHCP_SIZE - 300)
                 padding = DHCP_SIZE - 300;
-        result = safe_write(fd, dhcp_pkt, DHCP_SIZE - padding);
-        msg = "write";
+        result = send(fd, dhcp_pkt, DHCP_SIZE - padding, send_flags);
+        msg = "send";
  ret_close:
         close(fd);
         if (result < 0) {
diff --git a/networking/zcip.c b/networking/zcip.c
index 55440285f..94e49adcb 100644
--- a/networking/zcip.c
+++ b/networking/zcip.c
@@ -8,7 +8,6 @@
  *
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
-
 /*
  * ZCIP just manages the 169.254.*.* addresses.  That network is not
  * routed at the IP level, though various proxies or bridges can