4 files changed, 30 insertions, 13 deletions

diff --git a/networking/ifupdown.c b/networking/ifupdown.c
index 5481134e5..80fce87a6 100644
--- a/networking/ifupdown.c
+++ b/networking/ifupdown.c
@@ -1022,6 +1022,22 @@ static struct interfaces_file_t *read_interfaces(const char *filename, struct in
                         currently_processing = NONE;
                 } else if (strcmp(first_word, "source") == 0) {
                         read_interfaces(next_word(&rest_of_line), defn);
+                } else if (is_prefixed_with(first_word, "source-dir")) {
+                        const char *dirpath;
+                        DIR *dir;
+                        struct dirent *entry;
+
+                        dirpath = next_word(&rest_of_line);
+                        dir = xopendir(dirpath);
+                        while ((entry = readdir(dir)) != NULL) {
+                                char *path;
+                                if (entry->d_name[0] == '.')
+                                        continue;
+                                path = concat_path_file(dirpath, entry->d_name);
+                                read_interfaces(path, defn);
+                                free(path);
+                        }
+                        closedir(dir);
                 } else {
                         switch (currently_processing) {
                         case IFACE:
diff --git a/networking/ntpd.c b/networking/ntpd.c
index 991c518f6..1ebdc34c3 100644
--- a/networking/ntpd.c
+++ b/networking/ntpd.c
@@ -1116,20 +1116,25 @@ fit(peer_t *p, double rd)
 {
         if ((p->reachable_bits & (p->reachable_bits-1)) == 0) {
                 /* One or zero bits in reachable_bits */
-                VERB4 bb_error_msg("peer %s unfit for selection: unreachable", p->p_dotted);
+                VERB4 bb_error_msg("peer %s unfit for selection: "
+                                "unreachable", p->p_dotted);
                 return 0;
         }
 #if 0 /* we filter out such packets earlier */
         if ((p->lastpkt_status & LI_ALARM) == LI_ALARM
          || p->lastpkt_stratum >= MAXSTRAT
         ) {
-                VERB4 bb_error_msg("peer %s unfit for selection: bad status/stratum", p->p_dotted);
+                VERB4 bb_error_msg("peer %s unfit for selection: "
+                                "bad status/stratum", p->p_dotted);
                 return 0;
         }
 #endif
         /* rd is root_distance(p) */
         if (rd > MAXDIST + FREQ_TOLERANCE * (1 << G.poll_exp)) {
-                VERB4 bb_error_msg("peer %s unfit for selection: root distance too high", p->p_dotted);
+                VERB3 bb_error_msg("peer %s unfit for selection: "
+                        "root distance %f too high, jitter:%f",
+                        p->p_dotted, rd, p->filter_jitter
+                );
                 return 0;
         }
 //TODO
diff --git a/networking/udhcp/d6_dhcpc.c b/networking/udhcp/d6_dhcpc.c
index ed2255ef3..66e4b6c6a 100644
--- a/networking/udhcp/d6_dhcpc.c
+++ b/networking/udhcp/d6_dhcpc.c
@@ -1405,7 +1405,7 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
                         case RENEW_REQUESTED: /* manual (SIGUSR1) renew */
                         case_RENEW_REQUESTED:
                         case RENEWING:
-                                if (timeout > 60) {
+                                if (timeout >= 60) {
                                         /* send an unicast renew request */
                         /* Sometimes observed to fail (EADDRNOTAVAIL) to bind
                          * a new UDP socket for sending inside send_renew.
@@ -1465,11 +1465,9 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
                                  * For the second case, must make sure timeout
                                  * is not too big, or else we can send
                                  * futile renew requests for hours.
-                                 * (Ab)use -A TIMEOUT value (usually 20 sec)
-                                 * as a cap on the timeout.
                                  */
-                                if (timeout > tryagain_timeout)
-                                        timeout = tryagain_timeout;
+                                if (timeout > 60)
+                                        timeout = 60;
                                 goto case_RENEW_REQUESTED;
                         }
                         /* Start things over */
diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c
index 0310663e0..ab3e5a463 100644
--- a/networking/udhcp/dhcpc.c
+++ b/networking/udhcp/dhcpc.c
@@ -1519,7 +1519,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
                         case RENEW_REQUESTED: /* manual (SIGUSR1) renew */
                         case_RENEW_REQUESTED:
                         case RENEWING:
-                                if (timeout > 60) {
+                                if (timeout >= 60) {
                                         /* send an unicast renew request */
                         /* Sometimes observed to fail (EADDRNOTAVAIL) to bind
                          * a new UDP socket for sending inside send_renew.
@@ -1592,11 +1592,9 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
                                  * For the second case, must make sure timeout
                                  * is not too big, or else we can send
                                  * futile renew requests for hours.
-                                 * (Ab)use -A TIMEOUT value (usually 20 sec)
-                                 * as a cap on the timeout.
                                  */
-                                if (timeout > tryagain_timeout)
-                                        timeout = tryagain_timeout;
+                                if (timeout > 60)
+                                        timeout = 60;
                                 goto case_RENEW_REQUESTED;
                         }
                         /* Start things over */