Add in a first pass at ifconfig status reporting. It took a long while

hacking on the mess in net-tools-1.59, but it currently adds 12k and
supports ethernet, loop, ppp, and treats everything else as a generic
interface.  Works ok for me.
 -Erik

4 files changed, 2482 insertions, 482 deletions

diff --git a/Config.h b/Config.h
index 3fd4831..9b9eec6 100644
--- a/Config.h
+++ b/Config.h
@@ -284,6 +284,8 @@
 // Support for Minix filesystem, version 2
 //#define BB_FEATURE_MINIX2
 //
+// Enable ifconfig status reporting output -- this feature adds 12k.
+//#define BB_FEATURE_IFCONFIG_STATUS
 //
 // Enable busybox --install [-s]
 // to create links (or symlinks) for all the commands that are 
@@ -393,6 +395,14 @@
 #endif
 #endif
 //
+#if defined BB_IFCONFIG
+#ifdef BB_FEATURE_IFCONFIG_STATUS
+#define BB_INTERFACE
+#endif
+#else
+#undef BB_INTERFACE
+#endif	
+//
 #if defined BB_FEATURE_AUTOWIDTH
 #ifndef BB_FEATURE_USE_TERMIOS
 #define BB_FEATURE_USE_TERMIOS
diff --git a/ifconfig.c b/ifconfig.c
index a3e2c0f..2a50a96 100644
--- a/ifconfig.c
+++ b/ifconfig.c
@@ -15,16 +15,19 @@
  * 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.4 2001/03/06 00:48:59 andersen Exp $
+ *
+ * Majorly hacked up by Larry Doolittle <ldoolitt@recycle.lbl.gov> 
  *
  */
 
+#include "busybox.h"
+#include <sys/types.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
 #include <string.h>   // strcmp and friends
 #include <ctype.h>    // isdigit and friends
-#include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <netinet/in.h>
@@ -32,10 +35,50 @@
 #include <net/if.h>
 #include <net/if_arp.h>
 #include <linux/if_ether.h>
-#include "busybox.h"
 
 static int sockfd;  /* socket fd we use to manipulate stuff with */
 
+#define TESTME 0
+#if TESTME
+#define ioctl test_ioctl
+char *saddr_to_a(struct sockaddr *s)
+{
+	if (s->sa_family == ARPHRD_ETHER) {
+		static char hw[18];
+		sprintf(hw, "%2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x",
+			s->sa_data[0], s->sa_data[1], s->sa_data[2],
+			s->sa_data[3], s->sa_data[4], s->sa_data[5]);
+		return hw;
+	} else if (s->sa_family == AF_INET) {
+		struct sockaddr_in *ss = (struct sockaddr_in *) s;
+		return inet_ntoa(ss->sin_addr);
+	} else {
+		return NULL;
+	}
+}
+
+int test_ioctl(int __fd, unsigned long int __request, void *param)
+{
+	struct ifreq *i=(struct ifreq *)param;
+	printf("ioctl fd=%d, request=%ld\n", __fd, __request);
+	
+	switch(__request) {
+		case SIOCGIFFLAGS:   printf("  SIOCGIFFLAGS\n");       i->ifr_flags = 0;   break;
+		case SIOCSIFFLAGS:   printf("  SIOCSIFFLAGS, %x\n",    i->ifr_flags);     break;
+		case SIOCSIFMETRIC:  printf("  SIOCSIFMETRIC, %d\n",   i->ifr_metric);    break;
+		case SIOCSIFMTU:     printf("  SIOCSIFMTU, %d\n",      i->ifr_mtu);       break;
+		case SIOCSIFBRDADDR: printf("  SIOCSIFBRDADDR, %s\n",  saddr_to_a(&(i->ifr_broadaddr))); break;
+		case SIOCSIFDSTADDR: printf("  SIOCSIFDSTADDR, %s\n",  saddr_to_a(&(i->ifr_dstaddr  ))); break;
+		case SIOCSIFNETMASK: printf("  SIOCSIFNETMASK, %s\n",  saddr_to_a(&(i->ifr_netmask  ))); break;
+		case SIOCSIFADDR:    printf("  SIOCSIFADDR, %s\n",     saddr_to_a(&(i->ifr_addr     ))); break;
+		case SIOCSIFHWADDR:  printf("  SIOCSIFHWADDR, %s\n",   saddr_to_a(&(i->ifr_hwaddr   ))); break;  /* broken */
+		default:
+	}
+	return 0;
+}
+#endif
+
+
 /* print usage and exit */
 
 #define _(x) x
@@ -49,7 +92,7 @@ set_flag(char *ifname, short flag)
 	strcpy(ifr.ifr_name, ifname);
 	if (ioctl(sockfd, SIOCGIFFLAGS, &ifr) < 0) {
 		perror("SIOCGIFFLAGS"); 
-		return (-1);
+		return -1;
 	}
 	strcpy(ifr.ifr_name, ifname);
 	ifr.ifr_flags |= flag;
@@ -57,7 +100,7 @@ set_flag(char *ifname, short flag)
 		perror("SIOCSIFFLAGS");
 		return -1;
 	}
-	return (0);
+	return 0;
 }
 
 
@@ -78,9 +121,62 @@ clr_flag(char *ifname, short flag)
 		perror("SIOCSIFFLAGS");
 		return -1;
 	}
-	return (0);
+	return 0;
 }
 
+/* which element in struct ifreq to frob */
+enum frob {
+	L_METRIC,
+	L_MTU,
+	L_DATA,
+	L_BROAD,
+	L_DEST,
+	L_MASK,
+	L_HWAD,
+};
+
+
+struct flag_map {
+	char *name;
+	enum frob frob;
+	int flag;
+	int sflag;
+	int action;
+};
+
+/* action:
+ *  2   set
+ *  4   clear
+ *  6   set/clear
+ *  8   clear/set
+ *  10  numeric
+ *  12  address
+ *  14  address/clear
+ */
+const static struct flag_map flag_table[] = {
+	{"arp",         0,  IFF_NOARP,             0, 6},
+	{"trailers",    0,  IFF_NOTRAILERS,        0, 6},
+	{"promisc",     0,  IFF_PROMISC,           0, 8},
+	{"multicast",   0,  IFF_MULTICAST,         0, 8},
+	{"allmulti",    0,  IFF_ALLMULTI,          0, 8},
+	{"up",          0, (IFF_UP | IFF_RUNNING), 0, 2},
+	{"down",        0,  IFF_UP,                0, 4},
+	{"metric",      L_METRIC,              0, SIOCSIFMETRIC,  10},
+	{"mtu",         L_MTU,                 0, SIOCSIFMTU,     10},
+#ifdef SIOCSKEEPALIVE
+	{"keepalive",   L_DATA,                0, SIOCSKEEPALIVE, 10},
+#endif
+#ifdef SIOCSOUTFILL
+	{"outfill",     L_DATA,                0, SIOCSOUTFILL,   10},
+#endif
+	{"broadcast",   L_BROAD, IFF_BROADCAST,   SIOCSIFBRDADDR, 14},
+	{"dstaddr",     L_DEST,                0, SIOCSIFDSTADDR, 12},
+	{"netmask",     L_MASK,                0, SIOCSIFNETMASK, 12},
+	{"pointopoint", L_DEST,  IFF_POINTOPOINT, SIOCSIFDSTADDR, 14},
+	{"hw",          L_HWAD,                0, SIOCSIFHWADDR,  14},
+};
+
+
 /* resolve XXX.YYY.ZZZ.QQQ -> binary */
 
 static int
@@ -90,15 +186,16 @@ INET_resolve(char *name, struct sockaddr_in *sin)
 	sin->sin_port = 0;
 
 	/* Default is special, meaning 0.0.0.0. */
-	if (!strcmp(name, "default")) {
+	if (strcmp(name, "default")==0) {
 		sin->sin_addr.s_addr = INADDR_ANY;
-		return (1);
+		return 1;
 	}
 	/* Look to see if it's a dotted quad. */
 	if (inet_aton(name, &sin->sin_addr)) {
 		return 0;
 	}
 	/* guess not.. */
+	errno = EINVAL;
 	return -1;
 }
 
