X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=networking%2Finterface.c;h=a59f310a6abb9e7cef59aa15fc5f9aa87bda3501;hb=765b0eed3ef29a80115708c3249d3a541509cd24;hp=83b24f1d6aeaa8023c3af689dfaf0f43ab5f0fdc;hpb=a60f84ebf07863e390b72a2b6150e461a1ec18e9;p=oweals%2Fbusybox.git diff --git a/networking/interface.c b/networking/interface.c index 83b24f1d6..a59f310a6 100644 --- a/networking/interface.c +++ b/networking/interface.c @@ -30,17 +30,20 @@ * 20001008 - Bernd Eckenfels, Patch from RH for setting mtu * (default AF was wrong) */ - #include #include -#include "inet_common.h" +#if (defined(__GLIBC__) && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1) || defined(_NEWLIB_VERSION) +# include +#else +# include +#endif #include "libbb.h" - +#include "inet_common.h" #if ENABLE_FEATURE_HWIB /* #include */ -#undef INFINIBAND_ALEN -#define INFINIBAND_ALEN 20 +# undef INFINIBAND_ALEN +# define INFINIBAND_ALEN 20 #endif #if ENABLE_FEATURE_IPV6 @@ -53,45 +56,41 @@ #define _PATH_PROCNET_IFINET6 "/proc/net/if_inet6" #ifdef HAVE_AFINET6 - -#ifndef _LINUX_IN6_H +# ifndef _LINUX_IN6_H /* - * This is in linux/include/net/ipv6.h. + * This is from linux/include/net/ipv6.h */ - struct in6_ifreq { struct in6_addr ifr6_addr; uint32_t ifr6_prefixlen; unsigned int ifr6_ifindex; }; - -#endif - +# endif #endif /* HAVE_AFINET6 */ /* Defines for glibc2.0 users. */ #ifndef SIOCSIFTXQLEN -#define SIOCSIFTXQLEN 0x8943 -#define SIOCGIFTXQLEN 0x8942 +# define SIOCSIFTXQLEN 0x8943 +# define SIOCGIFTXQLEN 0x8942 #endif /* ifr_qlen is ifru_ivalue, but it isn't present in 2.0 kernel headers */ #ifndef ifr_qlen -#define ifr_qlen ifr_ifru.ifru_mtu +# define ifr_qlen ifr_ifru.ifru_mtu #endif #ifndef HAVE_TXQUEUELEN -#define HAVE_TXQUEUELEN 1 +# define HAVE_TXQUEUELEN 1 #endif #ifndef IFF_DYNAMIC -#define IFF_DYNAMIC 0x8000 /* dialup device with changing addresses */ +# define IFF_DYNAMIC 0x8000 /* dialup device with changing addresses */ #endif /* Display an Internet socket address. */ static const char* FAST_FUNC INET_sprint(struct sockaddr *sap, int numeric) { - static char *buff; + static char *buff; /* defaults to NULL */ free(buff); if (sap->sa_family == 0xFFFF || sap->sa_family == 0) @@ -395,7 +394,7 @@ static struct interface *add_interface(char *name) } new = xzalloc(sizeof(*new)); - strncpy(new->name, name, IFNAMSIZ); + strncpy_IFNAMSIZ(new->name, name); nextp = ife ? &ife->next : &int_list; new->prev = ife; new->next = *nextp; @@ -410,20 +409,20 @@ static struct interface *add_interface(char *name) static char *get_name(char *name, char *p) { /* 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; + * : after leading whitespace. + * If match is not made, set name empty and return unchanged p + */ + char *nameend; + char *namestart = skip_whitespace(p); - while (isspace(p[namestart])) - namestart++; nameend = namestart; - while (p[nameend] && p[nameend] != ':' && !isspace(p[nameend])) + while (*nameend && *nameend != ':' && !isspace(*nameend)) nameend++; - if (p[nameend] == ':') { + if (*nameend == ':') { if ((nameend - namestart) < IFNAMSIZ) { - memcpy(name, &p[namestart], nameend - namestart); + memcpy(name, namestart, nameend - namestart); name[nameend - namestart] = '\0'; - p = &p[nameend]; + p = nameend; } else { /* Interface name too large */ name[0] = '\0'; @@ -498,7 +497,7 @@ static void get_dev_fields(char *bp, struct interface *ife, int procnetdev_vsn) } } -static inline int procnetdev_version(char *buf) +static int procnetdev_version(char *buf) { if (strstr(buf, "compressed")) return 2; @@ -614,39 +613,39 @@ static int if_fetch(struct interface *ife) skfd = xsocket(AF_INET, SOCK_DGRAM, 0); - strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name)); + strncpy_IFNAMSIZ(ifr.ifr_name, ifname); if (ioctl(skfd, SIOCGIFFLAGS, &ifr) < 0) { close(skfd); return -1; } ife->flags = ifr.ifr_flags; - strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name)); + strncpy_IFNAMSIZ(ifr.ifr_name, ifname); 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; - strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name)); + strncpy_IFNAMSIZ(ifr.ifr_name, ifname); ife->metric = 0; if (ioctl(skfd, SIOCGIFMETRIC, &ifr) >= 0) ife->metric = ifr.ifr_metric; - strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name)); + strncpy_IFNAMSIZ(ifr.ifr_name, ifname); ife->mtu = 0; if (ioctl(skfd, SIOCGIFMTU, &ifr) >= 0) ife->mtu = ifr.ifr_mtu; memset(&ife->map, 0, sizeof(struct ifmap)); #ifdef SIOCGIFMAP - strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name)); + strncpy_IFNAMSIZ(ifr.ifr_name, ifname); if (ioctl(skfd, SIOCGIFMAP, &ifr) == 0) ife->map = ifr.ifr_map; #endif #ifdef HAVE_TXQUEUELEN - strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name)); + strncpy_IFNAMSIZ(ifr.ifr_name, ifname); ife->tx_queue_len = -1; /* unknown value */ if (ioctl(skfd, SIOCGIFTXQLEN, &ifr) >= 0) ife->tx_queue_len = ifr.ifr_qlen; @@ -654,23 +653,23 @@ static int if_fetch(struct interface *ife) ife->tx_queue_len = -1; /* unknown value */ #endif - strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name)); + strncpy_IFNAMSIZ(ifr.ifr_name, ifname); 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)); + strncpy_IFNAMSIZ(ifr.ifr_name, ifname); 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)); + strncpy_IFNAMSIZ(ifr.ifr_name, ifname); 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)); + strncpy_IFNAMSIZ(ifr.ifr_name, ifname); memset(&ife->netmask, 0, sizeof(struct sockaddr)); if (ioctl(skfd, SIOCGIFNETMASK, &ifr) >= 0) ife->netmask = ifr.ifr_netmask; @@ -711,14 +710,6 @@ static const struct hwtype loop_hwtype = { .type = ARPHRD_LOOPBACK }; -#include - -#if (defined(__GLIBC__) && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1) || defined(_NEWLIB_VERSION) -#include -#else -#include -#endif - /* Display an Ethernet address in readable format. */ static char* FAST_FUNC ether_print(unsigned char *ptr) { @@ -794,8 +785,6 @@ static int FAST_FUNC ether_input(const char *bufp, struct sockaddr *sap) return 0; } -#include - static const struct hwtype ppp_hwtype = { .name = "ppp", .title = "Point-to-Point Protocol", @@ -916,21 +905,90 @@ static void print_bytes_scaled(unsigned long long ull, const char *end) printf("X bytes:%llu (%llu.%u %sB)%s", ull, int_part, frac_part, ext, end); } -static void ife_print(struct interface *ptr) -{ - const struct aftype *ap; - const struct hwtype *hw; - int hf; - int can_compress = 0; #ifdef HAVE_AFINET6 +#define IPV6_ADDR_ANY 0x0000U + +#define IPV6_ADDR_UNICAST 0x0001U +#define IPV6_ADDR_MULTICAST 0x0002U +#define IPV6_ADDR_ANYCAST 0x0004U + +#define IPV6_ADDR_LOOPBACK 0x0010U +#define IPV6_ADDR_LINKLOCAL 0x0020U +#define IPV6_ADDR_SITELOCAL 0x0040U + +#define IPV6_ADDR_COMPATv4 0x0080U + +#define IPV6_ADDR_SCOPE_MASK 0x00f0U + +#define IPV6_ADDR_MAPPED 0x1000U +#define IPV6_ADDR_RESERVED 0x2000U /* reserved address space */ + + +static void ife_print6(struct interface *ptr) +{ + FILE *f; char addr6[40], devname[20]; struct sockaddr_in6 sap; int plen, scope, dad_status, if_idx; char addr6p[8][5]; + + f = fopen_for_read(_PATH_PROCNET_IFINET6); + if (f == NULL) + return; + + while (fscanf + (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 + ) { + if (!strcmp(devname, ptr->name)) { + sprintf(addr6, "%s:%s:%s:%s:%s:%s:%s:%s", + addr6p[0], addr6p[1], addr6p[2], addr6p[3], + addr6p[4], addr6p[5], addr6p[6], addr6p[7]); + inet_pton(AF_INET6, addr6, + (struct sockaddr *) &sap.sin6_addr); + sap.sin6_family = AF_INET6; + printf(" inet6 addr: %s/%d", + INET6_sprint((struct sockaddr *) &sap, 1), + plen); + printf(" Scope:"); + switch (scope & IPV6_ADDR_SCOPE_MASK) { + case 0: + puts("Global"); + break; + case IPV6_ADDR_LINKLOCAL: + puts("Link"); + break; + case IPV6_ADDR_SITELOCAL: + puts("Site"); + break; + case IPV6_ADDR_COMPATv4: + puts("Compat"); + break; + case IPV6_ADDR_LOOPBACK: + puts("Host"); + break; + default: + puts("Unknown"); + } + } + } + fclose(f); +} +#else +#define ife_print6(a) ((void)0) #endif +static void ife_print(struct interface *ptr) +{ + const struct aftype *ap; + const struct hwtype *hw; + int hf; + int can_compress = 0; + ap = get_afntype(ptr->addr.sa_family); if (ap == NULL) ap = get_afntype(0); @@ -947,9 +1005,11 @@ static void ife_print(struct interface *ptr) 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))) + if (hw->print != NULL + && !(hw_null_address(hw, ptr->hwaddr) && hw->suppress_null_addr) + ) { 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] */); @@ -971,68 +1031,7 @@ static void ife_print(struct interface *ptr) printf(" Mask:%s\n", ap->sprint(&ptr->netmask, 1)); } -#ifdef HAVE_AFINET6 - -#define IPV6_ADDR_ANY 0x0000U - -#define IPV6_ADDR_UNICAST 0x0001U -#define IPV6_ADDR_MULTICAST 0x0002U -#define IPV6_ADDR_ANYCAST 0x0004U - -#define IPV6_ADDR_LOOPBACK 0x0010U -#define IPV6_ADDR_LINKLOCAL 0x0020U -#define IPV6_ADDR_SITELOCAL 0x0040U - -#define IPV6_ADDR_COMPATv4 0x0080U - -#define IPV6_ADDR_SCOPE_MASK 0x00f0U - -#define IPV6_ADDR_MAPPED 0x1000U -#define IPV6_ADDR_RESERVED 0x2000U /* reserved address space */ - - f = fopen(_PATH_PROCNET_IFINET6, "r"); - if (f != NULL) { - while (fscanf - (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 - ) { - if (!strcmp(devname, ptr->name)) { - sprintf(addr6, "%s:%s:%s:%s:%s:%s:%s:%s", - addr6p[0], addr6p[1], addr6p[2], addr6p[3], - addr6p[4], addr6p[5], addr6p[6], addr6p[7]); - inet_pton(AF_INET6, addr6, - (struct sockaddr *) &sap.sin6_addr); - sap.sin6_family = AF_INET6; - printf(" inet6 addr: %s/%d", - INET6_sprint((struct sockaddr *) &sap, 1), - plen); - printf(" Scope:"); - switch (scope & IPV6_ADDR_SCOPE_MASK) { - case 0: - puts("Global"); - break; - case IPV6_ADDR_LINKLOCAL: - puts("Link"); - break; - case IPV6_ADDR_SITELOCAL: - puts("Site"); - break; - case IPV6_ADDR_COMPATv4: - puts("Compat"); - break; - case IPV6_ADDR_LOOPBACK: - puts("Host"); - break; - default: - puts("Unknown"); - } - } - } - fclose(f); - } -#endif + ife_print6(ptr); printf(" "); /* DONT FORGET TO ADD THE FLAGS IN ife_print_short, too */ @@ -1124,11 +1123,11 @@ static void ife_print(struct interface *ptr) printf("\n R"); print_bytes_scaled(ptr->stats.rx_bytes, " T"); print_bytes_scaled(ptr->stats.tx_bytes, "\n"); - } - if ((ptr->map.irq || ptr->map.mem_start || ptr->map.dma || - ptr->map.base_addr)) { + if (ptr->map.irq || ptr->map.mem_start + || ptr->map.dma || ptr->map.base_addr + ) { printf(" "); if (ptr->map.irq) printf("Interrupt:%d ", ptr->map.irq); @@ -1147,7 +1146,6 @@ static void ife_print(struct interface *ptr) bb_putchar('\n'); } - static int do_if_print(struct interface *ife) /*, int *opt_a)*/ { int res; @@ -1216,62 +1214,16 @@ static int if_print(char *ifname) /* Input an Infiniband address and convert to binary. */ int FAST_FUNC in_ib(const char *bufp, struct sockaddr *sap) { - unsigned char *ptr; - char c; - const char *orig; - int i; - unsigned val; - sap->sa_family = ib_hwtype.type; - ptr = (unsigned char *) sap->sa_data; - - i = 0; - orig = bufp; - while ((*bufp != '\0') && (i < INFINIBAND_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 { - errno = EINVAL; - 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) - val >>= 4; - else { - errno = EINVAL; - return -1; - } - if (c != 0) - bufp++; - *ptr++ = (unsigned char) (val & 0377); - i++; - - /* We might get a semicolon here - not required. */ - if (*bufp == ':') { - bufp++; - } - } -#ifdef DEBUG - fprintf(stderr, "in_ib(%s): %s\n", orig, UNSPEC_print(sap->sa_data)); -#endif +//TODO: error check? + hex2bin((char*)sap->sa_data, bufp, INFINIBAND_ALEN); +# ifdef HWIB_DEBUG + fprintf(stderr, "in_ib(%s): %s\n", bufp, UNSPEC_print(sap->sa_data)); +# endif return 0; } #endif - int FAST_FUNC display_interfaces(char *ifname) { int status;