X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=networking%2Fip.c;h=0105bd98b246fc8265832522e00710f2699aa922;hb=b51fd3525e48c79ef9e854dd357a9cdfdfeef72b;hp=e7cab74c93a886f2501c105416d59d1b7a697052;hpb=f112daa232122dd114933d04a9e415cfc61f1717;p=oweals%2Fbusybox.git

diff --git a/networking/ip.c b/networking/ip.c
index e7cab74c9..0105bd98b 100644
--- a/networking/ip.c
+++ b/networking/ip.c
@@ -1,10 +1,8 @@
+/* vi: set sw=4 ts=4: */
 /*
  * ip.c		"ip" utility frontend.
  *
- *		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.
+ * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
  *
  * Authors:	Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
  *
@@ -12,104 +10,122 @@
  * Changes:
  *
  * Rani Assaf <rani@magic.metawire.com> 980929:	resolve addresses
+ * Bernhard Fischer rewrote to use index_in_substr_array
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <syslog.h>
-#include <fcntl.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <string.h>
+#include "libbb.h"
 
-#include "./libiproute/utils.h"
-#include "./libiproute/ip_common.h"
+#include "libiproute/utils.h"
+#include "libiproute/ip_common.h"
 
-#include "busybox.h"
+#if ENABLE_FEATURE_IP_ADDRESS \
+ || ENABLE_FEATURE_IP_ROUTE \
+ || ENABLE_FEATURE_IP_LINK \
+ || ENABLE_FEATURE_IP_TUNNEL \
+ || ENABLE_FEATURE_IP_RULE
 
-#if 0
-int preferred_family = AF_UNSPEC;
-int oneline = 0;
-char * _SL_ = NULL;
-
-void ip_parse_common_args(int *argcp, char ***argvp)
+static int ATTRIBUTE_NORETURN ip_print_help(int ATTRIBUTE_UNUSED ac, char ATTRIBUTE_UNUSED **av)
 {
-	int argc = *argcp;
-	char **argv = *argvp;
-
-	while (argc > 1) {
-		char *opt = argv[1];
-
-		if (strcmp(opt,"--") == 0) {
-			argc--; argv++;
-			break;
-		}
+	bb_show_usage();
+}
 
-		if (opt[0] != '-')
-			break;
+static int (*ip_func)(int argc, char **argv) = ip_print_help;
 
-		if (opt[1] == '-')
-			opt++;
+static int ip_do(int argc, char **argv)
+{
+	ip_parse_common_args(&argc, &argv);
+	return ip_func(argc-1, argv+1);
+}
 
-		if (matches(opt, "-family") == 0) {
-			argc--;
-			argv++;
-			if (strcmp(argv[1], "inet") == 0)
-				preferred_family = AF_INET;
-			else if (strcmp(argv[1], "inet6") == 0)
-				preferred_family = AF_INET6;
-			else if (strcmp(argv[1], "link") == 0)
-				preferred_family = AF_PACKET;
-			else
-				invarg(argv[1], "invalid protocol family");
-		} else if (strcmp(opt, "-4") == 0) {
-			preferred_family = AF_INET;
-		} else if (strcmp(opt, "-6") == 0) {
-			preferred_family = AF_INET6;
-		} else if (strcmp(opt, "-0") == 0) {
-			preferred_family = AF_PACKET;
-		} else if (matches(opt, "-oneline") == 0) {
-			++oneline;
-		} else {
-			show_usage();
-		}
-		argc--;	argv++;
-	}
-	_SL_ = oneline ? "\\" : "\n" ;
+#if ENABLE_FEATURE_IP_ADDRESS
+int ipaddr_main(int argc, char **argv);
+int ipaddr_main(int argc, char **argv)
+{
+    ip_func = do_ipaddr;
+    return ip_do(argc, argv);
+}
+#endif
+#if ENABLE_FEATURE_IP_LINK
+int iplink_main(int argc, char **argv);
+int iplink_main(int argc, char **argv)
+{
+    ip_func = do_iplink;
+    return ip_do(argc, argv);
+}
+#endif
+#if ENABLE_FEATURE_IP_ROUTE
+int iproute_main(int argc, char **argv);
+int iproute_main(int argc, char **argv)
+{
+    ip_func = do_iproute;
+    return ip_do(argc, argv);
 }
 #endif
+#if ENABLE_FEATURE_IP_RULE
+int iprule_main(int argc, char **argv);
+int iprule_main(int argc, char **argv)
+{
+    ip_func = do_iprule;
+    return ip_do(argc, argv);
+}
+#endif
+#if ENABLE_FEATURE_IP_TUNNEL
+int iptunnel_main(int argc, char **argv);
+int iptunnel_main(int argc, char **argv)
+{
+    ip_func = do_iptunnel;
+    return ip_do(argc, argv);
+}
+#endif
+
 
+int ip_main(int argc, char **argv);
 int ip_main(int argc, char **argv)
 {
-	int ret = EXIT_FAILURE;
+	const char * const keywords[] = {
+		USE_FEATURE_IP_ADDRESS("address",)
+		USE_FEATURE_IP_ROUTE("route",)
+		USE_FEATURE_IP_LINK("link",)
+		USE_FEATURE_IP_TUNNEL("tunnel", "tunl",)
+		USE_FEATURE_IP_RULE("rule",)
+		NULL
+	};
+	enum {
+		USE_FEATURE_IP_ADDRESS(IP_addr,)
+		USE_FEATURE_IP_ROUTE(IP_route,)
+		USE_FEATURE_IP_LINK(IP_link,)
+		USE_FEATURE_IP_TUNNEL(IP_tunnel, IP_tunl,)
+		USE_FEATURE_IP_RULE(IP_rule,)
+		IP_none
+	};
 
 	ip_parse_common_args(&argc, &argv);
-
 	if (argc > 1) {
-#ifdef CONFIG_FEATURE_IP_ADDRESS
-		if (matches(argv[1], "address") == 0) {
-			ret = do_ipaddr(argc-2, argv+2);
-		}
+		int key = index_in_substr_array(keywords, argv[1]);
+		argc -= 2;
+		argv += 2;
+#if ENABLE_FEATURE_IP_ADDRESS
+		if (key == IP_addr)
+			ip_func = do_ipaddr;
 #endif
-#ifdef CONFIG_FEATURE_IP_ROUTE
-		else if (matches(argv[1], "route") == 0) {
-			ret = do_iproute(argc-2, argv+2);
-		}
+#if ENABLE_FEATURE_IP_ROUTE
+		if (key == IP_route)
+			ip_func = do_iproute;
 #endif
-#ifdef CONFIG_FEATURE_IP_LINK
-		else if (matches(argv[1], "link") == 0) {
-			ret = do_iplink(argc-2, argv+2);
-		}
+#if ENABLE_FEATURE_IP_LINK
+		if (key == IP_link)
+			ip_func = do_iplink;
 #endif
-#ifdef CONFIG_FEATURE_IP_TUNNEL
-		else if (matches(argv[1], "tunnel") == 0 || strcmp(argv[1], "tunl") == 0) {
-			ret = do_iptunnel(argc-2, argv+2);
-		}
+#if ENABLE_FEATURE_IP_TUNNEL
+		if (key == IP_tunnel || key == IP_tunl)
+			ip_func = do_iptunnel;
+#endif
+#if ENABLE_FEATURE_IP_RULE
+		if (key == IP_rule)
+			ip_func = do_iprule;
 #endif
 	}
-	if (ret) {
-		show_usage();
-	}
-	return(EXIT_SUCCESS);
+	return (ip_func(argc, argv));
 }
+
+#endif /* any of ENABLE_FEATURE_IP_xxx is 1 */