@@ -127,12 +224,12 @@ in_ether(char *bufp, struct sockaddr *sap)
 			val = c - 'A' + 10;
 		else {
 #ifdef DEBUG
-			fprintf(stderr,
-				_("in_ether(%s): invalid ether address!\n"),
+			error_msg(
+				_("in_ether(%s): invalid ether address!"),
 				orig);
 #endif
 			errno = EINVAL;
-			return (-1);
+			return -1;
 		}
 		val <<= 4;
 		c = *bufp;
@@ -146,22 +243,19 @@ in_ether(char *bufp, struct sockaddr *sap)
 			val >>= 4;
 		else {
 #ifdef DEBUG
-			fprintf(stderr,
-				_("in_ether(%s): invalid ether address!\n"),
+			error_msg(
+				_("in_ether(%s): invalid ether address!"),
 				orig);
 #endif
 			errno = EINVAL;
-			return (-1);
+			return -1;
 		}
 		if (c != 0)
 			bufp++;
 		*ptr++ = (unsigned char) (val & 0377);
 		i++;
 		
-		/* We might get a semicolon here - not required. */
-		if (*bufp == ':')
-			bufp++;
-		
+		/* optional colon already handled, don't swallow a second */
 	}
 
 	if(i != ETH_ALEN) {
@@ -171,25 +265,37 @@ in_ether(char *bufp, struct sockaddr *sap)
 
 	return 0;
 }
+		
+#ifdef BB_FEATURE_IFCONFIG_STATUS
+extern int display_interfaces(void);
+#else
+int display_interfaces(void)
+{
+    show_usage();
+}
+#endif
 
 int ifconfig_main(int argc, char **argv)
 {
 	struct ifreq ifr;
 	struct sockaddr_in sa;
-	struct sockaddr sa2;
-	char **spp;
+	char **spp, *cmd;
 	int goterr = 0;
-	int r, didnetmask = 0;
+	int r;
+	/* int didnetmask = 0;   special case input error detection no longer implemented */
 	char host[128];
+	const struct flag_map *ft;
+	int i, sense;
+	int a, ecode;
+	struct sockaddr *d;
 
 	if(argc < 2) {
-		show_usage();
+		return(display_interfaces());
 	}
 
 	/* 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] */
@@ -205,235 +311,84 @@ int ifconfig_main(int argc, char **argv)
 
 	/* 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;
-		}
-		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++;
-			}
-			spp++;
-			continue;
+		cmd = *spp;
+		sense=0;
+		if (*cmd=='-') {
+			sense=1;
+			cmd++;
 		}
-#ifdef SIOCSKEEPALIVE
-		if (!strcmp(*spp, "keepalive")) {
-			if (*++spp == NULL)
-				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;
-		}
-#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++;
+		ft = NULL;
+		for (i=0; i<(sizeof(flag_table)/sizeof(struct flag_map)); i++) {
+			if (strcmp(cmd, flag_table[i].name)==0) {
+				ft=flag_table+i;
+				spp++;
+				break;
 			}
-			spp++;
-			continue;
 		}
-#endif
+		if (ft) {
+			switch (ft->action+sense) {
+			case 4:
+			case 7:
+			case 8:
+			case 15:
+				goterr |= clr_flag(ifr.ifr_name, ft->flag);
+				break;
+			case 2:
+			case 6:
+			case 9:
+				goterr |= set_flag(ifr.ifr_name, ft->flag);
+				break;
+			case 10:
+				if (*spp == NULL)
+					show_usage();
+				a = atoi(*spp++);
+				switch (ft->frob) {
+					case L_METRIC: ifr.ifr_metric = a; break;
+					case L_MTU:    ifr.ifr_mtu    = a; break;
+					case L_DATA:   ifr.ifr_data   = (caddr_t) a; break;
+					default: error_msg_and_die("bugaboo");
+				}
 
-		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) {
+				if (ioctl(sockfd, ft->sflag, &ifr) < 0) {
+					perror(ft->name);  /* imperfect */
 					goterr++;
-					spp++;
-					continue;
 				}
-				memcpy((char *) &ifr.ifr_broadaddr,
-				       (char *) &sa,
-				       sizeof(struct sockaddr));
-				if (ioctl(sockfd, SIOCSIFBRDADDR, &ifr) < 0) {
-					perror("SIOCSIFBRDADDR");
-					goterr++;
+				break;
+			case 12:
+			case 14:
+				if (ft->action+sense==10 && *spp == NULL) {
+					show_usage();
+					break;
 				}
-				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++;
+				if (*spp != NULL) {
+					safe_strncpy(host, *spp, (sizeof host));
 					spp++;
-					continue;
+					if (ft->frob == L_HWAD) {
+						ecode = in_ether(host, &ifr.ifr_hwaddr);
+					} else {
+						switch (ft->frob) {
+							case L_BROAD: d = &ifr.ifr_broadaddr; break;
+							case L_DEST:  d = &ifr.ifr_dstaddr;   break;
+							case L_MASK:  d = &ifr.ifr_netmask;   break;
+							default: error_msg_and_die("bugaboo");
+						}
+						ecode = INET_resolve(host, (struct sockaddr_in *) d);
+					}
+					if (ecode < 0 || ioctl(sockfd, ft->sflag, &ifr) < 0) {
+						perror(ft->name);  /* imperfect */
+						goterr++;
+					}
 				}
-				memcpy((char *) &ifr.ifr_dstaddr, (char *) &sa,
-				       sizeof(struct sockaddr));
-				if (ioctl(sockfd, SIOCSIFDSTADDR, &ifr) < 0) {
-					perror("SIOCSIFDSTADDR");
-					goterr++;
+				if (ft->flag != 0) {
+					goterr |= set_flag(ifr.ifr_name, ft->flag);
 				}
-			}
-			goterr |= set_flag(ifr.ifr_name, IFF_POINTOPOINT);
-			spp++;
-			continue;
-		};
-
-		if (!strcmp(*spp, "hw")) {
-			if (*++spp == NULL || strcmp("ether", *spp)) {
+				break;
+			default:
 				show_usage();
-			}
-				
-			if (*++spp == NULL) {
-				/* silently ignore it if no address */
-				continue;
-			}
-
-			safe_strncpy(host, *spp, (sizeof host));
-			if (in_ether(host, &sa2) < 0) {
-				fprintf(stderr, "invalid hw-addr %s\n", host);
-				goterr++;
-				spp++;
-				continue;
-			}
-			memcpy((char *) &ifr.ifr_hwaddr, (char *) &sa2,
-			       sizeof(struct sockaddr));
-			if (ioctl(sockfd, SIOCSIFHWADDR, &ifr) < 0) {
-				perror("SIOCSIFHWADDR");
-				goterr++;
-			}
-			spp++;
+			} /* end of switch */
 			continue;
 		}
-
+		
 		/* If the next argument is a valid hostname, assume OK. */
 		safe_strncpy(host, *spp, (sizeof host));
 
@@ -471,6 +426,6 @@ int ifconfig_main(int argc, char **argv)
 
 	} /* end of while-loop */
 
-        exit(0);
+        return goterr;
 }
 
