Merge branch 'busybox' into merge

6 files changed, 148 insertions, 57 deletions

diff --git a/networking/ip.c b/networking/ip.c
index 9ecb99abb..97d618cd9 100644
--- a/networking/ip.c
+++ b/networking/ip.c
@@ -267,8 +267,7 @@
 //--------------123456789.123456789.123456789.123456789.123456789.123456789.123456789.123....79
 //usage:#define iptunnel_trivial_usage
 //usage:       "add|change|del|show [NAME]\n"
-//usage:       "        [mode ipip|gre|sit]\n"
-//usage:       "        [remote ADDR] [local ADDR] [ttl TTL]"
+//usage:       "        [mode ipip|gre|sit] [remote ADDR] [local ADDR] [ttl TTL]"
 //usage:#define iptunnel_full_usage "\n\n"
 //usage:       "iptunnel add|change|del|show [NAME]\n"
 //usage:       "        [mode ipip|gre|sit] [remote ADDR] [local ADDR]\n"
@@ -308,10 +307,9 @@
 //usage:        IF_FEATURE_IP_TUNNEL( IP_BAR_TUNNEL"tunnel")
 //usage:        IF_FEATURE_IP_NEIGH(  IP_BAR_NEIGH "neigh")
 //usage:        IF_FEATURE_IP_RULE(   IP_BAR_RULE  "rule")
-//usage:       " [COMMAND]"
+//usage:       " [ARGS]"
 //usage:#define ip_full_usage "\n\n"
 //usage:       "OPTIONS := -f[amily] inet|inet6|link | -o[neline]\n"
-//usage:       "COMMAND :="
 //usage:        IF_FEATURE_IP_ADDRESS("\n"
 //usage:        "ip addr "ipaddr_trivial_usage)
 //usage:        IF_FEATURE_IP_ROUTE("\n"
diff --git a/networking/nslookup.c b/networking/nslookup.c
index 3a614b0c6..e153eb585 100644
--- a/networking/nslookup.c
+++ b/networking/nslookup.c
@@ -318,6 +318,8 @@ struct globals {
         unsigned serv_count;
         struct ns *server;
         struct query *query;
+        char *search;
+        smalluint have_search_directive;
 } FIX_ALIASING;
 #define G (*(struct globals*)bb_common_bufsiz1)
 #define INIT_G() do { \
@@ -667,24 +669,60 @@ static void parse_resolvconf(void)
 
         resolv = fopen("/etc/resolv.conf", "r");
         if (resolv) {
-                char line[128], *p;
+                char line[512]; /* "search" is defined to be up to 256 chars */
 
                 while (fgets(line, sizeof(line), resolv)) {
-                        p = strtok(line, " \t\n");
+                        char *p, *arg;
 
-                        if (!p || strcmp(p, "nameserver") != 0)
+                        p = strtok(line, " \t\n");
+                        if (!p)
+                                continue;
+                        dbg("resolv_key:'%s'\n", p);
+                        arg = strtok(NULL, "\n");
+                        dbg("resolv_arg:'%s'\n", arg);
+                        if (!arg)
                                 continue;
 
-                        p = strtok(NULL, " \t\n");
+                        if (strcmp(p, "domain") == 0) {
+                                /* domain DOM */
+                                if (!G.have_search_directive)
+                                        goto set_search;
+                                continue;
+                        }
+                        if (strcmp(p, "search") == 0) {
+                                /* search DOM1 DOM2... */
+                                G.have_search_directive = 1;
+ set_search:
+                                free(G.search);
+                                G.search = xstrdup(arg);
+                                dbg("search='%s'\n", G.search);
+                                continue;
+                        }
 
-                        if (!p)
+                        if (strcmp(p, "nameserver") != 0)
                                 continue;
 
-                        add_ns(xstrdup(p));
+                        /* nameserver DNS */
+                        add_ns(xstrdup(arg));
                 }
 
                 fclose(resolv);
         }
