X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=networking%2Farp.c;h=278f2dc9a3b04d7fda86beeedd244ab1000d05f5;hb=074e8dcba76ac2a313d6a14ca2289e648f926b25;hp=6bd12656a6521d62248e10021c227a92537bc064;hpb=681f183b9408c877e78b2fe538fd6264c0a7493d;p=oweals%2Fbusybox.git diff --git a/networking/arp.c b/networking/arp.c index 6bd12656a..278f2dc9a 100644 --- a/networking/arp.c +++ b/networking/arp.c @@ -13,7 +13,7 @@ * modified for getopt32 by Arne Bernin */ -#include "busybox.h" +#include "libbb.h" #include "inet_common.h" #include @@ -27,44 +27,56 @@ #define DFLT_AF "inet" #define DFLT_HW "ether" -#define _PATH_PROCNET_ARP "/proc/net/arp" - -#define ARP_OPT_A (0x1) -#define ARP_OPT_p (0x2) -#define ARP_OPT_H (0x4) -#define ARP_OPT_t (0x8) -#define ARP_OPT_i (0x10) -#define ARP_OPT_a (0x20) -#define ARP_OPT_d (0x40) -#define ARP_OPT_n (0x80) /* do not resolve addresses */ -#define ARP_OPT_D (0x100) /* HW-address is devicename */ -#define ARP_OPT_s (0x200) -#define ARP_OPT_v (0x400 * DEBUG) /* debugging output flag */ - - -static const struct aftype *ap; /* current address family */ -static const struct hwtype *hw; /* current hardware type */ -static int sockfd; /* active socket descriptor */ -static smallint hw_set; /* flag if hw-type was set (-H) */ -static char *device = ""; /* current device */ - -static const char *const options[] = { - "pub", - "priv", - "temp", - "trail", - "dontpub", - "auto", - "dev", - "netmask", - NULL +enum { + ARP_OPT_A = (1 << 0), + ARP_OPT_p = (1 << 1), + ARP_OPT_H = (1 << 2), + ARP_OPT_t = (1 << 3), + ARP_OPT_i = (1 << 4), + ARP_OPT_a = (1 << 5), + ARP_OPT_d = (1 << 6), + ARP_OPT_n = (1 << 7), /* do not resolve addresses */ + ARP_OPT_D = (1 << 8), /* HW-address is devicename */ + ARP_OPT_s = (1 << 9), + ARP_OPT_v = (1 << 10) * DEBUG, /* debugging output flag */ }; +enum { + sockfd = 3, /* active socket descriptor */ +}; + +struct globals { + const struct aftype *ap; /* current address family */ + const struct hwtype *hw; /* current hardware type */ + const char *device; /* current device */ + smallint hw_set; /* flag if hw-type was set (-H) */ + +}; +#define G (*(struct globals*)&bb_common_bufsiz1) +#define ap (G.ap ) +#define hw (G.hw ) +#define device (G.device ) +#define hw_set (G.hw_set ) +#define INIT_G() do { \ + device = ""; \ +} while (0) + + +static const char options[] ALIGN1 = + "pub\0" + "priv\0" + "temp\0" + "trail\0" + "dontpub\0" + "auto\0" + "dev\0" + "netmask\0"; + /* Delete an entry from the ARP cache. */ /* Called only from main, once */ static int arp_del(char **args) { - char host[128]; + char *host; struct arpreq req; struct sockaddr sa; int flags = 0; @@ -73,8 +85,8 @@ static int arp_del(char **args) memset(&req, 0, sizeof(req)); /* Resolve the host name. */ - safe_strncpy(host, *args, 128); - if (ap->input(0, host, &sa) < 0) { + host = *args; + if (ap->input(host, &sa) < 0) { bb_herror_msg_and_die("%s", host); } @@ -87,7 +99,7 @@ static int arp_del(char **args) req.arp_flags = ATF_PERM; args++; while (*args != NULL) { - switch (index_in_str_array(options, *args)) { + switch (index_in_strings(options, *args)) { case 0: /* "pub" */ flags |= 1; args++; @@ -130,8 +142,8 @@ static int arp_del(char **args) if (*++args == NULL) bb_show_usage(); if (strcmp(*args, "255.255.255.255") != 0) { - safe_strncpy(host, *args, 128); - if (ap->input(0, host, &sa) < 0) { + host = *args; + if (ap->input(host, &sa) < 0) { bb_herror_msg_and_die("%s", host); } memcpy(&req.arp_netmask, &sa, sizeof(struct sockaddr)); @@ -190,9 +202,8 @@ static void arp_getdevhw(char *ifname, struct sockaddr *sa, const struct hwtype *xhw; strcpy(ifr.ifr_name, ifname); - if (ioctl(sockfd, SIOCGIFHWADDR, &ifr) < 0) { - bb_perror_msg_and_die("cant get HW-Address for '%s'", ifname); - } + ioctl_or_perror_and_die(sockfd, SIOCGIFHWADDR, &ifr, + "cant get HW-Address for '%s'", ifname); if (hwt && (ifr.ifr_hwaddr.sa_family != hw->type)) { bb_error_msg_and_die("protocol type mismatch"); } @@ -205,7 +216,7 @@ static void arp_getdevhw(char *ifname, struct sockaddr *sa, } bb_error_msg("device '%s' has HW address %s '%s'", ifname, xhw->name, - xhw->print((char *) &ifr.ifr_hwaddr.sa_data)); + xhw->print((unsigned char *) &ifr.ifr_hwaddr.sa_data)); } } @@ -213,15 +224,15 @@ static void arp_getdevhw(char *ifname, struct sockaddr *sa, /* Called only from main, once */ static int arp_set(char **args) { - char host[128]; + char *host; struct arpreq req; struct sockaddr sa; int flags; memset(&req, 0, sizeof(req)); - safe_strncpy(host, *args++, 128); - if (ap->input(0, host, &sa) < 0) { + host = *args++; + if (ap->input(host, &sa) < 0) { bb_herror_msg_and_die("%s", host); } /* If a host has more than one address, use the correct one! */ @@ -242,7 +253,7 @@ static int arp_set(char **args) /* Check out any modifiers. */ flags = ATF_PERM | ATF_COM; while (*args != NULL) { - switch (index_in_str_array(options, *args)) { + switch (index_in_strings(options, *args)) { case 0: /* "pub" */ flags |= ATF_PUBL; args++; @@ -285,8 +296,8 @@ static int arp_set(char **args) if (*++args == NULL) bb_show_usage(); if (strcmp(*args, "255.255.255.255") != 0) { - safe_strncpy(host, *args++, 128); - if (ap->input(0, host, &sa) < 0) { + host = *args; + if (ap->input(host, &sa) < 0) { bb_herror_msg_and_die("%s", host); } memcpy(&req.arp_netmask, &sa, sizeof(struct sockaddr)); @@ -308,18 +319,36 @@ static int arp_set(char **args) /* Call the kernel. */ if (option_mask32 & ARP_OPT_v) bb_error_msg("SIOCSARP()"); - if (ioctl(sockfd, SIOCSARP, &req) < 0) { - bb_perror_msg_and_die("SIOCSARP"); - } + xioctl(sockfd, SIOCSARP, &req); return 0; } /* Print the contents of an ARP request block. */ static void -arp_disp(char *name, char *ip, int type, int arp_flags, +arp_disp(const char *name, char *ip, int type, int arp_flags, char *hwa, char *mask, char *dev) { + static const int arp_masks[] = { + ATF_PERM, ATF_PUBL, +#ifdef HAVE_ATF_MAGIC + ATF_MAGIC, +#endif +#ifdef HAVE_ATF_DONTPUB + ATF_DONTPUB, +#endif + ATF_USETRAILERS, + }; + static const char arp_labels[] ALIGN1 = "PERM\0""PUP\0" +#ifdef HAVE_ATF_MAGIC + "AUTO\0" +#endif +#ifdef HAVE_ATF_DONTPUB + "DONTPUB\0" +#endif + "TRAIL\0" + ; + const struct hwtype *xhw; xhw = get_hwntype(type); @@ -340,132 +369,122 @@ arp_disp(char *name, char *ip, int type, int arp_flags, if (arp_flags & ATF_NETMASK) printf("netmask %s ", mask); - if (arp_flags & ATF_PERM) - printf("PERM "); - if (arp_flags & ATF_PUBL) - printf("PUP "); -#ifdef HAVE_ATF_MAGIC - if (arp_flags & ATF_MAGIC) - printf("AUTO "); -#endif -#ifdef HAVE_ATF_DONTPUB - if (arp_flags & ATF_DONTPUB) - printf("DONTPUB "); -#endif - if (arp_flags & ATF_USETRAILERS) - printf("TRAIL "); - - printf("on %s\n", dev); + print_flags_separated(arp_masks, arp_labels, arp_flags, " "); + printf(" on %s\n", dev); } /* Display the contents of the ARP cache in the kernel. */ /* Called only from main, once */ static int arp_show(char *name) { - char host[100]; + const char *host; + const char *hostname; + FILE *fp; struct sockaddr sa; - char ip[100]; - char hwa[100]; - char mask[100]; - char line[200]; - char dev[100]; int type, flags; - FILE *fp; - char *hostname; int num; unsigned entries = 0, shown = 0; + char ip[128]; + char hwa[128]; + char mask[128]; + char line[128]; + char dev[128]; - host[0] = '\0'; - + host = NULL; if (name != NULL) { /* Resolve the host name. */ - safe_strncpy(host, name, (sizeof host)); - if (ap->input(0, host, &sa) < 0) { - bb_herror_msg_and_die("%s", host); + if (ap->input(name, &sa) < 0) { + bb_herror_msg_and_die("%s", name); } - safe_strncpy(host, ap->sprint(&sa, 1), sizeof(host)); + host = xstrdup(ap->sprint(&sa, 1)); } - /* Open the PROCps kernel table. */ - fp = xfopen(_PATH_PROCNET_ARP, "r"); - /* Bypass header -- read until newline */ - if (fgets(line, sizeof(line), fp) != (char *) NULL) { + fp = xfopen_for_read("/proc/net/arp"); + /* Bypass header -- read one line */ + fgets(line, sizeof(line), fp); + + /* Read the ARP cache entries. */ + while (fgets(line, sizeof(line), fp)) { + mask[0] = '-'; mask[1] = '\0'; dev[0] = '-'; dev[1] = '\0'; - /* Read the ARP cache entries. */ - for (; fgets(line, sizeof(line), fp);) { - num = sscanf(line, "%s 0x%x 0x%x %100s %100s %100s\n", - ip, &type, &flags, hwa, mask, dev); - if (num < 4) - break; - - entries++; - /* if the user specified hw-type differs, skip it */ - if (hw_set && (type != hw->type)) - continue; - - /* if the user specified address differs, skip it */ - if (host[0] && strcmp(ip, host) != 0) - continue; - - /* if the user specified device differs, skip it */ - if (device[0] && strcmp(dev, device) != 0) - continue; - - shown++; - /* This IS ugly but it works -be */ - if (option_mask32 & ARP_OPT_n) - hostname = "?"; - else { - if (ap->input(0, ip, &sa) < 0) - hostname = ip; - else - hostname = ap->sprint(&sa, (option_mask32 & ARP_OPT_n) | 0x8000); - if (strcmp(hostname, ip) == 0) - hostname = "?"; - } + /* All these strings can't overflow + * because fgets above reads limited amount of data */ + num = sscanf(line, "%s 0x%x 0x%x %s %s %s\n", + ip, &type, &flags, hwa, mask, dev); + if (num < 4) + break; - arp_disp(hostname, ip, type, flags, hwa, mask, dev); + entries++; + /* if the user specified hw-type differs, skip it */ + if (hw_set && (type != hw->type)) + continue; + + /* if the user specified address differs, skip it */ + if (host && strcmp(ip, host) != 0) + continue; + + /* if the user specified device differs, skip it */ + if (device[0] && strcmp(dev, device) != 0) + continue; + + shown++; + /* This IS ugly but it works -be */ + hostname = "?"; + if (!(option_mask32 & ARP_OPT_n)) { + if (ap->input(ip, &sa) < 0) + hostname = ip; + else + hostname = ap->sprint(&sa, (option_mask32 & ARP_OPT_n) | 0x8000); + if (strcmp(hostname, ip) == 0) + hostname = "?"; } + + arp_disp(hostname, ip, type, flags, hwa, mask, dev); } if (option_mask32 & ARP_OPT_v) printf("Entries: %d\tSkipped: %d\tFound: %d\n", entries, entries - shown, shown); if (!shown) { - if (hw_set || host[0] || device[0]) + if (hw_set || host || device[0]) printf("No match found in %d entries\n", entries); } - - fclose(fp); - + if (ENABLE_FEATURE_CLEAN_UP) { + free((char*)host); + fclose(fp); + } return 0; } -int arp_main(int argc, char **argv) +int arp_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; +int arp_main(int argc UNUSED_PARAM, char **argv) { - char *hw_type; - char *protocol; + const char *hw_type = "ether"; + const char *protocol; + unsigned opts; + + INIT_G(); - /* Initialize variables... */ + xmove_fd(xsocket(AF_INET, SOCK_DGRAM, 0), sockfd); ap = get_aftype(DFLT_AF); if (!ap) bb_error_msg_and_die("%s: %s not supported", DFLT_AF, "address family"); - getopt32(argc, argv, "A:p:H:t:i:adnDsv", &protocol, &protocol, + opts = getopt32(argv, "A:p:H:t:i:adnDsv", &protocol, &protocol, &hw_type, &hw_type, &device); argv += optind; - if (option_mask32 & ARP_OPT_A || option_mask32 & ARP_OPT_p) { + if (opts & (ARP_OPT_A | ARP_OPT_p)) { ap = get_aftype(protocol); if (ap == NULL) bb_error_msg_and_die("%s: unknown %s", protocol, "address family"); } - if (option_mask32 & ARP_OPT_A || option_mask32 & ARP_OPT_p) { + if (opts & (ARP_OPT_A | ARP_OPT_p)) { hw = get_hwtype(hw_type); if (hw == NULL) bb_error_msg_and_die("%s: unknown %s", hw_type, "hardware type"); hw_set = 1; } - //if (option_mask32 & ARP_OPT_i)... -i + //if (opts & ARP_OPT_i)... -i if (ap->af != AF_INET) { bb_error_msg_and_die("%s: kernel only supports 'inet'", ap->name); @@ -482,16 +501,15 @@ int arp_main(int argc, char **argv) bb_error_msg_and_die("%s: %s without ARP support", hw->name, "hardware type"); } - sockfd = xsocket(AF_INET, SOCK_DGRAM, 0); /* Now see what we have to do here... */ - if (option_mask32 & (ARP_OPT_d|ARP_OPT_s)) { + if (opts & (ARP_OPT_d | ARP_OPT_s)) { if (argv[0] == NULL) bb_error_msg_and_die("need host name"); - if (option_mask32 & ARP_OPT_s) + if (opts & ARP_OPT_s) return arp_set(argv); return arp_del(argv); } - //if (option_mask32 & ARP_OPT_a) - default + //if (opts & ARP_OPT_a) - default return arp_show(argv[0]); }