Merge branch 'busybox' into merge

13 files changed, 252 insertions, 203 deletions

diff --git a/networking/httpd.c b/networking/httpd.c
index 74196a4f1..9439e206c 100644
--- a/networking/httpd.c
+++ b/networking/httpd.c
@@ -1046,6 +1046,7 @@ static void send_headers(int responseNum)
         /* Fixed size 29-byte string. Example: Sun, 06 Nov 1994 08:49:37 GMT */
         char date_str[40]; /* using a bit larger buffer to paranoia reasons */
 
+        struct tm tm;
         const char *responseString = "";
         const char *infoString = NULL;
 #if ENABLE_FEATURE_HTTPD_ERROR_PAGES
@@ -1074,7 +1075,8 @@ static void send_headers(int responseNum)
          * always fit into those kbytes.
          */
 
-        strftime(date_str, sizeof(date_str), RFC1123FMT, gmtime(&timer));
+        strftime(date_str, sizeof(date_str), RFC1123FMT, gmtime_r(&timer, &tm));
+        /* ^^^ using gmtime_r() instead of gmtime() to not use static data */
         len = sprintf(iobuf,
                         "HTTP/1.0 %d %s\r\n"
                         "Content-type: %s\r\n"
@@ -1128,7 +1130,7 @@ static void send_headers(int responseNum)
 #endif
 
         if (file_size != -1) {    /* file */
-                strftime(date_str, sizeof(date_str), RFC1123FMT, gmtime(&last_mod));
+                strftime(date_str, sizeof(date_str), RFC1123FMT, gmtime_r(&last_mod, &tm));
 #if ENABLE_FEATURE_HTTPD_RANGES
                 if (responseNum == HTTP_PARTIAL_CONTENT) {
                         len += sprintf(iobuf + len,
diff --git a/networking/ifconfig.c b/networking/ifconfig.c
index 61d91788a..5c47abc16 100644
--- a/networking/ifconfig.c
+++ b/networking/ifconfig.c
@@ -338,6 +338,7 @@ int ifconfig_main(int argc UNUSED_PARAM, char **argv)
         char *p;
         /*char host[128];*/
         const char *host = NULL; /* make gcc happy */
+        IF_FEATURE_IFCONFIG_STATUS(char *show_all_param;)
 
         did_flags = 0;
 #if ENABLE_FEATURE_IFCONFIG_BROADCAST_PLUS
@@ -349,15 +350,16 @@ int ifconfig_main(int argc UNUSED_PARAM, char **argv)
         ++argv;
 
 #if ENABLE_FEATURE_IFCONFIG_STATUS
-        if (argv[0] && (argv[0][0] == '-' && argv[0][1] == 'a' && !argv[0][2])) {
-                interface_opt_a = 1;
+        show_all_param = NULL;
+        if (argv[0] && argv[0][0] == '-' && argv[0][1] == 'a' && !argv[0][2]) {
                 ++argv;
+                show_all_param = IFNAME_SHOW_DOWNED_TOO;
         }
 #endif
 
         if (!argv[0] || !argv[1]) { /* one or no args */
 #if ENABLE_FEATURE_IFCONFIG_STATUS
-                return display_interfaces(argv[0] /* can be NULL */);
+                return display_interfaces(argv[0] ? argv[0] : show_all_param);
 #else
                 bb_error_msg_and_die("no support for status display");
 #endif
diff --git a/networking/interface.c b/networking/interface.c
index 89427f2f4..e5e55d8d4 100644
--- a/networking/interface.c
+++ b/networking/interface.c
@@ -318,31 +318,37 @@ struct interface {
         char name[IFNAMSIZ];                    /* interface name        */
         short type;                             /* if type               */
         short flags;                            /* various flags         */
+        int tx_queue_len;                       /* transmit queue length */
+
+        /* these should be contiguous, zeroed in one go in if_fetch(): */
+#define FIRST_TO_ZERO metric
         int metric;                             /* routing metric        */
         int mtu;                                /* MTU value             */
-        int tx_queue_len;                       /* transmit queue length */
         struct ifmap map;                       /* hardware setup        */
         struct sockaddr addr;                   /* IP address            */
         struct sockaddr dstaddr;                /* P-P IP address        */
         struct sockaddr broadaddr;              /* IP broadcast address  */
         struct sockaddr netmask;                /* IP network mask       */
-        int has_ip;
         char hwaddr[32];                        /* HW address            */
-        int statistics_valid;
+#define LAST_TO_ZERO hwaddr
+
+        smallint has_ip;
+        smallint statistics_valid;
         struct user_net_device_stats stats;     /* statistics            */
+#if 0 /* UNUSED */
         int keepalive;                          /* keepalive value for SLIP */
         int outfill;                            /* outfill value for SLIP */
+#endif
 };
 
-
-smallint interface_opt_a;       /* show all interfaces */
-
-static struct interface *int_list, *int_last;
+struct iface_list {
+        struct interface *int_list, *int_last;
+};
 
 
 #if 0
 /* like strcmp(), but knows about numbers */
-except that the freshly added calls to xatoul() brf on ethernet aliases with
+except that the freshly added calls to xatoul() barf on ethernet aliases with
 uClibc with e.g.: ife->name='lo'  name='eth0:1'
 static int nstrcmp(const char *a, const char *b)
 {
@@ -368,11 +374,11 @@ static int nstrcmp(const char *a, const char *b)
 }
 #endif
 
-static struct interface *add_interface(char *name)
+static struct interface *add_interface(struct iface_list *ilist, char *name)
 {
         struct interface *ife, **nextp, *new;
 
-        for (ife = int_last; ife; ife = ife->prev) {
+        for (ife = ilist->int_last; ife; ife = ife->prev) {
                 int n = /*n*/strcmp(ife->name, name);
 
                 if (n == 0)
@@ -383,43 +389,43 @@ static struct interface *add_interface(char *name)
 
         new = xzalloc(sizeof(*new));
         strncpy_IFNAMSIZ(new->name, name);
-        nextp = ife ? &ife->next : &int_list;
+
+        nextp = ife ? &ife->next : &ilist->int_list;
         new->prev = ife;
         new->next = *nextp;
         if (new->next)
                 new->next->prev = new;
         else
-                int_last = new;
+                ilist->int_last = new;
         *nextp = new;
         return new;
 }
 
-static char *get_name(char *name, char *p)
+static char *get_name(char name[IFNAMSIZ], char *p)
 {
-        /* Extract <name> from nul-terminated p where p matches
-         * <name>: after leading whitespace.
-         * If match is not made, set name empty and return unchanged p
+        /* Extract NAME from nul-terminated p of the form "<whitespace>NAME:"
+         * If match is not made, set NAME to "" and return unchanged p.
          */
         char *nameend;
-        char *namestart = skip_whitespace(p);
+        char *namestart;
 
-        nameend = namestart;
-        while (*nameend && *nameend != ':' && !isspace(*nameend))
-                nameend++;
-        if (*nameend == ':') {
-                if ((nameend - namestart) < IFNAMSIZ) {
+        nameend = namestart = skip_whitespace(p);
+
+        for (;;) {
+                if ((nameend - namestart) >= IFNAMSIZ)
+                        break; /* interface name too large - return "" */
+                if (*nameend == ':') {
                         memcpy(name, namestart, nameend - namestart);
                         name[nameend - namestart] = '\0';
-                        p = nameend;
-                } else {
-                        /* Interface name too large */
-                        name[0] = '\0';
+                        return nameend + 1;
                 }
-        } else {
-                /* trailing ':' not found - return empty */
-                name[0] = '\0';
+                nameend++;
+                /* isspace, NUL, any control char? */
+                if ((unsigned char)*nameend <= (unsigned char)' ')
+                        break; /* trailing ':' not found - return "" */
         }
-        return p + 1;
+        name[0] = '\0';
+        return p;
 }
 
 /* If scanf supports size qualifiers for %n conversions, then we can
@@ -435,7 +441,10 @@ static char *get_name(char *name, char *p)
 /*      "%llu%llu%lu%lu%lu%lu%lu%lu%llu%llu%lu%lu%lu%lu%lu%lu" */
 /* }; */
 
-        /* Lie about the size of the int pointed to for %n. */
+/* We use %n for unavailable data in older versions of /proc/net/dev formats.
+ * This results in bogus stores to ife->FOO members corresponding to
+ * %n specifiers (even the size of integers may not match).
+ */
 #if INT_MAX == LONG_MAX
 static const char *const ss_fmt[] = {
         "%n%llu%u%u%u%u%n%n%n%llu%u%u%u%u%u",
@@ -448,7 +457,6 @@ static const char *const ss_fmt[] = {
         "%llu%llu%lu%lu%lu%lu%n%n%llu%llu%lu%lu%lu%lu%lu",
         "%llu%llu%lu%lu%lu%lu%lu%lu%llu%llu%lu%lu%lu%lu%lu%lu"
 };
-
 #endif
 
 static void get_dev_fields(char *bp, struct interface *ife, int procnetdev_vsn)
@@ -456,22 +464,22 @@ static void get_dev_fields(char *bp, struct interface *ife, int procnetdev_vsn)
         memset(&ife->stats, 0, sizeof(struct user_net_device_stats));
 
         sscanf(bp, ss_fmt[procnetdev_vsn],
-                   &ife->stats.rx_bytes, /* missing for 0 */
+                   &ife->stats.rx_bytes, /* missing for v0 */
                    &ife->stats.rx_packets,
                    &ife->stats.rx_errors,
                    &ife->stats.rx_dropped,
                    &ife->stats.rx_fifo_errors,
                    &ife->stats.rx_frame_errors,
-                   &ife->stats.rx_compressed, /* missing for <= 1 */
-                   &ife->stats.rx_multicast, /* missing for <= 1 */
-                   &ife->stats.tx_bytes, /* missing for 0 */
+                   &ife->stats.rx_compressed, /* missing for v0, v1 */
+                   &ife->stats.rx_multicast, /* missing for v0, v1 */
+                   &ife->stats.tx_bytes, /* missing for v0 */
                    &ife->stats.tx_packets,
                    &ife->stats.tx_errors,
                    &ife->stats.tx_dropped,
                    &ife->stats.tx_fifo_errors,
                    &ife->stats.collisions,
                    &ife->stats.tx_carrier_errors,
-                   &ife->stats.tx_compressed /* missing for <= 1 */
+                   &ife->stats.tx_compressed /* missing for v0, v1 */
                    );
 
         if (procnetdev_vsn <= 1) {
@@ -494,31 +502,25 @@ static int procnetdev_version(char *buf)
         return 0;
 }
 
-static int if_readconf(void)
+static void if_readconf(struct iface_list *ilist)
 {
         int numreqs = 30;
         struct ifconf ifc;
         struct ifreq *ifr;
-        int n, err = -1;
+        int n;
         int skfd;
 
         ifc.ifc_buf = NULL;
 
         /* SIOCGIFCONF currently seems to only work properly on AF_INET sockets
            (as of 2.1.128) */
-        skfd = socket(AF_INET, SOCK_DGRAM, 0);
-        if (skfd < 0) {
-                bb_perror_msg("error: no inet socket available");
-                return -1;
-        }
+        skfd = xsocket(AF_INET, SOCK_DGRAM, 0);
 
         for (;;) {
                 ifc.ifc_len = sizeof(struct ifreq) * numreqs;
                 ifc.ifc_buf = xrealloc(ifc.ifc_buf, ifc.ifc_len);
 
-                if (ioctl_or_warn(skfd, SIOCGIFCONF, &ifc) < 0) {
-                        goto out;
-                }
+                xioctl(skfd, SIOCGIFCONF, &ifc);
                 if (ifc.ifc_len == (int)(sizeof(struct ifreq) * numreqs)) {
                         /* assume it overflowed and try again */
                         numreqs += 10;
@@ -529,67 +531,54 @@ static int if_readconf(void)
 
         ifr = ifc.ifc_req;
         for (n = 0; n < ifc.ifc_len; n += sizeof(struct ifreq)) {
-                add_interface(ifr->ifr_name);
+                add_interface(ilist, ifr->ifr_name);
                 ifr++;
         }
-        err = 0;
 
- out:
         close(skfd);
         free(ifc.ifc_buf);
-        return err;
 }
 
-static int if_readlist_proc(char *target)
+static int if_readlist_proc(struct iface_list *ilist, char *ifname)
 {
-        static smallint proc_read;
-
         FILE *fh;
         char buf[512];
         struct interface *ife;
-        int err, procnetdev_vsn;
-
-        if (proc_read)
-                return 0;
-        if (!target)
-                proc_read = 1;
+        int procnetdev_vsn;
+        int ret;
 
         fh = fopen_or_warn(_PATH_PROCNET_DEV, "r");
         if (!fh) {
-                return if_readconf();
+                return 0; /* "not found" */
         }
         fgets(buf, sizeof buf, fh);     /* eat line */
         fgets(buf, sizeof buf, fh);
 
         procnetdev_vsn = procnetdev_version(buf);
 
-        err = 0;
+        ret = 0;
         while (fgets(buf, sizeof buf, fh)) {
-                char *s, name[128];
+                char *s, name[IFNAMSIZ];
 
                 s = get_name(name, buf);
-                ife = add_interface(name);
+                ife = add_interface(ilist, name);
                 get_dev_fields(s, ife, procnetdev_vsn);
                 ife->statistics_valid = 1;
-                if (target && strcmp(target, name) == 0)
+                if (ifname && strcmp(ifname, name) == 0) {
+                        ret = 1; /* found */
                         break;
-        }
-        if (ferror(fh)) {
-                bb_perror_msg(_PATH_PROCNET_DEV);
-                err = -1;
-                proc_read = 0;
+                }
         }
         fclose(fh);
-        return err;
+        return ret;
 }
 
-static int if_readlist(void)
+static void if_readlist(struct iface_list *ilist, char *ifname)
 {
-        int err = if_readlist_proc(NULL);
+        int found = if_readlist_proc(ilist, ifname);
         /* Needed in order to get ethN:M aliases */
-        if (!err)
-                err = if_readconf();
-        return err;
+        if (!found)
+                if_readconf(ilist);
 }
 
 /* Fetch the interface configuration from the kernel. */
@@ -608,24 +597,29 @@ static int if_fetch(struct interface *ife)
         }
         ife->flags = ifr.ifr_flags;
 
+        /* set up default values if ioctl's would fail */
+        ife->tx_queue_len = -1; /* unknown value */
+        memset(&ife->FIRST_TO_ZERO, 0,
+                offsetof(struct interface, LAST_TO_ZERO)
+                        - offsetof(struct interface, FIRST_TO_ZERO)
+                + sizeof(ife->LAST_TO_ZERO)
+        );
+
         strncpy_IFNAMSIZ(ifr.ifr_name, ifname);
-        memset(ife->hwaddr, 0, 32);
         if (ioctl(skfd, SIOCGIFHWADDR, &ifr) >= 0)
                 memcpy(ife->hwaddr, ifr.ifr_hwaddr.sa_data, 8);
 
+//er.... why this _isnt_ inside if()?
         ife->type = ifr.ifr_hwaddr.sa_family;
 
         strncpy_IFNAMSIZ(ifr.ifr_name, ifname);
-        ife->metric = 0;
         if (ioctl(skfd, SIOCGIFMETRIC, &ifr) >= 0)
                 ife->metric = ifr.ifr_metric;
 
         strncpy_IFNAMSIZ(ifr.ifr_name, ifname);
-        ife->mtu = 0;
         if (ioctl(skfd, SIOCGIFMTU, &ifr) >= 0)
                 ife->mtu = ifr.ifr_mtu;
 
-        memset(&ife->map, 0, sizeof(struct ifmap));
 #ifdef SIOCGIFMAP
         strncpy_IFNAMSIZ(ifr.ifr_name, ifname);
         if (ioctl(skfd, SIOCGIFMAP, &ifr) == 0)
@@ -634,31 +628,24 @@ static int if_fetch(struct interface *ife)
 
 #ifdef HAVE_TXQUEUELEN
         strncpy_IFNAMSIZ(ifr.ifr_name, ifname);
-        ife->tx_queue_len = -1; /* unknown value */
         if (ioctl(skfd, SIOCGIFTXQLEN, &ifr) >= 0)
                 ife->tx_queue_len = ifr.ifr_qlen;
-#else
-        ife->tx_queue_len = -1; /* unknown value */
 #endif
 
         strncpy_IFNAMSIZ(ifr.ifr_name, ifname);
         ifr.ifr_addr.sa_family = AF_INET;
-        memset(&ife->addr, 0, sizeof(struct sockaddr));
         if (ioctl(skfd, SIOCGIFADDR, &ifr) == 0) {
                 ife->has_ip = 1;
                 ife->addr = ifr.ifr_addr;
                 strncpy_IFNAMSIZ(ifr.ifr_name, ifname);
-                memset(&ife->dstaddr, 0, sizeof(struct sockaddr));
                 if (ioctl(skfd, SIOCGIFDSTADDR, &ifr) >= 0)
                         ife->dstaddr = ifr.ifr_dstaddr;
 
                 strncpy_IFNAMSIZ(ifr.ifr_name, ifname);
-                memset(&ife->broadaddr, 0, sizeof(struct sockaddr));
                 if (ioctl(skfd, SIOCGIFBRDADDR, &ifr) >= 0)
                         ife->broadaddr = ifr.ifr_broadaddr;
 
                 strncpy_IFNAMSIZ(ifr.ifr_name, ifname);
-                memset(&ife->netmask, 0, sizeof(struct sockaddr));
                 if (ioctl(skfd, SIOCGIFNETMASK, &ifr) >= 0)
                         ife->netmask = ifr.ifr_netmask;
         }
@@ -1020,10 +1007,12 @@ static void ife_print(struct interface *ptr)
 
         /* DONT FORGET TO ADD THE FLAGS IN ife_print_short */
         printf(" MTU:%d  Metric:%d", ptr->mtu, ptr->metric ? ptr->metric : 1);
+#if 0
 #ifdef SIOCSKEEPALIVE
         if (ptr->outfill || ptr->keepalive)
                 printf("  Outfill:%d  Keepalive:%d", ptr->outfill, ptr->keepalive);
 #endif
+#endif
         bb_putchar('\n');
 
         /* If needed, display the interface statistics. */
@@ -1077,67 +1066,44 @@ static void ife_print(struct interface *ptr)
         bb_putchar('\n');
 }
 
-static int do_if_print(struct interface *ife) /*, int *opt_a)*/
+static int do_if_print(struct interface *ife, int show_downed_too)
 {
         int res;
 
         res = do_if_fetch(ife);
         if (res >= 0) {
-                if ((ife->flags & IFF_UP) || interface_opt_a)
+                if ((ife->flags & IFF_UP) || show_downed_too)
                         ife_print(ife);
         }
         return res;
 }
 
-static struct interface *lookup_interface(char *name)
-{
-        struct interface *ife = NULL;
-
-        if (if_readlist_proc(name) < 0)
-                return NULL;
-        ife = add_interface(name);
-        return ife;
-}
-
-#ifdef UNUSED
-static int for_all_interfaces(int (*doit) (struct interface *, void *),
-                                                        void *cookie)
+int FAST_FUNC display_interfaces(char *ifname)
 {
         struct interface *ife;
+        int res;
+        struct iface_list ilist;
 
-        if (!int_list && (if_readlist() < 0))
-                return -1;
-        for (ife = int_list; ife; ife = ife->next) {
-                int err = doit(ife, cookie);
-                if (err)
-                        return err;
-        }
-        return 0;
-}
-#endif
+        ilist.int_list = NULL;
+        ilist.int_last = NULL;
+        if_readlist(&ilist, ifname != IFNAME_SHOW_DOWNED_TOO ? ifname : NULL);
 
-/* for ipv4 add/del modes */
-static int if_print(char *ifname)
-{
-        struct interface *ife;
-        int res;
+        if (!ifname || ifname == IFNAME_SHOW_DOWNED_TOO) {
+                for (ife = ilist.int_list; ife; ife = ife->next) {
 
-        if (!ifname) {
-                /*res = for_all_interfaces(do_if_print, &interface_opt_a);*/
-                if (!int_list && (if_readlist() < 0))
-                        return -1;
-                for (ife = int_list; ife; ife = ife->next) {
-                        int err = do_if_print(ife); /*, &interface_opt_a);*/
-                        if (err)
-                                return err;
+                        BUILD_BUG_ON((int)(intptr_t)IFNAME_SHOW_DOWNED_TOO != 1);
+
+                        res = do_if_print(ife, (int)(intptr_t)ifname);
+                        if (res < 0)
+                                goto ret;
                 }
                 return 0;
         }
-        ife = lookup_interface(ifname);
-        res = do_if_fetch(ife);
-        if (res >= 0)
-                ife_print(ife);
-        return res;
+
+        ife = add_interface(&ilist, ifname);
+        res = do_if_print(ife, /*show_downed_too:*/ 1);
+ ret:
+        return (res < 0); /* status < 0 == 1 -- error */
 }
 
 #if ENABLE_FEATURE_HWIB
@@ -1153,12 +1119,3 @@ int FAST_FUNC in_ib(const char *bufp, struct sockaddr *sap)
         return 0;
 }
 #endif
-
-int FAST_FUNC display_interfaces(char *ifname)
-{
-        int status;
-
-        status = if_print(ifname);
-
-        return (status < 0); /* status < 0 == 1 -- error */
-}
diff --git a/networking/ip.c b/networking/ip.c
index accf90759..9ecb99abb 100644
--- a/networking/ip.c
+++ b/networking/ip.c
@@ -157,7 +157,7 @@
 //usage:#define iplink_trivial_usage
 //usage:       /*Usage:iplink*/"set IFACE [up|down] [arp on|off] [multicast on|off]\n"
 //usage:       "        [promisc on|off] [mtu NUM] [name NAME] [qlen NUM] [address MAC]\n"
-//usage:       "        [master IFACE | nomaster]\n"
+//usage:       "        [master IFACE | nomaster]"
 // * short help shows only "set" command, long help continues (with just one "\n")
 // * and shows all other commands:
 //usage:#define iplink_full_usage "\n"
diff --git a/networking/libiproute/ipaddress.c b/networking/libiproute/ipaddress.c
index d7f888176..9ec665b69 100644
--- a/networking/libiproute/ipaddress.c
+++ b/networking/libiproute/ipaddress.c
@@ -570,7 +570,10 @@ int FAST_FUNC ipaddr_list_or_flush(char **argv, int flush)
         }
 
         for (l = linfo; l; l = l->next) {
-                if (no_link || print_linkinfo(&l->h) == 0) {
+                if (no_link
+                 || (oneline || print_linkinfo(&l->h) == 0)
+                /* ^^^^^^^^^ "ip -oneline a" does not print link info */
+                ) {
                         struct ifinfomsg *ifi = NLMSG_DATA(&l->h);
                         if (G_filter.family != AF_PACKET)
                                 print_selected_addrinfo(ifi->ifi_index, ainfo);
diff --git a/networking/ntpd.c b/networking/ntpd.c
index 17e5c7da6..8205ab271 100644
--- a/networking/ntpd.c
+++ b/networking/ntpd.c
@@ -165,8 +165,12 @@
  * Using exact power of 2 (1/8) results in smaller code
  */
 #define SLEW_THRESHOLD 0.125
+//^^^^^^^^^^^^^^^^^^^^^^^^^^ TODO: man adjtimex about tmx.offset:
+// "Since Linux 2.6.26, the supplied value is clamped to the range (-0.5s, +0.5s)"
+// - can use this larger value instead?
+
 /* Stepout threshold (sec). std ntpd uses 900 (11 mins (!)) */
-#define WATCH_THRESHOLD  128
+//UNUSED: #define WATCH_THRESHOLD  128
 /* NB: set WATCH_THRESHOLD to ~60 when debugging to save time) */
 //UNUSED: #define PANIC_THRESHOLD 1000    /* panic threshold (sec) */
 
@@ -419,6 +423,7 @@ struct globals {
         uint8_t  discipline_state;      // doc calls it c.state
         uint8_t  poll_exp;              // s.poll
         int      polladj_count;         // c.count
+        int      FREQHOLD_cnt;
         long     kernel_freq_drift;
         peer_t   *last_update_peer;
         double   last_update_offset;    // c.last
@@ -1034,6 +1039,7 @@ step_time(double offset)
         tval = tvn.tv_sec;
         strftime_YYYYMMDDHHMMSS(buf, sizeof(buf), &tval);
         bb_error_msg("setting time to %s.%06u (offset %+fs)", buf, (unsigned)tvn.tv_usec, offset);
+        //maybe? G.FREQHOLD_cnt = 0;
 
         /* Correct various fields which contain time-relative values: */
 
@@ -1709,39 +1715,96 @@ update_local_clock(peer_t *p)
         tmx.freq = G.discipline_freq_drift * 65536e6;
 #endif
         tmx.modes = ADJ_OFFSET | ADJ_STATUS | ADJ_TIMECONST;// | ADJ_MAXERROR | ADJ_ESTERROR;
-        tmx.constant = (int)G.poll_exp - 4;
-        /* EXPERIMENTAL.
-         * The below if statement should be unnecessary, but...
-         * It looks like Linux kernel's PLL is far too gentle in changing
-         * tmx.freq in response to clock offset. Offset keeps growing
-         * and eventually we fall back to smaller poll intervals.
-         * We can make correction more aggressive (about x2) by supplying
-         * PLL time constant which is one less than the real one.
-         * To be on a safe side, let's do it only if offset is significantly
-         * larger than jitter.
-         */
-        if (G.offset_to_jitter_ratio >= TIMECONST_HACK_GATE)
-                tmx.constant--;
+
         tmx.offset = (long)(offset * 1000000); /* usec */
         if (SLEW_THRESHOLD < STEP_THRESHOLD) {
                 if (tmx.offset > (long)(SLEW_THRESHOLD * 1000000)) {
                         tmx.offset = (long)(SLEW_THRESHOLD * 1000000);
-                        tmx.constant--;
                 }
                 if (tmx.offset < -(long)(SLEW_THRESHOLD * 1000000)) {
                         tmx.offset = -(long)(SLEW_THRESHOLD * 1000000);
-                        tmx.constant--;
                 }
         }
-        if (tmx.constant < 0)
-                tmx.constant = 0;
 
         tmx.status = STA_PLL;
+        if (G.FREQHOLD_cnt != 0) {
+                /* man adjtimex on STA_FREQHOLD:
+                 * "Normally adjustments made via ADJ_OFFSET result in dampened
+                 * frequency adjustments also being made.
+                 * This flag prevents the small frequency adjustment from being
+                 * made when correcting for an ADJ_OFFSET value."
+                 *
+                 * Use this flag for a few first adjustments at the beginning
+                 * of ntpd execution, otherwise even relatively small initial
+                 * offset tend to cause largish changes to in-kernel tmx.freq.
+                 * If ntpd was restarted due to e.g. switch to another network,
+                 * this destroys already well-established tmx.freq value.
+                 */
+                if (G.FREQHOLD_cnt < 0) {
+                        /* Initialize it */
+// Example: a laptop whose clock runs slower when hibernated,
+// after wake up it still has good tmx.freq, but accumulated ~0.5 sec offset:
+// Run with code where initial G.FREQHOLD_cnt was always 8:
+//15:17:52.947 no valid datapoints, no peer selected
+//15:17:56.515 update from:<IP> offset:+0.485133 delay:0.157762 jitter:0.209310 clock drift:-1.393ppm tc:4
+//15:17:57.719 update from:<IP> offset:+0.483825 delay:0.158070 jitter:0.181159 clock drift:-1.393ppm tc:4
+//15:17:59.925 update from:<IP> offset:+0.479504 delay:0.158147 jitter:0.156657 clock drift:-1.393ppm tc:4
+//15:18:33.322 update from:<IP> offset:+0.428119 delay:0.158317 jitter:0.138071 clock drift:-1.393ppm tc:4
+//15:19:06.718 update from:<IP> offset:+0.376932 delay:0.158276 jitter:0.122075 clock drift:-1.393ppm tc:4
+//15:19:39.114 update from:<IP> offset:+0.327022 delay:0.158384 jitter:0.108538 clock drift:-1.393ppm tc:4
+//15:20:12.715 update from:<IP> offset:+0.275596 delay:0.158297 jitter:0.097292 clock drift:-1.393ppm tc:4
+//15:20:45.111 update from:<IP> offset:+0.225715 delay:0.158271 jitter:0.087841 clock drift:-1.393ppm tc:4
+// If allwed to continue, it would start increasing tmx.freq now.
+// Instead, it was ^Ced, and started anew:
+//15:21:15.043 no valid datapoints, no peer selected
+//15:21:17.408 update from:<IP> offset:+0.175910 delay:0.158314 jitter:0.076683 clock drift:-1.393ppm tc:4
+//15:21:19.774 update from:<IP> offset:+0.171784 delay:0.158401 jitter:0.066436 clock drift:-1.393ppm tc:4
+//15:21:22.140 update from:<IP> offset:+0.171660 delay:0.158592 jitter:0.057536 clock drift:-1.393ppm tc:4
+//15:21:22.140 update from:<IP> offset:+0.167126 delay:0.158507 jitter:0.049792 clock drift:-1.393ppm tc:4
+//15:21:55.696 update from:<IP> offset:+0.115223 delay:0.158277 jitter:0.050240 clock drift:-1.393ppm tc:4
+//15:22:29.093 update from:<IP> offset:+0.068051 delay:0.158243 jitter:0.049405 clock drift:-1.393ppm tc:5
+//15:23:02.490 update from:<IP> offset:+0.051632 delay:0.158215 jitter:0.043545 clock drift:-1.393ppm tc:5
+//15:23:34.726 update from:<IP> offset:+0.039984 delay:0.158157 jitter:0.038106 clock drift:-1.393ppm tc:5
+// STA_FREQHOLD no longer set, started increasing tmx.freq now:
+//15:24:06.961 update from:<IP> offset:+0.030968 delay:0.158190 jitter:0.033306 clock drift:+2.387ppm tc:5
+//15:24:40.357 update from:<IP> offset:+0.023648 delay:0.158211 jitter:0.029072 clock drift:+5.454ppm tc:5
+//15:25:13.774 update from:<IP> offset:+0.018068 delay:0.157660 jitter:0.025288 clock drift:+7.728ppm tc:5
+//15:26:19.173 update from:<IP> offset:+0.010057 delay:0.157969 jitter:0.022255 clock drift:+8.361ppm tc:6
+//15:27:26.602 update from:<IP> offset:+0.006737 delay:0.158103 jitter:0.019316 clock drift:+8.792ppm tc:6
+//15:28:33.030 update from:<IP> offset:+0.004513 delay:0.158294 jitter:0.016765 clock drift:+9.080ppm tc:6
+//15:29:40.617 update from:<IP> offset:+0.002787 delay:0.157745 jitter:0.014543 clock drift:+9.258ppm tc:6
+//15:30:47.045 update from:<IP> offset:+0.001324 delay:0.157709 jitter:0.012594 clock drift:+9.342ppm tc:6
+//15:31:53.473 update from:<IP> offset:+0.000007 delay:0.158142 jitter:0.010922 clock drift:+9.343ppm tc:6
+//15:32:58.902 update from:<IP> offset:-0.000728 delay:0.158222 jitter:0.009454 clock drift:+9.298ppm tc:6
+                        /*
+                         * This expression would choose 15 in the above example.
+                         */
+                        G.FREQHOLD_cnt = 8 + ((unsigned)(abs(tmx.offset)) >> 16);
+                }
+                G.FREQHOLD_cnt--;
+                tmx.status |= STA_FREQHOLD;
+        }
         if (G.ntp_status & LI_PLUSSEC)
                 tmx.status |= STA_INS;
         if (G.ntp_status & LI_MINUSSEC)
                 tmx.status |= STA_DEL;
 
+        tmx.constant = (int)G.poll_exp - 4;
+        /* EXPERIMENTAL.
+         * The below if statement should be unnecessary, but...
+         * It looks like Linux kernel's PLL is far too gentle in changing
+         * tmx.freq in response to clock offset. Offset keeps growing
+         * and eventually we fall back to smaller poll intervals.
+         * We can make correction more aggressive (about x2) by supplying
+         * PLL time constant which is one less than the real one.
+         * To be on a safe side, let's do it only if offset is significantly
+         * larger than jitter.
+         */
+        if (G.offset_to_jitter_ratio >= TIMECONST_HACK_GATE)
+                tmx.constant--;
+        if (tmx.constant < 0)
+                tmx.constant = 0;
+
         //tmx.esterror = (uint32_t)(clock_jitter * 1e6);
         //tmx.maxerror = (uint32_t)((sys_rootdelay / 2 + sys_rootdisp) * 1e6);
         rc = adjtimex(&tmx);
@@ -2227,6 +2290,7 @@ static NOINLINE void ntp_init(char **argv)
         if (BURSTPOLL != 0)
                 G.poll_exp = BURSTPOLL; /* speeds up initial sync */
         G.last_script_run = G.reftime = G.last_update_recv_time = gettime1900d(); /* sets G.cur_time too */
+        G.FREQHOLD_cnt = -1;
 
         /* Parse options */
         peers = NULL;
diff --git a/networking/tcpudp.c b/networking/tcpudp.c
index a90e3f80a..c914221ae 100644
--- a/networking/tcpudp.c
+++ b/networking/tcpudp.c
@@ -270,17 +270,22 @@ int tcpudpsvd_main(int argc UNUSED_PARAM, char **argv)
 
         tcp = (applet_name[0] == 't');
 
+        /* "+": stop on first non-option */
 #ifdef SSLSVD
         opts = getopt32(argv, "^+"
                 "c:+C:i:x:u:l:Eb:+hpt:vU:/:Z:K:" /* -c NUM, -b NUM */
+                "\0"
                 /* 3+ args, -i at most once, -p implies -h, -v is a counter */
-                "\0" "-3:i--i:ph:vv",
+                "-3:i--i:ph:vv",
                 &cmax, &str_C, &instructs, &instructs, &user, &preset_local_hostname,
                 &backlog, &str_t, &ssluser, &root, &cert, &key, &verbose
         );
 #else
-        /* "+": stop on first non-option */
-        opts = getopt32(argv, "+c:+C:i:x:u:l:Eb:hpt:v",
+        opts = getopt32(argv, "^+"
+                "c:+C:i:x:u:l:Eb:+hpt:v" /* -c NUM, -b NUM */
+                "\0"
+                /* 3+ args, -i at most once, -p implies -h, -v is a counter */
+                "-3:i--i:ph:vv",
                 &cmax, &str_C, &instructs, &instructs, &user, &preset_local_hostname,
                 &backlog, &str_t, &verbose
         );
diff --git a/networking/udhcp/common.h b/networking/udhcp/common.h
index 04939e707..13059f106 100644
--- a/networking/udhcp/common.h
+++ b/networking/udhcp/common.h
@@ -314,7 +314,7 @@ int udhcp_send_kernel_packet(struct dhcp_packet *dhcp_pkt,
 
 void udhcp_sp_setup(void) FAST_FUNC;
 void udhcp_sp_fd_set(struct pollfd *pfds, int extra_fd) FAST_FUNC;
-int udhcp_sp_read(struct pollfd *pfds) FAST_FUNC;
+int udhcp_sp_read(void) FAST_FUNC;
 
 int udhcp_read_interface(const char *interface, int *ifindex, uint32_t *nip, uint8_t *mac) FAST_FUNC;
 
diff --git a/networking/udhcp/d6_dhcpc.c b/networking/udhcp/d6_dhcpc.c
index 35c99e89c..289df66ee 100644
--- a/networking/udhcp/d6_dhcpc.c
+++ b/networking/udhcp/d6_dhcpc.c
@@ -1375,13 +1375,12 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
                         /* yah, I know, *you* say it would never happen */
                         timeout = INT_MAX;
                         continue; /* back to main loop */
-                } /* if select timed out */
+                } /* if poll timed out */
 
-                /* select() didn't timeout, something happened */
+                /* poll() didn't timeout, something happened */
 
                 /* Is it a signal? */
-                /* note: udhcp_sp_read checks poll result before reading */
-                switch (udhcp_sp_read(pfds)) {
+                switch (udhcp_sp_read()) {
                 case SIGUSR1:
                         client_config.first_secs = 0; /* make secs field count from 0 */
                         already_waited_sec = 0;
@@ -1416,7 +1415,7 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
                 }
 
                 /* Is it a packet? */
-                if (listen_mode == LISTEN_NONE || !pfds[1].revents)
+                if (!pfds[1].revents)
                         continue; /* no */
 
                 {
diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c
index 35694fbe3..90b07bf4b 100644
--- a/networking/udhcp/dhcpc.c
+++ b/networking/udhcp/dhcpc.c
@@ -1574,13 +1574,12 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
                         /* yah, I know, *you* say it would never happen */
                         timeout = INT_MAX;
                         continue; /* back to main loop */
-                } /* if select timed out */
+                } /* if poll timed out */
 
-                /* select() didn't timeout, something happened */
+                /* poll() didn't timeout, something happened */
 
                 /* Is it a signal? */
-                /* note: udhcp_sp_read checks poll result before reading */
-                switch (udhcp_sp_read(pfds)) {
+                switch (udhcp_sp_read()) {
                 case SIGUSR1:
                         client_config.first_secs = 0; /* make secs field count from 0 */
                         already_waited_sec = 0;
@@ -1615,7 +1614,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
                 }
 
                 /* Is it a packet? */
-                if (listen_mode == LISTEN_NONE || !pfds[1].revents)
+                if (!pfds[1].revents)
                         continue; /* no */
 
                 {
diff --git a/networking/udhcp/dhcpd.c b/networking/udhcp/dhcpd.c
index 093239536..19f94a2d7 100644
--- a/networking/udhcp/dhcpd.c
+++ b/networking/udhcp/dhcpd.c
@@ -853,6 +853,9 @@ int udhcpd_main(int argc UNUSED_PARAM, char **argv)
         /* Would rather not do read_config before daemonization -
          * otherwise NOMMU machines will parse config twice */
         read_config(argv[0] ? argv[0] : DHCPD_CONF_FILE);
+        /* prevent poll timeout overflow */
+        if (server_config.auto_time > INT_MAX / 1000)
+                server_config.auto_time = INT_MAX / 1000;
 
         /* Make sure fd 0,1,2 are open */
         bb_sanitize_stdio();
@@ -914,21 +917,31 @@ int udhcpd_main(int argc UNUSED_PARAM, char **argv)
                 }
 
                 udhcp_sp_fd_set(pfds, server_socket);
-                tv = timeout_end - monotonic_sec();
-                retval = 0;
-                if (!server_config.auto_time || tv > 0) {
-                        retval = poll(pfds, 2, server_config.auto_time ? tv * 1000 : -1);
-                }
-                if (retval == 0) {
-                        write_leases();
-                        goto continue_with_autotime;
+
+ new_tv:
+                tv = -1;
+                if (server_config.auto_time) {
+                        tv = timeout_end - monotonic_sec();
+                        if (tv <= 0) {
+ write_leases:
+                                write_leases();
+                                goto continue_with_autotime;
+                        }
+                        tv *= 1000;
                 }
-                if (retval < 0 && errno != EINTR) {
-                        log1("error on select");
-                        continue;
+
+                /* Block here waiting for either signal or packet */
+                retval = poll(pfds, 2, tv);
+                if (retval <= 0) {
+                        if (retval == 0)
+                                goto write_leases;
+                        if (errno == EINTR)
+                                goto new_tv;
+                        /* < 0 and not EINTR: should not happen */
+                        bb_perror_msg_and_die("poll");
                 }
 
-                switch (udhcp_sp_read(pfds)) {
+                if (pfds[0].revents) switch (udhcp_sp_read()) {
                 case SIGUSR1:
                         bb_error_msg("received %s", "SIGUSR1");
                         write_leases();
@@ -938,12 +951,16 @@ int udhcpd_main(int argc UNUSED_PARAM, char **argv)
                         bb_error_msg("received %s", "SIGTERM");
                         write_leases();
                         goto ret0;
-                case 0: /* no signal: read a packet */
-                        break;
-                default: /* signal or error (probably EINTR): back to select */
-                        continue;
                 }
 
+                /* Is it a packet? */
+                if (!pfds[1].revents)
+                        continue; /* no */
+
+                /* Note: we do not block here, we block on poll() instead.
+                 * Blocking here would prevent SIGTERM from working:
+                 * socket read inside this call is restarted on caught signals.
+                 */
                 bytes = udhcp_recv_kernel_packet(&packet, server_socket);
                 if (bytes < 0) {
                         /* bytes can also be -2 ("bad packet data") */
diff --git a/networking/udhcp/signalpipe.c b/networking/udhcp/signalpipe.c
index b101b4ce4..2ff78f0f2 100644
--- a/networking/udhcp/signalpipe.c
+++ b/networking/udhcp/signalpipe.c
@@ -40,6 +40,7 @@ void FAST_FUNC udhcp_sp_setup(void)
         xpiped_pair(signal_pipe);
         close_on_exec_on(signal_pipe.rd);
         close_on_exec_on(signal_pipe.wr);
+        ndelay_on(signal_pipe.rd);
         ndelay_on(signal_pipe.wr);
         bb_signals(0
                 + (1 << SIGUSR1)
@@ -61,20 +62,20 @@ void FAST_FUNC udhcp_sp_fd_set(struct pollfd pfds[2], int extra_fd)
                 pfds[1].fd = extra_fd;
                 pfds[1].events = POLLIN;
         }
+        /* this simplifies "is extra_fd ready?" tests elsewhere: */
+        pfds[1].revents = 0;
 }
 
 /* Read a signal from the signal pipe. Returns 0 if there is
  * no signal, -1 on error (and sets errno appropriately), and
  * your signal on success */
-int FAST_FUNC udhcp_sp_read(struct pollfd pfds[2])
+int FAST_FUNC udhcp_sp_read(void)
 {
         unsigned char sig;
 
-        if (!pfds[0].revents)
-                return 0;
-
+        /* Can't block here, fd is in nonblocking mode */
         if (safe_read(signal_pipe.rd, &sig, 1) != 1)
-                return -1;
+                return 0;
 
         return sig;
 }
diff --git a/networking/wget.c b/networking/wget.c
index b9225fac0..150bc8e12 100644
--- a/networking/wget.c
+++ b/networking/wget.c
@@ -1017,7 +1017,6 @@ static void download_one_url(const char *url)
         len_and_sockaddr *lsa;
         FILE *sfp;                      /* socket to web/ftp server         */
         FILE *dfp;                      /* socket to ftp server (data)      */
-        char *proxy = NULL;
         char *fname_out_alloc;
         char *redirected_path = NULL;
         struct host_info server;
@@ -1033,13 +1032,14 @@ static void download_one_url(const char *url)
         /* Use the proxy if necessary */
         use_proxy = (strcmp(G.proxy_flag, "off") != 0);
         if (use_proxy) {
-                proxy = getenv(target.protocol[0] == 'f' ? "ftp_proxy" : "http_proxy");
+                char *proxy = getenv(target.protocol[0] == 'f' ? "ftp_proxy" : "http_proxy");
 //FIXME: what if protocol is https? Ok to use http_proxy?
                 use_proxy = (proxy && proxy[0]);
                 if (use_proxy)
                         parse_url(proxy, &server);
         }
         if (!use_proxy) {
+                server.protocol = target.protocol;
                 server.port = target.port;
                 if (ENABLE_FEATURE_IPV6) {
                         //free(server.allocated); - can't be non-NULL
@@ -1104,7 +1104,7 @@ static void download_one_url(const char *url)
                 /* Open socket to http(s) server */
 #if ENABLE_FEATURE_WGET_OPENSSL
                 /* openssl (and maybe internal TLS) support is configured */
-                if (target.protocol == P_HTTPS) {
+                if (server.protocol == P_HTTPS) {
                         /* openssl-based helper
                          * Inconvenient API since we can't give it an open fd
                          */
@@ -1128,7 +1128,7 @@ static void download_one_url(const char *url)
 #elif ENABLE_FEATURE_WGET_HTTPS
                 /* Only internal TLS support is configured */
                 sfp = open_socket(lsa);
-                if (target.protocol == P_HTTPS)
+                if (server.protocol == P_HTTPS)
                         spawn_ssl_client(server.host, fileno(sfp), /*flags*/ 0);
 #else
                 /* ssl (https) support is not configured */