Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/networking/udhcp/leases.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/networking/udhcp/leases.c (modified) (7 diffs)

branches/3.3/mindi-busybox/networking/udhcp/leases.c

@@ -18 +18 @@
      * 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];
@@ -66 +68 @@
                 hostname_len = sizeof(oldest->hostname);
             p = safe_strncpy(oldest->hostname, hostname, hostname_len);
-            /* sanitization (s/non-ASCII/^/g) */
+            /*
+             * Sanitization (s/bad_char/./g).
+             * The intent is not to allow only "DNS-valid" hostnames,
+             * but merely make dumpleases output safe for shells to use.
+             * We accept "0-9A-Za-z._-", all other chars turn to dots.
+             */
             while (*p) {
-                if (*p < ' ' || *p > 126)
-                    *p = '^';
+                if (!isalnum(*p) && *p != '-' && *p != '_')
+                    *p = '.';
                 p++;
             }
@@ -113 +120 @@
 
 /* Check if the IP is taken; if it is, add it to the lease table */
-static int nobody_responds_to_arp(uint32_t nip, const uint8_t *safe_mac)
+static int nobody_responds_to_arp(uint32_t nip, const uint8_t *safe_mac, unsigned arpping_ms)
 {
     struct in_addr temp;
@@ -121 +128 @@
             server_config.server_nip,
             server_config.server_mac,
-            server_config.interface);
+            server_config.interface,
+            arpping_ms);
     if (r)
         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);
@@ -133 +141 @@
 
 /* Find a new usable (we think) address */
-uint32_t FAST_FUNC find_free_or_expired_nip(const uint8_t *safe_mac)
+uint32_t FAST_FUNC find_free_or_expired_nip(const uint8_t *safe_mac, unsigned arpping_ms)
 {
     uint32_t addr;
@@ -178 +186 @@
         if (!lease) {
 //TODO: DHCP servers do not always sit on the same subnet as clients: should *ping*, not arp-ping!
-            if (nobody_responds_to_arp(nip, safe_mac))
+            if (nobody_responds_to_arp(nip, safe_mac, arpping_ms))
                 return nip;
         } else {
@@ -195 +203 @@
     if (oldest_lease
      && is_expired_lease(oldest_lease)
-     && nobody_responds_to_arp(oldest_lease->lease_nip, safe_mac)
+     && nobody_responds_to_arp(oldest_lease->lease_nip, safe_mac, arpping_ms)
     ) {
         return oldest_lease->lease_nip;