From 4aca87515a5083ae0e31ce3177189fd43b6d05ac Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Sat, 3 Jan 2015 13:58:15 +0100 Subject: patch to Vanilla Tomato 1.28 --- release/src/router/busybox/networking/ip.c | 180 +++++++++++++++-------------- 1 file changed, 94 insertions(+), 86 deletions(-) (limited to 'release/src/router/busybox/networking/ip.c') diff --git a/release/src/router/busybox/networking/ip.c b/release/src/router/busybox/networking/ip.c index a0781bdb..9903c680 100644 --- a/release/src/router/busybox/networking/ip.c +++ b/release/src/router/busybox/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, * @@ -12,104 +10,114 @@ * Changes: * * Rani Assaf 980929: resolve addresses + * Bernhard Reutner-Fischer rewrote to use index_in_substr_array */ -#include -#include -#include -#include -#include -#include -#include -#include +#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 NORETURN ip_print_help(char **argv UNUSED_PARAM) { - int argc = *argcp; - char **argv = *argvp; - - while (argc > 1) { - char *opt = argv[1]; - - if (strcmp(opt,"--") == 0) { - argc--; argv++; - break; - } - - if (opt[0] != '-') - break; + bb_show_usage(); +} - if (opt[1] == '-') - opt++; +static int ip_do(int (*ip_func)(char **argv), char **argv) +{ + argv = ip_parse_common_args(argv + 1); + return ip_func(argv); +} - 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 { - bb_show_usage(); - } - argc--; argv++; - } - _SL_ = oneline ? "\\" : "\n" ; +#if ENABLE_FEATURE_IP_ADDRESS +int ipaddr_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; +int ipaddr_main(int argc UNUSED_PARAM, char **argv) +{ + return ip_do(do_ipaddr, argv); } #endif - -int ip_main(int argc, char **argv) +#if ENABLE_FEATURE_IP_LINK +int iplink_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; +int iplink_main(int argc UNUSED_PARAM, char **argv) +{ + return ip_do(do_iplink, argv); +} +#endif +#if ENABLE_FEATURE_IP_ROUTE +int iproute_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; +int iproute_main(int argc UNUSED_PARAM, char **argv) { - int ret = EXIT_FAILURE; + return ip_do(do_iproute, argv); +} +#endif +#if ENABLE_FEATURE_IP_RULE +int iprule_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; +int iprule_main(int argc UNUSED_PARAM, char **argv) +{ + return ip_do(do_iprule, argv); +} +#endif +#if ENABLE_FEATURE_IP_TUNNEL +int iptunnel_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; +int iptunnel_main(int argc UNUSED_PARAM, char **argv) +{ + return ip_do(do_iptunnel, argv); +} +#endif + - ip_parse_common_args(&argc, &argv); +int ip_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; +int ip_main(int argc UNUSED_PARAM, char **argv) +{ + static const char keywords[] ALIGN1 = + USE_FEATURE_IP_ADDRESS("address\0") + USE_FEATURE_IP_ROUTE("route\0") + USE_FEATURE_IP_LINK("link\0") + USE_FEATURE_IP_TUNNEL("tunnel\0" "tunl\0") + USE_FEATURE_IP_RULE("rule\0") + ; + 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 + }; + int (*ip_func)(char**) = ip_print_help; - if (argc > 1) { -#ifdef CONFIG_FEATURE_IP_ADDRESS - if (matches(argv[1], "address") == 0) { - ret = do_ipaddr(argc-2, argv+2); - } + argv = ip_parse_common_args(argv + 1); + if (*argv) { + int key = index_in_substrings(keywords, *argv); + argv++; +#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) { - bb_show_usage(); - } - return(EXIT_SUCCESS); + return ip_func(argv); } + +#endif /* any of ENABLE_FEATURE_IP_xxx is 1 */ -- cgit v1.2.3-54-g00ecf