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

branches/3.3/mindi-busybox/networking/arping.c

@@ -14 +14 @@
 //usage:     "\n    -q      Quiet"
 //usage:     "\n    -b      Keep broadcasting, don't go unicast"
-//usage:     "\n    -D      Duplicated address detection mode"
+//usage:     "\n    -D      Exit with 1 if DST_IP replies"
 //usage:     "\n    -U      Unsolicited ARP mode, update your neighbors"
 //usage:     "\n    -A      ARP answer mode, update your neighbors"
 //usage:     "\n    -c N        Stop after sending N ARP requests"
-//usage:     "\n    -w TIMEOUT  Time to wait for ARP reply, seconds"
+//usage:     "\n    -w TIMEOUT  Seconds to wait for ARP reply"
 //usage:     "\n    -I IFACE    Interface to use (default eth0)"
 //usage:     "\n    -s SRC_IP   Sender IP address"
@@ -29 +29 @@
 
 #include "libbb.h"
+#include "common_bufsiz.h"
 
 /* We don't expect to see 1000+ seconds delay, unsigned is enough */
@@ -61 +62 @@
     unsigned req_recv;
 } FIX_ALIASING;
-#define G (*(struct globals*)&bb_common_bufsiz1)
+#define G (*(struct globals*)bb_common_bufsiz1)
 #define src        (G.src       )
 #define dst        (G.dst       )
@@ -77 +78 @@
 #define req_recv   (G.req_recv  )
 #define INIT_G() do { \
+    setup_common_bufsiz(); \
     count = -1; \
 } while (0)
@@ -163 +165 @@
 }
 
-static bool recv_pack(unsigned char *buf, int len, struct sockaddr_ll *FROM)
+static void recv_pack(unsigned char *buf, int len, struct sockaddr_ll *FROM)
 {
     struct arphdr *ah = (struct arphdr *) buf;
@@ -182 +184 @@
      && FROM->sll_pkttype != PACKET_BROADCAST
      && FROM->sll_pkttype != PACKET_MULTICAST)
-        return false;
+        return;
 
     /* Only these types are recognized */
     if (ah->ar_op != htons(ARPOP_REQUEST) && ah->ar_op != htons(ARPOP_REPLY))
-        return false;
+        return;
 
     /* ARPHRD check and this darned FDDI hack here :-( */
     if (ah->ar_hrd != htons(FROM->sll_hatype)
      && (FROM->sll_hatype != ARPHRD_FDDI || ah->ar_hrd != htons(ARPHRD_ETHER)))
-        return false;
+        return;
 
     /* Protocol must be IP. */
@@ -198 +200 @@
      || (ah->ar_hln != me.sll_halen)
      || (len < (int)(sizeof(*ah) + 2 * (4 + ah->ar_hln))))
-        return false;
+        return;
 
     move_from_unaligned32(src_ip.s_addr, p + ah->ar_hln);
@@ -204 +206 @@
 
     if (dst.s_addr != src_ip.s_addr)
-        return false;
+        return;
     if (!(option_mask32 & DAD)) {
         if ((src.s_addr != dst_ip.s_addr)
-            || (memcmp(p + ah->ar_hln + 4, &me.sll_addr, ah->ar_hln)))
-            return false;
+         || (memcmp(p + ah->ar_hln + 4, &me.sll_addr, ah->ar_hln)))
+            return;
     } else {
         /* DAD packet was:
@@ -225 +227 @@
         if ((memcmp(p, &me.sll_addr, me.sll_halen) == 0)
          || (src.s_addr && src.s_addr != dst_ip.s_addr))
-            return false;
+            return;
     }
     if (!(option_mask32 & QUIET)) {
         int s_printed = 0;
 
-        printf("%scast re%s from %s [%s]",
+        printf("%scast re%s from %s [%02x:%02x:%02x:%02x:%02x:%02x]",
             FROM->sll_pkttype == PACKET_HOST ? "Uni" : "Broad",
             ah->ar_op == htons(ARPOP_REPLY) ? "ply" : "quest",
             inet_ntoa(src_ip),
-            ether_ntoa((struct ether_addr *) p));
+            p[0], p[1], p[2], p[3], p[4], p[5]
+        );
         if (dst_ip.s_addr != src.s_addr) {
             printf("for %s ", inet_ntoa(dst_ip));
@@ -240 +243 @@
         }
         if (memcmp(p + ah->ar_hln + 4, me.sll_addr, ah->ar_hln)) {
+            unsigned char *pp = p + ah->ar_hln + 4;
             if (!s_printed)
                 printf("for ");
-            printf("[%s]",
-                ether_ntoa((struct ether_addr *) p + ah->ar_hln + 4));
+            printf("[%02x:%02x:%02x:%02x:%02x:%02x]",
+                pp[0], pp[1], pp[2], pp[3], pp[4], pp[5]
+            );
         }
 
@@ -250 +255 @@
             printf(" %u.%03ums\n", diff / 1000, diff % 1000);
         } else {
-            printf(" UNSOLICITED?\n");
+            puts(" UNSOLICITED?");
         }
         fflush_all();
@@ -265 +270 @@
         option_mask32 |= UNICASTING;
     }
-    return true;
 }
 
@@ -285 +289 @@
     //xsetuid(getuid());
 
-    err_str = xasprintf("interface %s %%s", device);
     {
         unsigned opt;
@@ -303 +306 @@
 
     target = argv[optind];
-
+    err_str = xasprintf("interface %s %%s", device);
     xfunc_error_retval = 2;
 
@@ -360 +363 @@
             saddr.sin_addr = dst;
 
-            if (setsockopt(probe_fd, SOL_SOCKET, SO_DONTROUTE, &const_int_1, sizeof(const_int_1)) == -1)
-                bb_perror_msg("setsockopt(SO_DONTROUTE)");
+            if (setsockopt_SOL_SOCKET_1(probe_fd, SO_DONTROUTE) != 0)
+                bb_perror_msg("setsockopt(%s)", "SO_DONTROUTE");
             xconnect(probe_fd, (struct sockaddr *) &saddr, sizeof(saddr));
             getsockname(probe_fd, (struct sockaddr *) &saddr, &alen);