* Foundation; either version 2 of the License, or (at
* your option) any later version.
*
- * $Id: ifconfig.c,v 1.5 2001/03/08 22:57:00 mjn3 Exp $
+ * $Id: ifconfig.c,v 1.10 2001/03/26 16:26:16 mjn3 Exp $
*
*/
* converting to a table-driven approach. Added several (optional)
* args missing from initial port.
*
- * Still missing: media.
+ * Still missing: media, tunnel.
*/
#include <stdio.h>
#endif
#ifdef BB_FEATURE_IFCONFIG_STATUS
-extern int display_interfaces(void);
+extern int interface_opt_a;
+extern int display_interfaces(char *ifname);
#endif
/*
goterr = 0;
did_flags = 0;
- if(argc < 2) {
+ /* 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 <= 1) {
#ifdef BB_FEATURE_IFCONFIG_STATUS
- return(display_interfaces());
+ return display_interfaces(argc ? *argv : NULL);
#else
- show_usage();
+ error_msg_and_die( "ifconfig was not compiled with interface status display support.");
#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++;
-
/* get interface name */
safe_strncpy(ifr.ifr_name, *argv, IFNAMSIZ);
mask = M_MASK; /* set the appropriate mask. */
}
for (op = OptArray ; op->name ; op++) { /* Find table entry. */
- if (!strcmp(p,op->name)) { /* If name matches... */
+ if (strcmp(p,op->name) == 0) { /* If name matches... */
if ((mask &= op->flags)) { /* set the mask and go. */
goto FOUND_ARG;;
}
if (c >= '0' && c <= '9') {
c -= '0';
} else if (c >= 'a' && c <= 'f') {
- c -= ('a' + 10);
+ c -= ('a' - 10);
} else if (c >= 'A' && c <= 'F') {
- c -= ('A' + 10);
+ c -= ('A' - 10);
} else if (j && (c == ':' || c == 0)) {
break;
} else {