Merge branch 'busybox' into merge

3 files changed, 62 insertions, 67 deletions

diff --git a/networking/ntpd.c b/networking/ntpd.c
index b7fa5dce9..bfd5705fc 100644
--- a/networking/ntpd.c
+++ b/networking/ntpd.c
@@ -155,6 +155,7 @@
 #define RETRY_INTERVAL    32    /* on send/recv error, retry in N secs (need to be power of 2) */
 #define NOREPLY_INTERVAL 512    /* sent, but got no reply: cap next query by this many seconds */
 #define RESPONSE_INTERVAL 16    /* wait for reply up to N secs */
+#define HOSTNAME_INTERVAL  5    /* hostname lookup failed. Wait N secs for next try */
 
 /* Step threshold (sec). std ntpd uses 0.128.
  */
@@ -790,28 +791,20 @@ reset_peer_stats(peer_t *p, double offset)
         VERB6 bb_error_msg("%s->lastpkt_recv_time=%f", p->p_dotted, p->lastpkt_recv_time);
 }
 
-static void
-resolve_peer_hostname(peer_t *p, int loop_on_fail)
+static len_and_sockaddr*
+resolve_peer_hostname(peer_t *p)
 {
-        len_and_sockaddr *lsa;
-
- again:
-        lsa = host2sockaddr(p->p_hostname, 123);
-        if (!lsa) {
-                /* error message already emitted by host2sockaddr() */
-                if (!loop_on_fail)
-                        return;
-//FIXME: do this to avoid infinite looping on typo in a hostname?
-//well... in which case, what is a good value for loop_on_fail?
-                //if (--loop_on_fail == 0)
-                //      xfunc_die();
-                sleep(5);
-                goto again;
+        len_and_sockaddr *lsa = host2sockaddr(p->p_hostname, 123);
+        if (lsa) {
+                free(p->p_lsa);
+                free(p->p_dotted);
+                p->p_lsa = lsa;
+                p->p_dotted = xmalloc_sockaddr2dotted_noport(&lsa->u.sa);
+        } else {
+                /* error message is emitted by host2sockaddr() */
+                set_next(p, HOSTNAME_INTERVAL);
         }
-        free(p->p_lsa);
-        free(p->p_dotted);
-        p->p_lsa = lsa;
-        p->p_dotted = xmalloc_sockaddr2dotted_noport(&lsa->u.sa);
+        return lsa;
 }
 
 static void
@@ -822,28 +815,28 @@ add_peers(const char *s)
 
         p = xzalloc(sizeof(*p) + strlen(s));
         strcpy(p->p_hostname, s);
-        resolve_peer_hostname(p, /*loop_on_fail=*/ 1);
+        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); */
+        reset_peer_stats(p, STEP_THRESHOLD);
 
         /* 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;
+        if (resolve_peer_hostname(p)) {
+                for (item = G.ntp_peers; item != NULL; item = item->link) {
+                        peer_t *pp = (peer_t *) item->data;
+                        if (pp->p_dotted && 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_fd = -1;
-        p->p_xmt_msg.m_status = MODE_CLIENT | (NTP_VERSION << 3);
-        p->next_action_time = G.cur_time; /* = set_next(p, 0); */
-        reset_peer_stats(p, STEP_THRESHOLD);
-
         llist_add_to(&G.ntp_peers, p);
         G.peer_cnt++;
 }
