X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=networking%2Finterface.c;h=04d12b37e4e6695afeb2eebd9ede04dd0e0fe347;hb=17db1a9ac1064a4847fd6a381260c68ab3449951;hp=8784522369a780f2a55c23b7c3c8191dfa11e104;hpb=e2e56c7c4129de7d20df42e8239fd304c81ef29b;p=oweals%2Fbusybox.git diff --git a/networking/interface.c b/networking/interface.c index 878452236..04d12b37e 100644 --- a/networking/interface.c +++ b/networking/interface.c @@ -1,10 +1,10 @@ +/* vi: set sw=4 ts=4: */ /* * stolen from net-tools-1.59 and stripped down for busybox by * Erik Andersen * * Heavily modified by Manuel Novoa III Mar 12, 2001 * - * Pruned unused code using KEEP_UNUSED define. * Added print_bytes_scaled function to reduce code size. * Added some (potentially) missing defines. * Improved display support for -a and for a named interface. @@ -15,16 +15,11 @@ * that either displays or sets the characteristics of * one or more of the system's networking interfaces. * - * Version: $Id: interface.c,v 1.25 2004/08/26 21:45:21 andersen Exp $ * * Author: Fred N. van Kempen, * and others. Copyright 1993 MicroWalt Corporation * - * This program is free software; you can redistribute it - * and/or modify it under the terms of the GNU General - * Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at - * your option) any later version. + * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. * * Patched to support 'add' and 'del' keywords for INET(4) addresses * by Mrs. Brisby @@ -36,40 +31,12 @@ * (default AF was wrong) */ -/* #define KEEP_UNUSED */ - -/* - * - * Protocol Families. - * - */ -#define HAVE_AFINET 1 - -/* - * - * Device Hardware types. - * - */ -#define HAVE_HWETHER 1 -#define HAVE_HWPPP 1 -#undef HAVE_HWSLIP - - -#include "inet_common.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include #include #include -#include "busybox.h" +#include "inet_common.h" +#include "libbb.h" -#ifdef CONFIG_FEATURE_IPV6 +#if ENABLE_FEATURE_IPV6 # define HAVE_AFINET6 1 #else # undef HAVE_AFINET6 @@ -77,13 +44,8 @@ #define _PATH_PROCNET_DEV "/proc/net/dev" #define _PATH_PROCNET_IFINET6 "/proc/net/if_inet6" -#define new(p) ((p) = xcalloc(1,sizeof(*(p)))) - -#ifdef HAVE_HWSLIP -#include -#endif -#if HAVE_AFINET6 +#ifdef HAVE_AFINET6 #ifndef _LINUX_IN6_H /* @@ -98,7 +60,7 @@ struct in6_ifreq { #endif -#endif /* HAVE_AFINET6 */ +#endif /* HAVE_AFINET6 */ /* Defines for glibc2.0 users. */ #ifndef SIOCSIFTXQLEN @@ -119,175 +81,65 @@ struct in6_ifreq { #define IFF_DYNAMIC 0x8000 /* dialup device with changing addresses */ #endif -/* This structure defines protocol families and their handlers. */ -struct aftype { - const char *name; - const char *title; - int af; - int alen; - char *(*print) (unsigned char *); - char *(*sprint) (struct sockaddr *, int numeric); - int (*input) (int type, char *bufp, struct sockaddr *); - void (*herror) (char *text); - int (*rprint) (int options); - int (*rinput) (int typ, int ext, char **argv); - - /* may modify src */ - int (*getmask) (char *src, struct sockaddr * mask, char *name); - - int fd; - char *flag_file; -}; - -#ifdef KEEP_UNUSED - -static int flag_unx; -static int flag_inet; - -static struct aftrans_t { - char *alias; - char *name; - int *flag; -} aftrans[] = { - - { - "ip", "inet", &flag_inet}, -#ifdef HAVE_AFINET6 - { - "ip6", "inet6", &flag_inet6}, -#endif - { - "inet", "inet", &flag_inet}, -#ifdef HAVE_AFINET6 - { - "inet6", "inet6", &flag_inet6}, -#endif - { - "unix", "unix", &flag_unx}, { - "tcpip", "inet", &flag_inet}, - { - 0, 0, 0} -}; - -static char afname[256] = ""; -#endif /* KEEP_UNUSED */ - -#if HAVE_AFUNIX - -/* Display a UNIX domain address. */ -static char *UNIX_print(unsigned char *ptr) -{ - return (ptr); -} - - -/* Display a UNIX domain address. */ -static char *UNIX_sprint(struct sockaddr *sap, int numeric) -{ - static char buf[64]; - - if (sap->sa_family == 0xFFFF || sap->sa_family == 0) - return safe_strncpy(buf, _("[NONE SET]"), sizeof(buf)); - return (UNIX_print(sap->sa_data)); -} - - -static struct aftype unix_aftype = { - "unix", "UNIX Domain", AF_UNIX, 0, - UNIX_print, UNIX_sprint, NULL, NULL, - NULL, NULL, NULL, - -1, - "/proc/net/unix" -}; -#endif /* HAVE_AFUNIX */ - -#if HAVE_AFINET - -#ifdef KEEP_UNUSED -static void INET_reserror(char *text) -{ - herror(text); -} - -/* Display an Internet socket address. */ -static char *INET_print(unsigned char *ptr) -{ - return (inet_ntoa((*(struct in_addr *) ptr))); -} -#endif /* KEEP_UNUSED */ - /* Display an Internet socket address. */ -static char *INET_sprint(struct sockaddr *sap, int numeric) +static const char *INET_sprint(struct sockaddr *sap, int numeric) { - static char buff[128]; + static char *buff; + free(buff); if (sap->sa_family == 0xFFFF || sap->sa_family == 0) - return safe_strncpy(buff, _("[NONE SET]"), sizeof(buff)); - - if (INET_rresolve(buff, sizeof(buff), (struct sockaddr_in *) sap, - numeric, 0xffffff00) != 0) - return (NULL); - - return (buff); -} - -#ifdef KEEP_UNUSED -static char *INET_sprintmask(struct sockaddr *sap, int numeric, - unsigned int netmask) -{ - static char buff[128]; - - if (sap->sa_family == 0xFFFF || sap->sa_family == 0) - return safe_strncpy(buff, _("[NONE SET]"), sizeof(buff)); - if (INET_rresolve(buff, sizeof(buff), (struct sockaddr_in *) sap, - numeric, netmask) != 0) - return (NULL); - return (buff); + return "[NONE SET]"; + buff = INET_rresolve((struct sockaddr_in *) sap, numeric, 0xffffff00); + return buff; } +#ifdef UNUSED_AND_BUGGY static int INET_getsock(char *bufp, struct sockaddr *sap) { char *sp = bufp, *bp; unsigned int i; unsigned val; - struct sockaddr_in *sin; + struct sockaddr_in *sock_in; - sin = (struct sockaddr_in *) sap; - sin->sin_family = AF_INET; - sin->sin_port = 0; + sock_in = (struct sockaddr_in *) sap; + sock_in->sin_family = AF_INET; + sock_in->sin_port = 0; val = 0; bp = (char *) &val; - for (i = 0; i < sizeof(sin->sin_addr.s_addr); i++) { + for (i = 0; i < sizeof(sock_in->sin_addr.s_addr); i++) { *sp = toupper(*sp); - if ((*sp >= 'A') && (*sp <= 'F')) - bp[i] |= (int) (*sp - 'A') + 10; - else if ((*sp >= '0') && (*sp <= '9')) + if ((unsigned)(*sp - 'A') <= 5) + bp[i] |= (int) (*sp - ('A' - 10)); + else if (isdigit(*sp)) bp[i] |= (int) (*sp - '0'); else - return (-1); + return -1; bp[i] <<= 4; sp++; *sp = toupper(*sp); - if ((*sp >= 'A') && (*sp <= 'F')) - bp[i] |= (int) (*sp - 'A') + 10; - else if ((*sp >= '0') && (*sp <= '9')) + if ((unsigned)(*sp - 'A') <= 5) + bp[i] |= (int) (*sp - ('A' - 10)); + else if (isdigit(*sp)) bp[i] |= (int) (*sp - '0'); else - return (-1); + return -1; sp++; } - sin->sin_addr.s_addr = htonl(val); + sock_in->sin_addr.s_addr = htonl(val); return (sp - bufp); } +#endif -static int INET_input(int type, char *bufp, struct sockaddr *sap) +static int INET_input(/*int type,*/ const char *bufp, struct sockaddr *sap) { + return INET_resolve(bufp, (struct sockaddr_in *) sap, 0); +/* switch (type) { case 1: return (INET_getsock(bufp, sap)); @@ -296,76 +148,34 @@ static int INET_input(int type, char *bufp, struct sockaddr *sap) default: return (INET_resolve(bufp, (struct sockaddr_in *) sap, 0)); } +*/ } -static int INET_getnetmask(char *adr, struct sockaddr *m, char *name) -{ - struct sockaddr_in *mask = (struct sockaddr_in *) m; - char *slash, *end; - int prefix; - - if ((slash = strchr(adr, '/')) == NULL) - return 0; - - *slash++ = '\0'; - prefix = strtoul(slash, &end, 0); - if (*end != '\0') - return -1; - - if (name) { - sprintf(name, "/%d", prefix); - } - mask->sin_family = AF_INET; - mask->sin_addr.s_addr = htonl(~(0xffffffffU >> prefix)); - return 1; -} -#endif /* KEEP_UNUSED */ - -static struct aftype inet_aftype = { - "inet", "DARPA Internet", AF_INET, sizeof(unsigned long), - NULL /* UNUSED INET_print */ , INET_sprint, - NULL /* UNUSED INET_input */ , NULL /* UNUSED INET_reserror */ , - NULL /*INET_rprint */ , NULL /*INET_rinput */ , - NULL /* UNUSED INET_getnetmask */ , - -1, - NULL +static const struct aftype inet_aftype = { + .name = "inet", + .title = "DARPA Internet", + .af = AF_INET, + .alen = 4, + .sprint = INET_sprint, + .input = INET_input, }; -#endif /* HAVE_AFINET */ - -#if HAVE_AFINET6 - -#ifdef KEEP_UNUSED -static void INET6_reserror(char *text) -{ - herror(text); -} - -/* Display an Internet socket address. */ -static char *INET6_print(unsigned char *ptr) -{ - static char name[80]; - - inet_ntop(AF_INET6, (struct in6_addr *) ptr, name, 80); - return name; -} -#endif /* KEEP_UNUSED */ +#ifdef HAVE_AFINET6 /* Display an Internet socket address. */ /* dirty! struct sockaddr usually doesn't suffer for inet6 addresses, fst. */ -static char *INET6_sprint(struct sockaddr *sap, int numeric) +static const char *INET6_sprint(struct sockaddr *sap, int numeric) { - static char buff[128]; + static char *buff; + free(buff); if (sap->sa_family == 0xFFFF || sap->sa_family == 0) - return safe_strncpy(buff, _("[NONE SET]"), sizeof(buff)); - if (INET6_rresolve - (buff, sizeof(buff), (struct sockaddr_in6 *) sap, numeric) != 0) - return safe_strncpy(buff, _("[UNKNOWN]"), sizeof(buff)); - return (buff); + return "[NONE SET]"; + buff = INET6_rresolve((struct sockaddr_in6 *) sap, numeric); + return buff; } -#ifdef KEEP_UNUSED +#ifdef UNUSED static int INET6_getsock(char *bufp, struct sockaddr *sap) { struct sockaddr_in6 *sin6; @@ -375,41 +185,46 @@ static int INET6_getsock(char *bufp, struct sockaddr *sap) sin6->sin6_port = 0; if (inet_pton(AF_INET6, bufp, sin6->sin6_addr.s6_addr) <= 0) - return (-1); + return -1; return 16; /* ?;) */ } +#endif -static int INET6_input(int type, char *bufp, struct sockaddr *sap) +static int INET6_input(/*int type,*/ const char *bufp, struct sockaddr *sap) { + return INET6_resolve(bufp, (struct sockaddr_in6 *) sap); +/* switch (type) { case 1: return (INET6_getsock(bufp, sap)); default: return (INET6_resolve(bufp, (struct sockaddr_in6 *) sap)); } +*/ } -#endif /* KEEP_UNUSED */ - -static struct aftype inet6_aftype = { - "inet6", "IPv6", AF_INET6, sizeof(struct in6_addr), - NULL /* UNUSED INET6_print */ , INET6_sprint, - NULL /* UNUSED INET6_input */ , NULL /* UNUSED INET6_reserror */ , - NULL /*INET6_rprint */ , NULL /*INET6_rinput */ , - NULL /* UNUSED INET6_getnetmask */ , - -1, - NULL + +static const struct aftype inet6_aftype = { + .name = "inet6", + .title = "IPv6", + .af = AF_INET6, + .alen = sizeof(struct in6_addr), + .sprint = INET6_sprint, + .input = INET6_input, }; -#endif /* HAVE_AFINET6 */ +#endif /* HAVE_AFINET6 */ /* Display an UNSPEC address. */ static char *UNSPEC_print(unsigned char *ptr) { - static char buff[sizeof(struct sockaddr) * 3 + 1]; + static char *buff; + char *pos; unsigned int i; + if (!buff); + buff = xmalloc(sizeof(struct sockaddr) * 3 + 1); pos = buff; for (i = 0; i < sizeof(struct sockaddr); i++) { /* careful -- not every libc's sprintf returns # bytes written */ @@ -418,145 +233,39 @@ static char *UNSPEC_print(unsigned char *ptr) } /* Erase trailing "-". Works as long as sizeof(struct sockaddr) != 0 */ *--pos = '\0'; - return (buff); + return buff; } /* Display an UNSPEC socket address. */ -static char *UNSPEC_sprint(struct sockaddr *sap, int numeric) +static const char *UNSPEC_sprint(struct sockaddr *sap, int numeric) { - static char buf[64]; - if (sap->sa_family == 0xFFFF || sap->sa_family == 0) - return safe_strncpy(buf, _("[NONE SET]"), sizeof(buf)); - return (UNSPEC_print((unsigned char *)sap->sa_data)); + return "[NONE SET]"; + return UNSPEC_print((unsigned char *)sap->sa_data); } -static struct aftype unspec_aftype = { - "unspec", "UNSPEC", AF_UNSPEC, 0, - UNSPEC_print, UNSPEC_sprint, NULL, NULL, - NULL, +static const struct aftype unspec_aftype = { + .name = "unspec", + .title = "UNSPEC", + .af = AF_UNSPEC, + .alen = 0, + .print = UNSPEC_print, + .sprint = UNSPEC_sprint, }; -static struct aftype * const aftypes[] = { -#if HAVE_AFUNIX - &unix_aftype, -#endif -#if HAVE_AFINET +static const struct aftype *const aftypes[] = { &inet_aftype, -#endif -#if HAVE_AFINET6 +#ifdef HAVE_AFINET6 &inet6_aftype, #endif &unspec_aftype, NULL }; -#ifdef KEEP_UNUSED -static short sVafinit = 0; - -static void afinit() -{ - unspec_aftype.title = _("UNSPEC"); -#if HAVE_AFUNIX - unix_aftype.title = _("UNIX Domain"); -#endif -#if HAVE_AFINET - inet_aftype.title = _("DARPA Internet"); -#endif -#if HAVE_AFINET6 - inet6_aftype.title = _("IPv6"); -#endif - sVafinit = 1; -} - -static int aftrans_opt(const char *arg) -{ - struct aftrans_t *paft; - char *tmp1, *tmp2; - char buf[256]; - - safe_strncpy(buf, arg, sizeof(buf)); - - tmp1 = buf; - - while (tmp1) { - - tmp2 = strchr(tmp1, ','); - - if (tmp2) - *(tmp2++) = '\0'; - - paft = aftrans; - for (paft = aftrans; paft->alias; paft++) { - if (strcmp(tmp1, paft->alias)) - continue; - if (strlen(paft->name) + strlen(afname) + 1 >= sizeof(afname)) { - bb_error_msg(_("Too many address family arguments.")); - return (0); - } - if (paft->flag) - (*paft->flag)++; - if (afname[0]) - strcat(afname, ","); - strcat(afname, paft->name); - break; - } - if (!paft->alias) { - bb_error_msg(_("Unknown address family `%s'."), tmp1); - return (1); - } - tmp1 = tmp2; - } - - return (0); -} - -/* set the default AF list from the program name or a constant value */ -static void aftrans_def(char *tool, char *argv0, char *dflt) -{ - char *tmp; - char *buf; - - strcpy(afname, dflt); - - if (!(tmp = strrchr(argv0, '/'))) - tmp = argv0; /* no slash?! */ - else - tmp++; - - if (!(buf = strdup(tmp))) - return; - - if (strlen(tool) >= strlen(tmp)) { - free(buf); - return; - } - tmp = buf + (strlen(tmp) - strlen(tool)); - - if (strcmp(tmp, tool) != 0) { - free(buf); - return; - } - *tmp = '\0'; - if ((tmp = strchr(buf, '_'))) - *tmp = '\0'; - - afname[0] = '\0'; - if (aftrans_opt(buf)) - strcpy(afname, buf); - - free(buf); -} - /* Check our protocol family table for this family. */ -static struct aftype *get_aftype(const char *name) +const struct aftype *get_aftype(const char *name) { - struct aftype * const *afp; - -#ifdef KEEP_UNUSED - if (!sVafinit) - afinit(); -#endif /* KEEP_UNUSED */ + const struct aftype *const *afp; afp = aftypes; while (*afp != NULL) { @@ -564,82 +273,23 @@ static struct aftype *get_aftype(const char *name) return (*afp); afp++; } - if (strchr(name, ',')) - bb_error_msg(_("Please don't supply more than one address family.")); - return (NULL); + return NULL; } -#endif /* KEEP_UNUSED */ /* Check our protocol family table for this family. */ -static struct aftype *get_afntype(int af) +static const struct aftype *get_afntype(int af) { - struct aftype * const *afp; - -#ifdef KEEP_UNUSED - if (!sVafinit) - afinit(); -#endif /* KEEP_UNUSED */ + const struct aftype *const *afp; afp = aftypes; while (*afp != NULL) { if ((*afp)->af == af) - return (*afp); + return *afp; afp++; } - return (NULL); + return NULL; } -/* Check our protocol family table for this family and return its socket */ -static int get_socket_for_af(int af) -{ - struct aftype * const *afp; - -#ifdef KEEP_UNUSED - if (!sVafinit) - afinit(); -#endif /* KEEP_UNUSED */ - - afp = aftypes; - while (*afp != NULL) { - if ((*afp)->af == af) - return (*afp)->fd; - afp++; - } - return -1; -} - -#ifdef KEEP_UNUSED -/* type: 0=all, 1=getroute */ -static void print_aflist(int type) -{ - int count = 0; - char *txt; - struct aftype * const *afp; - -#ifdef KEEP_UNUSED - if (!sVafinit) - afinit(); -#endif /* KEEP_UNUSED */ - - afp = aftypes; - while (*afp != NULL) { - if ((type == 1 && ((*afp)->rprint == NULL)) || ((*afp)->af == 0)) { - afp++; - continue; - } - if ((count % 3) == 0) - fprintf(stderr, count ? "\n " : " "); - txt = (*afp)->name; - if (!txt) - txt = ".."; - fprintf(stderr, "%s (%s) ", txt, _((*afp)->title)); - count++; - afp++; - } - fprintf(stderr, "\n"); -} -#endif /* KEEP_UNUSED */ - struct user_net_device_stats { unsigned long long rx_packets; /* total packets received */ unsigned long long tx_packets; /* total packets transmitted */ @@ -691,74 +341,15 @@ struct interface { }; -int interface_opt_a = 0; /* show all interfaces */ - -#ifdef KEEP_UNUSED -static int opt_i = 0; /* show the statistics */ -static int opt_v = 0; /* debugging output flag */ - -static int addr_family = 0; /* currently selected AF */ -#endif /* KEEP_UNUSED */ +smallint interface_opt_a; /* show all interfaces */ static struct interface *int_list, *int_last; -static int skfd = -1; /* generic raw socket desc. */ -static int sockets_open(int family) -{ - struct aftype * const *aft; - int sfd = -1; - static int force = -1; - - if (force < 0) { - force = 0; - if (get_linux_version_code() < KERNEL_VERSION(2,1,0)) - force = 1; - if (access("/proc/net", R_OK)) - force = 1; - } - for (aft = aftypes; *aft; aft++) { - struct aftype *af = *aft; - int type = SOCK_DGRAM; - - if (af->af == AF_UNSPEC) - continue; - if (family && family != af->af) - continue; - if (af->fd != -1) { - sfd = af->fd; - continue; - } - /* Check some /proc file first to not stress kmod */ - if (!family && !force && af->flag_file) { - if (access(af->flag_file, R_OK)) - continue; - } - af->fd = socket(af->af, type, 0); - if (af->fd >= 0) - sfd = af->fd; - } - if (sfd < 0) { - bb_error_msg(_("No usable address families found.")); - } - return sfd; -} - -#ifdef CONFIG_FEATURE_CLEAN_UP -static void sockets_close(void) -{ - struct aftype * const *aft; - for (aft = aftypes; *aft != NULL; aft++) { - struct aftype *af = *aft; - if( af->fd != -1 ) { - close(af->fd); - af->fd = -1; - } - } -} -#endif - +#if 0 /* like strcmp(), but knows about numbers */ +except that the freshly added calls to xatoul() brf on ethernet aliases with +uClibc with e.g.: ife->name='lo' name='eth0:1' static int nstrcmp(const char *a, const char *b) { const char *a_ptr = a; @@ -777,24 +368,26 @@ static int nstrcmp(const char *a, const char *b) } if (isdigit(*a) && isdigit(*b)) { - return atoi(a_ptr) > atoi(b_ptr) ? 1 : -1; + return xatoul(a_ptr) > xatoul(b_ptr) ? 1 : -1; } return *a - *b; } +#endif static struct interface *add_interface(char *name) { struct interface *ife, **nextp, *new; for (ife = int_last; ife; ife = ife->prev) { - int n = nstrcmp(ife->name, name); + int n = /*n*/strcmp(ife->name, name); if (n == 0) return ife; if (n < 0) break; } - new(new); + + new = xzalloc(sizeof(*new)); safe_strncpy(new->name, name, IFNAMSIZ); nextp = ife ? &ife->next : &int_list; new->prev = ife; @@ -807,84 +400,30 @@ static struct interface *add_interface(char *name) return new; } - -static int if_readconf(void) -{ - int numreqs = 30; - struct ifconf ifc; - struct ifreq *ifr; - int n, err = -1; - int skfd2; - - /* SIOCGIFCONF currently seems to only work properly on AF_INET sockets - (as of 2.1.128) */ - skfd2 = get_socket_for_af(AF_INET); - if (skfd2 < 0) { - bb_perror_msg(("warning: no inet socket available")); - /* Try to soldier on with whatever socket we can get hold of. */ - skfd2 = sockets_open(0); - if (skfd2 < 0) - return -1; - } - - ifc.ifc_buf = NULL; - for (;;) { - ifc.ifc_len = sizeof(struct ifreq) * numreqs; - ifc.ifc_buf = xrealloc(ifc.ifc_buf, ifc.ifc_len); - - if (ioctl(skfd2, SIOCGIFCONF, &ifc) < 0) { - perror("SIOCGIFCONF"); - goto out; - } - if (ifc.ifc_len == sizeof(struct ifreq) * numreqs) { - /* assume it overflowed and try again */ - numreqs += 10; - continue; - } - break; - } - - ifr = ifc.ifc_req; - for (n = 0; n < ifc.ifc_len; n += sizeof(struct ifreq)) { - add_interface(ifr->ifr_name); - ifr++; - } - err = 0; - - out: - free(ifc.ifc_buf); - return err; -} - static char *get_name(char *name, char *p) { - /* Extract [:] from nul-terminated p where p matches - [:]: after leading whitespace. + /* Extract from nul-terminated p where p matches + : after leading whitespace. If match is not made, set name empty and return unchanged p */ - int namestart=0, nameend=0, aliasend; + int namestart = 0, nameend = 0; + while (isspace(p[namestart])) namestart++; - nameend=namestart; - while (p[nameend] && p[nameend]!=':' && !isspace(p[nameend])) + nameend = namestart; + while (p[nameend] && p[nameend] != ':' && !isspace(p[nameend])) nameend++; - if (p[nameend]==':') { - aliasend=nameend+1; - while (p[aliasend] && isdigit(p[aliasend])) - aliasend++; - if (p[aliasend]==':') { - nameend=aliasend; - } - if ((nameend-namestart)ifr_name); + ifr++; + } + err = 0; + + out: + close(skfd); + free(ifc.ifc_buf); + return err; +} + static int if_readlist_proc(char *target) { - static int proc_read; + static smallint proc_read; + FILE *fh; char buf[512]; struct interface *ife; @@ -976,7 +562,7 @@ static int if_readlist_proc(char *target) fh = fopen(_PATH_PROCNET_DEV, "r"); if (!fh) { - bb_perror_msg(_("Warning: cannot open %s. Limited output."), _PATH_PROCNET_DEV); + bb_perror_msg("warning: cannot open %s, limiting output", _PATH_PROCNET_DEV); return if_readconf(); } fgets(buf, sizeof buf, fh); /* eat line */ @@ -996,7 +582,7 @@ static int if_readlist_proc(char *target) break; } if (ferror(fh)) { - perror(_PATH_PROCNET_DEV); + bb_perror_msg(_PATH_PROCNET_DEV); err = -1; proc_read = 0; } @@ -1007,130 +593,84 @@ static int if_readlist_proc(char *target) static int if_readlist(void) { int err = if_readlist_proc(NULL); - + /* Needed in order to get ethN:M aliases */ if (!err) err = if_readconf(); return err; } -static int for_all_interfaces(int (*doit) (struct interface *, void *), - void *cookie) -{ - struct interface *ife; - - if (!int_list && (if_readlist() < 0)) - return -1; - for (ife = int_list; ife; ife = ife->next) { - int err = doit(ife, cookie); - - if (err) - return err; - } - return 0; -} - /* Fetch the interface configuration from the kernel. */ static int if_fetch(struct interface *ife) { struct ifreq ifr; - int fd; char *ifname = ife->name; + int skfd; + + skfd = xsocket(AF_INET, SOCK_DGRAM, 0); - strcpy(ifr.ifr_name, ifname); - if (ioctl(skfd, SIOCGIFFLAGS, &ifr) < 0) - return (-1); + strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name)); + if (ioctl(skfd, SIOCGIFFLAGS, &ifr) < 0) { + close(skfd); + return -1; + } ife->flags = ifr.ifr_flags; - strcpy(ifr.ifr_name, ifname); - if (ioctl(skfd, SIOCGIFHWADDR, &ifr) < 0) - memset(ife->hwaddr, 0, 32); - else + strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name)); + memset(ife->hwaddr, 0, 32); + if (ioctl(skfd, SIOCGIFHWADDR, &ifr) >= 0) memcpy(ife->hwaddr, ifr.ifr_hwaddr.sa_data, 8); ife->type = ifr.ifr_hwaddr.sa_family; - strcpy(ifr.ifr_name, ifname); - if (ioctl(skfd, SIOCGIFMETRIC, &ifr) < 0) - ife->metric = 0; - else + strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name)); + ife->metric = 0; + if (ioctl(skfd, SIOCGIFMETRIC, &ifr) >= 0) ife->metric = ifr.ifr_metric; - strcpy(ifr.ifr_name, ifname); - if (ioctl(skfd, SIOCGIFMTU, &ifr) < 0) - ife->mtu = 0; - else + strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name)); + ife->mtu = 0; + if (ioctl(skfd, SIOCGIFMTU, &ifr) >= 0) ife->mtu = ifr.ifr_mtu; -#ifdef HAVE_HWSLIP - if (ife->type == ARPHRD_SLIP || ife->type == ARPHRD_CSLIP || - ife->type == ARPHRD_SLIP6 || ife->type == ARPHRD_CSLIP6 || - ife->type == ARPHRD_ADAPT) { -#ifdef SIOCGOUTFILL - strcpy(ifr.ifr_name, ifname); - if (ioctl(skfd, SIOCGOUTFILL, &ifr) < 0) - ife->outfill = 0; - else - ife->outfill = (unsigned int) ifr.ifr_data; -#endif -#ifdef SIOCGKEEPALIVE - strcpy(ifr.ifr_name, ifname); - if (ioctl(skfd, SIOCGKEEPALIVE, &ifr) < 0) - ife->keepalive = 0; - else - ife->keepalive = (unsigned int) ifr.ifr_data; -#endif - } -#endif - + memset(&ife->map, 0, sizeof(struct ifmap)); #ifdef SIOCGIFMAP - strcpy(ifr.ifr_name, ifname); + strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name)); if (ioctl(skfd, SIOCGIFMAP, &ifr) == 0) ife->map = ifr.ifr_map; - else #endif - memset(&ife->map, 0, sizeof(struct ifmap)); #ifdef HAVE_TXQUEUELEN - strcpy(ifr.ifr_name, ifname); - if (ioctl(skfd, SIOCGIFTXQLEN, &ifr) < 0) - ife->tx_queue_len = -1; /* unknown value */ - else + strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name)); + ife->tx_queue_len = -1; /* unknown value */ + if (ioctl(skfd, SIOCGIFTXQLEN, &ifr) >= 0) ife->tx_queue_len = ifr.ifr_qlen; #else ife->tx_queue_len = -1; /* unknown value */ #endif -#if HAVE_AFINET - /* IPv4 address? */ - fd = get_socket_for_af(AF_INET); - if (fd >= 0) { - strcpy(ifr.ifr_name, ifname); - ifr.ifr_addr.sa_family = AF_INET; - if (ioctl(fd, SIOCGIFADDR, &ifr) == 0) { - ife->has_ip = 1; - ife->addr = ifr.ifr_addr; - strcpy(ifr.ifr_name, ifname); - if (ioctl(fd, SIOCGIFDSTADDR, &ifr) < 0) - memset(&ife->dstaddr, 0, sizeof(struct sockaddr)); - else - ife->dstaddr = ifr.ifr_dstaddr; - - strcpy(ifr.ifr_name, ifname); - if (ioctl(fd, SIOCGIFBRDADDR, &ifr) < 0) - memset(&ife->broadaddr, 0, sizeof(struct sockaddr)); - else - ife->broadaddr = ifr.ifr_broadaddr; - - strcpy(ifr.ifr_name, ifname); - if (ioctl(fd, SIOCGIFNETMASK, &ifr) < 0) - memset(&ife->netmask, 0, sizeof(struct sockaddr)); - else - ife->netmask = ifr.ifr_netmask; - } else - memset(&ife->addr, 0, sizeof(struct sockaddr)); + strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name)); + ifr.ifr_addr.sa_family = AF_INET; + memset(&ife->addr, 0, sizeof(struct sockaddr)); + if (ioctl(skfd, SIOCGIFADDR, &ifr) == 0) { + ife->has_ip = 1; + ife->addr = ifr.ifr_addr; + strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name)); + memset(&ife->dstaddr, 0, sizeof(struct sockaddr)); + if (ioctl(skfd, SIOCGIFDSTADDR, &ifr) >= 0) + ife->dstaddr = ifr.ifr_dstaddr; + + strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name)); + memset(&ife->broadaddr, 0, sizeof(struct sockaddr)); + if (ioctl(skfd, SIOCGIFBRDADDR, &ifr) >= 0) + ife->broadaddr = ifr.ifr_broadaddr; + + strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name)); + memset(&ife->netmask, 0, sizeof(struct sockaddr)); + if (ioctl(skfd, SIOCGIFNETMASK, &ifr) >= 0) + ife->netmask = ifr.ifr_netmask; } -#endif + close(skfd); return 0; } @@ -1138,47 +678,37 @@ static int if_fetch(struct interface *ife) static int do_if_fetch(struct interface *ife) { if (if_fetch(ife) < 0) { - char *errmsg; + const char *errmsg; if (errno == ENODEV) { /* Give better error message for this case. */ - errmsg = _("Device not found"); + errmsg = "Device not found"; } else { errmsg = strerror(errno); } - bb_error_msg(_("%s: error fetching interface information: %s"), + bb_error_msg("%s: error fetching interface information: %s", ife->name, errmsg); return -1; } return 0; } -/* This structure defines hardware protocols and their handlers. */ -struct hwtype { - const char * const name; - const char *title; - int type; - int alen; - char *(*print) (unsigned char *); - int (*input) (char *, struct sockaddr *); - int (*activate) (int fd); - int suppress_null_addr; -}; - static const struct hwtype unspec_hwtype = { - "unspec", "UNSPEC", -1, 0, - UNSPEC_print, NULL, NULL + .name = "unspec", + .title = "UNSPEC", + .type = -1, + .print = UNSPEC_print }; static const struct hwtype loop_hwtype = { - "loop", "Local Loopback", ARPHRD_LOOPBACK, 0, - NULL, NULL, NULL + .name = "loop", + .title = "Local Loopback", + .type = ARPHRD_LOOPBACK }; -#if HAVE_HWETHER #include -#if (__GLIBC__ >=2 && __GLIBC_MINOR >= 1) || defined(_NEWLIB_VERSION) +#if (defined(__GLIBC__) && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1) || defined(_NEWLIB_VERSION) #include #else #include @@ -1187,192 +717,109 @@ static const struct hwtype loop_hwtype = { /* Display an Ethernet address in readable format. */ static char *pr_ether(unsigned char *ptr) { - static char buff[64]; + static char *buff; - snprintf(buff, sizeof(buff), "%02X:%02X:%02X:%02X:%02X:%02X", + free(buff); + buff = xasprintf("%02X:%02X:%02X:%02X:%02X:%02X", (ptr[0] & 0377), (ptr[1] & 0377), (ptr[2] & 0377), (ptr[3] & 0377), (ptr[4] & 0377), (ptr[5] & 0377) ); - return (buff); + return buff; +} + +static int in_ether(const char *bufp, struct sockaddr *sap); + +static const struct hwtype ether_hwtype = { + .name = "ether", + .title = "Ethernet", + .type = ARPHRD_ETHER, + .alen = ETH_ALEN, + .print = pr_ether, + .input = in_ether +}; + +static unsigned hexchar2int(char c) +{ + if (isdigit(c)) + return c - '0'; + c &= ~0x20; /* a -> A */ + if ((unsigned)(c - 'A') <= 5) + return c - ('A' - 10); + return ~0U; } -#ifdef KEEP_UNUSED /* Input an Ethernet address and convert to binary. */ -static int in_ether(char *bufp, struct sockaddr *sap) +static int in_ether(const char *bufp, struct sockaddr *sap) { unsigned char *ptr; - char c, *orig; + char c; int i; unsigned val; sap->sa_family = ether_hwtype.type; - ptr = sap->sa_data; + ptr = (unsigned char*) sap->sa_data; i = 0; - orig = bufp; while ((*bufp != '\0') && (i < ETH_ALEN)) { - val = 0; - c = *bufp++; - if (isdigit(c)) - val = c - '0'; - else if (c >= 'a' && c <= 'f') - val = c - 'a' + 10; - else if (c >= 'A' && c <= 'F') - val = c - 'A' + 10; - else { -#ifdef DEBUG - bb_error_msg(_("in_ether(%s): invalid ether address!\n"), orig); -#endif + val = hexchar2int(*bufp++) * 0x10; + if (val > 0xff) { errno = EINVAL; - return (-1); + return -1; } - val <<= 4; c = *bufp; - if (isdigit(c)) - val |= c - '0'; - else if (c >= 'a' && c <= 'f') - val |= c - 'a' + 10; - else if (c >= 'A' && c <= 'F') - val |= c - 'A' + 10; - else if (c == ':' || c == 0) + if (c == ':' || c == 0) val >>= 4; else { -#ifdef DEBUG - bb_error_msg(_("in_ether(%s): invalid ether address!"), orig); -#endif - errno = EINVAL; - return (-1); + val |= hexchar2int(c); + if (val > 0xff) { + errno = EINVAL; + return -1; + } } if (c != 0) bufp++; - *ptr++ = (unsigned char) (val & 0377); + *ptr++ = (unsigned char) val; i++; /* We might get a semicolon here - not required. */ if (*bufp == ':') { -#ifdef DEBUG - if (i == ETH_ALEN) { - bb_error_msg(_("in_ether(%s): trailing : ignored!"), orig); - } -#endif bufp++; } } - -#ifdef DEBUG - /* That's it. Any trailing junk? */ - if ((i == ETH_ALEN) && (*bufp != '\0')) { - bb_error_msg(_("in_ether(%s): trailing junk!"), orig); - errno = EINVAL; - return (-1); - } - bb_error_msg("in_ether(%s): %s", orig, pr_ether(sap->sa_data)); -#endif - - return (0); + return 0; } -#endif /* KEEP_UNUSED */ - - -static const struct hwtype ether_hwtype = { - "ether", "Ethernet", ARPHRD_ETHER, ETH_ALEN, - pr_ether, NULL /* UNUSED in_ether */ , NULL -}; - - -#endif /* HAVE_HWETHER */ - - -#if HAVE_HWPPP #include -#ifdef KEEP_UNUSED -/* Start the PPP encapsulation on the file descriptor. */ -static int do_ppp(int fd) -{ - bb_error_msg(_("You cannot start PPP with this program.")); - return -1; -} -#endif /* KEEP_UNUSED */ - static const struct hwtype ppp_hwtype = { - "ppp", "Point-Point Protocol", ARPHRD_PPP, 0, - NULL, NULL, NULL /* UNUSED do_ppp */ , 0 + .name = "ppp", + .title = "Point-to-Point Protocol", + .type = ARPHRD_PPP }; +#if ENABLE_FEATURE_IPV6 +static const struct hwtype sit_hwtype = { + .name = "sit", + .title = "IPv6-in-IPv4", + .type = ARPHRD_SIT, + .print = UNSPEC_print, + .suppress_null_addr = 1 +}; +#endif -#endif /* HAVE_PPP */ - -static const struct hwtype * const hwtypes[] = { - +static const struct hwtype *const hwtypes[] = { &loop_hwtype, - -#if HAVE_HWSLIP - &slip_hwtype, - &cslip_hwtype, - &slip6_hwtype, - &cslip6_hwtype, - &adaptive_hwtype, -#endif -#if HAVE_HWSTRIP - &strip_hwtype, -#endif -#if HAVE_HWETHER ðer_hwtype, -#endif -#if HAVE_HWTUNNEL - &tunnel_hwtype, -#endif -#if HAVE_HWPPP &ppp_hwtype, -#endif &unspec_hwtype, +#if ENABLE_FEATURE_IPV6 + &sit_hwtype, +#endif NULL }; -#ifdef KEEP_UNUSED -static short sVhwinit = 0; - -static void hwinit() -{ - loop_hwtype.title = _("Local Loopback"); - unspec_hwtype.title = _("UNSPEC"); -#if HAVE_HWSLIP - slip_hwtype.title = _("Serial Line IP"); - cslip_hwtype.title = _("VJ Serial Line IP"); - slip6_hwtype.title = _("6-bit Serial Line IP"); - cslip6_hwtype.title = _("VJ 6-bit Serial Line IP"); - adaptive_hwtype.title = _("Adaptive Serial Line IP"); -#endif -#if HAVE_HWETHER - ether_hwtype.title = _("Ethernet"); -#endif -#if HAVE_HWTUNNEL - tunnel_hwtype.title = _("IPIP Tunnel"); -#endif -#if HAVE_HWPPP - ppp_hwtype.title = _("Point-to-Point Protocol"); -#endif - sVhwinit = 1; -} -#endif /* KEEP_UNUSED */ - #ifdef IFF_PORTSEL -#if 0 -static const char * const if_port_text[][4] = { - /* Keep in step with */ - {"unknown", NULL, NULL, NULL}, - {"10base2", "bnc", "coax", NULL}, - {"10baseT", "utp", "tpe", NULL}, - {"AUI", "thick", "db15", NULL}, - {"100baseT", NULL, NULL, NULL}, - {"100baseTX", NULL, NULL, NULL}, - {"100baseFX", NULL, NULL, NULL}, - {NULL, NULL, NULL, NULL}, -}; -#else -static const char * const if_port_text[] = { +static const char *const if_port_text[] = { /* Keep in step with */ "unknown", "10base2", @@ -1384,25 +831,33 @@ static const char * const if_port_text[] = { NULL }; #endif -#endif /* Check our hardware type table for this type. */ -static const struct hwtype *get_hwntype(int type) +const struct hwtype *get_hwtype(const char *name) { - const struct hwtype * const *hwp; + const struct hwtype *const *hwp; + + hwp = hwtypes; + while (*hwp != NULL) { + if (!strcmp((*hwp)->name, name)) + return (*hwp); + hwp++; + } + return NULL; +} -#ifdef KEEP_UNUSED - if (!sVhwinit) - hwinit(); -#endif /* KEEP_UNUSED */ +/* Check our hardware type table for this type. */ +const struct hwtype *get_hwntype(int type) +{ + const struct hwtype *const *hwp; hwp = hwtypes; while (*hwp != NULL) { if ((*hwp)->type == type) - return (*hwp); + return *hwp; hwp++; } - return (NULL); + return NULL; } /* return 1 if address is all zeros */ @@ -1417,7 +872,7 @@ static int hw_null_address(const struct hwtype *hw, void *ap) return 1; } -static const char TRext[] = "\0\0\0Ki\0Mi\0Gi\0Ti"; +static const char TRext[] ALIGN1 = "\0\0\0Ki\0Mi\0Gi\0Ti"; static void print_bytes_scaled(unsigned long long ull, const char *end) { @@ -1431,76 +886,25 @@ static void print_bytes_scaled(unsigned long long ull, const char *end) int_part = ull; i = 4; do { -#if 0 - /* This does correct rounding and is a little larger. But it - * uses KiB as the smallest displayed unit. */ - if ((int_part < (1024*1024 - 51)) || !--i) { - i = 0; - int_part += 51; /* 1024*.05 = 51.2 */ - frac_part = ((((unsigned int) int_part) & (1024-1)) * 10) / 1024; - } - int_part /= 1024; - ext += 3; /* KiB, MiB, GiB, TiB */ -#else if (int_part >= 1024) { frac_part = ((((unsigned int) int_part) & (1024-1)) * 10) / 1024; int_part /= 1024; ext += 3; /* KiB, MiB, GiB, TiB */ } --i; -#endif } while (i); printf("X bytes:%llu (%llu.%u %sB)%s", ull, int_part, frac_part, ext, end); } -static const char * const ife_print_flags_strs[] = { - "UP ", - "BROADCAST ", - "DEBUG ", - "LOOPBACK ", - "POINTOPOINT ", - "NOTRAILERS ", - "RUNNING ", - "NOARP ", - "PROMISC ", - "ALLMULTI ", - "SLAVE ", - "MASTER ", - "MULTICAST ", -#ifdef HAVE_DYNAMIC - "DYNAMIC " -#endif -}; - -static const unsigned short ife_print_flags_mask[] = { - IFF_UP, - IFF_BROADCAST, - IFF_DEBUG, - IFF_LOOPBACK, - IFF_POINTOPOINT, - IFF_NOTRAILERS, - IFF_RUNNING, - IFF_NOARP, - IFF_PROMISC, - IFF_ALLMULTI, - IFF_SLAVE, - IFF_MASTER, - IFF_MULTICAST, -#ifdef HAVE_DYNAMIC - IFF_DYNAMIC -#endif - 0 -}; - static void ife_print(struct interface *ptr) { - struct aftype *ap; + const struct aftype *ap; const struct hwtype *hw; int hf; int can_compress = 0; -#if HAVE_AFINET6 +#ifdef HAVE_AFINET6 FILE *f; char addr6[40], devname[20]; struct sockaddr_in6 sap; @@ -1521,36 +925,34 @@ static void ife_print(struct interface *ptr) if (hw == NULL) hw = get_hwntype(-1); - printf(_("%-9.9s Link encap:%s "), ptr->name, _(hw->title)); + printf("%-9.9s Link encap:%s ", ptr->name, hw->title); /* For some hardware types (eg Ash, ATM) we don't print the hardware address if it's null. */ if (hw->print != NULL && (!(hw_null_address(hw, ptr->hwaddr) && hw->suppress_null_addr))) - printf(_("HWaddr %s "), hw->print((unsigned char *)ptr->hwaddr)); + printf("HWaddr %s ", hw->print((unsigned char *)ptr->hwaddr)); #ifdef IFF_PORTSEL if (ptr->flags & IFF_PORTSEL) { - printf(_("Media:%s"), if_port_text[ptr->map.port] /* [0] */); + printf("Media:%s", if_port_text[ptr->map.port] /* [0] */); if (ptr->flags & IFF_AUTOMEDIA) - printf(_("(auto)")); + printf("(auto)"); } #endif - printf("\n"); + bb_putchar('\n'); -#if HAVE_AFINET if (ptr->has_ip) { - printf(_(" %s addr:%s "), ap->name, + printf(" %s addr:%s ", ap->name, ap->sprint(&ptr->addr, 1)); if (ptr->flags & IFF_POINTOPOINT) { - printf(_(" P-t-P:%s "), ap->sprint(&ptr->dstaddr, 1)); + printf(" P-t-P:%s ", ap->sprint(&ptr->dstaddr, 1)); } if (ptr->flags & IFF_BROADCAST) { - printf(_(" Bcast:%s "), ap->sprint(&ptr->broadaddr, 1)); + printf(" Bcast:%s ", ap->sprint(&ptr->broadaddr, 1)); } - printf(_(" Mask:%s\n"), ap->sprint(&ptr->netmask, 1)); + printf(" Mask:%s\n", ap->sprint(&ptr->netmask, 1)); } -#endif -#if HAVE_AFINET6 +#ifdef HAVE_AFINET6 #define IPV6_ADDR_ANY 0x0000U @@ -1569,12 +971,14 @@ static void ife_print(struct interface *ptr) #define IPV6_ADDR_MAPPED 0x1000U #define IPV6_ADDR_RESERVED 0x2000U /* reserved address space */ - if ((f = fopen(_PATH_PROCNET_IFINET6, "r")) != NULL) { + f = fopen(_PATH_PROCNET_IFINET6, "r"); + if (f != NULL) { while (fscanf - (f, "%4s%4s%4s%4s%4s%4s%4s%4s %02x %02x %02x %02x %20s\n", + (f, "%4s%4s%4s%4s%4s%4s%4s%4s %08x %02x %02x %02x %20s\n", addr6p[0], addr6p[1], addr6p[2], addr6p[3], addr6p[4], addr6p[5], addr6p[6], addr6p[7], &if_idx, &plen, &scope, - &dad_status, devname) != EOF) { + &dad_status, devname) != EOF + ) { if (!strcmp(devname, ptr->name)) { sprintf(addr6, "%s:%s:%s:%s:%s:%s:%s:%s", addr6p[0], addr6p[1], addr6p[2], addr6p[3], @@ -1582,30 +986,29 @@ static void ife_print(struct interface *ptr) inet_pton(AF_INET6, addr6, (struct sockaddr *) &sap.sin6_addr); sap.sin6_family = AF_INET6; - printf(_(" inet6 addr: %s/%d"), - inet6_aftype.sprint((struct sockaddr *) &sap, 1), + printf(" inet6 addr: %s/%d", + INET6_sprint((struct sockaddr *) &sap, 1), plen); - printf(_(" Scope:")); + printf(" Scope:"); switch (scope & IPV6_ADDR_SCOPE_MASK) { case 0: - printf(_("Global")); + puts("Global"); break; case IPV6_ADDR_LINKLOCAL: - printf(_("Link")); + puts("Link"); break; case IPV6_ADDR_SITELOCAL: - printf(_("Site")); + puts("Site"); break; case IPV6_ADDR_COMPATv4: - printf(_("Compat")); + puts("Compat"); break; case IPV6_ADDR_LOOPBACK: - printf(_("Host")); + puts("Host"); break; default: - printf(_("Unknown")); + puts("Unknown"); } - printf("\n"); } } fclose(f); @@ -1616,23 +1019,62 @@ static void ife_print(struct interface *ptr) /* DONT FORGET TO ADD THE FLAGS IN ife_print_short, too */ if (ptr->flags == 0) { - printf(_("[NO FLAGS] ")); + printf("[NO FLAGS] "); } else { - int i = 0; + static const char ife_print_flags_strs[] ALIGN1 = + "UP\0" + "BROADCAST\0" + "DEBUG\0" + "LOOPBACK\0" + "POINTOPOINT\0" + "NOTRAILERS\0" + "RUNNING\0" + "NOARP\0" + "PROMISC\0" + "ALLMULTI\0" + "SLAVE\0" + "MASTER\0" + "MULTICAST\0" +#ifdef HAVE_DYNAMIC + "DYNAMIC\0" +#endif + ; + static const unsigned short ife_print_flags_mask[] ALIGN2 = { + IFF_UP, + IFF_BROADCAST, + IFF_DEBUG, + IFF_LOOPBACK, + IFF_POINTOPOINT, + IFF_NOTRAILERS, + IFF_RUNNING, + IFF_NOARP, + IFF_PROMISC, + IFF_ALLMULTI, + IFF_SLAVE, + IFF_MASTER, + IFF_MULTICAST +#ifdef HAVE_DYNAMIC + ,IFF_DYNAMIC +#endif + }; + const unsigned short *mask = ife_print_flags_mask; + const char *str = ife_print_flags_strs; do { - if (ptr->flags & ife_print_flags_mask[i]) { - printf(_(ife_print_flags_strs[i])); + if (ptr->flags & *mask) { + printf("%s ", str); } - } while (ife_print_flags_mask[++i]); + mask++; + str += strlen(str) + 1; + } while (*str); } /* DONT FORGET TO ADD THE FLAGS IN ife_print_short */ - printf(_(" MTU:%d Metric:%d"), ptr->mtu, ptr->metric ? ptr->metric : 1); + printf(" MTU:%d Metric:%d", ptr->mtu, ptr->metric ? ptr->metric : 1); #ifdef SIOCSKEEPALIVE if (ptr->outfill || ptr->keepalive) - printf(_(" Outfill:%d Keepalive:%d"), ptr->outfill, ptr->keepalive); + printf(" Outfill:%d Keepalive:%d", ptr->outfill, ptr->keepalive); #endif - printf("\n"); + bb_putchar('\n'); /* If needed, display the interface statistics. */ @@ -1670,31 +1112,30 @@ static void ife_print(struct interface *ptr) ptr->map.base_addr)) { printf(" "); if (ptr->map.irq) - printf(_("Interrupt:%d "), ptr->map.irq); + printf("Interrupt:%d ", ptr->map.irq); if (ptr->map.base_addr >= 0x100) /* Only print devices using it for I/O maps */ - printf(_("Base address:0x%lx "), + printf("Base address:0x%lx ", (unsigned long) ptr->map.base_addr); if (ptr->map.mem_start) { - printf(_("Memory:%lx-%lx "), ptr->map.mem_start, + printf("Memory:%lx-%lx ", ptr->map.mem_start, ptr->map.mem_end); } if (ptr->map.dma) - printf(_("DMA chan:%x "), ptr->map.dma); - printf("\n"); + printf("DMA chan:%x ", ptr->map.dma); + bb_putchar('\n'); } - printf("\n"); + bb_putchar('\n'); } -static int do_if_print(struct interface *ife, void *cookie) +static int do_if_print(struct interface *ife) /*, int *opt_a)*/ { - int *opt_a = (int *) cookie; int res; res = do_if_fetch(ife); if (res >= 0) { - if ((ife->flags & IFF_UP) || *opt_a) + if ((ife->flags & IFF_UP) || interface_opt_a) ife_print(ife); } return res; @@ -1710,38 +1151,53 @@ static struct interface *lookup_interface(char *name) return ife; } +#ifdef UNUSED +static int for_all_interfaces(int (*doit) (struct interface *, void *), + void *cookie) +{ + struct interface *ife; + + if (!int_list && (if_readlist() < 0)) + return -1; + for (ife = int_list; ife; ife = ife->next) { + int err = doit(ife, cookie); + + if (err) + return err; + } + return 0; +} +#endif + /* for ipv4 add/del modes */ static int if_print(char *ifname) { + struct interface *ife; int res; if (!ifname) { - res = for_all_interfaces(do_if_print, &interface_opt_a); - } else { - struct interface *ife; - - ife = lookup_interface(ifname); - res = do_if_fetch(ife); - if (res >= 0) - ife_print(ife); + /*res = for_all_interfaces(do_if_print, &interface_opt_a);*/ + if (!int_list && (if_readlist() < 0)) + return -1; + for (ife = int_list; ife; ife = ife->next) { + int err = do_if_print(ife); /*, &interface_opt_a);*/ + if (err) + return err; + } + return 0; } + ife = lookup_interface(ifname); + res = do_if_fetch(ife); + if (res >= 0) + ife_print(ife); return res; } -int display_interfaces(char *ifname); int display_interfaces(char *ifname) { int status; - /* Create a channel to the NET kernel. */ - if ((skfd = sockets_open(0)) < 0) { - bb_perror_msg_and_die("socket"); - } - - /* Do we have to show the current setup? */ status = if_print(ifname); -#ifdef CONFIG_FEATURE_CLEAN_UP - sockets_close(); -#endif - exit(status < 0); + + return (status < 0); /* status < 0 == 1 -- error */ }