Merge branch 'busybox' into merge

22 files changed, 262 insertions, 151 deletions

diff --git a/networking/ifupdown.c b/networking/ifupdown.c
index 766dfabbd..2c6db926f 100644
--- a/networking/ifupdown.c
+++ b/networking/ifupdown.c
@@ -850,7 +850,6 @@ static struct interfaces_file_t *read_interfaces(const char *filename, struct in
                         char *iface_name;
                         char *address_family_name;
                         char *method_name;
-                        llist_t *iface_list;
 
                         currif = xzalloc(sizeof(*currif));
                         iface_name = next_word(&rest_of_line);
@@ -875,7 +874,20 @@ static struct interfaces_file_t *read_interfaces(const char *filename, struct in
                         currif->method = get_method(currif->address_family, method_name);
                         if (!currif->method)
                                 bb_error_msg_and_die("unknown method \"%s\"", method_name);
-
+#if 0
+// Allegedly, Debian allows a duplicate definition:
+// iface eth0 inet static
+//     address 192.168.0.15
+//     netmask 255.255.0.0
+//     gateway 192.168.0.1
+//
+// iface eth0 inet static
+//     address 10.0.0.1
+//     netmask 255.255.255.0
+//
+// This adds *two* addresses to eth0 (probably requires use of "ip", not "ifconfig"
+//
+                        llist_t *iface_list;
                         for (iface_list = defn->ifaces; iface_list; iface_list = iface_list->link) {
                                 struct interface_defn_t *tmp = (struct interface_defn_t *) iface_list->data;
                                 if ((strcmp(tmp->iface, currif->iface) == 0)
@@ -884,6 +896,7 @@ static struct interfaces_file_t *read_interfaces(const char *filename, struct in
                                         bb_error_msg_and_die("duplicate interface \"%s\"", tmp->iface);
                                 }
                         }
+#endif
                         llist_add_to_end(&(defn->ifaces), (char*)currif);
 
                         debug_noise("iface %s %s %s\n", currif->iface, address_family_name, method_name);
diff --git a/networking/inetd.c b/networking/inetd.c
index 243165a07..4f6673b12 100644
--- a/networking/inetd.c
+++ b/networking/inetd.c
@@ -834,10 +834,10 @@ static NOINLINE servtab_t *parse_one_line(void)
                         goto parse_err;
         }
 
-//      bb_info_msg(
-//              "ENTRY[%s][%s][%s][%d][%d][%d][%d][%d][%s][%s][%s]",
-//              sep->se_local_hostname, sep->se_service, sep->se_proto, sep->se_wait, sep->se_proto_no,
-//              sep->se_max, sep->se_count, sep->se_time, sep->se_user, sep->se_group, sep->se_program);
+        //bb_error_msg(
+        //      "ENTRY[%s][%s][%s][%d][%d][%d][%d][%d][%s][%s][%s]",
+        //      sep->se_local_hostname, sep->se_service, sep->se_proto, sep->se_wait, sep->se_proto_no,
+        //      sep->se_max, sep->se_count, sep->se_time, sep->se_user, sep->se_group, sep->se_program);
 
         /* check if the hostname specifier is a comma separated list
          * of hostnames. we'll make new entries for each address. */
diff --git a/networking/ntpd.c b/networking/ntpd.c
index 1651670d9..410318979 100644
--- a/networking/ntpd.c
+++ b/networking/ntpd.c
@@ -267,6 +267,7 @@ typedef struct {
 
 typedef struct {
         len_and_sockaddr *p_lsa;
+        char             *p_hostname;
         char             *p_dotted;
         int              p_fd;
         int              datapoint_idx;
@@ -727,7 +728,7 @@ reset_peer_stats(peer_t *p, double offset)
 
         /* Used to set p->filter_datapoint[i].d_dispersion = MAXDISP
          * and clear reachable bits, but this proved to be too agressive:
-         * after step (tested with suspinding laptop for ~30 secs),
+         * after step (tested with suspending laptop for ~30 secs),
          * this caused all previous data to be considered invalid,
          * making us needing to collect full ~8 datapoins per peer
          * after step in order to start trusting them.
@@ -766,11 +767,29 @@ reset_peer_stats(peer_t *p, double offset)
 static void
 add_peers(const char *s)
 {
+        llist_t *item;
         peer_t *p;
 
         p = xzalloc(sizeof(*p));
         p->p_lsa = xhost2sockaddr(s, 123);
         p->p_dotted = xmalloc_sockaddr2dotted_noport(&p->p_lsa->u.sa);
+
+        /* Names like N.<country2chars>.pool.ntp.org are randomly resolved
+         * to a pool of machines. Sometimes different N's resolve to the same IP.
+         * It is not useful to have two peers with same IP. We skip duplicates.
+         */
+        for (item = G.ntp_peers; item != NULL; item = item->link) {
+                peer_t *pp = (peer_t *) item->data;
+                if (strcmp(p->p_dotted, pp->p_dotted) == 0) {
+                        bb_error_msg("duplicate peer %s (%s)", s, p->p_dotted);
+                        free(p->p_lsa);
+                        free(p->p_dotted);
+                        free(p);
+                        return;
+                }
+        }
+
+        p->p_hostname = xstrdup(s);
         p->p_fd = -1;
         p->p_xmt_msg.m_status = MODE_CLIENT | (NTP_VERSION << 3);
         p->next_action_time = G.cur_time; /* = set_next(p, 0); */
@@ -1685,8 +1704,14 @@ update_local_clock(peer_t *p)
         VERB4 bb_error_msg("adjtimex:%d freq:%ld offset:%+ld status:0x%x",
                                 rc, tmx.freq, tmx.offset, tmx.status);
         G.kernel_freq_drift = tmx.freq / 65536;
-        VERB2 bb_error_msg("update from:%s offset:%+f jitter:%f clock drift:%+.3fppm tc:%d",
-                        p->p_dotted, offset, G.discipline_jitter, (double)tmx.freq / 65536, (int)tmx.constant);
+        VERB2 bb_error_msg("update from:%s offset:%+f delay:%f jitter:%f clock drift:%+.3fppm tc:%d",
+                        p->p_dotted,
+                        offset,
+                        p->lastpkt_delay,
+                        G.discipline_jitter,
+                        (double)tmx.freq / 65536,
+                        (int)tmx.constant
+        );
 
         return 1; /* "ok to increase poll interval" */
 }
@@ -1947,8 +1972,8 @@ recv_and_process_peer_pkt(peer_t *p)
                         adjust_poll(MINPOLL);
                 } else {
                         VERB3 if (rc > 0)
-                                bb_error_msg("want smaller poll interval: offset/jitter > %u",
-                                        POLLADJ_GATE);
+                                bb_error_msg("want smaller interval: offset/jitter = %u",
+                                        G.offset_to_jitter_ratio);
                         adjust_poll(-G.poll_exp * 2);
                 }
         }
@@ -2311,6 +2336,21 @@ int ntpd_main(int argc UNUSED_PARAM, char **argv)
                                         timeout = poll_interval(NOREPLY_INTERVAL);
                                         bb_error_msg("timed out waiting for %s, reach 0x%02x, next query in %us",
                                                         p->p_dotted, p->reachable_bits, timeout);
+
+                                        /* What if don't see it because it changed its IP? */
+                                        if (p->reachable_bits == 0) {
+                                                len_and_sockaddr *lsa = host2sockaddr(p->p_hostname, 123);
+                                                if (lsa) {
+                                                        char *dotted = xmalloc_sockaddr2dotted_noport(&lsa->u.sa);
+                                                        //if (strcmp(dotted, p->p_dotted) != 0)
+                                                        //      bb_error_msg("peer IP changed");
+                                                        free(p->p_lsa);
+                                                        free(p->p_dotted);
+                                                        p->p_lsa = lsa;
+                                                        p->p_dotted = dotted;
+                                                }
+                                        }
+
                                         set_next(p, timeout);
                                 }
                         }