diff --git a/interface.c b/interface.c
new file mode 100644
index 0000000..05019e5
--- /dev/null
+++ b/interface.c
@@ -0,0 +1,2080 @@
+/*
+ * ifconfig   This file contains an implementation of the command
+ *              that either displays or sets the characteristics of
+ *              one or more of the system's networking interfaces.
+ *
+ * Version:     $Id: interface.c,v 1.1 2001/03/06 00:48:59 andersen Exp $
+ *
+ * Author:      Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
+ *              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.
+ *
+ * Patched to support 'add' and 'del' keywords for INET(4) addresses
+ * by Mrs. Brisby <mrs.brisby@nimh.org>
+ *
+ * {1.34} - 19980630 - Arnaldo Carvalho de Melo <acme@conectiva.com.br>
+ *                     - gettext instead of catgets for i18n
+ *          10/1998  - Andi Kleen. Use interface list primitives.       
+ *	    20001008 - Bernd Eckenfels, Patch from RH for setting mtu 
+ *			(default AF was wrong)
+ * stolen from net-tools-1.59 and stripped down for busybox by 
+ *			Erik Andersen <andersee@debian.org>
+ */
+
+#include "busybox.h"
+
+/* 
+ * 
+ * Protocol Families.
+ * 
+ */
+#define HAVE_AFINET 1
+#undef HAVE_AFINET6
+#undef HAVE_AFIPX
+#undef HAVE_AFATALK
+#undef HAVE_AFNETROM
+#undef HAVE_AFX25
+#undef HAVE_AFECONET
+
+/* 
+ * 
+ * Device Hardware types.
+ * 
+ */
+#define HAVE_HWETHER	1
+#define HAVE_HWPPP	1
+#undef HAVE_HWSLIP
+
+
+#include <features.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/ioctl.h>
+#include <netinet/in.h>
+#include <net/if.h>
+#include <net/if_arp.h>
+#include <stdio.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <ctype.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <netdb.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <arpa/nameser.h>
+
+#define _(x) x
+#define _PATH_PROCNET_DEV               "/proc/net/dev"
+#define new(p) ((p) = xcalloc(1,sizeof(*(p))))
+#define xmalloc malloc
+#define xcalloc calloc
+#define xrealloc realloc
+#define KRELEASE(maj,min,patch) ((maj) * 10000 + (min)*1000 + (patch))
+
+int procnetdev_vsn = 1;
+
+
+/* Ugh.  But libc5 doesn't provide POSIX types.  */
+#include <asm/types.h>
+
+
+#ifdef HAVE_HWSLIP
+#include <linux/if_slip.h>
+#endif
+
+#if HAVE_AFINET6
+
+#ifndef _LINUX_IN6_H
+/*
+ *    This is in linux/include/net/ipv6.h.
+ */
+
+struct in6_ifreq {
+    struct in6_addr ifr6_addr;
+    __u32 ifr6_prefixlen;
+    unsigned int ifr6_ifindex;
+};
+
+#endif
+
+#endif				/* HAVE_AFINET6 */
+
+#if HAVE_AFIPX
+#if (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1)
+#include <netipx/ipx.h>
+#else
+#include "ipx.h"
+#endif
+#endif
+#if 0
+#include "net-support.h"
+#include "pathnames.h"
+#include "version.h"
+#include "../intl.h"
+#include "interface.h"
+#include "sockets.h"
+#include "util.h"
+#endif
+
+/* This structure defines protocol families and their handlers. */
+struct aftype {
+    char *name;
+    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;
+};
+
+extern struct aftype *aftypes[];
+int flag_unx;
+int flag_ipx;
+int flag_ax25;
+int flag_ddp;
+int flag_netrom;
+int flag_inet;
+int flag_inet6;
+int flag_econet;
+int flag_x25 = 0;
+int flag_ash;
+
+
+struct aftrans_t {
+    char *alias;
+    char *name;
+    int *flag;
+} aftrans[] = {
+
+    {
+	"ax25", "ax25", &flag_ax25
+    },
+    {
+	"ip", "inet", &flag_inet
+    },
+    {
+	"ip6", "inet6", &flag_inet6
+    },
+    {
+	"ipx", "ipx", &flag_ipx
+    },
+    {
+	"appletalk", "ddp", &flag_ddp
+    },
+    {
+	"netrom", "netrom", &flag_netrom
+    },
+    {
+	"inet", "inet", &flag_inet
+    },
+    {
+	"inet6", "inet6", &flag_inet6
+    },
+    {
+	"ddp", "ddp", &flag_ddp
+    },
+    {
+	"unix", "unix", &flag_unx
+    },
+    {
+	"tcpip", "inet", &flag_inet
+    },
+    {
+	"econet", "ec", &flag_econet
+    },
+    {
+	"x25", "x25", &flag_x25
+    },
+    {
+        "ash", "ash", &flag_ash
+    },
+    {
+	0, 0, 0
+    }
+};
+
+char afname[256] = "";
+
+#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));
+}
+
+
+struct aftype unix_aftype =
+{
+    "unix", NULL, /*"UNIX Domain", */ AF_UNIX, 0,
+    UNIX_print, UNIX_sprint, NULL, NULL,
+    NULL, NULL, NULL,
+    -1,
+    "/proc/net/unix"
+};
+#endif				/* HAVE_AFUNIX */
+
+#if HAVE_AFINET
+
+extern int h_errno;             /* some netdb.h versions don't export this */
+
+/* cache */
+struct addr {
+    struct sockaddr_in addr;
+    char *name;
+    int host;
+    struct addr *next;
+};
+
+static struct addr *INET_nn = NULL;	/* addr-to-name cache           */
+
+static int INET_resolve(char *name, struct sockaddr_in *sin, int hostfirst)
+{
+    struct hostent *hp;
+    struct netent *np;
+
+    /* Grmpf. -FvK */
+    sin->sin_family = AF_INET;
+    sin->sin_port = 0;
+
+    /* 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;
+    }
+    /* If we expect this to be a hostname, try hostname database first */
+#ifdef DEBUG
+    if (hostfirst) fprintf (stderr, "gethostbyname (%s)\n", name);
+#endif
+    if (hostfirst && 
+	(hp = gethostbyname(name)) != (struct hostent *) NULL) {
+	memcpy((char *) &sin->sin_addr, (char *) hp->h_addr_list[0], 
+		sizeof(struct in_addr));
+	return 0;
+    }
+    /* Try the NETWORKS database to see if this is a known network. */
+#ifdef DEBUG
+    fprintf (stderr, "getnetbyname (%s)\n", name);
+#endif
+    if ((np = getnetbyname(name)) != (struct netent *) NULL) {
+	sin->sin_addr.s_addr = htonl(np->n_net);
+	return 1;
+    }
+    if (hostfirst) {
+	/* Don't try again */
+	errno = h_errno;
+	return -1;
+    }
+#ifdef DEBUG
+    res_init();
+    _res.options |= RES_DEBUG;
+#endif
+
+#ifdef DEBUG
+    fprintf (stderr, "gethostbyname (%s)\n", name);
+#endif
+    if ((hp = gethostbyname(name)) == (struct hostent *) NULL) {
+	errno = h_errno;
+	return -1;
+    }
+    memcpy((char *) &sin->sin_addr, (char *) hp->h_addr_list[0], 
+	   sizeof(struct in_addr));
+
+    return 0;
+}
+
+
+/* numeric: & 0x8000: default instead of *, 
+ *	    & 0x4000: host instead of net, 
+ *	    & 0x0fff: don't resolve
+ */
+static int INET_rresolve(char *name, size_t len, struct sockaddr_in *sin, 
+			 int numeric, unsigned int netmask)
+{
+    struct hostent *ent;
+    struct netent *np;
+    struct addr *pn;
+    unsigned long ad, host_ad;
+    int host = 0;
+
+    /* Grmpf. -FvK */
+    if (sin->sin_family != AF_INET) {
+#ifdef DEBUG
+	fprintf(stderr, _("rresolve: unsupport address family %d !\n"), sin->sin_family);
+#endif
+	errno = EAFNOSUPPORT;
+	return (-1);
+    }
+    ad = (unsigned long) sin->sin_addr.s_addr;
+#ifdef DEBUG
+    fprintf (stderr, "rresolve: %08lx, mask %08x, num %08x \n", ad, netmask, numeric);
+#endif
+    if (ad == INADDR_ANY) {
+	if ((numeric & 0x0FFF) == 0) {
+	    if (numeric & 0x8000)
+		safe_strncpy(name, "default", len);
+	    else
+	        safe_strncpy(name, "*", len);
+	    return (0);
+	}
+    }
+    if (numeric & 0x0FFF) {
+        safe_strncpy(name, inet_ntoa(sin->sin_addr), len);
+	return (0);
+    }
+
+    if ((ad & (~netmask)) != 0 || (numeric & 0x4000))
+	host = 1;
+#if 0
+    INET_nn = NULL;
+#endif
+    pn = INET_nn;
+    while (pn != NULL) {
+	if (pn->addr.sin_addr.s_addr == ad && pn->host == host) {
+	    safe_strncpy(name, pn->name, len);
+#ifdef DEBUG
+	    fprintf (stderr, "rresolve: found %s %08lx in cache\n", (host? "host": "net"), ad);
+#endif
+	    return (0);
+	}
+	pn = pn->next;
+    }
+
+    host_ad = ntohl(ad);
+    np = NULL;
+    ent = NULL;
+    if (host) {
+#ifdef DEBUG
+	fprintf (stderr, "gethostbyaddr (%08lx)\n", ad);
+#endif
+	ent = gethostbyaddr((char *) &ad, 4, AF_INET);
+	if (ent != NULL)
+	    safe_strncpy(name, ent->h_name, len);
+    } else {
+#ifdef DEBUG
+	fprintf (stderr, "getnetbyaddr (%08lx)\n", host_ad);
+#endif
+	np = getnetbyaddr(host_ad, AF_INET);
+	if (np != NULL)
+	    safe_strncpy(name, np->n_name, len);
+    }
+    if ((ent == NULL) && (np == NULL))
+	safe_strncpy(name, inet_ntoa(sin->sin_addr), len);
+    pn = (struct addr *) malloc(sizeof(struct addr));
+    pn->addr = *sin;
+    pn->next = INET_nn;
+    pn->host = host;
+    pn->name = (char *) malloc(strlen(name) + 1);
+    strcpy(pn->name, name);
+    INET_nn = pn;
+
+    return (0);
+}
+
+
+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)));
+}
+
+
+/* Display an Internet socket address. */
+static char *INET_sprint(struct sockaddr *sap, int numeric)
+{
+    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, 0xffffff00) != 0)
+	return (NULL);
+
+    return (buff);
+}
+
+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);
+}
+
+
+static int INET_getsock(char *bufp, struct sockaddr *sap)
+{
+    char *sp = bufp, *bp;
+    unsigned int i;
+    unsigned val;
+    struct sockaddr_in *sin;
+
+    sin = (struct sockaddr_in *) sap;
+    sin->sin_family = AF_INET;
+    sin->sin_port = 0;
+
+    val = 0;
+    bp = (char *) &val;
+    for (i = 0; i < sizeof(sin->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'))
+	    bp[i] |= (int) (*sp - '0');
+	else
+	    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'))
+	    bp[i] |= (int) (*sp - '0');
+	else
+	    return (-1);
+
+	sp++;
+    }
+    sin->sin_addr.s_addr = htonl(val);
+
+    return (sp - bufp);
+}
+
+static int INET_input(int type, char *bufp, struct sockaddr *sap)
+{
+    switch (type) {
+    case 1:
+	return (INET_getsock(bufp, sap));
+    case 256:
+	return (INET_resolve(bufp, (struct sockaddr_in *) sap, 1));
+    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;
+}
+
+
+struct aftype inet_aftype =
+{
+    "inet", NULL, /*"DARPA Internet", */ AF_INET, sizeof(unsigned long),
+    INET_print, INET_sprint, INET_input, INET_reserror,
+    NULL /*INET_rprint */ , NULL /*INET_rinput */ ,
+    INET_getnetmask,
+    -1,
+    NULL
+};
+
+#endif				/* HAVE_AFINET */
+
+/* Display an UNSPEC address. */
+static char *UNSPEC_print(unsigned char *ptr)
+{
+    static char buff[64];
+    char *pos;
+    unsigned int i;
+
+    pos = buff;
+    for (i = 0; i < sizeof(struct sockaddr); i++) {
+	pos += sprintf(pos, "%02X-", (*ptr++ & 0377));
+    }
+    buff[strlen(buff) - 1] = '\0';
+    return (buff);
+}
+
+/* Display an UNSPEC socket address. */
+static 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(sap->sa_data));
+}
+
+struct aftype unspec_aftype =
+{
+    "unspec", NULL, /*"UNSPEC", */ AF_UNSPEC, 0,
+    UNSPEC_print, UNSPEC_sprint, NULL, NULL,
+    NULL,
+};
+
+static short sVafinit = 0;
+
+struct aftype *aftypes[] =
+{
+#if HAVE_AFUNIX
+    &unix_aftype,
+#endif
+#if HAVE_AFINET
+    &inet_aftype,
+#endif
+#if HAVE_AFINET6
+    &inet6_aftype,
+#endif
+#if HAVE_AFAX25
+    &ax25_aftype,
+#endif
+#if HAVE_AFNETROM
+    &netrom_aftype,
+#endif
+#if HAVE_AFROSE
+    &rose_aftype,
+#endif
+#if HAVE_AFIPX
+    &ipx_aftype,
+#endif
+#if HAVE_AFATALK
+    &ddp_aftype,
+#endif
+#if HAVE_AFECONET
+    &ec_aftype,
+#endif
+#if HAVE_AFASH
+    &ash_aftype,
+#endif
+#if HAVE_AFX25
+    &x25_aftype,
+#endif
+    &unspec_aftype,
+    NULL
+};
+
+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
+#if HAVE_AFAX25
+    ax25_aftype.title = _("AMPR AX.25");
+#endif
+#if HAVE_AFNETROM
+    netrom_aftype.title = _("AMPR NET/ROM");
+#endif
+#if HAVE_AFIPX
+    ipx_aftype.title = _("Novell IPX");
+#endif
+#if HAVE_AFATALK
+    ddp_aftype.title = _("Appletalk DDP");
+#endif
+#if HAVE_AFECONET
+    ec_aftype.title = _("Econet");
+#endif
+#if HAVE_AFX25
+    x25_aftype.title = _("CCITT X.25");
+#endif
+#if HAVE_AFROSE
+    rose_aftype.title = _("AMPR ROSE");
+#endif
+#if HAVE_AFASH
+    ash_aftype.title = _("Ash");
+#endif	
+    sVafinit = 1;
+}
+
+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 = index(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)) {
+		fprintf(stderr, _("Too much address family arguments.\n"));
+		return (0);
+	    }
+	    if (paft->flag)
+		(*paft->flag)++;
+	    if (afname[0])
+		strcat(afname, ",");
+	    strcat(afname, paft->name);
+	    break;
+	}
+	if (!paft->alias) {
+	    fprintf(stderr, _("Unknown address family `%s'.\n"), tmp1);
+	    return (1);
+	}
+	tmp1 = tmp2;
+    }
+
+    return (0);
+}
+
+/* set the default AF list from the program name or a constant value    */
+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. */
+struct aftype *get_aftype(const char *name)
+{
+    struct aftype **afp;
+
+    if (!sVafinit)
+	afinit();
+
+    afp = aftypes;
+    while (*afp != NULL) {
+	if (!strcmp((*afp)->name, name))
+	    return (*afp);
+	afp++;
+    }
+    if (index(name, ','))
+	fprintf(stderr, _("Please don't supply more than one address family.\n"));
+    return (NULL);
+}
+
+
+/* Check our protocol family table for this family. */
+struct aftype *get_afntype(int af)
+{
+    struct aftype **afp;
+
+    if (!sVafinit)
+	afinit();
+
+    afp = aftypes;
+    while (*afp != NULL) {
+	if ((*afp)->af == af)
+	    return (*afp);
+	afp++;
+    }
+    return (NULL);
+}
+
+/* Check our protocol family table for this family and return its socket */
+int get_socket_for_af(int af)
+{
+    struct aftype **afp;
+
+    if (!sVafinit)
+	afinit();
+
+    afp = aftypes;
+    while (*afp != NULL) {
+	if ((*afp)->af == af)
+	    return (*afp)->fd;
+	afp++;
+    }
+    return -1;
+}
+
+/* type: 0=all, 1=getroute */
+void print_aflist(int type) {
+    int count = 0;
+    char * txt;
+    struct aftype **afp;
+
+    if (!sVafinit)
+	afinit();
+
+    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");
+}
+
+struct user_net_device_stats {
+    unsigned long long rx_packets;	/* total packets received       */
+    unsigned long long tx_packets;	/* total packets transmitted    */
+    unsigned long long rx_bytes;	/* total bytes received         */
+    unsigned long long tx_bytes;	/* total bytes transmitted      */
+    unsigned long rx_errors;	/* bad packets received         */
+    unsigned long tx_errors;	/* packet transmit problems     */
+    unsigned long rx_dropped;	/* no space in linux buffers    */
+    unsigned long tx_dropped;	/* no space available in linux  */
+    unsigned long rx_multicast;	/* multicast packets received   */
+    unsigned long rx_compressed;
+    unsigned long tx_compressed;
+    unsigned long collisions;
+
+    /* detailed rx_errors: */
+    unsigned long rx_length_errors;
+    unsigned long rx_over_errors;	/* receiver ring buff overflow  */
+    unsigned long rx_crc_errors;	/* recved pkt with crc error    */
+    unsigned long rx_frame_errors;	/* recv'd frame alignment error */
+    unsigned long rx_fifo_errors;	/* recv'r fifo overrun          */
+    unsigned long rx_missed_errors;	/* receiver missed packet     */
+    /* detailed tx_errors */
+    unsigned long tx_aborted_errors;
+    unsigned long tx_carrier_errors;
+    unsigned long tx_fifo_errors;
+    unsigned long tx_heartbeat_errors;
+    unsigned long tx_window_errors;
+};
+
+struct interface {
+    struct interface *next, *prev; 
+    char name[IFNAMSIZ];	/* interface name        */
+    short type;			/* if type               */
+    short flags;		/* various flags         */
+    int metric;			/* routing metric        */
+    int mtu;			/* MTU value             */
+    int tx_queue_len;		/* transmit queue length */
+    struct ifmap map;		/* hardware setup        */
+    struct sockaddr addr;	/* IP address            */
+    struct sockaddr dstaddr;	/* P-P IP address        */
+    struct sockaddr broadaddr;	/* IP broadcast address  */
+    struct sockaddr netmask;	/* IP network mask       */
+    struct sockaddr ipxaddr_bb;	/* IPX network address   */
+    struct sockaddr ipxaddr_sn;	/* IPX network address   */
+    struct sockaddr ipxaddr_e3;	/* IPX network address   */
+    struct sockaddr ipxaddr_e2;	/* IPX network address   */
+    struct sockaddr ddpaddr;	/* Appletalk DDP address */
+    struct sockaddr ecaddr;	/* Econet address        */
+    int has_ip;
+    int has_ipx_bb;
+    int has_ipx_sn;
+    int has_ipx_e3;
+    int has_ipx_e2;
+    int has_ax25;
+    int has_ddp;
+    int has_econet;
+    char hwaddr[32];		/* HW address            */
+    int statistics_valid;
+    struct user_net_device_stats stats;		/* statistics            */
+    int keepalive;		/* keepalive value for SLIP */
+    int outfill;		/* outfill value for SLIP */
+};
+
+
+int opt_a = 0;			/* show all interfaces          */
+int opt_i = 0;			/* show the statistics          */
+int opt_v = 0;			/* debugging output flag        */
+
+int addr_family = 0;		/* currently selected AF        */
+static struct interface *int_list, *int_last;
+int skfd = -1;			/* generic raw socket desc.     */
+
+
+int sockets_open(int family)
+{
+    struct aftype **aft;
+    int sfd = -1;
+    static int force = -1;
+
+    if (force < 0) {
+	force = 0;
+	if (get_kernel_revision() < KRELEASE(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;
+	}
+#if HAVE_AFNETROM
+	if (af->af == AF_NETROM)
+	    type = SOCK_SEQPACKET;
+#endif
+#if HAVE_AFX25
+       if (af->af == AF_X25)
+           type = SOCK_SEQPACKET;
+#endif
+	af->fd = socket(af->af, type, 0);
+	if (af->fd >= 0)
+	    sfd = af->fd;
+    }
+    if (sfd < 0)
+	fprintf(stderr, _("No usable address families found.\n"));
+    return sfd;
+}
+
+/* like strcmp(), but knows about numbers */
+int nstrcmp(const char *astr, const char *b)
+{
+    const char *a = astr;
+
+    while (*a == *b) {
+	if (*a == '\0')
+	    return 0;
+	a++;
+	b++;
+    }
+    if (isdigit(*a)) {
+	if (!isdigit(*b))
+	    return -1;
+	while (a > astr) {
+	    a--;
+	    if (!isdigit(*a)) {
+		a++;
+		break;
+	    }
+	    if (!isdigit(*b))
+		return -1;
+	    b--;
+	}
+	return atoi(a) > atoi(b) ? 1 : -1;
+    }
+    return *a - *b;
+}
+
+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); 
+	    if (n == 0) 
+		    return ife; 
+	    if (n < 0) 
+		    break; 
+    }
+    new(new); 
+    safe_strncpy(new->name, name, IFNAMSIZ); 
+    nextp = ife ? &ife->next : &int_list;
+    new->prev = ife;
+    new->next = *nextp; 
+    if (new->next) 
+	    new->next->prev = new; 
+    else
+	    int_last = new; 
+    *nextp = new; 
+    return new; 
+}
+
+
+static int if_readconf(void)
+{
+    int numreqs = 30;
+    struct ifconf ifc;
+    struct ifreq *ifr;
+    int n, err = -1;
+    int skfd;
+
+    /* SIOCGIFCONF currently seems to only work properly on AF_INET sockets
+       (as of 2.1.128) */ 
+    skfd = get_socket_for_af(AF_INET);
+    if (skfd < 0) {
+	fprintf(stderr, _("warning: no inet socket available: %s\n"),
+		strerror(errno));
+	/* Try to soldier on with whatever socket we can get hold of.  */
+	skfd = sockets_open(0);
+	if (skfd < 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(skfd, 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)
+{
+    while (isspace(*p))
+	p++;
+    while (*p) {
+	if (isspace(*p))
+	    break;
+	if (*p == ':') {	/* could be an alias */
+	    char *dot = p, *dotname = name;
+	    *name++ = *p++;
+	    while (isdigit(*p))
+		*name++ = *p++;
+	    if (*p != ':') {	/* it wasn't, backup */
+		p = dot;
+		name = dotname;
+	    }
+	    if (*p == '\0')
+		return NULL;
+	    p++;
+	    break;
+	}
+	*name++ = *p++;
+    }
+    *name++ = '\0';
+    return p;
+}
+
+static int get_dev_fields(char *bp, struct interface *ife)
+{
+    switch (procnetdev_vsn) {
+    case 3:
+	sscanf(bp,
+	"%llu %llu %lu %lu %lu %lu %lu %lu %llu %llu %lu %lu %lu %lu %lu %lu",
+	       &ife->stats.rx_bytes,
+	       &ife->stats.rx_packets,
+	       &ife->stats.rx_errors,
+	       &ife->stats.rx_dropped,
+	       &ife->stats.rx_fifo_errors,
+	       &ife->stats.rx_frame_errors,
+	       &ife->stats.rx_compressed,
+	       &ife->stats.rx_multicast,
+
+	       &ife->stats.tx_bytes,
+	       &ife->stats.tx_packets,
+	       &ife->stats.tx_errors,
+	       &ife->stats.tx_dropped,
+	       &ife->stats.tx_fifo_errors,
+	       &ife->stats.collisions,
+	       &ife->stats.tx_carrier_errors,
+	       &ife->stats.tx_compressed);
+	break;
+    case 2:
+	sscanf(bp, "%llu %llu %lu %lu %lu %lu %llu %llu %lu %lu %lu %lu %lu",
+	       &ife->stats.rx_bytes,
+	       &ife->stats.rx_packets,
+	       &ife->stats.rx_errors,
+	       &ife->stats.rx_dropped,
+	       &ife->stats.rx_fifo_errors,
+	       &ife->stats.rx_frame_errors,
+
+	       &ife->stats.tx_bytes,
+	       &ife->stats.tx_packets,
+	       &ife->stats.tx_errors,
+	       &ife->stats.tx_dropped,
+	       &ife->stats.tx_fifo_errors,
+	       &ife->stats.collisions,
+	       &ife->stats.tx_carrier_errors);
+	ife->stats.rx_multicast = 0;
+	break;
+    case 1:
+	sscanf(bp, "%llu %lu %lu %lu %lu %llu %lu %lu %lu %lu %lu",
+	       &ife->stats.rx_packets,
+	       &ife->stats.rx_errors,
+	       &ife->stats.rx_dropped,
+	       &ife->stats.rx_fifo_errors,
+	       &ife->stats.rx_frame_errors,
+
+	       &ife->stats.tx_packets,
+	       &ife->stats.tx_errors,
+	       &ife->stats.tx_dropped,
+	       &ife->stats.tx_fifo_errors,
+	       &ife->stats.collisions,
+	       &ife->stats.tx_carrier_errors);
+	ife->stats.rx_bytes = 0;
+	ife->stats.tx_bytes = 0;
+	ife->stats.rx_multicast = 0;
+	break;
+    }
+    return 0;
+}
+
+static int procnetdev_version(char *buf)
+{
+    if (strstr(buf, "compressed"))
+	return 3;
+    if (strstr(buf, "bytes"))
+	return 2;
+    return 1;
+}
+
+static int if_readlist_proc(char *target)
+{
+    static int proc_read; 
+    FILE *fh;
+    char buf[512];
+    struct interface *ife;
+    int err;
+
+    if (proc_read) 
+	    return 0; 
+    if (!target) 
+	    proc_read = 1;
+
+    fh = fopen(_PATH_PROCNET_DEV, "r");
+    if (!fh) {
+		fprintf(stderr, _("Warning: cannot open %s (%s). Limited output.\n"),
+			_PATH_PROCNET_DEV, strerror(errno)); 
+		return if_readconf();
+	}	
+    fgets(buf, sizeof buf, fh);	/* eat line */
+    fgets(buf, sizeof buf, fh);
+
+#if 0				/* pretty, but can't cope with missing fields */
+    fmt = proc_gen_fmt(_PATH_PROCNET_DEV, 1, fh,
+		       "face", "",	/* parsed separately */
+		       "bytes", "%lu",
+		       "packets", "%lu",
+		       "errs", "%lu",
+		       "drop", "%lu",
+		       "fifo", "%lu",
+		       "frame", "%lu",
+		       "compressed", "%lu",
+		       "multicast", "%lu",
+		       "bytes", "%lu",
+		       "packets", "%lu",
+		       "errs", "%lu",
+		       "drop", "%lu",
+		       "fifo", "%lu",
+		       "colls", "%lu",
+		       "carrier", "%lu",
+		       "compressed", "%lu",
+		       NULL);
+    if (!fmt)
+	return -1;
+#else
+    procnetdev_vsn = procnetdev_version(buf);
+#endif
+
+    err = 0;
+    while (fgets(buf, sizeof buf, fh)) {
+	char *s, name[IFNAMSIZ];
+	s = get_name(name, buf);    
+	ife = add_interface(name);
+	get_dev_fields(s, ife);
+	ife->statistics_valid = 1;
+	if (target && !strcmp(target,name))
+		break;
+    }
+    if (ferror(fh)) {
+	perror(_PATH_PROCNET_DEV);
+	err = -1;
+	proc_read = 0; 
+    }
+
+#if 0
+    free(fmt);
+#endif
+    fclose(fh);
+    return err;
+}
+
+int if_readlist(void) 
+{ 
+    int err = if_readlist_proc(NULL); 
+    if (!err)
+	    err = if_readconf();
+    return err;
+} 
+
+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;
+}
+
+/* Support for fetching an IPX address */
+
+#if HAVE_AFIPX
+static int ipx_getaddr(int sock, int ft, struct ifreq *ifr)
+{
+    ((struct sockaddr_ipx *) &ifr->ifr_addr)->sipx_type = ft;
+    return ioctl(sock, SIOCGIFADDR, ifr);
+}
+#endif
+
+
+/* Fetch the interface configuration from the kernel. */
+int if_fetch(struct interface *ife)
+{
+    struct ifreq ifr;
+    int fd;
+    char *ifname = ife->name; 
+
+    strcpy(ifr.ifr_name, ifname);
+    if (ioctl(skfd, SIOCGIFFLAGS, &ifr) < 0)
+	return (-1);
+    ife->flags = ifr.ifr_flags;
+
+    strcpy(ifr.ifr_name, ifname);
+    if (ioctl(skfd, SIOCGIFHWADDR, &ifr) < 0)
+	memset(ife->hwaddr, 0, 32);
+    else
+	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
+	ife->metric = ifr.ifr_metric;
+
+    strcpy(ifr.ifr_name, ifname);
+    if (ioctl(skfd, SIOCGIFMTU, &ifr) < 0)
+	ife->mtu = 0;
+    else
+	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
+
+    strcpy(ifr.ifr_name, ifname);
+    if (ioctl(skfd, SIOCGIFMAP, &ifr) < 0)
+	memset(&ife->map, 0, sizeof(struct ifmap));
+    else
+	memcpy(&ife->map, &ifr.ifr_map, sizeof(struct ifmap));
+
+    strcpy(ifr.ifr_name, ifname);
+    if (ioctl(skfd, SIOCGIFMAP, &ifr) < 0)
+	memset(&ife->map, 0, sizeof(struct ifmap));
+    else
+	ife->map = ifr.ifr_map;
+
+#ifdef HAVE_TXQUEUELEN
+    strcpy(ifr.ifr_name, ifname);
+    if (ioctl(skfd, SIOCGIFTXQLEN, &ifr) < 0)
+	ife->tx_queue_len = -1;	/* unknown value */
+    else
+	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));
+    }
+#endif
+
+#if HAVE_AFATALK
+    /* DDP address maybe ? */
+    fd = get_socket_for_af(AF_APPLETALK);
+    if (fd >= 0) {
+	strcpy(ifr.ifr_name, ifname);
+	if (ioctl(fd, SIOCGIFADDR, &ifr) == 0) {
+	    ife->ddpaddr = ifr.ifr_addr;
+	    ife->has_ddp = 1;
+	}
+    }
+#endif
+
+#if HAVE_AFIPX
+    /* Look for IPX addresses with all framing types */
+    fd = get_socket_for_af(AF_IPX);
+    if (fd >= 0) {
+	strcpy(ifr.ifr_name, ifname);
+	if (!ipx_getaddr(fd, IPX_FRAME_ETHERII, &ifr)) {
+	    ife->has_ipx_bb = 1;
+	    ife->ipxaddr_bb = ifr.ifr_addr;
+	}
+	strcpy(ifr.ifr_name, ifname);
+	if (!ipx_getaddr(fd, IPX_FRAME_SNAP, &ifr)) {
+	    ife->has_ipx_sn = 1;
+	    ife->ipxaddr_sn = ifr.ifr_addr;
+	}
+	strcpy(ifr.ifr_name, ifname);
+	if (!ipx_getaddr(fd, IPX_FRAME_8023, &ifr)) {
+	    ife->has_ipx_e3 = 1;
+	    ife->ipxaddr_e3 = ifr.ifr_addr;
+	}
+	strcpy(ifr.ifr_name, ifname);
+	if (!ipx_getaddr(fd, IPX_FRAME_8022, &ifr)) {
+	    ife->has_ipx_e2 = 1;
+	    ife->ipxaddr_e2 = ifr.ifr_addr;
+	}
+    }
+#endif
+
+#if HAVE_AFECONET
+    /* Econet address maybe? */
+    fd = get_socket_for_af(AF_ECONET);
+    if (fd >= 0) {
+	strcpy(ifr.ifr_name, ifname);
+	if (ioctl(fd, SIOCGIFADDR, &ifr) == 0) {
+	    ife->ecaddr = ifr.ifr_addr;
+	    ife->has_econet = 1;
+	}
+    }
+#endif
+
+    return 0;
+}
+
+
+int do_if_fetch(struct interface *ife)
+{ 
+    if (if_fetch(ife) < 0) {
+	char *errmsg; 
+	if (errno == ENODEV) { 
+	    /* Give better error message for this case. */ 
+	    errmsg = _("Device not found"); 
+	} else { 
+	    errmsg = strerror(errno); 
+	}
+  	fprintf(stderr, _("%s: error fetching interface information: %s\n"),
+		ife->name, errmsg);
+	return -1;
+    }
+    return 0; 
+}
+
+/* This structure defines hardware protocols and their handlers. */
+struct hwtype {
+    char *name;
+    char *title;
+    int type;
+    int alen;
+    char *(*print) (unsigned char *);
+    int (*input) (char *, struct sockaddr *);
+    int (*activate) (int fd);
+    int suppress_null_addr;
+};
+
+/* Display an UNSPEC address. */
+static char *pr_unspec(unsigned char *ptr)
+{
+    static char buff[64];
+    char *pos;
+    unsigned int i;
+
+    pos = buff;
+    for (i = 0; i < sizeof(struct sockaddr); i++) {
+	pos += sprintf(pos, "%02X-", (*ptr++ & 0377));
+    }
+    buff[strlen(buff) - 1] = '\0';
+    return (buff);
+}
+
+struct hwtype unspec_hwtype =
+{
+    "unspec", NULL, /*"UNSPEC", */ -1, 0,
+    pr_unspec, NULL, NULL
+};
+
+struct hwtype loop_hwtype =
+{
+    "loop", NULL, /*"Local Loopback", */ ARPHRD_LOOPBACK, 0,
+    NULL, NULL, NULL
+};
+
+#if HAVE_HWETHER
+#include <net/if_arp.h>
+#include <linux/if_ether.h>
+
+extern struct hwtype ether_hwtype;
+
+/* Display an Ethernet address in readable format. */
+static char *pr_ether(unsigned char *ptr)
+{
+    static char buff[64];
+
+    snprintf(buff, sizeof(buff), "%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);
+}
+
+
+/* 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 = ether_hwtype.type;
+    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);
+#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);
+#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 == ':') {
+	    if (i == ETH_ALEN) {
+#ifdef DEBUG
+		fprintf(stderr, _("in_ether(%s): trailing : ignored!\n"),
+			orig)
+#endif
+		    ;		/* nothing */
+	    }
+	    bufp++;
+	}
+    }
+
+    /* That's it.  Any trailing junk? */
+    if ((i == ETH_ALEN) && (*bufp != '\0')) {
+#ifdef DEBUG
+	fprintf(stderr, _("in_ether(%s): trailing junk!\n"), orig);
+	errno = EINVAL;
+	return (-1);
+#endif
+    }
+#ifdef DEBUG
+    fprintf(stderr, "in_ether(%s): %s\n", orig, pr_ether(sap->sa_data));
+#endif
+
+    return (0);
+}
+
+
+struct hwtype ether_hwtype =
+{
+    "ether", NULL, /*"10Mbps Ethernet", */ ARPHRD_ETHER, ETH_ALEN,
+    pr_ether, in_ether, NULL
+};
+
+
+#endif				/* HAVE_HWETHER */
+
+
+#if HAVE_HWPPP
+
+#include <net/if_arp.h>
+
+/* Start the PPP encapsulation on the file descriptor. */
+static int do_ppp(int fd)
+{
+    fprintf(stderr, _("You cannot start PPP with this program.\n"));
+    return -1;
+}
+
+
+struct hwtype ppp_hwtype =
+{
+    "ppp", NULL, /*"Point-Point Protocol", */ ARPHRD_PPP, 0,
+    NULL, NULL, do_ppp, 0
+};
+
+
+#endif				/* HAVE_PPP */
+
+static struct hwtype *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_HWASH
+    &ash_hwtype,
+#endif
+#if HAVE_HWETHER
+    &ether_hwtype,
+#endif
+#if HAVE_HWTR
+    &tr_hwtype,
+#ifdef ARPHRD_IEEE802_TR
+    &tr_hwtype1, 
+#endif
+#endif
+#if HAVE_HWAX25
+    &ax25_hwtype,
+#endif
+#if HAVE_HWNETROM
+    &netrom_hwtype,
+#endif
+#if HAVE_HWROSE
+    &rose_hwtype,
+#endif
+#if HAVE_HWTUNNEL
+    &tunnel_hwtype,
+#endif
+#if HAVE_HWPPP
+    &ppp_hwtype,
+#endif
+#if HAVE_HWHDLCLAPB
+    &hdlc_hwtype,
+    &lapb_hwtype,
+#endif
+#if HAVE_HWARC
+    &arcnet_hwtype,
+#endif
+#if HAVE_HWFR
+    &dlci_hwtype,
+    &frad_hwtype,
+#endif
+#if HAVE_HWSIT
+    &sit_hwtype,
+#endif
+#if HAVE_HWFDDI
+    &fddi_hwtype,
+#endif
+#if HAVE_HWHIPPI
+    &hippi_hwtype,
+#endif
+#if HAVE_HWIRDA
+    &irda_hwtype,
+#endif
+#if HAVE_HWEC
+    &ec_hwtype,
+#endif
+#if HAVE_HWX25
+    &x25_hwtype,
+#endif
+    &unspec_hwtype,
+    NULL
+};
+
+static short sVhwinit = 0;
+
+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_HWASH
+    ash_hwtype.title = _("Ash");
+#endif
+#if HAVE_HWFDDI
+    fddi_hwtype.title = _("Fiber Distributed Data Interface");
+#endif
+#if HAVE_HWHIPPI
+    hippi_hwtype.title = _("HIPPI");
+#endif
+#if HAVE_HWAX25
+    ax25_hwtype.title = _("AMPR AX.25");
+#endif
+#if HAVE_HWROSE
+    rose_hwtype.title = _("AMPR ROSE");
+#endif
+#if HAVE_HWNETROM
+    netrom_hwtype.title = _("AMPR NET/ROM");
+#endif
+#if HAVE_HWX25
+    x25_hwtype.title = _("generic X.25");
+#endif
+#if HAVE_HWTUNNEL
+    tunnel_hwtype.title = _("IPIP Tunnel");
+#endif
+#if HAVE_HWPPP
+    ppp_hwtype.title = _("Point-to-Point Protocol");
+#endif
+#if HAVE_HWHDLCLAPB
+    hdlc_hwtype.title = _("(Cisco)-HDLC");
+    lapb_hwtype.title = _("LAPB");
+#endif
+#if HAVE_HWARC
+    arcnet_hwtype.title = _("ARCnet");
+#endif
+#if HAVE_HWFR
+    dlci_hwtype.title = _("Frame Relay DLCI");
+    frad_hwtype.title = _("Frame Relay Access Device");
+#endif
+#if HAVE_HWSIT
+    sit_hwtype.title = _("IPv6-in-IPv4");
+#endif
+#if HAVE_HWIRDA
+    irda_hwtype.title = _("IrLAP");
+#endif
+#if HAVE_HWTR
+    tr_hwtype.title = _("16/4 Mbps Token Ring");
+#ifdef ARPHRD_IEEE802_TR
+    tr_hwtype1.title = _("16/4 Mbps Token Ring (New)") ; 
+#endif
+#endif
+#if HAVE_HWEC
+    ec_hwtype.title = _("Econet");
+#endif
+    sVhwinit = 1;
+}
+
+#ifdef IFF_PORTSEL
+const char *if_port_text[][4] =
+{
+    /* Keep in step with <linux/netdevice.h> */
+    {"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},
+};
+#endif
+
+/* Check our hardware type table for this type. */
+struct hwtype *get_hwntype(int type)
+{
+    struct hwtype **hwp;
+
+    if (!sVhwinit)
+	hwinit();
+
+    hwp = hwtypes;
+    while (*hwp != NULL) {
+	if ((*hwp)->type == type)
+	    return (*hwp);
+	hwp++;
+    }
+    return (NULL);
+}
+
+/* return 1 if address is all zeros */
+int hw_null_address(struct hwtype *hw, void *ap)
+{
+    unsigned int i;
+    unsigned char *address = (unsigned char *)ap;
+    for (i = 0; i < hw->alen; i++)
+	if (address[i])
+	    return 0;
+    return 1;
+}
+
+void ife_print(struct interface *ptr)
+{
+    struct aftype *ap;
+    struct hwtype *hw;
+    int hf;
+    int can_compress = 0;
+    unsigned long long rx, tx, short_rx, short_tx;
+    char Rext[5]="b";
+    char Text[5]="b";
+
+#if HAVE_AFIPX
+    static struct aftype *ipxtype = NULL;
+#endif
+#if HAVE_AFECONET
+    static struct aftype *ectype = NULL;
+#endif
+#if HAVE_AFATALK
+    static struct aftype *ddptype = NULL;
+#endif
+#if HAVE_AFINET6
+    FILE *f;
+    char addr6[40], devname[20];
+    struct sockaddr_in6 sap;
+    int plen, scope, dad_status, if_idx;
+    extern struct aftype inet6_aftype;
+    char addr6p[8][5];
+#endif
+
+    ap = get_afntype(ptr->addr.sa_family);
+    if (ap == NULL)
+	ap = get_afntype(0);
+
+    hf = ptr->type;
+
+    if (hf == ARPHRD_CSLIP || hf == ARPHRD_CSLIP6)
+	can_compress = 1;
+
+    hw = get_hwntype(hf);
+    if (hw == NULL)
+	hw = get_hwntype(-1);
+
+    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(ptr->hwaddr));
+#ifdef IFF_PORTSEL
+    if (ptr->flags & IFF_PORTSEL) {
+	printf(_("Media:%s"), if_port_text[ptr->map.port][0]);
+	if (ptr->flags & IFF_AUTOMEDIA)
+	    printf(_("(auto)"));
+    }
+#endif
+    printf("\n");
+
+#if HAVE_AFINET
+    if (ptr->has_ip) {
+	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));
+	}
+	if (ptr->flags & IFF_BROADCAST) {
+	    printf(_(" Bcast:%s "), ap->sprint(&ptr->broadaddr, 1));
+	}
+	printf(_(" Mask:%s\n"), ap->sprint(&ptr->netmask, 1));
+    }
+#endif
+
+#if HAVE_AFINET6
+    /* FIXME: should be integrated into interface.c.   */
+
+    if ((f = fopen(_PATH_PROCNET_IFINET6, "r")) != NULL) {
+	while (fscanf(f, "%4s%4s%4s%4s%4s%4s%4s%4s %02x %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]);
+		inet6_aftype.input(1, addr6, (struct sockaddr *) &sap);
+		printf(_("          inet6 addr: %s/%d"),
+		 inet6_aftype.sprint((struct sockaddr *) &sap, 1), plen);
+		printf(_(" Scope:"));
+		switch (scope) {
+		case 0:
+		    printf(_("Global"));
+		    break;
+		case IPV6_ADDR_LINKLOCAL:
+		    printf(_("Link"));
+		    break;
+		case IPV6_ADDR_SITELOCAL:
+		    printf(_("Site"));
+		    break;
+		case IPV6_ADDR_COMPATv4:
+		    printf(_("Compat"));
+		    break;
+		case IPV6_ADDR_LOOPBACK:
+		    printf(_("Host"));
+		    break;
+		default:
+		    printf(_("Unknown"));
+		}
+		printf("\n");
+	    }
+	}
+	fclose(f);
+    }
+#endif
+
+#if HAVE_AFIPX
+    if (ipxtype == NULL)
+	ipxtype = get_afntype(AF_IPX);
+
+    if (ipxtype != NULL) {
+	if (ptr->has_ipx_bb)
+	    printf(_("          IPX/Ethernet II addr:%s\n"),
+		   ipxtype->sprint(&ptr->ipxaddr_bb, 1));
+	if (ptr->has_ipx_sn)
+	    printf(_("          IPX/Ethernet SNAP addr:%s\n"),
+		   ipxtype->sprint(&ptr->ipxaddr_sn, 1));
+	if (ptr->has_ipx_e2)
+	    printf(_("          IPX/Ethernet 802.2 addr:%s\n"),
+		   ipxtype->sprint(&ptr->ipxaddr_e2, 1));
+	if (ptr->has_ipx_e3)
+	    printf(_("          IPX/Ethernet 802.3 addr:%s\n"),
+		   ipxtype->sprint(&ptr->ipxaddr_e3, 1));
+    }
+#endif
+
+#if HAVE_AFATALK
+    if (ddptype == NULL)
+	ddptype = get_afntype(AF_APPLETALK);
+    if (ddptype != NULL) {
+	if (ptr->has_ddp)
+	    printf(_("          EtherTalk Phase 2 addr:%s\n"), ddptype->sprint(&ptr->ddpaddr, 1));
+    }
+#endif
+
+#if HAVE_AFECONET
+    if (ectype == NULL)
+	ectype = get_afntype(AF_ECONET);
+    if (ectype != NULL) {
+	if (ptr->has_econet)
+	    printf(_("          econet addr:%s\n"), ectype->sprint(&ptr->ecaddr, 1));
+    }
+#endif
+
+    printf("          ");
+    /* DONT FORGET TO ADD THE FLAGS IN ife_print_short, too */
+    if (ptr->flags == 0)
+	printf(_("[NO FLAGS] "));
+    if (ptr->flags & IFF_UP)
+	printf(_("UP "));
+    if (ptr->flags & IFF_BROADCAST)
+	printf(_("BROADCAST "));
+    if (ptr->flags & IFF_DEBUG)
+	printf(_("DEBUG "));
+    if (ptr->flags & IFF_LOOPBACK)
+	printf(_("LOOPBACK "));
+    if (ptr->flags & IFF_POINTOPOINT)
+	printf(_("POINTOPOINT "));
+    if (ptr->flags & IFF_NOTRAILERS)
+	printf(_("NOTRAILERS "));
+    if (ptr->flags & IFF_RUNNING)
+	printf(_("RUNNING "));
+    if (ptr->flags & IFF_NOARP)
+	printf(_("NOARP "));
+    if (ptr->flags & IFF_PROMISC)
+	printf(_("PROMISC "));
+    if (ptr->flags & IFF_ALLMULTI)
+	printf(_("ALLMULTI "));
+    if (ptr->flags & IFF_SLAVE)
+	printf(_("SLAVE "));
+    if (ptr->flags & IFF_MASTER)
+	printf(_("MASTER "));
+    if (ptr->flags & IFF_MULTICAST)
+	printf(_("MULTICAST "));
+#ifdef HAVE_DYNAMIC
+    if (ptr->flags & IFF_DYNAMIC)
+	printf(_("DYNAMIC "));
+#endif
+    /* DONT FORGET TO ADD THE FLAGS IN ife_print_short */
+    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);
+#endif
+    printf("\n");
+
+    /* If needed, display the interface statistics. */
+
+    if (ptr->statistics_valid) {
+	/* XXX: statistics are currently only printed for the primary address,
+	 *      not for the aliases, although strictly speaking they're shared
+	 *      by all addresses.
+	 */
+	printf("          ");
+
+	printf(_("RX packets:%llu errors:%lu dropped:%lu overruns:%lu frame:%lu\n"),
+	       ptr->stats.rx_packets, ptr->stats.rx_errors,
+	       ptr->stats.rx_dropped, ptr->stats.rx_fifo_errors,
+	       ptr->stats.rx_frame_errors);
+	if (can_compress)
+	    printf(_("             compressed:%lu\n"), ptr->stats.rx_compressed);
+
+	rx = ptr->stats.rx_bytes;  
+	tx = ptr->stats.tx_bytes;
+	short_rx = rx * 10;  
+	short_tx = tx * 10;
+	if (rx > 1048576) { short_rx /= 1048576;  strcpy(Rext, "Mb"); }
+	else if (rx > 1024) { short_rx /= 1024;  strcpy(Rext, "Kb"); }
+	if (tx > 1048576) { short_tx /= 1048576;  strcpy(Text, "Mb"); }
+	else if (tx > 1024) { short_tx /= 1024;  strcpy(Text, "Kb"); }
+
+	printf("          ");
+	printf(_("TX packets:%llu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n"),
+	       ptr->stats.tx_packets, ptr->stats.tx_errors,
+	       ptr->stats.tx_dropped, ptr->stats.tx_fifo_errors,
+	       ptr->stats.tx_carrier_errors);
+	printf(_("          collisions:%lu "), ptr->stats.collisions);
+	if (can_compress)
+	    printf(_("compressed:%lu "), ptr->stats.tx_compressed);
+	if (ptr->tx_queue_len != -1)
+	    printf(_("txqueuelen:%d "), ptr->tx_queue_len);
+	printf("\n          ");
+	printf(_("RX bytes:%llu (%lu.%lu %s)  TX bytes:%llu (%lu.%lu %s)\n"),
+	       rx, (unsigned long)(short_rx / 10), 
+	       (unsigned long)(short_rx % 10), Rext, 
+	       tx, (unsigned long)(short_tx / 10), 
+	       (unsigned long)(short_tx % 10), Text);
+    }
+
+    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);
+	if (ptr->map.base_addr >= 0x100)	/* Only print devices using it for 
+						   I/O maps */
+	    printf(_("Base address:0x%x "), ptr->map.base_addr);
+	if (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("\n");
+}
+
+
+int do_if_print(struct interface *ife, void *cookie)
+{
+    int *opt_a = (int *) cookie;
+    int res; 
+
+    res = do_if_fetch(ife); 
+    if (res >= 0) {   
+	if ((ife->flags & IFF_UP) || *opt_a)
+	    ife_print(ife);
+    }
+    return res;
+}
+
+struct interface *lookup_interface(char *name)
+{
+    struct interface *ife = NULL;
+
+    if (if_readlist_proc(name) < 0) 
+	    return NULL; 
+    ife = add_interface(name); 
+    return ife;
+}
+
+/* for ipv4 add/del modes */
+static int if_print(char *ifname)
+{
+    int res;
+
+    if (!ifname) {
+	res = for_all_interfaces(do_if_print, &opt_a);
+    } else {
+	struct interface *ife;
+
+	ife = lookup_interface(ifname);
+	res = do_if_fetch(ife); 
+	if (res >= 0) 
+	    ife_print(ife);
+    }
+    return res; 
+}
+
+int display_interfaces(void)
+{
+    int status;
+
+    /* Create a channel to the NET kernel. */
+    if ((skfd = sockets_open(0)) < 0) {
+	perror("socket");
+	exit(1);
+    }
+
+    /* Do we have to show the current setup? */
+    status = if_print((char *) NULL);
+    close(skfd);
+    exit(status < 0);
+}
+
diff --git a/networking/ifconfig.c b/networking/ifconfig.c
index a3e2c0f..2a50a96 100644
--- a/networking/ifconfig.c
+++ b/networking/ifconfig.c
@@ -15,16 +15,19 @@
  * 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.4 2001/03/06 00:48:59 andersen Exp $
