X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=networking%2Farping.c;h=46bd65e3610207e9c0ed8fa89c454780f0bdcf9e;hb=b6d421b635670939e4ec047543f84cb507e5fe9d;hp=915af326187525fd0f1b25e9cb229779ca060887;hpb=e53738558f2f1aa8cd536545479ab98b0df808c5;p=oweals%2Fbusybox.git diff --git a/networking/arping.c b/networking/arping.c index 915af3261..46bd65e36 100644 --- a/networking/arping.c +++ b/networking/arping.c @@ -1,19 +1,34 @@ /* vi: set sw=4 ts=4: */ /* - * arping.c - Ping hosts by ARP requests/replies + * Licensed under GPLv2 or later, see file LICENSE in this source tree. * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. - * - * Author: Alexey Kuznetsov + * Author: Alexey Kuznetsov * Busybox port: Nick Fedchik */ +//usage:#define arping_trivial_usage +//usage: "[-fqbDUA] [-c CNT] [-w TIMEOUT] [-I IFACE] [-s SRC_IP] DST_IP" +//usage:#define arping_full_usage "\n\n" +//usage: "Send ARP requests/replies\n" +//usage: "\n -f Quit on first ARP reply" +//usage: "\n -q Quiet" +//usage: "\n -b Keep broadcasting, don't go unicast" +//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 Seconds to wait for ARP reply" +//usage: "\n -I IFACE Interface to use (default eth0)" +//usage: "\n -s SRC_IP Sender IP address" +//usage: "\n DST_IP Target IP address" + #include #include #include #include #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()) @@ -45,8 +60,8 @@ struct globals { unsigned received; unsigned brd_recv; unsigned req_recv; -}; -#define G (*(struct globals*)&bb_common_bufsiz1) +} FIX_ALIASING; +#define G (*(struct globals*)bb_common_bufsiz1) #define src (G.src ) #define dst (G.dst ) #define me (G.me ) @@ -62,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) @@ -148,7 +164,7 @@ static void catcher(void) alarm(1); } -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; unsigned char *p = (unsigned char *) (ah + 1); @@ -167,33 +183,33 @@ static bool recv_pack(unsigned char *buf, int len, struct sockaddr_ll *FROM) if (FROM->sll_pkttype != PACKET_HOST && FROM->sll_pkttype != PACKET_BROADCAST && FROM->sll_pkttype != PACKET_MULTICAST) - return false; + return; - /* Only these types are recognised */ + /* 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. */ if (ah->ar_pro != htons(ETH_P_IP) || (ah->ar_pln != 4) || (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); move_from_unaligned32(dst_ip.s_addr, p + ah->ar_hln + 4 + ah->ar_hln); 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: src_ip = 0 (or some src) @@ -210,34 +226,37 @@ static bool recv_pack(unsigned char *buf, int len, struct sockaddr_ll *FROM) */ 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)); 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(stdout); + fflush_all(); } received++; if (FROM->sll_pkttype != PACKET_HOST) @@ -250,7 +269,6 @@ static bool recv_pack(unsigned char *buf, int len, struct sockaddr_ll *FROM) memcpy(he.sll_addr, p, me.sll_halen); option_mask32 |= UNICASTING; } - return true; } int arping_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; @@ -270,7 +288,6 @@ int arping_main(int argc UNUSED_PARAM, char **argv) // Need to remove SUID_NEVER from applets.h for this to work //xsetuid(getuid()); - err_str = xasprintf("interface %s %%s", device); { unsigned opt; char *str_timeout; @@ -278,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; @@ -288,7 +305,7 @@ int arping_main(int argc UNUSED_PARAM, char **argv) } target = argv[optind]; - + err_str = xasprintf("interface %s %%s", device); xfunc_error_retval = 2; { @@ -345,12 +362,13 @@ 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) - 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)); - if (getsockname(probe_fd, (struct sockaddr *) &saddr, &alen) == -1) { - bb_perror_msg_and_die("getsockname"); - } + getsockname(probe_fd, (struct sockaddr *) &saddr, &alen); + //never happens: + //if (getsockname(probe_fd, (struct sockaddr *) &saddr, &alen) == -1) + // bb_perror_msg_and_die("getsockname"); if (saddr.sin_family != AF_INET) bb_error_msg_and_die("no IP address configured"); src = saddr.sin_addr; @@ -365,10 +383,10 @@ int arping_main(int argc UNUSED_PARAM, char **argv) { socklen_t alen = sizeof(me); - - if (getsockname(sock_fd, (struct sockaddr *) &me, &alen) == -1) { - bb_perror_msg_and_die("getsockname"); - } + getsockname(sock_fd, (struct sockaddr *) &me, &alen); + //never happens: + //if (getsockname(sock_fd, (struct sockaddr *) &me, &alen) == -1) + // bb_perror_msg_and_die("getsockname"); } if (me.sll_halen == 0) { bb_error_msg(err_str, "is not ARPable (no ll address)");