diff --git a/networking/ntpd.diff b/networking/ntpd.diff
new file mode 100644
index 000000000..4afd7e134
--- /dev/null
+++ b/networking/ntpd.diff
@@ -0,0 +1,24 @@
+This patch scales down small offsets quadratically. Reduces sensitivity to jitter
+
+diff --git a/networking/ntpd.c b/networking/ntpd.c
+index 4695c33..ac05815 100644
+--- a/networking/ntpd.c
++++ b/networking/ntpd.c
+@@ -1654,6 +1654,17 @@ update_local_clock(peer_t *p)
+         */
+        if (G.offset_to_jitter_ratio >= TIMECONST_HACK_GATE)
+                tmx.constant--;
++
++{
++    double d = p->lastpkt_delay;
++    if (d > SLEW_THRESHOLD)
++       d = SLEW_THRESHOLD;
++    d /= 2;
++    if ((abs_offset / d) < 1) {
++        offset *= (abs_offset / d);
++    }
++}
++
+        tmx.offset = (long)(offset * 1000000); /* usec */
+        if (SLEW_THRESHOLD < STEP_THRESHOLD) {
+                if (tmx.offset > (long)(SLEW_THRESHOLD * 1000000)) {
diff --git a/networking/traceroute.c b/networking/traceroute.c
index 642110c54..eee4f8873 100644
--- a/networking/traceroute.c
+++ b/networking/traceroute.c
@@ -497,7 +497,7 @@ send_probe(int seq, int ttl)
 
         res = xsendto(sndsock, out, len, &dest_lsa->u.sa, dest_lsa->len);
         if (res != len)
-                bb_info_msg("sent %d octets, ret=%d", len, res);
+                bb_error_msg("sent %d octets, ret=%d", len, res);
 }
 
 #if ENABLE_FEATURE_TRACEROUTE_VERBOSE
diff --git a/networking/tunctl.c b/networking/tunctl.c
index 3a0870eb5..941e8bbd3 100644
--- a/networking/tunctl.c
+++ b/networking/tunctl.c
@@ -82,7 +82,7 @@ int tunctl_main(int argc UNUSED_PARAM, char **argv)
         // delete?
         if (opts & OPT_d) {
                 IOCTL(fd, TUNSETPERSIST, (void *)(uintptr_t)0);
-                bb_info_msg("Set '%s' %spersistent", ifr.ifr_name, "non");
+                printf("Set '%s' nonpersistent\n", ifr.ifr_name);
                 return EXIT_SUCCESS;
         }
 
diff --git a/networking/udhcp/arpping.c b/networking/udhcp/arpping.c
index fad2283c3..c98027316 100644
--- a/networking/udhcp/arpping.c
+++ b/networking/udhcp/arpping.c
@@ -132,6 +132,6 @@ int FAST_FUNC arpping(uint32_t test_nip,
 
  ret:
         close(s);
-        log1("%srp reply received for this address", rv ? "No a" : "A");
+        log1("%srp reply received for this address", rv ? "no a" : "A");
         return rv;
 }
diff --git a/networking/udhcp/common.c b/networking/udhcp/common.c
index bc41c8d4d..0cf4dab63 100644
--- a/networking/udhcp/common.c
+++ b/networking/udhcp/common.c
@@ -142,7 +142,7 @@ const char dhcp_option_strings[] ALIGN1 =
  * udhcp_str2optset: to determine how many bytes to allocate.
  * xmalloc_optname_optval: to estimate string length
  * from binary option length: (option[LEN] / dhcp_option_lengths[opt_type])
- * is the number of elements, multiply in by one element's string width
+ * is the number of elements, multiply it by one element's string width
  * (len_of_option_as_string[opt_type]) and you know how wide string you need.
  */
 const uint8_t dhcp_option_lengths[] ALIGN1 = {
@@ -162,7 +162,18 @@ const uint8_t dhcp_option_lengths[] ALIGN1 = {
         [OPTION_S32] =     4,
         /* Just like OPTION_STRING, we use minimum length here */
         [OPTION_STATIC_ROUTES] = 5,
-        [OPTION_6RD] =    22,  /* ignored by udhcp_str2optset */
+        [OPTION_6RD] =    12,  /* ignored by udhcp_str2optset */
+        /* The above value was chosen as follows:
+         * len_of_option_as_string[] for this option is >60: it's a string of the form
+         * "32 128 ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff 255.255.255.255 ".
+         * Each additional ipv4 address takes 4 bytes in binary option and appends
+         * another "255.255.255.255 " 16-byte string. We can set [OPTION_6RD] = 4
+         * but this severely overestimates string length: instead of 16 bytes,
+         * it adds >60 for every 4 bytes in binary option.
+         * We cheat and declare here that option is in units of 12 bytes.
+         * This adds more than 60 bytes for every three ipv4 addresses - more than enough.
+         * (Even 16 instead of 12 should work, but let's be paranoid).
+         */
 };
 
 
@@ -172,7 +183,7 @@ static void log_option(const char *pfx, const uint8_t *opt)
         if (dhcp_verbose >= 2) {
                 char buf[256 * 2 + 2];
                 *bin2hex(buf, (void*) (opt + OPT_DATA), opt[OPT_LEN]) = '\0';
-                bb_info_msg("%s: 0x%02x %s", pfx, opt[OPT_CODE], buf);
+                bb_error_msg("%s: 0x%02x %s", pfx, opt[OPT_CODE], buf);
         }
 }
 #else
@@ -246,7 +257,7 @@ uint8_t* FAST_FUNC udhcp_get_option(struct dhcp_packet *packet, int code)
                         continue; /* complain and return NULL */
 
                 if (optionptr[OPT_CODE] == code) {
-                        log_option("Option found", optionptr);
+                        log_option("option found", optionptr);
                         return optionptr + OPT_DATA;
                 }
 
@@ -258,7 +269,7 @@ uint8_t* FAST_FUNC udhcp_get_option(struct dhcp_packet *packet, int code)
         }
 
         /* log3 because udhcpc uses it a lot - very noisy */
-        log3("Option 0x%02x not found", code);
+        log3("option 0x%02x not found", code);
         return NULL;
 }
 
@@ -292,7 +303,7 @@ void FAST_FUNC udhcp_add_binary_option(struct dhcp_packet *packet, uint8_t *addo
                                 addopt[OPT_CODE]);
                 return;
         }
-        log_option("Adding option", addopt);
+        log_option("adding option", addopt);
         memcpy(optionptr + end, addopt, len);
         optionptr[end + len] = DHCP_END;
 }