+
+        if (!G.search) {
+                /* default search domain is domain part of hostname */
+                char *h = safe_gethostname();
+                char *d = strchr(h, '.');
+                if (d) {
+                        G.search = d + 1;
+                        dbg("search='%s' (from hostname)\n", G.search);
+                }
+                /* else free(h); */
+        }
+
+        /* Cater for case of "domain ." in resolv.conf */
+        if (G.search && LONE_CHAR(G.search, '.'))
+                G.search = NULL;
 }
 
 static void add_query(int type, const char *dname)
@@ -695,7 +733,7 @@ static void add_query(int type, const char *dname)
 
         count = G.query_count++;
 
-        G.query = xrealloc_vector(G.query, /*2=2^1:*/ 1, count);
+        G.query = xrealloc_vector(G.query, /*4=2^2:*/ 2, count);
         new_q = &G.query[count];
 
         dbg("new query#%u type %u for '%s'\n", count, type, dname);
@@ -709,6 +747,28 @@ static void add_query(int type, const char *dname)
         new_q->qlen = qlen;
 }
 
+static void add_query_with_search(int type, const char *dname)
+{
+        char *s;
+
+        if (type == T_PTR || !G.search || strchr(dname, '.')) {
+                add_query(type, dname);
+                return;
+        }
+
+        s = G.search;
+        for (;;) {
+                char *fullname, *e;
+
+                e = skip_non_whitespace(s);
+                fullname = xasprintf("%s.%.*s", dname, (int)(e - s), s);
+                add_query(type, fullname);
+                s = skip_whitespace(e);
+                if (!*s)
+                        break;
+        }
+}
+
 static char *make_ptr(const char *addrstr)
 {
         unsigned char addr[16];
@@ -833,6 +893,18 @@ int nslookup_main(int argc UNUSED_PARAM, char **argv)
                 }
         }
 
