Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/networking/udhcp/arpping.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/arpping.c (modified) (4 diffs)

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

@@ -40 +40 @@
         uint32_t from_ip,
         uint8_t *from_mac,
-        const char *interface)
+        const char *interface,
+        unsigned timeo)
 {
     int timeout_ms;
@@ -48 +49 @@
     struct sockaddr addr;   /* for interface name */
     struct arpMsg arp;
+
+    if (!timeo)
+        return 1;
 
     s = socket(PF_PACKET, SOCK_PACKET, htons(ETH_P_ARP));
@@ -84 +88 @@
 
     /* wait for arp reply, and check it */
-    timeout_ms = 2000;
+    timeout_ms = (int)timeo;
     do {
         typedef uint32_t aliased_uint32_t FIX_ALIASING;
@@ -125 +129 @@
          * (people did see overflows here when system time jumps):
          */
-    } while ((unsigned)timeout_ms <= 2000);
+    } while ((unsigned)timeout_ms <= timeo);
 
  ret:
     close(s);
-    log1("%srp reply received for this address", rv ? "No a" : "A");
+    log1("%srp reply received for this address", rv ? "no a" : "A");
     return rv;
 }