@@ -391,7 +402,7 @@ static NOINLINE void attach_option(
                 struct option_set *new, **curr;
 
                 /* make a new option */
-                log2("Attaching option %02x to list", optflag->code);
+                log2("attaching option %02x to list", optflag->code);
                 new = xmalloc(sizeof(*new));
                 new->data = xmalloc(length + OPT_DATA);
                 new->data[OPT_CODE] = optflag->code;
@@ -411,7 +422,7 @@ static NOINLINE void attach_option(
                 unsigned old_len;
 
                 /* add it to an existing option */
-                log2("Attaching option %02x to existing member of list", optflag->code);
+                log2("attaching option %02x to existing member of list", optflag->code);
                 old_len = existing->data[OPT_LEN];
                 if (old_len + length < 255) {
                         /* actually 255 is ok too, but adding a space can overlow it */
diff --git a/networking/udhcp/common.h b/networking/udhcp/common.h
index d20659e2f..496ab11a1 100644
--- a/networking/udhcp/common.h
+++ b/networking/udhcp/common.h
@@ -256,16 +256,16 @@ struct option_set *udhcp_find_option(struct option_set *opt_list, uint8_t code)
 #if defined CONFIG_UDHCP_DEBUG && CONFIG_UDHCP_DEBUG >= 1
 # define IF_UDHCP_VERBOSE(...) __VA_ARGS__
 extern unsigned dhcp_verbose;
-# define log1(...) do { if (dhcp_verbose >= 1) bb_info_msg(__VA_ARGS__); } while (0)
+# define log1(...) do { if (dhcp_verbose >= 1) bb_error_msg(__VA_ARGS__); } while (0)
 # if CONFIG_UDHCP_DEBUG >= 2
 void udhcp_dump_packet(struct dhcp_packet *packet) FAST_FUNC;
-#  define log2(...) do { if (dhcp_verbose >= 2) bb_info_msg(__VA_ARGS__); } while (0)
+#  define log2(...) do { if (dhcp_verbose >= 2) bb_error_msg(__VA_ARGS__); } while (0)
 # else
 #  define udhcp_dump_packet(...) ((void)0)
 #  define log2(...) ((void)0)
 # endif
 # if CONFIG_UDHCP_DEBUG >= 3
-#  define log3(...) do { if (dhcp_verbose >= 3) bb_info_msg(__VA_ARGS__); } while (0)
+#  define log3(...) do { if (dhcp_verbose >= 3) bb_error_msg(__VA_ARGS__); } while (0)
 # else
 #  define log3(...) ((void)0)
 # endif
diff --git a/networking/udhcp/d6_dhcpc.c b/networking/udhcp/d6_dhcpc.c
index 4e9b705b9..422254d62 100644
--- a/networking/udhcp/d6_dhcpc.c
+++ b/networking/udhcp/d6_dhcpc.c
@@ -251,7 +251,7 @@ static void d6_run_script(struct d6_packet *packet, const char *name)
         envp = fill_envp(packet);
 
         /* call script */
-        log1("Executing %s %s", client_config.script, name);
+        log1("executing %s %s", client_config.script, name);
         argv[0] = (char*) client_config.script;
         argv[1] = (char*) name;
         argv[2] = NULL;
@@ -428,7 +428,7 @@ static NOINLINE int send_d6_discover(uint32_t xid, struct in6_addr *requested_ip
          */
         opt_ptr = add_d6_client_options(opt_ptr);
 
-        bb_info_msg("Sending discover...");
+        bb_error_msg("sending %s", "discover");
         return d6_mcast_from_client_config_ifindex(&packet, opt_ptr);
 }
 
@@ -481,7 +481,7 @@ static NOINLINE int send_d6_select(uint32_t xid)
          */
         opt_ptr = add_d6_client_options(opt_ptr);
 
-        bb_info_msg("Sending select...");
+        bb_error_msg("sending %s", "select");
         return d6_mcast_from_client_config_ifindex(&packet, opt_ptr);
 }
 
@@ -550,7 +550,7 @@ static NOINLINE int send_d6_renew(uint32_t xid, struct in6_addr *server_ipv6, st
          */
         opt_ptr = add_d6_client_options(opt_ptr);
 
-        bb_info_msg("Sending renew...");
+        bb_error_msg("sending %s", "renew");
         if (server_ipv6)
                 return d6_send_kernel_packet(
                         &packet, (opt_ptr - (uint8_t*) &packet),
@@ -573,7 +573,7 @@ static int send_d6_release(struct in6_addr *server_ipv6, struct in6_addr *our_cu
         /* IA NA (contains our current IP) */
         opt_ptr = d6_store_blob(opt_ptr, client6_data.ia_na, client6_data.ia_na->len + 2+2);
 
-        bb_info_msg("Sending release...");
+        bb_error_msg("sending %s", "release");
         return d6_send_kernel_packet(
                 &packet, (opt_ptr - (uint8_t*) &packet),
                 our_cur_ipv6, CLIENT_PORT6,
@@ -592,19 +592,19 @@ static NOINLINE int d6_recv_raw_packet(struct in6_addr *peer_ipv6
 
         bytes = safe_read(fd, &packet, sizeof(packet));
         if (bytes < 0) {
-                log1("Packet read error, ignoring");
+                log1("packet read error, ignoring");
                 /* NB: possible down interface, etc. Caller should pause. */
                 return bytes; /* returns -1 */
         }
 
         if (bytes < (int) (sizeof(packet.ip6) + sizeof(packet.udp))) {
-                log1("Packet is too short, ignoring");
+                log1("packet is too short, ignoring");
                 return -2;
         }
 
         if (bytes < sizeof(packet.ip6) + ntohs(packet.ip6.ip6_plen)) {
                 /* packet is bigger than sizeof(packet), we did partial read */
-                log1("Oversized packet, ignoring");
+                log1("oversized packet, ignoring");
                 return -2;
         }
 
@@ -618,7 +618,7 @@ static NOINLINE int d6_recv_raw_packet(struct in6_addr *peer_ipv6
         /* || bytes > (int) sizeof(packet) - can't happen */
          || packet.udp.len != packet.ip6.ip6_plen
         ) {
-                log1("Unrelated/bogus packet, ignoring");
+                log1("unrelated/bogus packet, ignoring");
                 return -2;
         }
 
@@ -630,11 +630,11 @@ static NOINLINE int d6_recv_raw_packet(struct in6_addr *peer_ipv6
 //      check = packet.udp.check;
 //      packet.udp.check = 0;
 //      if (check && check != inet_cksum((uint16_t *)&packet, bytes)) {
-//              log1("Packet with bad UDP checksum received, ignoring");
+//              log1("packet with bad UDP checksum received, ignoring");
 //              return -2;
 //      }
 
-        log1("Received a packet");
+        log1("received %s", "a packet");
         d6_dump_packet(&packet.data);
 
         bytes -= sizeof(packet.ip6) + sizeof(packet.udp);
@@ -722,10 +722,10 @@ static int d6_raw_socket(int ifindex)
         };
 #endif
 
-        log1("Opening raw socket on ifindex %d", ifindex); //log2?
+        log1("opening raw socket on ifindex %d", ifindex); //log2?
 
         fd = xsocket(PF_PACKET, SOCK_DGRAM, htons(ETH_P_IPV6));
-        log1("Got raw socket fd %d", fd); //log2?
+        log1("got raw socket fd %d", fd); //log2?
 
         sock.sll_family = AF_PACKET;
         sock.sll_protocol = htons(ETH_P_IPV6);
@@ -738,18 +738,18 @@ static int d6_raw_socket(int ifindex)
                 /* Ignoring error (kernel may lack support for this) */
                 if (setsockopt(fd, SOL_SOCKET, SO_ATTACH_FILTER, &filter_prog,
                                 sizeof(filter_prog)) >= 0)
-                        log1("Attached filter to raw socket fd %d", fd); // log?
+                        log1("attached filter to raw socket fd %d", fd); // log?
         }
 #endif
 
-        log1("Created raw socket");
+        log1("created raw socket");
 
         return fd;
 }
 
 static void change_listen_mode(int new_mode)
 {
-        log1("Entering listen mode: %s",
+        log1("entering listen mode: %s",
                 new_mode != LISTEN_NONE
                         ? (new_mode == LISTEN_KERNEL ? "kernel" : "raw")
                         : "none"
@@ -770,7 +770,7 @@ static void change_listen_mode(int new_mode)
 /* Called only on SIGUSR1 */
 static void perform_renew(void)
 {
-        bb_info_msg("Performing a DHCP renew");
+        bb_error_msg("performing DHCP renew");
         switch (state) {
         case BOUND:
                 change_listen_mode(LISTEN_KERNEL);
@@ -794,11 +794,11 @@ static void perform_d6_release(struct in6_addr *server_ipv6, struct in6_addr *ou
 {
         /* send release packet */
         if (state == BOUND || state == RENEWING || state == REBINDING) {
-                bb_info_msg("Unicasting a release");
+                bb_error_msg("unicasting a release");
                 send_d6_release(server_ipv6, our_cur_ipv6); /* unicast */
                 d6_run_script(NULL, "deconfig");
         }
-        bb_info_msg("Entering released state");
+        bb_error_msg("entering released state");
 
         change_listen_mode(LISTEN_NONE);
         state = RELEASED;
@@ -1034,7 +1034,7 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
         /* Create pidfile */
         write_pidfile(client_config.pidfile);
         /* Goes to stdout (unless NOMMU) and possibly syslog */
-        bb_info_msg("%s (v"BB_VER") started", applet_name);
+        bb_error_msg("started, v"BB_VER);
         /* Set up the signal pipe */
         udhcp_sp_setup();
         /* We want random_xid to be random... */
@@ -1074,7 +1074,7 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
                 retval = 0;
                 /* If we already timed out, fall through with retval = 0, else... */
                 if ((int)tv.tv_sec > 0) {
-                        log1("Waiting on select %u seconds", (int)tv.tv_sec);
+                        log1("waiting on select %u seconds", (int)tv.tv_sec);
                         timestamp_before_wait = (unsigned)monotonic_sec();
                         retval = select(max_fd + 1, &rfds, NULL, NULL, &tv);
                         if (retval < 0) {
@@ -1124,14 +1124,14 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
                                 d6_run_script(NULL, "leasefail");
 #if BB_MMU /* -b is not supported on NOMMU */
                                 if (opt & OPT_b) { /* background if no lease */
-                                        bb_info_msg("No lease, forking to background");
+                                        bb_error_msg("no lease, forking to background");
                                         client_background();
                                         /* do not background again! */
                                         opt = ((opt & ~OPT_b) | OPT_f);
                                 } else
 #endif
                                 if (opt & OPT_n) { /* abort if no lease */
-                                        bb_info_msg("No lease, failing");
+                                        bb_error_msg("no lease, failing");
                                         retval = 1;
                                         goto ret;
                                 }
@@ -1159,7 +1159,7 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
                                 state = RENEWING;
                                 client_config.first_secs = 0; /* make secs field count from 0 */
                                 change_listen_mode(LISTEN_KERNEL);
-                                log1("Entering renew state");
+                                log1("entering renew state");
                                 /* fall right through */
                         case RENEW_REQUESTED: /* manual (SIGUSR1) renew */
                         case_RENEW_REQUESTED:
@@ -1179,7 +1179,7 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
                                         continue;
                                 }
                                 /* Timed out, enter rebinding state */
-                                log1("Entering rebinding state");
+                                log1("entering rebinding state");
                                 state = REBINDING;
                                 /* fall right through */
                         case REBINDING:
@@ -1194,7 +1194,7 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
                                         continue;
                                 }
                                 /* Timed out, enter init state */
-                                bb_info_msg("Lease lost, entering init state");
+                                bb_error_msg("lease lost, entering init state");
                                 d6_run_script(NULL, "deconfig");
                                 state = INIT_SELECTING;
                                 client_config.first_secs = 0; /* make secs field count from 0 */
@@ -1242,7 +1242,7 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
                         timeout = INT_MAX;
                         continue;
                 case SIGTERM:
-                        bb_info_msg("Received SIGTERM");
+                        bb_error_msg("received %s", "SIGTERM");
                         goto ret0;
                 }
 
@@ -1260,7 +1260,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_info_msg("Read error: %s, reopening socket", strerror(errno));
+                                bb_error_msg("read error: %s, reopening socket", strerror(errno));
                                 sleep(discover_timeout); /* 3 seconds by default */
                                 change_listen_mode(listen_mode); /* just close and reopen */
                         }
@@ -1298,7 +1298,7 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
                                 option = d6_find_option(packet.d6_options, packet_end, D6_OPT_STATUS_CODE);
                                 if (option && option->data[4] != 0) {
                                         /* return to init state */
-                                        bb_info_msg("Received DHCP NAK (%u)", option->data[4]);
+                                        bb_error_msg("received DHCP NAK (%u)", option->data[4]);
                                         d6_run_script(&packet, "nak");
                                         if (state != REQUESTING)
                                                 d6_run_script(NULL, "deconfig");
@@ -1453,7 +1453,7 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
                                         lease_seconds = 0x0fffffff;
                                 /* enter bound state */
                                 timeout = lease_seconds / 2;
-                                bb_info_msg("Lease obtained, lease time %u",
+                                bb_error_msg("lease obtained, lease time %u",
                                         /*inet_ntoa(temp_addr),*/ (unsigned)lease_seconds);
                                 d6_run_script(&packet, state == REQUESTING ? "bound" : "renew");
 
diff --git a/networking/udhcp/d6_packet.c b/networking/udhcp/d6_packet.c
index 79b2946ef..e166f520d 100644
--- a/networking/udhcp/d6_packet.c
+++ b/networking/udhcp/d6_packet.c
@@ -17,12 +17,12 @@ void FAST_FUNC d6_dump_packet(struct d6_packet *packet)
         if (dhcp_verbose < 2)
                 return;
 
-        bb_info_msg(
-                " xid %x"
+        bb_error_msg(
+                "xid %x"
                 , packet->d6_xid32
         );
         //*bin2hex(buf, (void *) packet->chaddr, sizeof(packet->chaddr)) = '\0';
-        //bb_info_msg(" chaddr %s", buf);
+        //bb_error_msg(" chaddr %s", buf);
 }
 #endif
 
@@ -35,15 +35,15 @@ int FAST_FUNC d6_recv_kernel_packet(struct in6_addr *peer_ipv6
         memset(packet, 0, sizeof(*packet));
         bytes = safe_read(fd, packet, sizeof(*packet));
         if (bytes < 0) {
-                log1("Packet read error, ignoring");
+                log1("packet read error, ignoring");
                 return bytes; /* returns -1 */
         }
 
         if (bytes < offsetof(struct d6_packet, d6_options)) {
-                bb_info_msg("Packet with bad magic, ignoring");
+                bb_error_msg("packet with bad magic, ignoring");
                 return -2;
         }
-        log1("Received a packet");
+        log1("received %s", "a packet");
         d6_dump_packet(packet);
 
         return bytes;
diff --git a/networking/udhcp/d6_socket.c b/networking/udhcp/d6_socket.c
index 56f69f6a1..910f296a3 100644
--- a/networking/udhcp/d6_socket.c
+++ b/networking/udhcp/d6_socket.c
@@ -13,7 +13,7 @@ int FAST_FUNC d6_listen_socket(int port, const char *inf)
         int fd;
         struct sockaddr_in6 addr;
 
-        log1("Opening listen socket on *:%d %s", port, inf);
+        log1("opening listen socket on *:%d %s", port, inf);
         fd = xsocket(PF_INET6, SOCK_DGRAM, IPPROTO_UDP);
 
         setsockopt_reuseaddr(fd);
diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c
index 48097bc24..660b943ce 100644
--- a/networking/udhcp/dhcpc.c
+++ b/networking/udhcp/dhcpc.c
@@ -113,7 +113,7 @@ static const uint8_t len_of_option_as_string[] = {
         [OPTION_IP              ] = sizeof("255.255.255.255 "),
         [OPTION_IP_PAIR         ] = sizeof("255.255.255.255 ") * 2,
         [OPTION_STATIC_ROUTES   ] = sizeof("255.255.255.255/32 255.255.255.255 "),
-        [OPTION_6RD             ] = sizeof("32 128 ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff 255.255.255.255 "),
+        [OPTION_6RD             ] = sizeof("132 128 ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff 255.255.255.255 "),
         [OPTION_STRING          ] = 1,
         [OPTION_STRING_HOST     ] = 1,
 #if ENABLE_FEATURE_UDHCP_RFC3397
@@ -222,7 +222,7 @@ static NOINLINE char *xmalloc_optname_optval(uint8_t *option, const struct dhcp_
         type = optflag->flags & OPTION_TYPE_MASK;
         optlen = dhcp_option_lengths[type];
         upper_length = len_of_option_as_string[type]
-                * ((unsigned)(len + optlen - 1) / (unsigned)optlen);
+                * ((unsigned)(len + optlen) / (unsigned)optlen);
 
         dest = ret = xmalloc(upper_length + strlen(opt_name) + 2);
         dest += sprintf(ret, "%s=", opt_name);
@@ -561,7 +561,7 @@ static void udhcp_run_script(struct dhcp_packet *packet, const char *name)
         envp = fill_envp(packet);
 
         /* call script */
-        log1("Executing %s %s", client_config.script, name);
+        log1("executing %s %s", client_config.script, name);
         argv[0] = (char*) client_config.script;
         argv[1] = (char*) name;
         argv[2] = NULL;
@@ -675,10 +675,10 @@ static void add_client_options(struct dhcp_packet *packet)
  * client reverts to using the IP broadcast address.
  */
 
-static int raw_bcast_from_client_config_ifindex(struct dhcp_packet *packet)
+static int raw_bcast_from_client_config_ifindex(struct dhcp_packet *packet, uint32_t src_nip)
 {
         return udhcp_send_raw_packet(packet,
-                /*src*/ INADDR_ANY, CLIENT_PORT,
+                /*src*/ src_nip, CLIENT_PORT,
                 /*dst*/ INADDR_BROADCAST, SERVER_PORT, MAC_BCAST_ADDR,
                 client_config.ifindex);
 }
@@ -689,7 +689,7 @@ static int bcast_or_ucast(struct dhcp_packet *packet, uint32_t ciaddr, uint32_t
                 return udhcp_send_kernel_packet(packet,
                         ciaddr, CLIENT_PORT,
                         server, SERVER_PORT);
-        return raw_bcast_from_client_config_ifindex(packet);
+        return raw_bcast_from_client_config_ifindex(packet, ciaddr);
 }
 
 /* Broadcast a DHCP discover packet to the network, with an optionally requested IP */
@@ -714,8 +714,8 @@ static NOINLINE int send_discover(uint32_t xid, uint32_t requested)
          */
         add_client_options(&packet);
 
-        bb_info_msg("Sending discover...");
-        return raw_bcast_from_client_config_ifindex(&packet);
+        bb_error_msg("sending %s", "discover");
+        return raw_bcast_from_client_config_ifindex(&packet, INADDR_ANY);
 }
 
 /* Broadcast a DHCP request message */
@@ -758,8 +758,8 @@ static NOINLINE int send_select(uint32_t xid, uint32_t server, uint32_t requeste
         add_client_options(&packet);
 
         addr.s_addr = requested;
-        bb_info_msg("Sending select for %s...", inet_ntoa(addr));
-        return raw_bcast_from_client_config_ifindex(&packet);
+        bb_error_msg("sending select for %s", inet_ntoa(addr));
+        return raw_bcast_from_client_config_ifindex(&packet, INADDR_ANY);
 }
 
 /* Unicast or broadcast a DHCP renew message */
@@ -797,7 +797,7 @@ static NOINLINE int send_renew(uint32_t xid, uint32_t server, uint32_t ciaddr)
          */
         add_client_options(&packet);
 
-        bb_info_msg("Sending renew...");
+        bb_error_msg("sending %s", "renew");
         return bcast_or_ucast(&packet, ciaddr, server);
 }
 
@@ -826,8 +826,8 @@ static NOINLINE int send_decline(/*uint32_t xid,*/ uint32_t server, uint32_t req
 
         udhcp_add_simple_option(&packet, DHCP_SERVER_ID, server);
 
-        bb_info_msg("Sending decline...");
-        return raw_bcast_from_client_config_ifindex(&packet);
+        bb_error_msg("sending %s", "decline");
+        return raw_bcast_from_client_config_ifindex(&packet, INADDR_ANY);
 }
 #endif
 
@@ -846,7 +846,7 @@ static int send_release(uint32_t server, uint32_t ciaddr)
 
         udhcp_add_simple_option(&packet, DHCP_SERVER_ID, server);
 
-        bb_info_msg("Sending release...");
+        bb_error_msg("sending %s", "release");
         /* Note: normally we unicast here since "server" is not zero.
          * However, there _are_ people who run "address-less" DHCP servers,
          * and reportedly ISC dhcp client and Windows allow that.
@@ -881,7 +881,7 @@ static NOINLINE int udhcp_recv_raw_packet(struct dhcp_packet *dhcp_pkt, int fd)
                 if (bytes < 0) {
                         if (errno == EINTR)
                                 continue;
-                        log1("Packet read error, ignoring");
+                        log1("packet read error, ignoring");
                         /* NB: possible down interface, etc. Caller should pause. */
                         return bytes; /* returns -1 */
                 }
@@ -889,13 +889,13 @@ static NOINLINE int udhcp_recv_raw_packet(struct dhcp_packet *dhcp_pkt, int fd)
         }
 
         if (bytes < (int) (sizeof(packet.ip) + sizeof(packet.udp))) {
-                log1("Packet is too short, ignoring");
+                log1("packet is too short, ignoring");
                 return -2;
         }
 
         if (bytes < ntohs(packet.ip.tot_len)) {
                 /* packet is bigger than sizeof(packet), we did partial read */
-                log1("Oversized packet, ignoring");
+                log1("oversized packet, ignoring");
                 return -2;
         }
 
@@ -910,7 +910,7 @@ static NOINLINE int udhcp_recv_raw_packet(struct dhcp_packet *dhcp_pkt, int fd)
         /* || bytes > (int) sizeof(packet) - can't happen */
          || ntohs(packet.udp.len) != (uint16_t)(bytes - sizeof(packet.ip))
         ) {
-                log1("Unrelated/bogus packet, ignoring");
+                log1("unrelated/bogus packet, ignoring");
                 return -2;
         }
 
@@ -918,7 +918,7 @@ static NOINLINE int udhcp_recv_raw_packet(struct dhcp_packet *dhcp_pkt, int fd)
         check = packet.ip.check;
         packet.ip.check = 0;
         if (check != inet_cksum((uint16_t *)&packet.ip, sizeof(packet.ip))) {
-                log1("Bad IP header checksum, ignoring");
+                log1("bad IP header checksum, ignoring");
                 return -2;
         }
 
@@ -943,17 +943,17 @@ static NOINLINE int udhcp_recv_raw_packet(struct dhcp_packet *dhcp_pkt, int fd)
         check = packet.udp.check;
         packet.udp.check = 0;
         if (check && check != inet_cksum((uint16_t *)&packet, bytes)) {
-                log1("Packet with bad UDP checksum received, ignoring");
+                log1("packet with bad UDP checksum received, ignoring");
                 return -2;
         }
  skip_udp_sum_check:
 
         if (packet.data.cookie != htonl(DHCP_MAGIC)) {
-                bb_info_msg("Packet with bad magic, ignoring");
+                bb_error_msg("packet with bad magic, ignoring");
                 return -2;
         }
 
-        log1("Received a packet");
+        log1("received %s", "a packet");
         udhcp_dump_packet(&packet.data);
 
         bytes -= sizeof(packet.ip) + sizeof(packet.udp);
@@ -992,14 +992,14 @@ static int udhcp_raw_socket(int ifindex)
         int fd;
         struct sockaddr_ll sock;
 
-        log1("Opening raw socket on ifindex %d", ifindex); //log2?
+        log1("opening raw socket on ifindex %d", ifindex); //log2?
 
         fd = xsocket(PF_PACKET, SOCK_DGRAM, htons(ETH_P_IP));
         /* ^^^^^
          * SOCK_DGRAM: remove link-layer headers on input (SOCK_RAW keeps them)
          * ETH_P_IP: want to receive only packets with IPv4 eth type
          */
-        log1("Got raw socket fd"); //log2?
+        log1("got raw socket fd"); //log2?
 
         sock.sll_family = AF_PACKET;
         sock.sll_protocol = htons(ETH_P_IP);
@@ -1055,23 +1055,23 @@ static int udhcp_raw_socket(int ifindex)
                 /* Ignoring error (kernel may lack support for this) */
                 if (setsockopt(fd, SOL_SOCKET, SO_ATTACH_FILTER, &filter_prog,
                                 sizeof(filter_prog)) >= 0)
-                        log1("Attached filter to raw socket fd"); // log?
+                        log1("attached filter to raw socket fd"); // log?
         }
 #endif
 
         if (setsockopt_1(fd, SOL_PACKET, PACKET_AUXDATA) != 0) {
                 if (errno != ENOPROTOOPT)
-                        log1("Can't set PACKET_AUXDATA on raw socket");
+                        log1("can't set PACKET_AUXDATA on raw socket");
         }
 
-        log1("Created raw socket");
+        log1("created raw socket");
 
         return fd;
 }
 
 static void change_listen_mode(int new_mode)
 {
-        log1("Entering listen mode: %s",
+        log1("entering listen mode: %s",
                 new_mode != LISTEN_NONE
                         ? (new_mode == LISTEN_KERNEL ? "kernel" : "raw")
                         : "none"
@@ -1092,7 +1092,7 @@ static void change_listen_mode(int new_mode)
 /* Called only on SIGUSR1 */
 static void perform_renew(void)
 {
-        bb_info_msg("Performing a DHCP renew");
+        bb_error_msg("performing DHCP renew");
         switch (state) {
         case BOUND:
                 change_listen_mode(LISTEN_KERNEL);
@@ -1122,12 +1122,12 @@ static void perform_release(uint32_t server_addr, uint32_t requested_ip)
                 temp_addr.s_addr = server_addr;
                 strcpy(buffer, inet_ntoa(temp_addr));
                 temp_addr.s_addr = requested_ip;
-                bb_info_msg("Unicasting a release of %s to %s",
+                bb_error_msg("unicasting a release of %s to %s",
                                 inet_ntoa(temp_addr), buffer);
                 send_release(server_addr, requested_ip); /* unicast */
                 udhcp_run_script(NULL, "deconfig");
         }
-        bb_info_msg("Entering released state");
+        bb_error_msg("entering released state");
 
         change_listen_mode(LISTEN_NONE);
         state = RELEASED;
@@ -1395,7 +1395,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
         /* Create pidfile */
         write_pidfile(client_config.pidfile);
         /* Goes to stdout (unless NOMMU) and possibly syslog */
-        bb_info_msg("%s (v"BB_VER") started", applet_name);
+        bb_error_msg("started, v"BB_VER);
         /* Set up the signal pipe */
         udhcp_sp_setup();
         /* We want random_xid to be random... */
@@ -1434,7 +1434,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
                 retval = 0;
                 /* If we already timed out, fall through with retval = 0, else... */
                 if ((int)tv.tv_sec > 0) {
-                        log1("Waiting on select %u seconds", (int)tv.tv_sec);
+                        log1("waiting on select %u seconds", (int)tv.tv_sec);
                         timestamp_before_wait = (unsigned)monotonic_sec();
                         retval = select(max_fd + 1, &rfds, NULL, NULL, &tv);
                         if (retval < 0) {
@@ -1485,14 +1485,14 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
                                 udhcp_run_script(NULL, "leasefail");
 #if BB_MMU /* -b is not supported on NOMMU */
                                 if (opt & OPT_b) { /* background if no lease */
-                                        bb_info_msg("No lease, forking to background");
+                                        bb_error_msg("no lease, forking to background");
                                         client_background();
                                         /* do not background again! */
                                         opt = ((opt & ~OPT_b) | OPT_f);
                                 } else
 #endif
                                 if (opt & OPT_n) { /* abort if no lease */
-                                        bb_info_msg("No lease, failing");
+                                        bb_error_msg("no lease, failing");
                                         retval = 1;
                                         goto ret;
                                 }
@@ -1501,7 +1501,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
                                 packet_num = 0;
                                 continue;
                         case REQUESTING:
-                                if (!discover_retries || packet_num < discover_retries) {
+                                if (packet_num < 3) {
                                         /* send broadcast select packet */
                                         send_select(xid, server_addr, requested_ip);
                                         timeout = discover_timeout;
@@ -1520,7 +1520,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
                                 state = RENEWING;
                                 client_config.first_secs = 0; /* make secs field count from 0 */
                                 change_listen_mode(LISTEN_KERNEL);
-                                log1("Entering renew state");
+                                log1("entering renew state");
                                 /* fall right through */
                         case RENEW_REQUESTED: /* manual (SIGUSR1) renew */
                         case_RENEW_REQUESTED:
@@ -1540,7 +1540,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
                                         continue;
                                 }
                                 /* Timed out, enter rebinding state */
-                                log1("Entering rebinding state");
+                                log1("entering rebinding state");
                                 state = REBINDING;
                                 /* fall right through */
                         case REBINDING:
@@ -1555,7 +1555,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
                                         continue;
                                 }
                                 /* Timed out, enter init state */
-                                bb_info_msg("Lease lost, entering init state");
+                                bb_error_msg("lease lost, entering init state");
                                 udhcp_run_script(NULL, "deconfig");
                                 state = INIT_SELECTING;
                                 client_config.first_secs = 0; /* make secs field count from 0 */
@@ -1603,7 +1603,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
                         timeout = INT_MAX;
                         continue;
                 case SIGTERM:
-                        bb_info_msg("Received SIGTERM");
+                        bb_error_msg("received %s", "SIGTERM");
                         goto ret0;
                 }
 
@@ -1621,7 +1621,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_info_msg("Read error: %s, reopening socket", strerror(errno));
+                                bb_error_msg("read error: %s, reopening socket", strerror(errno));
                                 sleep(discover_timeout); /* 3 seconds by default */
                                 change_listen_mode(listen_mode); /* just close and reopen */
                         }
@@ -1744,7 +1744,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
                                                         client_config.interface,
                                                         arpping_ms)
                                         ) {
-                                                bb_info_msg("Offered address is in use "
+                                                bb_error_msg("offered address is in use "
                                                         "(got ARP reply), declining");
                                                 send_decline(/*xid,*/ server_addr, packet.yiaddr);
 
@@ -1763,7 +1763,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
 #endif
                                 /* enter bound state */
                                 temp_addr.s_addr = packet.yiaddr;
-                                bb_info_msg("Lease of %s obtained, lease time %u",
+                                bb_error_msg("lease of %s obtained, lease time %u",
                                         inet_ntoa(temp_addr), (unsigned)lease_seconds);
                                 requested_ip = packet.yiaddr;
 
@@ -1817,7 +1817,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
                                                 goto non_matching_svid;
                                 }
                                 /* return to init state */
-                                bb_info_msg("Received DHCP NAK");
+                                bb_error_msg("received %s", "DHCP NAK");
                                 udhcp_run_script(&packet, "nak");
                                 if (state != REQUESTING)
                                         udhcp_run_script(NULL, "deconfig");
diff --git a/networking/udhcp/dhcpd.c b/networking/udhcp/dhcpd.c
index 2de074f9b..2671ea3e2 100644
--- a/networking/udhcp/dhcpd.c
+++ b/networking/udhcp/dhcpd.c
@@ -61,11 +61,11 @@ static void send_packet_to_client(struct dhcp_packet *dhcp_pkt, int force_broadc
          || (dhcp_pkt->flags & htons(BROADCAST_FLAG))
          || dhcp_pkt->ciaddr == 0
         ) {
-                log1("Broadcasting packet to client");
+                log1("broadcasting packet to client");
                 ciaddr = INADDR_BROADCAST;
                 chaddr = MAC_BCAST_ADDR;
         } else {
-                log1("Unicasting packet to client ciaddr");
+                log1("unicasting packet to client ciaddr");
                 ciaddr = dhcp_pkt->ciaddr;
                 chaddr = dhcp_pkt->chaddr;
         }
@@ -79,7 +79,7 @@ static void send_packet_to_client(struct dhcp_packet *dhcp_pkt, int force_broadc
 /* Send a packet to gateway_nip using the kernel ip stack */
 static void send_packet_to_relay(struct dhcp_packet *dhcp_pkt)
 {
-        log1("Forwarding packet to relay");
+        log1("forwarding packet to relay");
 
         udhcp_send_kernel_packet(dhcp_pkt,
                         server_config.server_nip, SERVER_PORT,
@@ -214,7 +214,7 @@ static NOINLINE void send_offer(struct dhcp_packet *oldpacket,
         add_server_options(&packet);
 
         addr.s_addr = packet.yiaddr;
-        bb_info_msg("Sending OFFER of %s", inet_ntoa(addr));
+        bb_error_msg("sending OFFER of %s", inet_ntoa(addr));
         /* send_packet emits error message itself if it detects failure */
         send_packet(&packet, /*force_bcast:*/ 0);
 }
@@ -226,7 +226,7 @@ static NOINLINE void send_NAK(struct dhcp_packet *oldpacket)
 
         init_packet(&packet, oldpacket, DHCPNAK);
 
-        log1("Sending NAK");
+        log1("sending %s", "NAK");
         send_packet(&packet, /*force_bcast:*/ 1);
 }
 
@@ -247,7 +247,7 @@ static NOINLINE void send_ACK(struct dhcp_packet *oldpacket, uint32_t yiaddr)
         add_server_options(&packet);
 
         addr.s_addr = yiaddr;
-        bb_info_msg("Sending ACK to %s", inet_ntoa(addr));
+        bb_error_msg("sending ACK to %s", inet_ntoa(addr));
         send_packet(&packet, /*force_bcast:*/ 0);
 
         p_host_name = (const char*) udhcp_get_option(oldpacket, DHCP_HOST_NAME);
@@ -361,7 +361,7 @@ int udhcpd_main(int argc UNUSED_PARAM, char **argv)
         write_pidfile(server_config.pidfile);
         /* if (!..) bb_perror_msg("can't create pidfile %s", pidfile); */
 
-        bb_info_msg("%s (v"BB_VER") started", applet_name);
+        bb_error_msg("started, v"BB_VER);
 
         option = udhcp_find_option(server_config.options, DHCP_LEASE_TIME);
         server_config.max_lease_sec = DEFAULT_LEASE_TIME;
@@ -427,18 +427,18 @@ int udhcpd_main(int argc UNUSED_PARAM, char **argv)
                         goto continue_with_autotime;
                 }
                 if (retval < 0 && errno != EINTR) {
-                        log1("Error on select");
+                        log1("error on select");
                         continue;
                 }
 
                 switch (udhcp_sp_read(&rfds)) {
                 case SIGUSR1:
-                        bb_info_msg("Received SIGUSR1");
+                        bb_error_msg("received %s", "SIGUSR1");
                         write_leases();
                         /* why not just reset the timeout, eh */
                         goto continue_with_autotime;
                 case SIGTERM:
-                        bb_info_msg("Received SIGTERM");
+                        bb_error_msg("received %s", "SIGTERM");
                         write_leases();
                         goto ret0;
                 case 0: /* no signal: read a packet */
@@ -451,7 +451,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: %s, reopening socket", strerror(errno));
                                 close(server_socket);
                                 server_socket = -1;
                         }
@@ -486,7 +486,7 @@ int udhcpd_main(int argc UNUSED_PARAM, char **argv)
                 /* Look for a static/dynamic lease */
                 static_lease_nip = get_static_nip_by_mac(server_config.static_leases, &packet.chaddr);
                 if (static_lease_nip) {
-                        bb_info_msg("Found static lease: %x", static_lease_nip);
+                        bb_error_msg("found static lease: %x", static_lease_nip);
                         memcpy(&fake_lease.lease_mac, &packet.chaddr, 6);
                         fake_lease.lease_nip = static_lease_nip;
                         fake_lease.expires = 0;
@@ -504,13 +504,13 @@ int udhcpd_main(int argc UNUSED_PARAM, char **argv)
                 switch (state[0]) {
 
                 case DHCPDISCOVER:
-                        log1("Received DISCOVER");
+                        log1("received %s", "DISCOVER");
 
                         send_offer(&packet, static_lease_nip, lease, requested_ip_opt, arpping_ms);
                         break;
 
                 case DHCPREQUEST:
-                        log1("Received REQUEST");
+                        log1("received %s", "REQUEST");
 /* RFC 2131:
 
 o DHCPREQUEST generated during SELECTING state:
@@ -635,7 +635,7 @@ o DHCPREQUEST generated during REBINDING state:
                          * chaddr must be filled in,
                          * ciaddr must be 0 (we do not check this)
                          */
-                        log1("Received DECLINE");
+                        log1("received %s", "DECLINE");
                         if (server_id_opt
                          && requested_ip_opt
                          && lease  /* chaddr matches this lease */
@@ -655,7 +655,7 @@ o DHCPREQUEST generated during REBINDING state:
                          * chaddr must be filled in,
                          * ciaddr must be filled in
                          */
-                        log1("Received RELEASE");
+                        log1("received %s", "RELEASE");
                         if (server_id_opt
                          && lease  /* chaddr matches this lease */
                          && packet.ciaddr == lease->lease_nip
@@ -665,7 +665,7 @@ o DHCPREQUEST generated during REBINDING state:
                         break;
 
                 case DHCPINFORM:
-                        log1("Received INFORM");
+                        log1("received %s", "INFORM");
                         send_inform(&packet);
                         break;
                 }
diff --git a/networking/udhcp/domain_codec.c b/networking/udhcp/domain_codec.c
index c1325d8be..5a923cc2c 100644
--- a/networking/udhcp/domain_codec.c
+++ b/networking/udhcp/domain_codec.c
@@ -7,6 +7,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 #ifdef DNS_COMPR_TESTING
+# define _GNU_SOURCE
 # define FAST_FUNC /* nothing */
 # define xmalloc malloc
 # include <stdlib.h>
@@ -42,7 +43,7 @@ char* FAST_FUNC dname_dec(const uint8_t *cstr, int clen, const char *pre)
          */
         while (1) {
                 /* note: "return NULL" below are leak-safe since
-                 * dst isn't yet allocated */
+                 * dst isn't allocated yet */
                 const uint8_t *c;
                 unsigned crtpos, retpos, depth, len;
 
@@ -63,11 +64,10 @@ char* FAST_FUNC dname_dec(const uint8_t *cstr, int clen, const char *pre)
                                 if (crtpos + *c + 1 > clen) /* label too long? abort */
                                         return NULL;
                                 if (dst)
-                                        memcpy(dst + len, c + 1, *c);
+                                        /* \3com ---> "com." */
+                                        ((char*)mempcpy(dst + len, c + 1, *c))[0] = '.';
                                 len += *c + 1;
                                 crtpos += *c + 1;
-                                if (dst)
-                                        dst[len - 1] = '.';
                         } else {
                                 /* NUL: end of current domain name */
                                 if (retpos == 0) {
@@ -78,7 +78,10 @@ char* FAST_FUNC dname_dec(const uint8_t *cstr, int clen, const char *pre)
                                         crtpos = retpos;
                                         retpos = depth = 0;
                                 }
-                                if (dst)
+                                if (dst && len != 0)
+                                        /* \4host\3com\0\4host and we are at \0:
+                                         * \3com was converted to "com.", change dot to space.
+                                         */
                                         dst[len - 1] = ' ';
                         }
 
@@ -95,9 +98,8 @@ char* FAST_FUNC dname_dec(const uint8_t *cstr, int clen, const char *pre)
                 if (!dst) { /* first pass? */
                         /* allocate dst buffer and copy pre */
                         unsigned plen = strlen(pre);
-                        ret = dst = xmalloc(plen + len);
-                        memcpy(dst, pre, plen);
-                        dst += plen;
+                        ret = xmalloc(plen + len);
+                        dst = stpcpy(ret, pre);
                 } else {
                         dst[len - 1] = '\0';
                         break;
@@ -228,6 +230,9 @@ int main(int argc, char **argv)
         int len;
         uint8_t *encoded;
 
+        uint8_t str[6] = { 0x00, 0x00, 0x02, 0x65, 0x65, 0x00 };
+        printf("NUL:'%s'\n",   dname_dec(str, 6, ""));
+
 #define DNAME_DEC(encoded,pre) dname_dec((uint8_t*)(encoded), sizeof(encoded), (pre))
         printf("'%s'\n",       DNAME_DEC("\4host\3com\0", "test1:"));
         printf("test2:'%s'\n", DNAME_DEC("\4host\3com\0\4host\3com\0", ""));
diff --git a/networking/udhcp/files.c b/networking/udhcp/files.c
index 1c8808c0f..7b57c6258 100644
--- a/networking/udhcp/files.c
+++ b/networking/udhcp/files.c
@@ -195,7 +195,11 @@ void FAST_FUNC read_leases(const char *file)
                         uint32_t static_nip;
 
                         if (expires <= 0)
-                                continue;
+                                /* We keep expired leases: add_lease() will add
+                                 * a lease with 0 seconds remaining.
+                                 * Fewer IP address changes this way for mass reboot scenario.
+                                 */
+                                expires = 0;
 
                         /* Check if there is a different static lease for this IP or MAC */
                         static_nip = get_static_nip_by_mac(server_config.static_leases, lease.lease_mac);
@@ -222,7 +226,7 @@ void FAST_FUNC read_leases(const char *file)
 #endif
                 }
         }
-        log1("Read %d leases", i);
+        log1("read %d leases", i);
  ret:
         close(fd);
 }
diff --git a/networking/udhcp/leases.c b/networking/udhcp/leases.c
index 844bb60b1..6642e396d 100644
--- a/networking/udhcp/leases.c
+++ b/networking/udhcp/leases.c
@@ -17,7 +17,9 @@ static struct dyn_lease *oldest_expired_lease(void)
         /* Unexpired leases have g_leases[i].expires >= current time
          * and therefore can't ever match */
         for (i = 0; i < server_config.max_leases; i++) {
-                if (g_leases[i].expires < oldest_time) {
+                if (g_leases[i].expires == 0 /* empty entry */
+                 || g_leases[i].expires < oldest_time
+                ) {
                         oldest_time = g_leases[i].expires;
                         oldest_lease = &g_leases[i];
                 }
@@ -131,7 +133,7 @@ static int nobody_responds_to_arp(uint32_t nip, const uint8_t *safe_mac, unsigne
                 return r;
 
         temp.s_addr = nip;
-        bb_info_msg("%s belongs to someone, reserving it for %u seconds",
+        bb_error_msg("%s belongs to someone, reserving it for %u seconds",
                 inet_ntoa(temp), (unsigned)server_config.conflict_time);
         add_lease(NULL, nip, server_config.conflict_time, NULL, 0);
         return 0;
diff --git a/networking/udhcp/packet.c b/networking/udhcp/packet.c
index 148f52551..0a31f2643 100644
--- a/networking/udhcp/packet.c
+++ b/networking/udhcp/packet.c
@@ -38,8 +38,8 @@ void FAST_FUNC udhcp_dump_packet(struct dhcp_packet *packet)
         if (dhcp_verbose < 2)
                 return;
 
-        bb_info_msg(
-                //" op %x"
+        bb_error_msg(
+                //"op %x"
                 //" htype %x"
                 " hlen %x"
                 //" hops %x"
@@ -73,7 +73,7 @@ void FAST_FUNC udhcp_dump_packet(struct dhcp_packet *packet)
                 //, packet->options[]
         );
         *bin2hex(buf, (void *) packet->chaddr, sizeof(packet->chaddr)) = '\0';
-        bb_info_msg(" chaddr %s", buf);
+        bb_error_msg("chaddr %s", buf);
 }
 #endif
 
@@ -85,17 +85,17 @@ int FAST_FUNC udhcp_recv_kernel_packet(struct dhcp_packet *packet, int fd)
         memset(packet, 0, sizeof(*packet));
         bytes = safe_read(fd, packet, sizeof(*packet));
         if (bytes < 0) {
-                log1("Packet read error, ignoring");
+                log1("packet read error, ignoring");
                 return bytes; /* returns -1 */
         }
 
         if (bytes < offsetof(struct dhcp_packet, options)
          || packet->cookie != htonl(DHCP_MAGIC)
         ) {
-                bb_info_msg("Packet with bad magic, ignoring");
+                bb_error_msg("packet with bad magic, ignoring");
                 return -2;
         }
-        log1("Received a packet");
+        log1("received %s", "a packet");
         udhcp_dump_packet(packet);
 
         return bytes;
diff --git a/networking/udhcp/socket.c b/networking/udhcp/socket.c
index a42106960..4fd79f423 100644
--- a/networking/udhcp/socket.c
+++ b/networking/udhcp/socket.c
@@ -56,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;
         }
 
@@ -82,7 +82,7 @@ int FAST_FUNC udhcp_listen_socket(/*uint32_t ip,*/ int port, const char *inf)
         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);
diff --git a/networking/udhcp/static_leases.c b/networking/udhcp/static_leases.c
index f4a24ab62..b7f9e5c59 100644
--- a/networking/udhcp/static_leases.c
+++ b/networking/udhcp/static_leases.c
@@ -66,7 +66,7 @@ void FAST_FUNC log_static_leases(struct static_lease **st_lease_pp)
 
         cur = *st_lease_pp;
         while (cur) {
-                bb_info_msg("static lease: mac:%02x:%02x:%02x:%02x:%02x:%02x nip:%x",
+                bb_error_msg("static lease: mac:%02x:%02x:%02x:%02x:%02x:%02x nip:%x",
                         cur->mac[0], cur->mac[1], cur->mac[2],
                         cur->mac[3], cur->mac[4], cur->mac[5],
                         cur->nip
diff --git a/networking/wget.c b/networking/wget.c
index edf8fd8af..87d3bbd13 100644
--- a/networking/wget.c
+++ b/networking/wget.c
@@ -203,7 +203,7 @@ struct globals {
         const char *user_agent; /* "User-Agent" header field */
 #if ENABLE_FEATURE_WGET_TIMEOUT
         unsigned timeout_seconds;
-        bool connecting;
+        bool die_if_timed_out;
 #endif
         int output_fd;
         int o_flags;
@@ -333,9 +333,20 @@ static char* sanitize_string(char *s)
 static void alarm_handler(int sig UNUSED_PARAM)
 {
         /* This is theoretically unsafe (uses stdio and malloc in signal handler) */
-        if (G.connecting)
+        if (G.die_if_timed_out)
                 bb_error_msg_and_die("download timed out");
 }
+static void set_alarm(void)
+{
+        if (G.timeout_seconds) {
+                alarm(G.timeout_seconds);
+                G.die_if_timed_out = 1;
+        }
+}
+# define clear_alarm() ((void)(G.die_if_timed_out = 0))
+#else
+# define set_alarm()   ((void)0)
+# define clear_alarm() ((void)0)
 #endif
 
 static FILE *open_socket(len_and_sockaddr *lsa)
@@ -343,9 +354,9 @@ static FILE *open_socket(len_and_sockaddr *lsa)
         int fd;
         FILE *fp;
 
-        IF_FEATURE_WGET_TIMEOUT(alarm(G.timeout_seconds); G.connecting = 1;)
+        set_alarm();
         fd = xconnect_stream(lsa);
-        IF_FEATURE_WGET_TIMEOUT(G.connecting = 0;)
+        clear_alarm();
 
         /* glibc 2.4 seems to try seeking on it - ??! */
         /* hopefully it understands what ESPIPE means... */
@@ -357,14 +368,15 @@ static FILE *open_socket(len_and_sockaddr *lsa)
 }
 
 /* Returns '\n' if it was seen, else '\0'. Trims at first '\r' or '\n' */
-/* FIXME: does not respect FEATURE_WGET_TIMEOUT and -T N: */
 static char fgets_and_trim(FILE *fp)
 {
         char c;
         char *buf_ptr;
 
+        set_alarm();
         if (fgets(G.wget_buf, sizeof(G.wget_buf) - 1, fp) == NULL)
                 bb_perror_msg_and_die("error getting response");
+        clear_alarm();
 
         buf_ptr = strchrnul(G.wget_buf, '\n');
         c = *buf_ptr;
diff --git a/networking/zcip.c b/networking/zcip.c
index 1d6910555..c93082619 100644
--- a/networking/zcip.c
+++ b/networking/zcip.c
@@ -176,7 +176,7 @@ static int run(char *argv[3], const char *param, uint32_t nip)
                 xsetenv("ip", addr);
                 fmt -= 3;
         }
-        bb_info_msg(fmt, argv[2], argv[0], addr);
+        bb_error_msg(fmt, argv[2], argv[0], addr);
 
         status = spawn_and_wait(argv + 1);
         if (status < 0) {
@@ -317,7 +317,7 @@ int zcip_main(int argc UNUSED_PARAM, char **argv)
 #if BB_MMU
                 bb_daemonize(0 /*was: DAEMON_CHDIR_ROOT*/);
 #endif
-                bb_info_msg("start, interface %s", argv_intf);
+                bb_error_msg("start, interface %s", argv_intf);
         }
 
         // Run the dynamic address negotiation protocol,