+ *
+ * Majorly hacked up by Larry Doolittle <ldoolitt@recycle.lbl.gov> 
  *
  */
 
+#include "busybox.h"
+#include <sys/types.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
 #include <string.h>   // strcmp and friends
 #include <ctype.h>    // isdigit and friends
-#include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <netinet/in.h>
@@ -32,10 +35,50 @@
 #include <net/if.h>
 #include <net/if_arp.h>
 #include <linux/if_ether.h>
-#include "busybox.h"
 
 static int sockfd;  /* socket fd we use to manipulate stuff with */
 
+#define TESTME 0
+#if TESTME
+#define ioctl test_ioctl
+char *saddr_to_a(struct sockaddr *s)
+{
+	if (s->sa_family == ARPHRD_ETHER) {
+		static char hw[18];
+		sprintf(hw, "%2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x",
+			s->sa_data[0], s->sa_data[1], s->sa_data[2],
+			s->sa_data[3], s->sa_data[4], s->sa_data[5]);
+		return hw;
+	} else if (s->sa_family == AF_INET) {
+		struct sockaddr_in *ss = (struct sockaddr_in *) s;
+		return inet_ntoa(ss->sin_addr);
+	} else {
+		return NULL;
+	}
+}
+
+int test_ioctl(int __fd, unsigned long int __request, void *param)
+{
+	struct ifreq *i=(struct ifreq *)param;
+	printf("ioctl fd=%d, request=%ld\n", __fd, __request);
+	
+	switch(__request) {
+		case SIOCGIFFLAGS:   printf("  SIOCGIFFLAGS\n");       i->ifr_flags = 0;   break;
+		case SIOCSIFFLAGS:   printf("  SIOCSIFFLAGS, %x\n",    i->ifr_flags);     break;
+		case SIOCSIFMETRIC:  printf("  SIOCSIFMETRIC, %d\n",   i->ifr_metric);    break;
+		case SIOCSIFMTU:     printf("  SIOCSIFMTU, %d\n",      i->ifr_mtu);       break;
+		case SIOCSIFBRDADDR: printf("  SIOCSIFBRDADDR, %s\n",  saddr_to_a(&(i->ifr_broadaddr))); break;
+		case SIOCSIFDSTADDR: printf("  SIOCSIFDSTADDR, %s\n",  saddr_to_a(&(i->ifr_dstaddr  ))); break;
+		case SIOCSIFNETMASK: printf("  SIOCSIFNETMASK, %s\n",  saddr_to_a(&(i->ifr_netmask  ))); break;
+		case SIOCSIFADDR:    printf("  SIOCSIFADDR, %s\n",     saddr_to_a(&(i->ifr_addr     ))); break;
+		case SIOCSIFHWADDR:  printf("  SIOCSIFHWADDR, %s\n",   saddr_to_a(&(i->ifr_hwaddr   ))); break;  /* broken */
+		default:
+	}
+	return 0;
+}
+#endif
+
+
 /* print usage and exit */
 
 #define _(x) x
