aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2007-03-18 17:57:36 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2007-03-18 17:57:36 +0000
commita631e7164299421a8852159ab91137d6f8ffbd7c (patch)
tree790fcd04f9b15d332cb8e8f08207e43200cea37c
parente3d83aafb40ba31369d41e456c06e929252de2e1 (diff)
downloadbusybox-w32-a631e7164299421a8852159ab91137d6f8ffbd7c.tar.gz
busybox-w32-a631e7164299421a8852159ab91137d6f8ffbd7c.tar.bz2
busybox-w32-a631e7164299421a8852159ab91137d6f8ffbd7c.zip
ip: fix misnumbered command names
-rw-r--r--networking/ip.c5
-rw-r--r--networking/libiproute/iproute.c25
2 files changed, 16 insertions, 14 deletions
diff --git a/networking/ip.c b/networking/ip.c
index 4c8b89e2f..7a7f55c46 100644
--- a/networking/ip.c
+++ b/networking/ip.c
@@ -33,8 +33,9 @@ int ip_main(int argc, char **argv)
33 if (ENABLE_FEATURE_IP_LINK && matches(argv[1], "link") == 0) { 33 if (ENABLE_FEATURE_IP_LINK && matches(argv[1], "link") == 0) {
34 ret = do_iplink(argc-2, argv+2); 34 ret = do_iplink(argc-2, argv+2);
35 } 35 }
36 if (ENABLE_FEATURE_IP_TUNNEL && 36 if (ENABLE_FEATURE_IP_TUNNEL
37 (matches(argv[1], "tunnel") == 0 || strcmp(argv[1], "tunl") == 0)) { 37 && (matches(argv[1], "tunnel") == 0 || strcmp(argv[1], "tunl") == 0)
38 ) {
38 ret = do_iptunnel(argc-2, argv+2); 39 ret = do_iptunnel(argc-2, argv+2);
39 } 40 }
40 if (ENABLE_FEATURE_IP_RULE && matches(argv[1], "rule") == 0) { 41 if (ENABLE_FEATURE_IP_RULE && matches(argv[1], "rule") == 0) {
diff --git a/networking/libiproute/iproute.c b/networking/libiproute/iproute.c
index c4c3fc2ca..c8a58c11c 100644
--- a/networking/libiproute/iproute.c
+++ b/networking/libiproute/iproute.c
@@ -835,9 +835,11 @@ static int iproute_get(int argc, char **argv)
835 835
836int do_iproute(int argc, char **argv) 836int do_iproute(int argc, char **argv)
837{ 837{
838 static const char * const ip_route_commands[] = 838 static const char * const ip_route_commands[] = {
839 { "add", "append", "change", "chg", "delete", "get", 839 /*0-3*/ "add", "append", "change", "chg",
840 "list", "show", "prepend", "replace", "test", "flush", 0 }; 840 /*4-7*/ "delete", "get", "list", "show",
841 /*8..*/ "prepend", "replace", "test", "flush", 0
842 };
841 int command_num = 6; 843 int command_num = 6;
842 unsigned int flags = 0; 844 unsigned int flags = 0;
843 int cmd = RTM_NEWROUTE; 845 int cmd = RTM_NEWROUTE;
@@ -848,7 +850,7 @@ int do_iproute(int argc, char **argv)
848 command_num = index_in_substr_array(ip_route_commands, *argv); 850 command_num = index_in_substr_array(ip_route_commands, *argv);
849 } 851 }
850 switch (command_num) { 852 switch (command_num) {
851 case 0: /* add*/ 853 case 0: /* add */
852 flags = NLM_F_CREATE|NLM_F_EXCL; 854 flags = NLM_F_CREATE|NLM_F_EXCL;
853 break; 855 break;
854 case 1: /* append */ 856 case 1: /* append */
@@ -859,21 +861,20 @@ int do_iproute(int argc, char **argv)
859 flags = NLM_F_REPLACE; 861 flags = NLM_F_REPLACE;
860 break; 862 break;
861 case 4: /* delete */ 863 case 4: /* delete */
862 case 5: /* del */
863 cmd = RTM_DELROUTE; 864 cmd = RTM_DELROUTE;
864 break; 865 break;
865 case 6: /* get */ 866 case 5: /* get */
866 return iproute_get(argc-1, argv+1); 867 return iproute_get(argc-1, argv+1);
867 case 7: /* list */ 868 case 6: /* list */
868 case 8: /* show */ 869 case 7: /* show */
869 return iproute_list_or_flush(argc-1, argv+1, 0); 870 return iproute_list_or_flush(argc-1, argv+1, 0);
870 case 9: /* prepend */ 871 case 8: /* prepend */
871 flags = NLM_F_CREATE; 872 flags = NLM_F_CREATE;
872 case 10: /* replace */ 873 case 9: /* replace */
873 flags = NLM_F_CREATE|NLM_F_REPLACE; 874 flags = NLM_F_CREATE|NLM_F_REPLACE;
874 case 11: /* test */ 875 case 10: /* test */
875 flags = NLM_F_EXCL; 876 flags = NLM_F_EXCL;
876 case 12: /* flush */ 877 case 11: /* flush */
877 return iproute_list_or_flush(argc-1, argv+1, 1); 878 return iproute_list_or_flush(argc-1, argv+1, 1);
878 default: 879 default:
879 bb_error_msg_and_die("unknown command %s", *argv); 880 bb_error_msg_and_die("unknown command %s", *argv);