@@ -871,6 +864,11 @@ do_sendto(int fd,
 static void
 send_query_to_peer(peer_t *p)
 {
+        if (!p->p_lsa) {
+                if (!resolve_peer_hostname(p))
+                        return;
+        }
+
         /* Why do we need to bind()?
          * See what happens when we don't bind:
          *
@@ -2238,7 +2236,7 @@ static NOINLINE void ntp_init(char **argv)
                         IF_FEATURE_NTPD_SERVER("I:") /* compat */
                         "d" /* compat */
                         "46aAbgL", /* compat, ignored */
-                        &peers,&G.script_name,
+                        &peers, &G.script_name,
 #if ENABLE_FEATURE_NTPD_SERVER
                         &G.if_name,
 #endif
@@ -2263,9 +2261,6 @@ static NOINLINE void ntp_init(char **argv)
         if (opts & OPT_N)
                 setpriority(PRIO_PROCESS, 0, -15);
 
-        /* add_peers() calls can retry DNS resolution (possibly forever).
-         * Daemonize before them, or else boot can stall forever.
-         */
         if (!(opts & OPT_n)) {
                 bb_daemonize_or_rexec(DAEMON_DEVNULL_STDIO, argv);
                 logmode = LOGMODE_NONE;
@@ -2400,7 +2395,7 @@ int ntpd_main(int argc UNUSED_PARAM, char **argv)
 
                                         /* What if don't see it because it changed its IP? */
                                         if (p->reachable_bits == 0)
-                                                resolve_peer_hostname(p, /*loop_on_fail=*/ 0);
+                                                resolve_peer_hostname(p);
 
                                         set_next(p, timeout);
                                 }
diff --git a/networking/udhcp/Config.src b/networking/udhcp/Config.src
index 90fb313b5..7bc13a719 100644
--- a/networking/udhcp/Config.src
+++ b/networking/udhcp/Config.src
@@ -6,29 +6,13 @@
 INSERT
 
 config UDHCPD
-        bool "udhcp server (udhcpd)"
+        bool "udhcpd (DHCP server)"
         default y
         select PLATFORM_LINUX
         help
           udhcpd is a DHCP server geared primarily toward embedded systems,
           while striving to be fully functional and RFC compliant.
 
-config DHCPRELAY
-        bool "dhcprelay"
-        default y
-        help
-          dhcprelay listens for dhcp requests on one or more interfaces
-          and forwards these requests to a different interface or dhcp
-          server.
-
-config DUMPLEASES
-        bool "Lease display utility (dumpleases)"
-        default y
-        help
-          dumpleases displays the leases written out by the udhcpd server.
-          Lease times are stored in the file by time remaining in lease, or
-          by the absolute time that it expires in seconds from epoch.
-
 config FEATURE_UDHCPD_WRITE_LEASES_EARLY
         bool "Rewrite the lease file at every new acknowledge"
         default y
@@ -61,8 +45,24 @@ config DHCPD_LEASES_FILE
           udhcpd stores addresses in a lease file. This is the absolute path
           of the file. Normally it is safe to leave it untouched.
 
+config DUMPLEASES
+        bool "dumpleases"
+        default y
+        help
+          dumpleases displays the leases written out by the udhcpd.
+          Lease times are stored in the file by time remaining in lease, or
+          by the absolute time that it expires in seconds from epoch.
+
+config DHCPRELAY
+        bool "dhcprelay"
+        default y
+        help
+          dhcprelay listens for dhcp requests on one or more interfaces
+          and forwards these requests to a different interface or dhcp
+          server.
+
 config UDHCPC
-        bool "udhcp client (udhcpc)"
+        bool "udhcpc (DHCP client)"
         default y
         select PLATFORM_LINUX
         help
@@ -93,6 +93,15 @@ config FEATURE_UDHCPC_SANITIZEOPT
           they will be replaced with string "bad" when exporting
           to the environment.
 
+config UDHCPC_DEFAULT_SCRIPT
+        string "Absolute path to config script"
+        default "/usr/share/udhcpc/default.script"
+        depends on UDHCPC
+        help
+          This script is called after udhcpc receives an answer. See
+          examples/udhcp for a working example. Normally it is safe
+          to leave this untouched.
+
 config FEATURE_UDHCP_PORT
         bool "Enable '-P port' option for udhcpd and udhcpc"
         default n
@@ -130,15 +139,6 @@ config FEATURE_UDHCP_8021Q
           If selected, both client and server will support passing of VLAN
           ID and priority via options 132 and 133 as per 802.1Q.
 
-config UDHCPC_DEFAULT_SCRIPT
-        string "Absolute path to config script"
-        default "/usr/share/udhcpc/default.script"
-        depends on UDHCPC
-        help
-          This script is called after udhcpc receives an answer. See
-          examples/udhcp for a working example. Normally it is safe
-          to leave this untouched.
-
 config UDHCPC_SLACK_FOR_BUGGY_SERVERS
         int "DHCP options slack buffer size"
         default 80
diff --git a/networking/udhcp/d6_dhcpc.c b/networking/udhcp/d6_dhcpc.c
index ddf3412a0..64339c9b5 100644
--- a/networking/udhcp/d6_dhcpc.c
+++ b/networking/udhcp/d6_dhcpc.c
@@ -12,7 +12,7 @@
  */
 
 //config:config UDHCPC6
-//config:       bool "udhcp client for DHCPv6 (udhcpc6)"
+//config:       bool "udhcpc6 (DHCPv6 client, NOT READY)"
 //config:       default n  # not yet ready
 //config:       depends on FEATURE_IPV6
 //config:       help