X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=networking%2Fifconfig.c;h=fcbeb24202c5f8a38cb4814a22c83ac8cd14eb51;hb=403a5a298eaa5d1d827ad6ebbf38a7b765ba5b44;hp=513f176d1f28a805d7668e3ded081ecb3dd9e1f6;hpb=baf55a85fc08ddad71b43a2348fd4f58338be83f;p=oweals%2Fbusybox.git diff --git a/networking/ifconfig.c b/networking/ifconfig.c index 513f176d1..fcbeb2420 100644 --- a/networking/ifconfig.c +++ b/networking/ifconfig.c @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* ifconfig * * Similar to the standard Unix ifconfig, but with only the necessary @@ -6,17 +7,10 @@ * Bjorn Wesen, Axis Communications AB * * - * Authors of the original ifconfig was: + * Authors of the original ifconfig was: * Fred N. van Kempen, * - * 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. - * - * $Id: ifconfig.c,v 1.19 2002/08/22 18:22:10 bug1 Exp $ - * + * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ /* @@ -32,21 +26,21 @@ * IPV6 support added by Bart Visscher */ -#include -#include -#include /* strcmp and friends */ -#include /* isdigit and friends */ -#include /* offsetof */ -#include +#include #include #include -#include -#include +#if defined(__GLIBC__) && __GLIBC__ >=2 && __GLIBC_MINOR__ >= 1 +#include +#include +#else +#include +#include +#endif #include "inet_common.h" -#include "busybox.h" +#include "libbb.h" -#ifdef CONFIG_FEATURE_IFCONFIG_SLIP -#include +#if ENABLE_FEATURE_IFCONFIG_SLIP +# include #endif /* I don't know if this is needed for busybox or not. Anyone? */ @@ -55,20 +49,20 @@ /* 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 IFF_DYNAMIC -#define IFF_DYNAMIC 0x8000 /* dialup device with changing addresses */ +# define IFF_DYNAMIC 0x8000 /* dialup device with changing addresses */ #endif -#if CONFIG_FEATURE_IPV6 +#if ENABLE_FEATURE_IPV6 struct in6_ifreq { struct in6_addr ifr6_addr; uint32_t ifr6_prefixlen; @@ -119,6 +113,13 @@ struct in6_ifreq { #define A_NETMASK 0x20 /* Set if netmask (check for multiple sets). */ #define A_SET_AFTER 0x40 /* Set a flag at the end. */ #define A_COLON_CHK 0x80 /* Is this needed? See below. */ +#if ENABLE_FEATURE_IFCONFIG_BROADCAST_PLUS +#define A_HOSTNAME 0x100 /* Set if it is ip addr. */ +#define A_BROADCAST 0x200 /* Set if it is broadcast addr. */ +#else +#define A_HOSTNAME 0 +#define A_BROADCAST 0 +#endif /* * These defines are for dealing with the A_CAST_TYPE field. @@ -148,12 +149,12 @@ struct in6_ifreq { #define ARG_IRQ (A_ARG_REQ | A_MAP_UCHAR) #define ARG_DSTADDR (A_ARG_REQ | A_CAST_HOST_COPY_RESOLVE) #define ARG_NETMASK (A_ARG_REQ | A_CAST_HOST_COPY_RESOLVE | A_NETMASK) -#define ARG_BROADCAST (A_ARG_REQ | A_CAST_HOST_COPY_RESOLVE | A_SET_AFTER) +#define ARG_BROADCAST (A_ARG_REQ | A_CAST_HOST_COPY_RESOLVE | A_SET_AFTER | A_BROADCAST) #define ARG_HW (A_ARG_REQ | A_CAST_HOST_COPY_IN_ETHER) -#define ARG_POINTOPOINT (A_CAST_HOST_COPY_RESOLVE | A_SET_AFTER) +#define ARG_POINTOPOINT (A_ARG_REQ | A_CAST_HOST_COPY_RESOLVE | A_SET_AFTER) #define ARG_KEEPALIVE (A_ARG_REQ | A_CAST_CHAR_PTR) #define ARG_OUTFILL (A_ARG_REQ | A_CAST_CHAR_PTR) -#define ARG_HOSTNAME (A_CAST_HOST_COPY_RESOLVE | A_SET_AFTER | A_COLON_CHK) +#define ARG_HOSTNAME (A_CAST_HOST_COPY_RESOLVE | A_SET_AFTER | A_COLON_CHK | A_HOSTNAME) #define ARG_ADD_DEL (A_CAST_HOST_COPY_RESOLVE | A_SET_AFTER) @@ -169,127 +170,133 @@ struct arg1opt { struct options { const char *name; +#if ENABLE_FEATURE_IFCONFIG_BROADCAST_PLUS + const unsigned int flags:6; + const unsigned int arg_flags:10; +#else const unsigned char flags; const unsigned char arg_flags; +#endif const unsigned short selector; }; #define ifreq_offsetof(x) offsetof(struct ifreq, x) static const struct arg1opt Arg1Opt[] = { - {"SIOCSIFMETRIC", SIOCSIFMETRIC, ifreq_offsetof(ifr_metric)}, - {"SIOCSIFMTU", SIOCSIFMTU, ifreq_offsetof(ifr_mtu)}, - {"SIOCSIFTXQLEN", SIOCSIFTXQLEN, ifreq_offsetof(ifr_qlen)}, - {"SIOCSIFDSTADDR", SIOCSIFDSTADDR, ifreq_offsetof(ifr_dstaddr)}, - {"SIOCSIFNETMASK", SIOCSIFNETMASK, ifreq_offsetof(ifr_netmask)}, - {"SIOCSIFBRDADDR", SIOCSIFBRDADDR, ifreq_offsetof(ifr_broadaddr)}, -#ifdef CONFIG_FEATURE_IFCONFIG_HW - {"SIOCSIFHWADDR", SIOCSIFHWADDR, ifreq_offsetof(ifr_hwaddr)}, -#endif - {"SIOCSIFDSTADDR", SIOCSIFDSTADDR, ifreq_offsetof(ifr_dstaddr)}, + { "SIFMETRIC", SIOCSIFMETRIC, ifreq_offsetof(ifr_metric) }, + { "SIFMTU", SIOCSIFMTU, ifreq_offsetof(ifr_mtu) }, + { "SIFTXQLEN", SIOCSIFTXQLEN, ifreq_offsetof(ifr_qlen) }, + { "SIFDSTADDR", SIOCSIFDSTADDR, ifreq_offsetof(ifr_dstaddr) }, + { "SIFNETMASK", SIOCSIFNETMASK, ifreq_offsetof(ifr_netmask) }, + { "SIFBRDADDR", SIOCSIFBRDADDR, ifreq_offsetof(ifr_broadaddr) }, +#if ENABLE_FEATURE_IFCONFIG_HW + { "SIFHWADDR", SIOCSIFHWADDR, ifreq_offsetof(ifr_hwaddr) }, +#endif + { "SIFDSTADDR", SIOCSIFDSTADDR, ifreq_offsetof(ifr_dstaddr) }, #ifdef SIOCSKEEPALIVE - {"SIOCSKEEPALIVE", SIOCSKEEPALIVE, ifreq_offsetof(ifr_data)}, + { "SKEEPALIVE", SIOCSKEEPALIVE, ifreq_offsetof(ifr_data) }, #endif #ifdef SIOCSOUTFILL - {"SIOCSOUTFILL", SIOCSOUTFILL, ifreq_offsetof(ifr_data)}, + { "SOUTFILL", SIOCSOUTFILL, ifreq_offsetof(ifr_data) }, #endif -#ifdef CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ - {"SIOCSIFMAP", SIOCSIFMAP, ifreq_offsetof(ifr_map.mem_start)}, - {"SIOCSIFMAP", SIOCSIFMAP, ifreq_offsetof(ifr_map.base_addr)}, - {"SIOCSIFMAP", SIOCSIFMAP, ifreq_offsetof(ifr_map.irq)}, +#if ENABLE_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ + { "SIFMAP", SIOCSIFMAP, ifreq_offsetof(ifr_map.mem_start) }, + { "SIFMAP", SIOCSIFMAP, ifreq_offsetof(ifr_map.base_addr) }, + { "SIFMAP", SIOCSIFMAP, ifreq_offsetof(ifr_map.irq) }, #endif /* Last entry if for unmatched (possibly hostname) arg. */ -#if CONFIG_FEATURE_IPV6 - {"SIOCSIFADDR", SIOCSIFADDR, ifreq_offsetof(ifr_addr)}, /* IPv6 version ignores the offset */ - {"SIOCDIFADDR", SIOCDIFADDR, ifreq_offsetof(ifr_addr)}, /* IPv6 version ignores the offset */ +#if ENABLE_FEATURE_IPV6 + { "SIFADDR", SIOCSIFADDR, ifreq_offsetof(ifr_addr) }, /* IPv6 version ignores the offset */ + { "DIFADDR", SIOCDIFADDR, ifreq_offsetof(ifr_addr) }, /* IPv6 version ignores the offset */ #endif - {"SIOCSIFADDR", SIOCSIFADDR, ifreq_offsetof(ifr_addr)}, + { "SIFADDR", SIOCSIFADDR, ifreq_offsetof(ifr_addr) }, }; static const struct options OptArray[] = { - {"metric", N_ARG, ARG_METRIC, 0}, - {"mtu", N_ARG, ARG_MTU, 0}, - {"txqueuelen", N_ARG, ARG_TXQUEUELEN, 0}, - {"dstaddr", N_ARG, ARG_DSTADDR, 0}, - {"netmask", N_ARG, ARG_NETMASK, 0}, - {"broadcast", N_ARG | M_CLR, ARG_BROADCAST, IFF_BROADCAST}, -#ifdef CONFIG_FEATURE_IFCONFIG_HW - {"hw", N_ARG, ARG_HW, 0}, -#endif - {"pointopoint", N_ARG | M_CLR, ARG_POINTOPOINT, IFF_POINTOPOINT}, + { "metric", N_ARG, ARG_METRIC, 0 }, + { "mtu", N_ARG, ARG_MTU, 0 }, + { "txqueuelen", N_ARG, ARG_TXQUEUELEN, 0 }, + { "dstaddr", N_ARG, ARG_DSTADDR, 0 }, + { "netmask", N_ARG, ARG_NETMASK, 0 }, + { "broadcast", N_ARG | M_CLR, ARG_BROADCAST, IFF_BROADCAST }, +#if ENABLE_FEATURE_IFCONFIG_HW + { "hw", N_ARG, ARG_HW, 0 }, +#endif + { "pointopoint", N_ARG | M_CLR, ARG_POINTOPOINT, IFF_POINTOPOINT }, #ifdef SIOCSKEEPALIVE - {"keepalive", N_ARG, ARG_KEEPALIVE, 0}, + { "keepalive", N_ARG, ARG_KEEPALIVE, 0 }, #endif #ifdef SIOCSOUTFILL - {"outfill", N_ARG, ARG_OUTFILL, 0}, -#endif -#ifdef CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ - {"mem_start", N_ARG, ARG_MEM_START, 0}, - {"io_addr", N_ARG, ARG_IO_ADDR, 0}, - {"irq", N_ARG, ARG_IRQ, 0}, -#endif -#if CONFIG_FEATURE_IPV6 - {"add", N_ARG, ARG_ADD_DEL, 0}, - {"del", N_ARG, ARG_ADD_DEL, 0}, -#endif - {"arp", N_CLR | M_SET, 0, IFF_NOARP}, - {"trailers", N_CLR | M_SET, 0, IFF_NOTRAILERS}, - {"promisc", N_SET | M_CLR, 0, IFF_PROMISC}, - {"multicast", N_SET | M_CLR, 0, IFF_MULTICAST}, - {"allmulti", N_SET | M_CLR, 0, IFF_ALLMULTI}, - {"dynamic", N_SET | M_CLR, 0, IFF_DYNAMIC}, - {"up", N_SET, 0, (IFF_UP | IFF_RUNNING)}, - {"down", N_CLR, 0, IFF_UP}, - {NULL, 0, ARG_HOSTNAME, (IFF_UP | IFF_RUNNING)} + { "outfill", N_ARG, ARG_OUTFILL, 0 }, +#endif +#if ENABLE_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ + { "mem_start", N_ARG, ARG_MEM_START, 0 }, + { "io_addr", N_ARG, ARG_IO_ADDR, 0 }, + { "irq", N_ARG, ARG_IRQ, 0 }, +#endif +#if ENABLE_FEATURE_IPV6 + { "add", N_ARG, ARG_ADD_DEL, 0 }, + { "del", N_ARG, ARG_ADD_DEL, 0 }, +#endif + { "arp", N_CLR | M_SET, 0, IFF_NOARP }, + { "trailers", N_CLR | M_SET, 0, IFF_NOTRAILERS }, + { "promisc", N_SET | M_CLR, 0, IFF_PROMISC }, + { "multicast", N_SET | M_CLR, 0, IFF_MULTICAST }, + { "allmulti", N_SET | M_CLR, 0, IFF_ALLMULTI }, + { "dynamic", N_SET | M_CLR, 0, IFF_DYNAMIC }, + { "up", N_SET, 0, (IFF_UP | IFF_RUNNING) }, + { "down", N_CLR, 0, IFF_UP }, + { NULL, 0, ARG_HOSTNAME, (IFF_UP | IFF_RUNNING) } }; /* * A couple of prototypes. */ -#ifdef CONFIG_FEATURE_IFCONFIG_HW -static int in_ether(char *bufp, struct sockaddr *sap); -#endif - -#ifdef CONFIG_FEATURE_IFCONFIG_STATUS -extern int interface_opt_a; -extern int display_interfaces(char *ifname); +#if ENABLE_FEATURE_IFCONFIG_HW +static int in_ether(const char *bufp, struct sockaddr *sap); #endif /* * Our main function. */ +int ifconfig_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int ifconfig_main(int argc, char **argv) { struct ifreq ifr; struct sockaddr_in sai; - -#if CONFIG_FEATURE_IPV6 - struct sockaddr_in6 sai6; -#endif -#ifdef CONFIG_FEATURE_IFCONFIG_HW +#if ENABLE_FEATURE_IFCONFIG_HW struct sockaddr sa; #endif const struct arg1opt *a1op; const struct options *op; int sockfd; /* socket fd we use to manipulate stuff with */ - int goterr; int selector; - char *p; - char host[128]; +#if ENABLE_FEATURE_IFCONFIG_BROADCAST_PLUS + unsigned int mask; + unsigned int did_flags; + unsigned int sai_hostname, sai_netmask; +#else unsigned char mask; unsigned char did_flags; +#endif + char *p; + /*char host[128];*/ + const char *host = NULL; /* make gcc happy */ - goterr = 0; did_flags = 0; +#if ENABLE_FEATURE_IFCONFIG_BROADCAST_PLUS + sai_hostname = 0; + sai_netmask = 0; +#endif /* skip argv[0] */ ++argv; --argc; -#ifdef CONFIG_FEATURE_IFCONFIG_STATUS - if ((argc > 0) && (strcmp(*argv, "-a") == 0)) { +#if ENABLE_FEATURE_IFCONFIG_STATUS + if (argc > 0 && (argv[0][0] == '-' && argv[0][1] == 'a' && !argv[0][2])) { interface_opt_a = 1; --argc; ++argv; @@ -297,18 +304,15 @@ int ifconfig_main(int argc, char **argv) #endif if (argc <= 1) { -#ifdef CONFIG_FEATURE_IFCONFIG_STATUS +#if ENABLE_FEATURE_IFCONFIG_STATUS return display_interfaces(argc ? *argv : NULL); #else - error_msg_and_die - ("ifconfig was not compiled with interface status display support."); + bb_error_msg_and_die("no support for status display"); #endif } /* Create a channel to the NET kernel. */ - if ((sockfd = socket(AF_INET, SOCK_DGRAM, 0)) < 0) { - perror_msg_and_die("socket"); - } + sockfd = xsocket(AF_INET, SOCK_DGRAM, 0); /* get interface name */ safe_strncpy(ifr.ifr_name, *argv, IFNAMSIZ); @@ -323,204 +327,180 @@ int ifconfig_main(int argc, char **argv) } for (op = OptArray; op->name; op++) { /* Find table entry. */ if (strcmp(p, op->name) == 0) { /* If name matches... */ - if ((mask &= op->flags)) { /* set the mask and go. */ - goto FOUND_ARG;; - } + mask &= op->flags; + if (mask) /* set the mask and go. */ + goto FOUND_ARG; /* If we get here, there was a valid arg with an */ /* invalid '-' prefix. */ - ++goterr; - goto LOOP; + bb_error_msg_and_die("bad: '%s'", p-1); } } /* We fell through, so treat as possible hostname. */ - a1op = Arg1Opt + (sizeof(Arg1Opt) / sizeof(Arg1Opt[0])) - 1; + a1op = Arg1Opt + ARRAY_SIZE(Arg1Opt) - 1; mask = op->arg_flags; goto HOSTNAME; - FOUND_ARG: + FOUND_ARG: if (mask & ARG_MASK) { mask = op->arg_flags; a1op = Arg1Opt + (op - OptArray); - if (mask & A_NETMASK & did_flags) { - show_usage(); - } + if (mask & A_NETMASK & did_flags) + bb_show_usage(); if (*++argv == NULL) { - if (mask & A_ARG_REQ) { - show_usage(); - } else { - --argv; - mask &= A_SET_AFTER; /* just for broadcast */ - } + if (mask & A_ARG_REQ) + bb_show_usage(); + --argv; + mask &= A_SET_AFTER; /* just for broadcast */ } else { /* got an arg so process it */ - HOSTNAME: - did_flags |= (mask & A_NETMASK); + HOSTNAME: + did_flags |= (mask & (A_NETMASK|A_HOSTNAME)); if (mask & A_CAST_HOST_COPY) { -#ifdef CONFIG_FEATURE_IFCONFIG_HW +#if ENABLE_FEATURE_IFCONFIG_HW if (mask & A_CAST_RESOLVE) { #endif -#if CONFIG_FEATURE_IPV6 +#if ENABLE_FEATURE_IPV6 char *prefix; int prefix_len = 0; #endif - - safe_strncpy(host, *argv, (sizeof host)); -#if CONFIG_FEATURE_IPV6 - if ((prefix = strchr(host, '/'))) { - prefix_len = atol(prefix + 1); - if ((prefix_len < 0) || (prefix_len > 128)) { - ++goterr; - goto LOOP; - } - *prefix = 0; + /*safe_strncpy(host, *argv, (sizeof host));*/ + host = *argv; +#if ENABLE_FEATURE_IPV6 + prefix = strchr(host, '/'); + if (prefix) { + prefix_len = xatou_range(prefix + 1, 0, 128); + *prefix = '\0'; } #endif - sai.sin_family = AF_INET; sai.sin_port = 0; - if (!strcmp(host, bb_INET_default)) { + if (!strcmp(host, bb_str_default)) { /* Default is special, meaning 0.0.0.0. */ sai.sin_addr.s_addr = INADDR_ANY; -#if CONFIG_FEATURE_IPV6 - } else - if (inet_pton(AF_INET6, host, &sai6.sin6_addr) > - 0) { - int sockfd6; - struct in6_ifreq ifr6; - - memcpy((char *) &ifr6.ifr6_addr, - (char *) &sai6.sin6_addr, - sizeof(struct in6_addr)); - - /* Create a channel to the NET kernel. */ - if ((sockfd6 = - socket(AF_INET6, SOCK_DGRAM, 0)) < 0) { - perror_msg_and_die("socket6"); - } - if (ioctl(sockfd6, SIOGIFINDEX, &ifr) < 0) { - perror("SIOGIFINDEX"); - ++goterr; + } +#if ENABLE_FEATURE_IFCONFIG_BROADCAST_PLUS + else if ((host[0] == '+' && !host[1]) && (mask & A_BROADCAST) + && (did_flags & (A_NETMASK|A_HOSTNAME)) == (A_NETMASK|A_HOSTNAME) + ) { + /* + is special, meaning broadcast is derived. */ + sai.sin_addr.s_addr = (~sai_netmask) | (sai_hostname & sai_netmask); + } +#endif + else { + len_and_sockaddr *lsa; + if (strcmp(host, "inet") == 0) + continue; /* compat stuff */ + lsa = xhost2sockaddr(host, 0); +#if ENABLE_FEATURE_IPV6 + if (lsa->u.sa.sa_family == AF_INET6) { + int sockfd6; + struct in6_ifreq ifr6; + + memcpy((char *) &ifr6.ifr6_addr, + (char *) &(lsa->u.sin6.sin6_addr), + sizeof(struct in6_addr)); + + /* Create a channel to the NET kernel. */ + sockfd6 = xsocket(AF_INET6, SOCK_DGRAM, 0); + xioctl(sockfd6, SIOGIFINDEX, &ifr); + ifr6.ifr6_ifindex = ifr.ifr_ifindex; + ifr6.ifr6_prefixlen = prefix_len; + ioctl_or_perror_and_die(sockfd6, a1op->selector, &ifr6, "SIOC%s", a1op->name); + if (ENABLE_FEATURE_CLEAN_UP) + free(lsa); continue; } - ifr6.ifr6_ifindex = ifr.ifr_ifindex; - ifr6.ifr6_prefixlen = prefix_len; - if (ioctl(sockfd6, a1op->selector, &ifr6) < 0) { - perror(a1op->name); - ++goterr; - } - continue; #endif - } else if (inet_aton(host, &sai.sin_addr) == 0) { - /* It's not a dotted quad. */ - ++goterr; - continue; + sai.sin_addr = lsa->u.sin.sin_addr; + if (ENABLE_FEATURE_CLEAN_UP) + free(lsa); } +#if ENABLE_FEATURE_IFCONFIG_BROADCAST_PLUS + if (mask & A_HOSTNAME) + sai_hostname = sai.sin_addr.s_addr; + if (mask & A_NETMASK) + sai_netmask = sai.sin_addr.s_addr; +#endif p = (char *) &sai; -#ifdef CONFIG_FEATURE_IFCONFIG_HW +#if ENABLE_FEATURE_IFCONFIG_HW } else { /* A_CAST_HOST_COPY_IN_ETHER */ /* This is the "hw" arg case. */ - if (strcmp("ether", *argv) || (*++argv == NULL)) { - show_usage(); - } - safe_strncpy(host, *argv, (sizeof host)); - if (in_ether(host, &sa)) { - error_msg("invalid hw-addr %s", host); - ++goterr; - continue; - } + if (strcmp("ether", *argv) || !*++argv) + bb_show_usage(); + /*safe_strncpy(host, *argv, sizeof(host));*/ + host = *argv; + if (in_ether(host, &sa)) + bb_error_msg_and_die("invalid hw-addr %s", host); p = (char *) &sa; } #endif - memcpy((((char *) (&ifr)) + a1op->ifr_offset), + memcpy( (((char *)&ifr) + a1op->ifr_offset), p, sizeof(struct sockaddr)); } else { - unsigned int i = strtoul(*argv, NULL, 0); - - p = ((char *) (&ifr)) + a1op->ifr_offset; -#ifdef CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ + /* FIXME: error check?? */ + unsigned long i = strtoul(*argv, NULL, 0); + p = ((char *)&ifr) + a1op->ifr_offset; +#if ENABLE_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ if (mask & A_MAP_TYPE) { - if (ioctl(sockfd, SIOCGIFMAP, &ifr) < 0) { - ++goterr; - continue; - } - if ((mask & A_MAP_UCHAR) == A_MAP_UCHAR) { + xioctl(sockfd, SIOCGIFMAP, &ifr); + if ((mask & A_MAP_UCHAR) == A_MAP_UCHAR) *((unsigned char *) p) = i; - } else if (mask & A_MAP_USHORT) { + else if (mask & A_MAP_USHORT) *((unsigned short *) p) = i; - } else { + else *((unsigned long *) p) = i; - } } else #endif - if (mask & A_CAST_CHAR_PTR) { + if (mask & A_CAST_CHAR_PTR) *((caddr_t *) p) = (caddr_t) i; - } else { /* A_CAST_INT */ + else /* A_CAST_INT */ *((int *) p) = i; - } } - if (ioctl(sockfd, a1op->selector, &ifr) < 0) { - perror(a1op->name); - ++goterr; - continue; - } + ioctl_or_perror_and_die(sockfd, a1op->selector, &ifr, "SIOC%s", a1op->name); #ifdef QUESTIONABLE_ALIAS_CASE if (mask & A_COLON_CHK) { /* * Don't do the set_flag() if the address is an alias with - * a - at the end, since it's deleted already! - Roman + * a '-' at the end, since it's deleted already! - Roman * * Should really use regex.h here, not sure though how well - * it'll go with the cross-platform support etc. + * it'll go with the cross-platform support etc. */ char *ptr; short int found_colon = 0; - - for (ptr = ifr.ifr_name; *ptr; ptr++) { - if (*ptr == ':') { + for (ptr = ifr.ifr_name; *ptr; ptr++) + if (*ptr == ':') found_colon++; - } - } - - if (found_colon && *(ptr - 1) == '-') { + if (found_colon && ptr[-1] == '-') continue; - } } #endif } - if (!(mask & A_SET_AFTER)) { + if (!(mask & A_SET_AFTER)) continue; - } mask = N_SET; } - if (ioctl(sockfd, SIOCGIFFLAGS, &ifr) < 0) { - perror("SIOCGIFFLAGS"); - ++goterr; - } else { - selector = op->selector; - if (mask & SET_MASK) { - ifr.ifr_flags |= selector; - } else { - ifr.ifr_flags &= ~selector; - } - if (ioctl(sockfd, SIOCSIFFLAGS, &ifr) < 0) { - perror("SIOCSIFFLAGS"); - ++goterr; - } - } - LOOP: - continue; - } /* end of while-loop */ - - return goterr; + xioctl(sockfd, SIOCGIFFLAGS, &ifr); + selector = op->selector; + if (mask & SET_MASK) + ifr.ifr_flags |= selector; + else + ifr.ifr_flags &= ~selector; + xioctl(sockfd, SIOCSIFFLAGS, &ifr); + } /* while () */ + + if (ENABLE_FEATURE_CLEAN_UP) + close(sockfd); + return 0; } -#ifdef CONFIG_FEATURE_IFCONFIG_HW +#if ENABLE_FEATURE_IFCONFIG_HW /* 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 *ptr; int i, j; unsigned char val; unsigned char c; @@ -528,22 +508,21 @@ static int in_ether(char *bufp, struct sockaddr *sap) sap->sa_family = ARPHRD_ETHER; ptr = sap->sa_data; - for (i = 0; i < ETH_ALEN; i++) { - val = 0; + i = 0; + do { + j = val = 0; /* We might get a semicolon here - not required. */ if (i && (*bufp == ':')) { bufp++; } - for (j = 0; j < 2; j++) { + do { c = *bufp; - if (c >= '0' && c <= '9') { + if (((unsigned char)(c - '0')) <= 9) { c -= '0'; - } else if (c >= 'a' && c <= 'f') { - c -= ('a' - 10); - } else if (c >= 'A' && c <= 'F') { - c -= ('A' - 10); + } else if (((unsigned char)((c|0x20) - 'a')) <= 5) { + c = (c|0x20) - ('a'-10); } else if (j && (c == ':' || c == 0)) { break; } else { @@ -552,10 +531,10 @@ static int in_ether(char *bufp, struct sockaddr *sap) ++bufp; val <<= 4; val += c; - } + } while (++j < 2); *ptr++ = val; - } + } while (++i < ETH_ALEN); - return (int) (*bufp); /* Error if we don't end at end of string. */ + return *bufp; /* Error if we don't end at end of string. */ } #endif