@@ -49,7 +92,7 @@ set_flag(char *ifname, short flag)
 	strcpy(ifr.ifr_name, ifname);
 	if (ioctl(sockfd, SIOCGIFFLAGS, &ifr) < 0) {
 		perror("SIOCGIFFLAGS"); 
-		return (-1);
+		return -1;
 	}
 	strcpy(ifr.ifr_name, ifname);
 	ifr.ifr_flags |= flag;
@@ -57,7 +100,7 @@ set_flag(char *ifname, short flag)
 		perror("SIOCSIFFLAGS");
 		return -1;
 	}
-	return (0);
+	return 0;
 }
 
 
@@ -78,9 +121,62 @@ clr_flag(char *ifname, short flag)
 		perror("SIOCSIFFLAGS");
 		return -1;
 	}
-	return (0);
+	return 0;
 }
 
+/* which element in struct ifreq to frob */
+enum frob {
+	L_METRIC,
+	L_MTU,
+	L_DATA,
+	L_BROAD,
+	L_DEST,
+	L_MASK,
+	L_HWAD,
+};
+
+
+struct flag_map {
+	char *name;
+	enum frob frob;
+	int flag;
+	int sflag;
+	int action;
+};
+
+/* action:
+ *  2   set
+ *  4   clear
+ *  6   set/clear
+ *  8   clear/set
+ *  10  numeric
+ *  12  address
+ *  14  address/clear
+ */
+const static struct flag_map flag_table[] = {
+	{"arp",         0,  IFF_NOARP,             0, 6},
+	{"trailers",    0,  IFF_NOTRAILERS,        0, 6},
+	{"promisc",     0,  IFF_PROMISC,           0, 8},
+	{"multicast",   0,  IFF_MULTICAST,         0, 8},
+	{"allmulti",    0,  IFF_ALLMULTI,          0, 8},
+	{"up",          0, (IFF_UP | IFF_RUNNING), 0, 2},
+	{"down",        0,  IFF_UP,                0, 4},
+	{"metric",      L_METRIC,              0, SIOCSIFMETRIC,  10},
+	{"mtu",         L_MTU,                 0, SIOCSIFMTU,     10},
+#ifdef SIOCSKEEPALIVE
+	{"keepalive",   L_DATA,                0, SIOCSKEEPALIVE, 10},
+#endif
+#ifdef SIOCSOUTFILL
+	{"outfill",     L_DATA,                0, SIOCSOUTFILL,   10},
+#endif
+	{"broadcast",   L_BROAD, IFF_BROADCAST,   SIOCSIFBRDADDR, 14},
+	{"dstaddr",     L_DEST,                0, SIOCSIFDSTADDR, 12},
+	{"netmask",     L_MASK,                0, SIOCSIFNETMASK, 12},
+	{"pointopoint", L_DEST,  IFF_POINTOPOINT, SIOCSIFDSTADDR, 14},
+	{"hw",          L_HWAD,                0, SIOCSIFHWADDR,  14},
+};
+
+
 /* resolve XXX.YYY.ZZZ.QQQ -> binary */
 
 static int
