iproute: support onelink route option and print route flags

[oweals/busybox.git] / networking / libiproute / iptunnel.c

diff --git a/networking/libiproute/iptunnel.c b/networking/libiproute/iptunnel.c
index bce373d05e5482aec5cc83df4085bc983a730e12..b54c3c53fe4cfb8692d2525886ceda7c3198184b 100644 (file)
--- a/networking/libiproute/iptunnel.c
+++ b/networking/libiproute/iptunnel.c
@@ -1,16 +1,14 @@
 /* vi: set sw=4 ts=4: */
 /*
- * iptunnel.c         "ip tunnel"
- *
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  *
- * Authors:    Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
+ * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
  *
  * Changes:
  *
- * Rani Assaf <rani@magic.metawire.com> 980929:        resolve addresses
- * Rani Assaf <rani@magic.metawire.com> 980930:        do not allow key for ipip/sit
- * Phil Karn <karn@ka9q.ampr.org>      990408: "pmtudisc" flag
+ * Rani Assaf <rani@magic.metawire.com> 980929: resolve addresses
+ * Rani Assaf <rani@magic.metawire.com> 980930: do not allow key for ipip/sit
+ * Phil Karn <karn@ka9q.ampr.org>       990408: "pmtudisc" flag
  */
 
 #include <netinet/ip.h>
@@ -440,7 +438,7 @@ static void print_tunnel(struct ip_tunnel_parm *p)
                        printf(" inherit");
                if (p->iph.tos & ~1)
                        printf("%c%s ", p->iph.tos & 1 ? '/' : ' ',
-                              rtnl_dsfield_n2a(p->iph.tos & ~1, b1));
+                               rtnl_dsfield_n2a(p->iph.tos & ~1, b1));
        }
        if (!(p->iph.frag_off & htons(IP_DF)))
                printf(" nopmtudisc");
@@ -563,9 +561,9 @@ int FAST_FUNC do_iptunnel(char **argv)
        enum { ARG_add = 0, ARG_change, ARG_del, ARG_show, ARG_list, ARG_lst };
 
        if (*argv) {
-               smalluint key = index_in_substrings(keywords, *argv);
-               if (key > 5)
-                       bb_error_msg_and_die(bb_msg_invalid_arg, *argv, applet_name);
+               int key = index_in_substrings(keywords, *argv);
+               if (key < 0)
+                       invarg(*argv, applet_name);
                argv++;
                if (key == ARG_add)
                        return do_add(SIOCADDTUNNEL, argv);