I forgot to malloc space for the NULL.
[oweals/busybox.git] / ifconfig.c
index a3e2c0fdbb7da0a40f6e86896b05a2f2d76f5dbb..75bcf38e8f25a2946389f17737f4a25d18320d82 100644 (file)
  * Foundation;  either  version 2 of the License, or  (at
  * your option) any later version.
  *
- * $Id: ifconfig.c,v 1.3 2001/02/20 06:14:07 andersen Exp $
+ * $Id: ifconfig.c,v 1.8 2001/03/12 09:57:59 mjn3 Exp $
  *
  */
 
+/*
+ * Heavily modified by Manuel Novoa III       Mar 6, 2001
+ *
+ * From initial port to busybox, removed most of the redundancy by
+ * converting to a table-driven approach.  Added several (optional)
+ * args missing from initial port.
+ *
+ * Still missing:  media, tunnel.
+ */
+
 #include <stdio.h>
 #include <stdlib.h>
-#include <errno.h>
 #include <string.h>   // strcmp and friends
 #include <ctype.h>    // isdigit and friends
+#include <stddef.h>                            /* offsetof */
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <linux/if_ether.h>
 #include "busybox.h"
 
-static int sockfd;  /* socket fd we use to manipulate stuff with */
+#ifdef BB_FEATURE_IFCONFIG_SLIP
+#include <linux/if_slip.h>
+#endif
 
-/* print usage and exit */
+/* I don't know if this is needed for busybox or not.  Anyone? */
+#define QUESTIONABLE_ALIAS_CASE
 
-#define _(x) x
 
-/* Set a certain interface flag. */
-static int
-set_flag(char *ifname, short flag)
-{
-       struct ifreq ifr;
-       
-       strcpy(ifr.ifr_name, ifname);
-       if (ioctl(sockfd, SIOCGIFFLAGS, &ifr) < 0) {
-               perror("SIOCGIFFLAGS"); 
-               return (-1);
-       }
-       strcpy(ifr.ifr_name, ifname);
-       ifr.ifr_flags |= flag;
-       if (ioctl(sockfd, SIOCSIFFLAGS, &ifr) < 0) {
-               perror("SIOCSIFFLAGS");
-               return -1;
-       }
-       return (0);
-}
+/* Defines for glibc2.0 users. */
+#ifndef SIOCSIFTXQLEN
+#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
+#endif
 
-/* Clear a certain interface flag. */
-static int
-clr_flag(char *ifname, short flag)
-{
-       struct ifreq ifr;
-       
-       strcpy(ifr.ifr_name, ifname);
-       if (ioctl(sockfd, SIOCGIFFLAGS, &ifr) < 0) {
-               perror("SIOCGIFFLAGS");
-               return -1;
-       }
-       strcpy(ifr.ifr_name, ifname);
-       ifr.ifr_flags &= ~flag;
-       if (ioctl(sockfd, SIOCSIFFLAGS, &ifr) < 0) {
-               perror("SIOCSIFFLAGS");
-               return -1;
-       }
-       return (0);
-}
+#ifndef IFF_DYNAMIC
+#define IFF_DYNAMIC     0x8000  /* dialup device with changing addresses */
+#endif
 
-/* resolve XXX.YYY.ZZZ.QQQ -> binary */
+/*
+ * Here are the bit masks for the "flags" member of struct options below.
+ * N_ signifies no arg prefix; M_ signifies arg prefixed by '-'.
+ * CLR clears the flag; SET sets the flag; ARG signifies (optional) arg.
+ */
+#define N_CLR            0x01
+#define M_CLR            0x02
+#define N_SET            0x04
+#define M_SET            0x08
+#define N_ARG            0x10
+#define M_ARG            0x20
+
+#define M_MASK           (M_CLR | M_SET | M_ARG)
+#define N_MASK           (N_CLR | N_SET | N_ARG)
+#define SET_MASK         (N_SET | M_SET)
+#define CLR_MASK         (N_CLR | M_CLR)
+#define SET_CLR_MASK     (SET_MASK | CLR_MASK)
+#define ARG_MASK         (M_ARG | N_ARG)
+
+/*
+ * Here are the bit masks for the "arg_flags" member of struct options below.
+ */
 