@@ -90,15 +186,16 @@ INET_resolve(char *name, struct sockaddr_in *sin)
 	sin->sin_port = 0;
 
 	/* Default is special, meaning 0.0.0.0. */
-	if (!strcmp(name, "default")) {
+	if (strcmp(name, "default")==0) {
 		sin->sin_addr.s_addr = INADDR_ANY;
-		return (1);
+		return 1;
 	}
 	/* Look to see if it's a dotted quad. */
 	if (inet_aton(name, &sin->sin_addr)) {
 		return 0;
 	}
 	/* guess not.. */
+	errno = EINVAL;
 	return -1;
 }
 
@@ -127,12 +224,12 @@ in_ether(char *bufp, struct sockaddr *sap)
 			val = c - 'A' + 10;
 		else {
 #ifdef DEBUG
-			fprintf(stderr,
-				_("in_ether(%s): invalid ether address!\n"),
+			error_msg(
+				_("in_ether(%s): invalid ether address!"),
 				orig);
 #endif
 			errno = EINVAL;
-			return (-1);
+			return -1;
 		}
 		val <<= 4;
 		c = *bufp;
@@ -146,22 +243,19 @@ in_ether(char *bufp, struct sockaddr *sap)
 			val >>= 4;
 		else {
 #ifdef DEBUG
-			fprintf(stderr,
-				_("in_ether(%s): invalid ether address!\n"),
+			error_msg(
+				_("in_ether(%s): invalid ether address!"),
 				orig);
 #endif
 			errno = EINVAL;
-			return (-1);
+			return -1;
 		}
 		if (c != 0)
 			bufp++;
 		*ptr++ = (unsigned char) (val & 0377);
 		i++;
 		
-		/* We might get a semicolon here - not required. */
-		if (*bufp == ':')
-			bufp++;
-		
+		/* optional colon already handled, don't swallow a second */
 	}
 
 	if(i != ETH_ALEN) {
@@ -171,25 +265,37 @@ in_ether(char *bufp, struct sockaddr *sap)
 
 	return 0;
 }
+		
+#ifdef BB_FEATURE_IFCONFIG_STATUS
+extern int display_interfaces(void);
+#else
+int display_interfaces(void)
+{
+    show_usage();
+}
+#endif
 
 int ifconfig_main(int argc, char **argv)
 {
 	struct ifreq ifr;
 	struct sockaddr_in sa;
-	struct sockaddr sa2;
-	char **spp;
+	char **spp, *cmd;
 	int goterr = 0;
-	int r, didnetmask = 0;
+	int r;
+	/* int didnetmask = 0;   special case input error detection no longer implemented */
 	char host[128];
+	const struct flag_map *ft;
+	int i, sense;
+	int a, ecode;
+	struct sockaddr *d;
 
 	if(argc < 2) {
-		show_usage();
+		return(display_interfaces());
 	}
 
 	/* 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] */
@@ -205,235 +311,84 @@ int ifconfig_main(int argc, char **argv)
 
 	/* 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;
-		}
-		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++;
-			}
-			spp++;
-			continue;
+		cmd = *spp;
+		sense=0;
+		if (*cmd=='-') {
+			sense=1;
+			cmd++;
 		}
-#ifdef SIOCSKEEPALIVE
-		if (!strcmp(*spp, "keepalive")) {
-			if (*++spp == NULL)
-				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;
-		}
-#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++;
+		ft = NULL;
+		for (i=0; i<(sizeof(flag_table)/sizeof(struct flag_map)); i++) {
+			if (strcmp(cmd, flag_table[i].name)==0) {
+				ft=flag_table+i;
+				spp++;
+				break;
 			}
-			spp++;
-			continue;
 		}
-#endif
+		if (ft) {
+			switch (ft->action+sense) {
+			case 4:
+			case 7:
+			case 8:
+			case 15:
+				goterr |= clr_flag(ifr.ifr_name, ft->flag);
+				break;
+			case 2:
+			case 6:
+			case 9:
+				goterr |= set_flag(ifr.ifr_name, ft->flag);
+				break;
+			case 10:
+				if (*spp == NULL)
+					show_usage();
+				a = atoi(*spp++);
+				switch (ft->frob) {
+					case L_METRIC: ifr.ifr_metric = a; break;
+					case L_MTU:    ifr.ifr_mtu    = a; break;
+					case L_DATA:   ifr.ifr_data   = (caddr_t) a; break;
+					default: error_msg_and_die("bugaboo");
+				}
 
-		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) {
+				if (ioctl(sockfd, ft->sflag, &ifr) < 0) {
+					perror(ft->name);  /* imperfect */
 					goterr++;
-					spp++;
-					continue;
 				}
-				memcpy((char *) &ifr.ifr_broadaddr,
-				       (char *) &sa,
-				       sizeof(struct sockaddr));
-				if (ioctl(sockfd, SIOCSIFBRDADDR, &ifr) < 0) {
-					perror("SIOCSIFBRDADDR");
-					goterr++;
+				break;
+			case 12:
+			case 14:
+				if (ft->action+sense==10 && *spp == NULL) {
+					show_usage();
+					break;
 				}
-				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++;
+				if (*spp != NULL) {
+					safe_strncpy(host, *spp, (sizeof host));
 					spp++;
-					continue;
+					if (ft->frob == L_HWAD) {
+						ecode = in_ether(host, &ifr.ifr_hwaddr);
+					} else {
+						switch (ft->frob) {
+							case L_BROAD: d = &ifr.ifr_broadaddr; break;
+							case L_DEST:  d = &ifr.ifr_dstaddr;   break;
+							case L_MASK:  d = &ifr.ifr_netmask;   break;
+							default: error_msg_and_die("bugaboo");
+						}
+						ecode = INET_resolve(host, (struct sockaddr_in *) d);
+					}
+					if (ecode < 0 || ioctl(sockfd, ft->sflag, &ifr) < 0) {
+						perror(ft->name);  /* imperfect */
+						goterr++;
+					}
 				}
-				memcpy((char *) &ifr.ifr_dstaddr, (char *) &sa,
-				       sizeof(struct sockaddr));
-				if (ioctl(sockfd, SIOCSIFDSTADDR, &ifr) < 0) {
-					perror("SIOCSIFDSTADDR");
-					goterr++;
+				if (ft->flag != 0) {
+					goterr |= set_flag(ifr.ifr_name, ft->flag);
 				}
-			}
-			goterr |= set_flag(ifr.ifr_name, IFF_POINTOPOINT);
-			spp++;
-			continue;
-		};
-
-		if (!strcmp(*spp, "hw")) {
-			if (*++spp == NULL || strcmp("ether", *spp)) {
+				break;
+			default:
 				show_usage();
-			}
-				
-			if (*++spp == NULL) {
-				/* silently ignore it if no address */
-				continue;
-			}
-
-			safe_strncpy(host, *spp, (sizeof host));
-			if (in_ether(host, &sa2) < 0) {
-				fprintf(stderr, "invalid hw-addr %s\n", host);
-				goterr++;
-				spp++;
-				continue;
-			}
-			memcpy((char *) &ifr.ifr_hwaddr, (char *) &sa2,
-			       sizeof(struct sockaddr));
-			if (ioctl(sockfd, SIOCSIFHWADDR, &ifr) < 0) {
-				perror("SIOCSIFHWADDR");
-				goterr++;
-			}
-			spp++;
+			} /* end of switch */
 			continue;
 		}
-
+		
 		/* If the next argument is a valid hostname, assume OK. */
 		safe_strncpy(host, *spp, (sizeof host));
 
@@ -471,6 +426,6 @@ int ifconfig_main(int argc, char **argv)
 
 	} /* end of while-loop */
 
-        exit(0);
+        return goterr;
 }