+        /* Use given DNS server if present */
+        if (argv[1]) {
+                if (argv[2])
+                        bb_show_usage();
+                add_ns(argv[1]);
+        } else {
+                parse_resolvconf();
+                /* Fall back to localhost if we could not find NS in resolv.conf */
+                if (G.serv_count == 0)
+                        add_ns("127.0.0.1");
+        }
+
         if (types == 0) {
                 /* No explicit type given, guess query type.
                  * If we can convert the domain argument into a ptr (means that
@@ -846,31 +918,19 @@ int nslookup_main(int argc UNUSED_PARAM, char **argv)
                 if (ptr) {
                         add_query(T_PTR, ptr);
                 } else {
-                        add_query(T_A, argv[0]);
+                        add_query_with_search(T_A, argv[0]);
 #if ENABLE_FEATURE_IPV6
-                        add_query(T_AAAA, argv[0]);
+                        add_query_with_search(T_AAAA, argv[0]);
 #endif
                 }
         } else {
                 int c;
                 for (c = 0; c < ARRAY_SIZE(qtypes); c++) {
                         if (types & (1 << c))
-                                add_query(qtypes[c].type, argv[0]);
+                                add_query_with_search(qtypes[c].type, argv[0]);
                 }
         }
 
-        /* Use given DNS server if present */
-        if (argv[1]) {
-                if (argv[2])
-                        bb_show_usage();
-                add_ns(argv[1]);
-        } else {
-                parse_resolvconf();
-                /* Fall back to localhost if we could not find NS in resolv.conf */
-                if (G.serv_count == 0)
-                        add_ns("127.0.0.1");
-        }
-
         for (rc = 0; rc < G.serv_count;) {
                 int c;
 
diff --git a/networking/ntpd.c b/networking/ntpd.c
index 7b800369e..991c518f6 100644
--- a/networking/ntpd.c
+++ b/networking/ntpd.c
@@ -149,8 +149,8 @@
  */
 
 #define INITIAL_SAMPLES    4    /* how many samples do we want for init */
-#define MIN_FREQHOLD      10    /* adjust offset, but not freq in this many first adjustments */
-#define BAD_DELAY_GROWTH   4    /* drop packet if its delay grew by more than this */
+#define MIN_FREQHOLD      12    /* adjust offset, but not freq in this many first adjustments */
+#define BAD_DELAY_GROWTH   4    /* drop packet if its delay grew by more than this factor */
 
 #define RETRY_INTERVAL    32    /* on send/recv error, retry in N secs (need to be power of 2) */
 #define NOREPLY_INTERVAL 512    /* sent, but got no reply: cap next query by this many seconds */
@@ -1777,9 +1777,9 @@ update_local_clock(peer_t *p)
 //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 MIN_FREQHOLD + 7 in the above example.
+                         * This expression would choose MIN_FREQHOLD + 8 in the above example.
                          */
-                        G.FREQHOLD_cnt = MIN_FREQHOLD + ((unsigned)(abs(tmx.offset)) >> 16);
+                        G.FREQHOLD_cnt = 1 + MIN_FREQHOLD + ((unsigned)(abs(tmx.offset)) >> 16);
                 }
                 G.FREQHOLD_cnt--;
                 tmx.status |= STA_FREQHOLD;
@@ -1819,7 +1819,7 @@ update_local_clock(peer_t *p)
         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,
+                        p->p_raw_delay,
                         G.discipline_jitter,
                         (double)tmx.freq / 65536,
                         (int)tmx.constant
@@ -1976,27 +1976,30 @@ recv_and_process_peer_pkt(peer_t *p)
         T2 = lfp_to_d(msg.m_rectime);
         T3 = lfp_to_d(msg.m_xmttime);
         T4 = G.cur_time;
-
-        /* The delay calculation is a special case. In cases where the
-         * server and client clocks are running at different rates and
-         * with very fast networks, the delay can appear negative. In
-         * order to avoid violating the Principle of Least Astonishment,
-         * the delay is clamped not less than the system precision.
-         */
         delay = (T4 - T1) - (T3 - T2);
-        if (delay < G_precision_sec)
-                delay = G_precision_sec;
+
         /*
          * If this packet's delay is much bigger than the last one,
          * it's better to just ignore it than use its much less precise value.
          */
         prev_delay = p->p_raw_delay;
-        p->p_raw_delay = delay;
-        if (p->reachable_bits && delay > prev_delay * BAD_DELAY_GROWTH) {
+        p->p_raw_delay = (delay < 0 ? 0.0 : delay);
+        if (p->reachable_bits
+         && delay > prev_delay * BAD_DELAY_GROWTH
+         && delay > 1.0 / (8 * 1024) /* larger than ~0.000122 */
+        ) {
                 bb_error_msg("reply from %s: delay %f is too high, ignoring", p->p_dotted, delay);
                 goto pick_normal_interval;
         }
 
+        /* The delay calculation is a special case. In cases where the
+         * server and client clocks are running at different rates and
+         * with very fast networks, the delay can appear negative. In
+         * order to avoid violating the Principle of Least Astonishment,
+         * the delay is clamped not less than the system precision.
+         */
+        if (delay < G_precision_sec)
+                delay = G_precision_sec;
         p->lastpkt_delay = delay;
         p->lastpkt_recv_time = T4;
         VERB6 bb_error_msg("%s->lastpkt_recv_time=%f", p->p_dotted, p->lastpkt_recv_time);
@@ -2024,7 +2027,7 @@ recv_and_process_peer_pkt(peer_t *p)
                 bb_error_msg("reply from %s: offset:%+f delay:%f status:0x%02x strat:%d refid:0x%08x rootdelay:%f reach:0x%02x",
                         p->p_dotted,
                         offset,
-                        p->lastpkt_delay,
+                        p->p_raw_delay,
                         p->lastpkt_status,
                         p->lastpkt_stratum,
                         p->lastpkt_refid,
diff --git a/networking/ping.c b/networking/ping.c
index 8f85d3ec2..570184fee 100644
--- a/networking/ping.c
+++ b/networking/ping.c
@@ -74,6 +74,7 @@
 //usage:        )
 //usage:     "\n        -c CNT          Send only CNT pings"
 //usage:     "\n        -s SIZE         Send SIZE data bytes in packets (default 56)"
+//usage:     "\n        -i SECS         Interval"
 //usage:     "\n        -A              Ping as soon as reply is recevied"
 //usage:     "\n        -t TTL          Set TTL"
 //usage:     "\n        -I IFACE/IP     Source interface or IP address"
@@ -91,6 +92,7 @@
 //usage:       "Send ICMP ECHO_REQUEST packets to network hosts\n"
 //usage:     "\n        -c CNT          Send only CNT pings"
 //usage:     "\n        -s SIZE         Send SIZE data bytes in packets (default 56)"
+//usage:     "\n        -i SECS         Interval"
 //usage:     "\n        -A              Ping as soon as reply is recevied"
 //usage:     "\n        -I IFACE/IP     Source interface or IP address"
 //usage:     "\n        -q              Quiet, only display output at start"
@@ -350,7 +352,7 @@ static int common_ping_main(sa_family_t af, char **argv)
 /* Full(er) version */
 
 /* -c NUM, -t NUM, -w NUM, -W NUM */
-#define OPT_STRING "qvAc:+s:t:+w:+W:+I:np:4"IF_PING6("6")
+#define OPT_STRING "qvAc:+s:t:+w:+W:+I:np:i:4"IF_PING6("6")
 enum {
         OPT_QUIET = 1 << 0,
         OPT_VERBOSE = 1 << 1,
@@ -363,8 +365,9 @@ enum {
         OPT_I = 1 << 8,
         /*OPT_n = 1 << 9, - ignored */
         OPT_p = 1 << 10,
-        OPT_IPV4 = 1 << 11,
-        OPT_IPV6 = (1 << 12) * ENABLE_PING6,
+        OPT_i = 1 << 11,
+        OPT_IPV4 = 1 << 12,
+        OPT_IPV6 = (1 << 13) * ENABLE_PING6,
 };
 
 
@@ -382,6 +385,7 @@ struct globals {
         unsigned long long tsum; /* in us, sum of all times */
         unsigned cur_us; /* low word only, we don't need more */
         unsigned deadline_us;
+        unsigned interval_us;
         unsigned timeout;
         unsigned sizeof_rcv_packet;
         char *rcv_packet; /* [datalen + MAXIPLEN + MAXICMPLEN] */
@@ -481,9 +485,15 @@ static void sendping_tail(void (*sp)(int), int size_pkt)
                 bb_error_msg_and_die(bb_msg_write_error);
 
         if (pingcount == 0 || G.ntransmitted < pingcount) {
-                /* Didn't send all pings yet - schedule next in 1s */
+                /* Didn't send all pings yet - schedule next in -i SEC interval */
+                struct itimerval i;
                 signal(SIGALRM, sp);
-                alarm(PINGINTERVAL);
+                /*ualarm(G.interval_us, 0); - does not work for >=1sec on some libc */
+                i.it_interval.tv_sec = 0;
+                i.it_interval.tv_usec = 0;
+                i.it_value.tv_sec = G.interval_us / 1000000;
+                i.it_value.tv_usec = G.interval_us % 1000000;
+                setitimer(ITIMER_REAL, &i, NULL);
         } else { /* -c NN, and all NN are sent */
                 /* Wait for the last ping to come back.
                  * -W timeout: wait for a response in seconds.
@@ -885,6 +895,8 @@ static int common_ping_main(int opt, char **argv)
 {
         len_and_sockaddr *lsa;
         char *str_s, *str_p;
+        char *str_i = (char*)"1";
+        duration_t interval;
 
         INIT_G();
 
@@ -892,7 +904,7 @@ static int common_ping_main(int opt, char **argv)
                         OPT_STRING
                         /* exactly one arg; -v and -q don't mix */
                         "\0" "=1:q--v:v--q",
-                        &pingcount, &str_s, &opt_ttl, &G.deadline_us, &timeout, &str_I, &str_p
+                        &pingcount, &str_s, &opt_ttl, &G.deadline_us, &timeout, &str_I, &str_p, &str_i
         );
         if (opt & OPT_s)
                 datalen = xatou16(str_s); // -s
@@ -910,6 +922,10 @@ static int common_ping_main(int opt, char **argv)
                 unsigned d = G.deadline_us < INT_MAX/1000000 ? G.deadline_us : INT_MAX/1000000;
                 G.deadline_us = 1 | ((d * 1000000) + monotonic_us());
         }
+        interval = parse_duration_str(str_i);
+        if (interval > INT_MAX/1000000)
+                interval = INT_MAX/1000000;
+        G.interval_us = interval * 1000000;
 
         myid = (uint16_t) getpid();
         hostname = argv[optind];
diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c
index c2805a009..0310663e0 100644
--- a/networking/udhcp/dhcpc.c
+++ b/networking/udhcp/dhcpc.c
@@ -160,8 +160,8 @@ static int mton(uint32_t mask)
 
 #if ENABLE_FEATURE_UDHCPC_SANITIZEOPT
 /* Check if a given label represents a valid DNS label
- * Return pointer to the first character after the label upon success,
- * NULL otherwise.
+ * Return pointer to the first character after the label
+ * (NUL or dot) upon success, NULL otherwise.
  * See RFC1035, 2.3.1
  */
 /* We don't need to be particularly anal. For example, allowing _, hyphen
@@ -173,8 +173,10 @@ static int mton(uint32_t mask)
 static const char *valid_domain_label(const char *label)
 {
         unsigned char ch;
-        unsigned pos = 0;
+        //unsigned pos = 0;
 
+        if (label[0] == '-')
+                return NULL;
         for (;;) {
                 ch = *label;
                 if ((ch|0x20) < 'a' || (ch|0x20) > 'z') {
@@ -187,7 +189,7 @@ static const char *valid_domain_label(const char *label)
                         }
                 }
                 label++;
-                pos++;
+                //pos++;
                 //Do we want this?
                 //if (pos > 63) /* NS_MAXLABEL; labels must be 63 chars or less */
                 //      return NULL;
@@ -272,6 +274,12 @@ static NOINLINE char *xmalloc_optname_optval(uint8_t *option, const struct dhcp_
                 case OPTION_STRING_HOST:
                         memcpy(dest, option, len);
                         dest[len] = '\0';
+//TODO: it appears option 15 DHCP_DOMAIN_NAME is often abused
+//by DHCP admins to contain a space-separated list of domains,
+//not one domain name (presumably, to work as list of search domains,
+//instead of using proper option 119 DHCP_DOMAIN_SEARCH).
+//Currently, good_hostname() balks on strings containing spaces.
+//Do we need to allow it? Only for DHCP_DOMAIN_NAME option?
                         if (type == OPTION_STRING_HOST && !good_hostname(dest))
                                 safe_strncpy(dest, "bad", len);
                         return ret;
diff --git a/networking/whois.c b/networking/whois.c
index f0ec86301..f3da32b4e 100644
--- a/networking/whois.c
+++ b/networking/whois.c
@@ -39,20 +39,26 @@ static char *query(const char *host, int port, const char *domain)
         bool success;
         char *redir = NULL;
         const char *pfx = "";
-        char linebuf[1024];
+        /* some .io domains reported to have very long strings in whois
+         * responses, 1k was not enough:
+         */
+        char linebuf[2 * 1024];
         char *buf = NULL;
         unsigned bufpos = 0;
 
  again:
         printf("[Querying %s:%d '%s%s']\n", host, port, pfx, domain);
         fd = create_and_connect_stream_or_die(host, port);
-        success = 0;
         fdprintf(fd, "%s%s\r\n", pfx, domain);
         fp = xfdopen_for_read(fd);
 
-        while (fgets(linebuf, sizeof(linebuf), fp)) {
-                unsigned len = strcspn(linebuf, "\r\n");
+        success = 0;
+        while (fgets(linebuf, sizeof(linebuf)-1, fp)) {
+                unsigned len;
+
+                len = strcspn(linebuf, "\r\n");
                 linebuf[len++] = '\n';
+                linebuf[len] = '\0';
 
                 buf = xrealloc(buf, bufpos + len + 1);
                 memcpy(buf + bufpos, linebuf, len);