-static int
-INET_resolve(char *name, struct sockaddr_in *sin)
-{
-       sin->sin_family = AF_INET;
-       sin->sin_port = 0;
+/*
+ * cast type:
+ *   00 int
+ *   01 char *
+ *   02 HOST_COPY in_ether
+ *   03 HOST_COPY INET_resolve
+ */
+#define A_CAST_TYPE      0x03
+/*
+ * map type:
+ *   00 not a map type (mem_start, io_addr, irq)
+ *   04 memstart (unsigned long)
+ *   08 io_addr  (unsigned short)
+ *   0C irq      (unsigned char)
+ */
+#define A_MAP_TYPE       0x0C
+#define A_ARG_REQ        0x10  /* Set if an arg is required. */
+#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. */
+
+/*
+ * These defines are for dealing with the A_CAST_TYPE field.
+ */
+#define A_CAST_CHAR_PTR  0x01
+#define A_CAST_RESOLVE   0x01
+#define A_CAST_HOST_COPY 0x02
+#define A_CAST_HOST_COPY_IN_ETHER    A_CAST_HOST_COPY
+#define A_CAST_HOST_COPY_RESOLVE     (A_CAST_HOST_COPY | A_CAST_RESOLVE)
+
+/*
+ * These defines are for dealing with the A_MAP_TYPE field.
+ */
+#define A_MAP_ULONG      0x04  /* memstart */
+#define A_MAP_USHORT     0x08  /* io_addr */
+#define A_MAP_UCHAR      0x0C  /* irq */
 
-       /* Default is special, meaning 0.0.0.0. */
-       if (!strcmp(name, "default")) {
-               sin->sin_addr.s_addr = INADDR_ANY;
-               return (1);
-       }
-       /* Look to see if it's a dotted quad. */
-       if (inet_aton(name, &sin->sin_addr)) {
-               return 0;
-       }
-       /* guess not.. */
-       return -1;
-}
+/*
+ * Define the bit masks signifying which operations to perform for each arg.
+ */
 
