X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=networking%2Farping.c;h=dbfd75ef52da712393cca1c81c13d8cb31a84560;hb=16aa7a73c40ba5dfaabaedb8a5533619cb8b6cb6;hp=6383f9a88e9771ba22431c3b01e0242f8dbc067f;hpb=a09300a88c68f72bae2a4f25bb0f8620e560832c;p=oweals%2Fbusybox.git diff --git a/networking/arping.c b/networking/arping.c index 6383f9a88..dbfd75ef5 100644 --- a/networking/arping.c +++ b/networking/arping.c @@ -1,13 +1,27 @@ /* 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 Duplicated address detection mode" +//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 -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 @@ -45,7 +59,7 @@ struct globals { unsigned received; unsigned brd_recv; unsigned req_recv; -}; +} FIX_ALIASING; #define G (*(struct globals*)&bb_common_bufsiz1) #define src (G.src ) #define dst (G.dst ) @@ -61,10 +75,16 @@ struct globals { #define received (G.received ) #define brd_recv (G.brd_recv ) #define req_recv (G.req_recv ) -#define INIT_G() \ - do { \ - count = -1; \ - } while (0) +#define INIT_G() do { \ + count = -1; \ +} while (0) + +// If GNUisms are not available... +//static void *mempcpy(void *_dst, const void *_src, int n) +//{ +// memcpy(_dst, _src, n); +// return (char*)_dst + n; +//} static int send_pack(struct in_addr *src_addr, struct in_addr *dst_addr, struct sockaddr_ll *ME, @@ -75,27 +95,21 @@ static int send_pack(struct in_addr *src_addr, struct arphdr *ah = (struct arphdr *) buf; unsigned char *p = (unsigned char *) (ah + 1); - ah->ar_hrd = htons(ME->sll_hatype); ah->ar_hrd = htons(ARPHRD_ETHER); ah->ar_pro = htons(ETH_P_IP); ah->ar_hln = ME->sll_halen; ah->ar_pln = 4; ah->ar_op = option_mask32 & ADVERT ? htons(ARPOP_REPLY) : htons(ARPOP_REQUEST); - memcpy(p, &ME->sll_addr, ah->ar_hln); - p += ME->sll_halen; - - memcpy(p, src_addr, 4); - p += 4; + p = mempcpy(p, &ME->sll_addr, ah->ar_hln); + p = mempcpy(p, src_addr, 4); if (option_mask32 & ADVERT) - memcpy(p, &ME->sll_addr, ah->ar_hln); + p = mempcpy(p, &ME->sll_addr, ah->ar_hln); else - memcpy(p, &HE->sll_addr, ah->ar_hln); - p += ah->ar_hln; + p = mempcpy(p, &HE->sll_addr, ah->ar_hln); - memcpy(p, dst_addr, 4); - p += 4; + p = mempcpy(p, dst_addr, 4); err = sendto(sock_fd, buf, p - buf, 0, (struct sockaddr *) HE, sizeof(*HE)); if (err == p - buf) { @@ -107,7 +121,7 @@ static int send_pack(struct in_addr *src_addr, return err; } -static void finish(void) ATTRIBUTE_NORETURN; +static void finish(void) NORETURN; static void finish(void) { if (!(option_mask32 & QUIET)) { @@ -121,7 +135,7 @@ static void finish(void) if (option_mask32 & DAD) exit(!!received); if (option_mask32 & UNSOLICITED) - exit(0); + exit(EXIT_SUCCESS); exit(!received); } @@ -148,45 +162,52 @@ static void catcher(void) alarm(1); } -static int recv_pack(unsigned char *buf, int len, struct sockaddr_ll *FROM) +static bool recv_pack(unsigned char *buf, int len, struct sockaddr_ll *FROM) { struct arphdr *ah = (struct arphdr *) buf; unsigned char *p = (unsigned char *) (ah + 1); struct in_addr src_ip, dst_ip; + /* moves below assume in_addr is 4 bytes big, ensure that */ + struct BUG_in_addr_must_be_4 { + char BUG_in_addr_must_be_4[ + sizeof(struct in_addr) == 4 ? 1 : -1 + ]; + char BUG_s_addr_must_be_4[ + sizeof(src_ip.s_addr) == 4 ? 1 : -1 + ]; + }; /* Filter out wild packets */ if (FROM->sll_pkttype != PACKET_HOST && FROM->sll_pkttype != PACKET_BROADCAST && FROM->sll_pkttype != PACKET_MULTICAST) - return 0; + return false; - /* Only these types are recognised */ + /* Only these types are recognized */ if (ah->ar_op != htons(ARPOP_REQUEST) && ah->ar_op != htons(ARPOP_REPLY)) - return 0; + return false; /* 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 0; + return false; /* Protocol must be IP. */ - if (ah->ar_pro != htons(ETH_P_IP)) - return 0; - if (ah->ar_pln != 4) - return 0; - if (ah->ar_hln != me.sll_halen) - return 0; - if (len < sizeof(*ah) + 2 * (4 + ah->ar_hln)) - return 0; - memcpy(&src_ip, p + ah->ar_hln, 4); - memcpy(&dst_ip, p + ah->ar_hln + 4 + ah->ar_hln, 4); + 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; + + 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; if (!(option_mask32 & DAD)) { - if (dst.s_addr != src_ip.s_addr) - return 0; - if (src.s_addr != dst_ip.s_addr) - return 0; - if (memcmp(p + ah->ar_hln + 4, &me.sll_addr, ah->ar_hln)) - return 0; + if ((src.s_addr != dst_ip.s_addr) + || (memcmp(p + ah->ar_hln + 4, &me.sll_addr, ah->ar_hln))) + return false; } else { /* DAD packet was: src_ip = 0 (or some src) @@ -201,12 +222,9 @@ static int recv_pack(unsigned char *buf, int len, struct sockaddr_ll *FROM) also that it matches to dst_ip, otherwise dst_ip/dst_hw do not matter. */ - if (src_ip.s_addr != dst.s_addr) - return 0; - if (memcmp(p, &me.sll_addr, me.sll_halen) == 0) - return 0; - if (src.s_addr && src.s_addr != dst_ip.s_addr) - return 0; + if ((memcmp(p, &me.sll_addr, me.sll_halen) == 0) + || (src.s_addr && src.s_addr != dst_ip.s_addr)) + return false; } if (!(option_mask32 & QUIET)) { int s_printed = 0; @@ -233,7 +251,7 @@ static int recv_pack(unsigned char *buf, int len, struct sockaddr_ll *FROM) } else { printf(" UNSOLICITED?\n"); } - fflush(stdout); + fflush_all(); } received++; if (FROM->sll_pkttype != PACKET_HOST) @@ -246,16 +264,17 @@ static int recv_pack(unsigned char *buf, int len, struct sockaddr_ll *FROM) memcpy(he.sll_addr, p, me.sll_halen); option_mask32 |= UNICASTING; } - return 1; + return true; } int arping_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; -int arping_main(int argc, char **argv) +int arping_main(int argc UNUSED_PARAM, char **argv) { const char *device = "eth0"; char *source = NULL; char *target; unsigned char *packet; + char *err_str; INIT_G(); @@ -267,16 +286,14 @@ int arping_main(int argc, char **argv) { unsigned opt; - char *str_count, *str_timeout; + char *str_timeout; /* Dad also sets quit_on_reply. * Advert also sets unsolicited. */ - opt_complementary = "=1:Df:AU"; + opt_complementary = "=1:Df:AU:c+"; opt = getopt32(argv, "DUAqfbc:w:I:s:", - &str_count, &str_timeout, &device, &source); - if (opt & 0x40) /* -c: count */ - count = xatoi_u(str_count); + &count, &str_timeout, &device, &source); if (opt & 0x80) /* -w: timeout */ timeout_us = xatou_range(str_timeout, 0, INT_MAX/2000000) * 1000000 + 500000; //if (opt & 0x200) /* -s: source */ @@ -284,26 +301,26 @@ int arping_main(int argc, char **argv) } target = argv[optind]; - + err_str = xasprintf("interface %s %%s", device); xfunc_error_retval = 2; { struct ifreq ifr; memset(&ifr, 0, sizeof(ifr)); - strncpy(ifr.ifr_name, device, sizeof(ifr.ifr_name) - 1); + strncpy_IFNAMSIZ(ifr.ifr_name, device); /* We use ifr.ifr_name in error msg so that problem * with truncated name will be visible */ - ioctl_or_perror_and_die(sock_fd, SIOCGIFINDEX, &ifr, "interface %s not found", ifr.ifr_name); + ioctl_or_perror_and_die(sock_fd, SIOCGIFINDEX, &ifr, err_str, "not found"); me.sll_ifindex = ifr.ifr_ifindex; xioctl(sock_fd, SIOCGIFFLAGS, (char *) &ifr); if (!(ifr.ifr_flags & IFF_UP)) { - bb_error_msg_and_die("interface %s is down", device); + bb_error_msg_and_die(err_str, "is down"); } if (ifr.ifr_flags & (IFF_NOARP | IFF_LOOPBACK)) { - bb_error_msg("interface %s is not ARPable", device); + bb_error_msg(err_str, "is not ARPable"); return (option_mask32 & DAD ? 0 : 2); } } @@ -311,7 +328,7 @@ int arping_main(int argc, char **argv) /* if (!inet_aton(target, &dst)) - not needed */ { len_and_sockaddr *lsa; lsa = xhost_and_af2sockaddr(target, 0, AF_INET); - memcpy(&dst, &lsa->sin.sin_addr.s_addr, 4); + dst = lsa->u.sin.sin_addr; if (ENABLE_FEATURE_CLEAN_UP) free(lsa); } @@ -327,8 +344,7 @@ int arping_main(int argc, char **argv) struct sockaddr_in saddr; int probe_fd = xsocket(AF_INET, SOCK_DGRAM, 0); - if (setsockopt(probe_fd, SOL_SOCKET, SO_BINDTODEVICE, device, strlen(device) + 1) == -1) - bb_perror_msg("cannot bind to device %s", device); + setsockopt_bindtodevice(probe_fd, device); memset(&saddr, 0, sizeof(saddr)); saddr.sin_family = AF_INET; if (src.s_addr) { @@ -345,9 +361,10 @@ int arping_main(int argc, char **argv) if (setsockopt(probe_fd, SOL_SOCKET, SO_DONTROUTE, &const_int_1, sizeof(const_int_1)) == -1) bb_perror_msg("setsockopt(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; @@ -362,13 +379,13 @@ int arping_main(int argc, 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("interface %s is not ARPable (no ll address)", device); + bb_error_msg(err_str, "is not ARPable (no ll address)"); return (option_mask32 & DAD ? 0 : 2); } he = me; @@ -380,18 +397,8 @@ int arping_main(int argc, char **argv) printf(" from %s via %s\n", inet_ntoa(src), device); } - { - struct sigaction sa; - - memset(&sa, 0, sizeof(sa)); - sa.sa_flags = SA_RESTART; - - sa.sa_handler = (void (*)(int)) finish; - sigaction(SIGINT, &sa, NULL); - - sa.sa_handler = (void (*)(int)) catcher; - sigaction(SIGALRM, &sa, NULL); - } + signal_SA_RESTART_empty_mask(SIGINT, (void (*)(int))finish); + signal_SA_RESTART_empty_mask(SIGALRM, (void (*)(int))catcher); catcher();