telnetd: treat all 2-byte IACs in 240..249 range as NOPs.

[oweals/busybox.git] / networking / arping.c

diff --git a/networking/arping.c b/networking/arping.c
index 9ac4a7cee7dddb7a6d998258c1ce88c7e4630f71..46bd65e3610207e9c0ed8fa89c454780f0bdcf9e 100644 (file)
--- a/networking/arping.c
+++ b/networking/arping.c
@@ -28,6 +28,7 @@
 #include <netpacket/packet.h>
 
 #include "libbb.h"
+#include "common_bufsiz.h"
 
 /* We don't expect to see 1000+ seconds delay, unsigned is enough */
 #define MONOTONIC_US() ((unsigned)monotonic_us())
@@ -60,7 +61,7 @@ struct globals {
        unsigned brd_recv;
        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       )
 #define me         (G.me        )
@@ -76,6 +77,7 @@ struct globals {
 #define brd_recv   (G.brd_recv  )
 #define req_recv   (G.req_recv  )
 #define INIT_G() do { \
+       setup_common_bufsiz(); \
        count = -1; \
 } while (0)
 
@@ -229,27 +231,30 @@ static void recv_pack(unsigned char *buf, int len, struct sockaddr_ll *FROM)
        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));
                        s_printed = 1;
                }
                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]
+                       );
                }
 
                if (last) {
                        unsigned diff = MONOTONIC_US() - last;
                        printf(" %u.%03ums\n", diff / 1000, diff % 1000);
                } else {
-                       printf(" UNSOLICITED?\n");
+                       puts(" UNSOLICITED?");
                }
                fflush_all();
        }
@@ -290,8 +295,8 @@ int arping_main(int argc UNUSED_PARAM, char **argv)
                /* Dad also sets quit_on_reply.
                 * Advert also sets unsolicited.
                 */
-               opt_complementary = "=1:Df:AU:c+";
-               opt = getopt32(argv, "DUAqfbc:w:I:s:",
+               opt_complementary = "=1:Df:AU";
+               opt = getopt32(argv, "DUAqfbc:+w:I:s:",
                                &count, &str_timeout, &device, &source);
                if (opt & 0x80) /* -w: timeout */
                        timeout_us = xatou_range(str_timeout, 0, INT_MAX/2000000) * 1000000 + 500000;
@@ -357,7 +362,7 @@ int arping_main(int argc UNUSED_PARAM, char **argv)
                        saddr.sin_port = htons(1025);
                        saddr.sin_addr = dst;
 
-                       if (setsockopt(probe_fd, SOL_SOCKET, SO_DONTROUTE, &const_int_1, sizeof(const_int_1)) == -1)
+                       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);