-/* Input an Ethernet address and convert to binary. */
-static int
-in_ether(char *bufp, struct sockaddr *sap)
-{
-       unsigned char *ptr;
-       char c, *orig;
-       int i;
-       unsigned val;
-       
-       sap->sa_family = ARPHRD_ETHER;
-       ptr = 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
-                       fprintf(stderr,
-                               _("in_ether(%s): invalid ether address!\n"),
-                               orig);
+#define ARG_METRIC       (A_ARG_REQ /*| A_CAST_INT*/)
+#define ARG_MTU          (A_ARG_REQ /*| A_CAST_INT*/)
+#define ARG_TXQUEUELEN   (A_ARG_REQ /*| A_CAST_INT*/)
+#define ARG_MEM_START    (A_ARG_REQ | A_MAP_ULONG)
+#define ARG_IO_ADDR      (A_ARG_REQ | A_MAP_USHORT)
+#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_HW           (A_ARG_REQ | A_CAST_HOST_COPY_IN_ETHER)
+#define ARG_POINTOPOINT  (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)
+
+
+/*
+ * Set up the tables.  Warning!  They must have corresponding order!
+ */
+
+struct arg1opt {
+       const char *name;
+       unsigned short selector;
+       unsigned short ifr_offset;
+};
+
+struct options {
+       const char *name;
+       const unsigned char flags;
+       const unsigned char arg_flags;
+       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 BB_FEATURE_IFCONFIG_HW
+       {"SIOCSIFHWADDR",  SIOCSIFHWADDR,  ifreq_offsetof(ifr_hwaddr)},
 #endif
-                       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 {
-#ifdef DEBUG
-                       fprintf(stderr,
-                               _("in_ether(%s): invalid ether address!\n"),
-                               orig);
+       {"SIOCSIFDSTADDR", SIOCSIFDSTADDR, ifreq_offsetof(ifr_dstaddr)},
+#ifdef SIOCSKEEPALIVE
+       {"SIOCSKEEPALIVE", SIOCSKEEPALIVE, ifreq_offsetof(ifr_data)},
 #endif
-                       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 SIOCSOUTFILL
+       {"SIOCSOUTFILL",   SIOCSOUTFILL,   ifreq_offsetof(ifr_data)},
+#endif
+#ifdef BB_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)},
+#endif
+       /* Last entry if for unmatched (possibly hostname) arg. */
+       {"SIOCSIFADDR",    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 BB_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},
+#endif
+#ifdef SIOCSOUTFILL
+       {"outfill",      N_ARG,         ARG_OUTFILL,     0},
+#endif
+#ifdef BB_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
+       {"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.
+ */
 
-       if(i != ETH_ALEN) {
-               errno = EINVAL;
-               return -1;
-       }
+#ifdef BB_FEATURE_IFCONFIG_HW
+static int in_ether(char *bufp, struct sockaddr *sap);
+#endif
 
-       return 0;
-}
+#ifdef BB_FEATURE_IFCONFIG_STATUS
+extern int interface_opt_a;
+extern int display_interfaces(char *ifname);
+#endif
+
+/*
+ * Our main function.
+ */
 
 int ifconfig_main(int argc, char **argv)
 {
        struct ifreq ifr;
-       struct sockaddr_in sa;
-       struct sockaddr sa2;
-       char **spp;
-       int goterr = 0;
-       int r, didnetmask = 0;
+       struct sockaddr_in sai;
+#ifdef BB_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];
+       unsigned char mask;
+       unsigned char did_flags;
+
+       goterr = 0;
+       did_flags = 0;
+
+       /* skip argv[0] */
+       ++argv;
+       --argc;
+
+#ifdef BB_FEATURE_IFCONFIG_STATUS
+       if ((argc > 0) && (strcmp(*argv,"-a") == 0)) {
+               interface_opt_a = 1;
+               --argc;
+               ++argv;
+       }
+#endif
 
-       if(argc < 2) {
+       if(argc <= 1) {
+#ifdef BB_FEATURE_IFCONFIG_STATUS
+               return display_interfaces(argc ? *argv : NULL);
+#else
                show_usage();
+#endif
        }
 
        /* Create a channel to the NET kernel. */
        if ((sockfd = socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
-               perror("socket");
-               exit(1);
+               perror_msg_and_die("socket");
        }
 
-       /* skip argv[0] */
-
-       argc--;
-       argv++;
-
-       spp = argv;
-
        /* get interface name */
-
-       safe_strncpy(ifr.ifr_name, *spp++, IFNAMSIZ);
+       safe_strncpy(ifr.ifr_name, *argv, IFNAMSIZ);
 
        /* Process the remaining arguments. */
-       while (*spp != (char *) NULL) {
-               if (!strcmp(*spp, "arp")) {
-                       goterr |= clr_flag(ifr.ifr_name, IFF_NOARP);
-                       spp++;
-                       continue;
-               }
-               if (!strcmp(*spp, "-arp")) {
-                       goterr |= set_flag(ifr.ifr_name, IFF_NOARP);
-                       spp++;
-                       continue;
-               }
-               
-               if (!strcmp(*spp, "trailers")) {
-                       goterr |= clr_flag(ifr.ifr_name, IFF_NOTRAILERS);
-                       spp++;
-                       continue;
-               }
-               if (!strcmp(*spp, "-trailers")) {
-                       goterr |= set_flag(ifr.ifr_name, IFF_NOTRAILERS);
-                       spp++;
-                       continue;
-               }
-               if (!strcmp(*spp, "promisc")) {
-                       goterr |= set_flag(ifr.ifr_name, IFF_PROMISC);
-                       spp++;
-                       continue;
-               }
-               if (!strcmp(*spp, "-promisc")) {
-                       goterr |= clr_flag(ifr.ifr_name, IFF_PROMISC);
-                       spp++;
-                       continue;
-               }
-               if (!strcmp(*spp, "multicast")) {
-                       goterr |= set_flag(ifr.ifr_name, IFF_MULTICAST);
-                       spp++;
-                       continue;
-               }
-               if (!strcmp(*spp, "-multicast")) {
-                       goterr |= clr_flag(ifr.ifr_name, IFF_MULTICAST);
-                       spp++;
-                       continue;
+       while (*++argv != (char *) NULL) {
+               p = *argv;
+               mask = N_MASK;
+               if (*p == '-') {                /* If the arg starts with '-'... */
+                       ++p;                            /*    advance past it and */
+                       mask = M_MASK;          /*    set the appropriate mask. */
                }
-               if (!strcmp(*spp, "allmulti")) {
-                       goterr |= set_flag(ifr.ifr_name, IFF_ALLMULTI);
-                       spp++;
-                       continue;
-               }
-               if (!strcmp(*spp, "-allmulti")) {
-                       goterr |= clr_flag(ifr.ifr_name, IFF_ALLMULTI);
-                       spp++;
-                       continue;
-               }
-               if (!strcmp(*spp, "up")) {
-                       goterr |= set_flag(ifr.ifr_name, (IFF_UP | IFF_RUNNING));
-                       spp++;
-                       continue;
-               }
-               if (!strcmp(*spp, "down")) {
-                       goterr |= clr_flag(ifr.ifr_name, IFF_UP);
-                       spp++;
-                       continue;
-               }
-
-               if (!strcmp(*spp, "metric")) {
-                       if (*++spp == NULL)
-                               show_usage();
-                       ifr.ifr_metric = atoi(*spp);
-                       if (ioctl(sockfd, SIOCSIFMETRIC, &ifr) < 0) {
-                               fprintf(stderr, "SIOCSIFMETRIC: %s\n", strerror(errno));
-                               goterr++;
-                       }
-                       spp++;
-                       continue;
-               }
-               if (!strcmp(*spp, "mtu")) {
-                       if (*++spp == NULL)
-                               show_usage();
-                       ifr.ifr_mtu = atoi(*spp);
-                       if (ioctl(sockfd, SIOCSIFMTU, &ifr) < 0) {
-                               fprintf(stderr, "SIOCSIFMTU: %s\n", strerror(errno));
-                               goterr++;
+               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;;
+                               }
+                               /* If we get here, there was a valid arg with an */
+                               /* invalid '-' prefix. */
+                               ++goterr;
+                               goto LOOP;
                        }
-                       spp++;
-                       continue;
                }
-#ifdef SIOCSKEEPALIVE
-               if (!strcmp(*spp, "keepalive")) {
-                       if (*++spp == NULL)
+               
+               /* We fell through, so treat as possible hostname. */
+               a1op = Arg1Opt + (sizeof(Arg1Opt) / sizeof(Arg1Opt[0])) - 1;
+               mask = op->arg_flags;
+               goto HOSTNAME;
+
+       FOUND_ARG:
+               if (mask & ARG_MASK) {
+                       mask = op->arg_flags;
+                       a1op = Arg1Opt + (op - OptArray);
+                       if (mask & A_NETMASK & did_flags) {
                                show_usage();
-                       ifr.ifr_data = (caddr_t) atoi(*spp);
-                       if (ioctl(sockfd, SIOCSKEEPALIVE, &ifr) < 0) {
-                               fprintf(stderr, "SIOCSKEEPALIVE: %s\n", strerror(errno));
-                               goterr++;
                        }
-                       spp++;
-                       continue;
-               }
+                       if (*++argv == NULL) {
+                               if (mask & A_ARG_REQ) {
+                                       show_usage();
+                               } else {
+                                       --argv;
+                                       mask &= A_SET_AFTER; /* just for broadcast */
+                               }
+                       } else {                        /* got an arg so process it */
+                       HOSTNAME:
+                               did_flags |= (mask & A_NETMASK);
+                               if (mask & A_CAST_HOST_COPY) {
+#ifdef BB_FEATURE_IFCONFIG_HW
+                                       if (mask & A_CAST_RESOLVE) {
 #endif
-
-#ifdef SIOCSOUTFILL
-               if (!strcmp(*spp, "outfill")) {
-                       if (*++spp == NULL)
-                               show_usage();
-                       ifr.ifr_data = (caddr_t) atoi(*spp);
-                       if (ioctl(sockfd, SIOCSOUTFILL, &ifr) < 0) {
-                               fprintf(stderr, "SIOCSOUTFILL: %s\n", strerror(errno));
-                               goterr++;
-                       }
-                       spp++;
-                       continue;
-               }
+                                               safe_strncpy(host, *argv, (sizeof host));
+                                               sai.sin_family = AF_INET;
+                                               sai.sin_port = 0;
+                                               if (!strcmp(host, "default")) {
+                                                       /* Default is special, meaning 0.0.0.0. */
+                                                       sai.sin_addr.s_addr = INADDR_ANY;
+                                               } else if (inet_aton(host, &sai.sin_addr) == 0) {
+                                                       /* It's not a dotted quad. */
+                                                       ++goterr;
+                                                       continue;
+                                               }
+                                               p = (char *) &sai;
+#ifdef BB_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)) {
+                                                       fprintf(stderr, "invalid hw-addr %s\n", host);
+                                                       ++goterr;
+                                                       continue;
+                                               }
+                                               p = (char *) &sa;
+                                       }
 #endif
-
-               if (!strcmp(*spp, "-broadcast")) {
-                       goterr |= clr_flag(ifr.ifr_name, IFF_BROADCAST);
-                       spp++;
-                       continue;
-               }
-               if (!strcmp(*spp, "broadcast")) {
-                       if (*++spp != NULL) {
-                               safe_strncpy(host, *spp, (sizeof host));
-                               if (INET_resolve(host, &sa) < 0) {
-                                       goterr++;
-                                       spp++;
-                                       continue;
-                               }
-                               memcpy((char *) &ifr.ifr_broadaddr,
-                                      (char *) &sa,
-                                      sizeof(struct sockaddr));
-                               if (ioctl(sockfd, SIOCSIFBRDADDR, &ifr) < 0) {
-                                       perror("SIOCSIFBRDADDR");
-                                       goterr++;
+                                       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 BB_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) {
+                                                       *((unsigned char *) p) = i;
+                                               } else if (mask & A_MAP_USHORT) {
+                                                       *((unsigned short *) p) = i;
+                                               } else {
+                                                       *((unsigned long *) p) = i;
+                                               }
+                                       } else
+#endif
+                                       if (mask & A_CAST_CHAR_PTR) {
+                                               *((caddr_t *) p) = (caddr_t) i;
+                                       } else { /* A_CAST_INT */
+                                               *((int *) p) = i;
+                                       }
                                }
-                               spp++;
-                       }
-                       goterr |= set_flag(ifr.ifr_name, IFF_BROADCAST);
-                       continue;
-               }
-               if (!strcmp(*spp, "dstaddr")) {
-                       if (*++spp == NULL)
-                               show_usage();
-                       safe_strncpy(host, *spp, (sizeof host));
-                       if (INET_resolve(host, &sa) < 0) {
-                               goterr++;
-                               spp++;
-                               continue;
-                       }
-                       memcpy((char *) &ifr.ifr_dstaddr, (char *) &sa,
-                              sizeof(struct sockaddr));
-                       if (ioctl(sockfd, SIOCSIFDSTADDR, &ifr) < 0) {
-                               fprintf(stderr, "SIOCSIFDSTADDR: %s\n",
-                                       strerror(errno));
-                               goterr++;
-                       }
-                       spp++;
-                       continue;
-               }
-               if (!strcmp(*spp, "netmask")) {
-                       if (*++spp == NULL || didnetmask)
-                               show_usage();
-                       safe_strncpy(host, *spp, (sizeof host));
-                       if (INET_resolve(host, &sa) < 0) {
-                               goterr++;
-                               spp++;
-                               continue;
-                       }
-                       didnetmask++;
-                       memcpy((char *) &ifr.ifr_netmask, (char *) &sa,
-                              sizeof(struct sockaddr));
-                       if (ioctl(sockfd, SIOCSIFNETMASK, &ifr) < 0) {
-                               perror("SIOCSIFNETMASK");
-                               goterr++;
-                       }
-                       spp++;
-                       continue;
-               }
-
-               if (!strcmp(*spp, "-pointopoint")) {
-                       goterr |= clr_flag(ifr.ifr_name, IFF_POINTOPOINT);
-                       spp++;
-                       continue;
-               }
-               if (!strcmp(*spp, "pointopoint")) {
-                       if (*(spp + 1) != NULL) {
-                               spp++;
-                               safe_strncpy(host, *spp, (sizeof host));
-                               if (INET_resolve(host, &sa)) {
-                                       goterr++;
-                                       spp++;
+                                               
+                               if (ioctl(sockfd, a1op->selector, &ifr) < 0) {
+                                       perror(a1op->name);
+                                       ++goterr;
                                        continue;
                                }
-                               memcpy((char *) &ifr.ifr_dstaddr, (char *) &sa,
-                                      sizeof(struct sockaddr));
-                               if (ioctl(sockfd, SIOCSIFDSTADDR, &ifr) < 0) {
-                                       perror("SIOCSIFDSTADDR");
-                                       goterr++;
-                               }
-                       }
-                       goterr |= set_flag(ifr.ifr_name, IFF_POINTOPOINT);
-                       spp++;
-                       continue;
-               };
 
-               if (!strcmp(*spp, "hw")) {
-                       if (*++spp == NULL || strcmp("ether", *spp)) {
-                               show_usage();
+#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
+                                        *
+                                        * Should really use regex.h here, not sure though how well
+                                        * 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 == ':') {
+                                                       found_colon++;
+                                               }
+                                       }
+                       
+                                       if (found_colon && *(ptr - 1) == '-') {
+                                               continue;
+                                       }
+                               }
+#endif
                        }
-                               
-                       if (*++spp == NULL) {
-                               /* silently ignore it if no address */
+                       if (!(mask & A_SET_AFTER)) {
                                continue;
                        }
+                       mask = N_SET;
+               }
 
-                       safe_strncpy(host, *spp, (sizeof host));
-                       if (in_ether(host, &sa2) < 0) {
-                               fprintf(stderr, "invalid hw-addr %s\n", host);
-                               goterr++;
-                               spp++;
-                               continue;
+               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;
                        }
-                       memcpy((char *) &ifr.ifr_hwaddr, (char *) &sa2,
-                              sizeof(struct sockaddr));
-                       if (ioctl(sockfd, SIOCSIFHWADDR, &ifr) < 0) {
-                               perror("SIOCSIFHWADDR");
-                               goterr++;
+                       if (ioctl(sockfd, SIOCSIFFLAGS, &ifr) < 0) {
+                               perror("SIOCSIFFLAGS"); 
+                               ++goterr;
                        }
-                       spp++;
-                       continue;
                }
+       LOOP:
+       } /* end of while-loop */
 
-               /* If the next argument is a valid hostname, assume OK. */
-               safe_strncpy(host, *spp, (sizeof host));
-
-               if (INET_resolve(host, &sa) < 0) {
-                       show_usage();
-               }
-               memcpy((char *) &ifr.ifr_addr,
-                      (char *) &sa, sizeof(struct sockaddr));
+       return goterr;
+}
 
-               r = ioctl(sockfd, SIOCSIFADDR, &ifr);
+#ifdef BB_FEATURE_IFCONFIG_HW
+/* Input an Ethernet address and convert to binary. */
+static int
+in_ether(char *bufp, struct sockaddr *sap)
+{
+       unsigned char *ptr;
+       int i, j;
+       unsigned char val;
+       unsigned char c;
+       
+       sap->sa_family = ARPHRD_ETHER;
+       ptr = sap->sa_data;
+       
+       for (i = 0 ; i < ETH_ALEN ; i++) {
+               val = 0;
 
-               if (r < 0) {
-                       perror("SIOCSIFADDR");
-                       goterr++;
+               /* We might get a semicolon here - not required. */
+               if (i && (*bufp == ':')) {
+                       bufp++;
                }
 
-               /*
-                * Don't do the set_flag() if the address is an alias with 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. 
-                */
-               {
-                       char *ptr;
-                       short int found_colon = 0;
-                       for (ptr = ifr.ifr_name; *ptr; ptr++ )
-                               if (*ptr == ':') found_colon++;
-                       
-                       if (!(found_colon && *(ptr - 1) == '-'))
-                               goterr |= set_flag(ifr.ifr_name, (IFF_UP | IFF_RUNNING));
+               for (j=0 ; j<2 ; j++) {
+                       c = *bufp;
+                       if (c >= '0' && c <= '9') {
+                               c -= '0';
+                       } else if (c >= 'a' && c <= 'f') {
+                               c -= ('a' + 10);
+                       } else if (c >= 'A' && c <= 'F') {
+                               c -= ('A' + 10);
+                       } else if (j && (c == ':' || c == 0)) {
+                               break;
+                       } else {
+                               return -1;
+                       }
+                       ++bufp;
+                       val <<= 4;
+                       val += c;
                }
-               
-               spp++;
-
-       } /* end of while-loop */
+               *ptr++ = val;
+       }
 
-        exit(0);
+       return (int) (*bufp);           /* Error if we don't end at end of string. */
 }
-
+#endif