Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/networking/libiproute/iproute.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/networking/libiproute/iproute.c (modified) (36 diffs)

branches/2.2.9/mindi-busybox/networking/libiproute/iproute.c

@@ -1 +1 @@
 /* vi: set sw=4 ts=4: */
 /*
- * iproute.c        "ip route".
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  *
- * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
- *
- * 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> 980929: resolve addresses
  * Kunihiro Ishiguro <kunihiro@zebra.org> 001102: rtnh_ifindex was not initialized
  */
 
-#include "ip_common.h"  /* #include "libbb.h" is inside */
+#include "ip_common.h"  /* #include "libbb.h" is inside */
 #include "rt_names.h"
 #include "utils.h"
@@ -23 +20 @@
 
 
-typedef struct filter_t {
+struct filter_t {
     int tb;
-    int flushed;
+    smallint flushed;
     char *flushb;
     int flushp;
     int flushe;
     struct rtnl_handle *rth;
-    int protocol, protocolmask;
-    int scope, scopemask;
-    int type, typemask;
-    int tos, tosmask;
+    //int protocol, protocolmask; - write-only fields?!
+    //int scope, scopemask; - unused
+    //int type; - read-only
+    //int typemask; - unused
+    //int tos, tosmask; - unused
     int iif, iifmask;
     int oif, oifmask;
-    int realm, realmmask;
-    inet_prefix rprefsrc;
+    //int realm, realmmask; - unused
+    //inet_prefix rprefsrc; - read-only
     inet_prefix rvia;
     inet_prefix rdst;
@@ -43 +41 @@
     inet_prefix rsrc;
     inet_prefix msrc;
-} filter_t;
-
-#define filter (*(filter_t*)&bb_common_bufsiz1)
+} FIX_ALIASING;
+typedef struct filter_t filter_t;
+
+#define G_filter (*(filter_t*)&bb_common_bufsiz1)
 
 static int flush_update(void)
 {
-    if (rtnl_send(filter.rth, filter.flushb, filter.flushp) < 0) {
-        bb_perror_msg("failed to send flush request");
+    if (rtnl_send(G_filter.rth, G_filter.flushb, G_filter.flushp) < 0) {
+        bb_perror_msg("can't send flush request");
         return -1;
     }
-    filter.flushp = 0;
+    G_filter.flushp = 0;
     return 0;
 }
@@ -65 +64 @@
         return hz_internal;
 
-    fp = fopen("/proc/net/psched", "r");
+    fp = fopen_for_read("/proc/net/psched");
     if (fp) {
         unsigned nom, denom;
@@ -79 +78 @@
 }
 
-static int print_route(struct sockaddr_nl *who ATTRIBUTE_UNUSED,
-        struct nlmsghdr *n, void *arg)
+static int FAST_FUNC print_route(const struct sockaddr_nl *who UNUSED_PARAM,
+        struct nlmsghdr *n, void *arg UNUSED_PARAM)
 {
-    FILE *fp = (FILE*)arg;
     struct rtmsg *r = NLMSG_DATA(n);
     int len = n->nlmsg_len;
@@ -92 +90 @@
     SPRINT_BUF(b1);
 
-
     if (n->nlmsg_type != RTM_NEWROUTE && n->nlmsg_type != RTM_DELROUTE) {
         fprintf(stderr, "Not a route: %08x %08x %08x\n",
@@ -98 +95 @@
         return 0;
     }
-    if (filter.flushb && n->nlmsg_type != RTM_NEWROUTE)
+    if (G_filter.flushb && n->nlmsg_type != RTM_NEWROUTE)
         return 0;
     len -= NLMSG_LENGTH(sizeof(*r));
@@ -110 +107 @@
 
     if (r->rtm_family == AF_INET6) {
-        if (filter.tb) {
-            if (filter.tb < 0) {
-                if (!(r->rtm_flags&RTM_F_CLONED)) {
+        if (G_filter.tb) {
+            if (G_filter.tb < 0) {
+                if (!(r->rtm_flags & RTM_F_CLONED)) {
                     return 0;
                 }
             } else {
-                if (r->rtm_flags&RTM_F_CLONED) {
+                if (r->rtm_flags & RTM_F_CLONED) {
                     return 0;
                 }
-                if (filter.tb == RT_TABLE_LOCAL) {
+                if (G_filter.tb == RT_TABLE_LOCAL) {
                     if (r->rtm_type != RTN_LOCAL) {
                         return 0;
                     }
-                } else if (filter.tb == RT_TABLE_MAIN) {
+                } else if (G_filter.tb == RT_TABLE_MAIN) {
                     if (r->rtm_type == RTN_LOCAL) {
                         return 0;
@@ -133 +130 @@
         }
     } else {
-        if (filter.tb > 0 && filter.tb != r->rtm_table) {
+        if (G_filter.tb > 0 && G_filter.tb != r->rtm_table) {
             return 0;
         }
     }
-    if (filter.rdst.family &&
-        (r->rtm_family != filter.rdst.family || filter.rdst.bitlen > r->rtm_dst_len)) {
-        return 0;
-    }
-    if (filter.mdst.family &&
-        (r->rtm_family != filter.mdst.family ||
-         (filter.mdst.bitlen >= 0 && filter.mdst.bitlen < r->rtm_dst_len))) {
-        return 0;
-    }
-    if (filter.rsrc.family &&
-        (r->rtm_family != filter.rsrc.family || filter.rsrc.bitlen > r->rtm_src_len)) {
-        return 0;
-    }
-    if (filter.msrc.family &&
-        (r->rtm_family != filter.msrc.family ||
-         (filter.msrc.bitlen >= 0 && filter.msrc.bitlen < r->rtm_src_len))) {
+    if (G_filter.rdst.family
+     && (r->rtm_family != G_filter.rdst.family || G_filter.rdst.bitlen > r->rtm_dst_len)
+    ) {
+        return 0;
+    }
+    if (G_filter.mdst.family
+     && (r->rtm_family != G_filter.mdst.family
+        || (G_filter.mdst.bitlen >= 0 && G_filter.mdst.bitlen < r->rtm_dst_len)
+        )
+    ) {
+        return 0;
+    }
+    if (G_filter.rsrc.family
+     && (r->rtm_family != G_filter.rsrc.family || G_filter.rsrc.bitlen > r->rtm_src_len)
+    ) {
+        return 0;
+    }
+    if (G_filter.msrc.family
+     && (r->rtm_family != G_filter.msrc.family
+        || (G_filter.msrc.bitlen >= 0 && G_filter.msrc.bitlen < r->rtm_src_len)
+        )
+    ) {
         return 0;
     }
@@ -159 +162 @@
     parse_rtattr(tb, RTA_MAX, RTM_RTA(r), len);
 
-    if (filter.rdst.family && inet_addr_match(&dst, &filter.rdst, filter.rdst.bitlen))
-        return 0;
-    if (filter.mdst.family && filter.mdst.bitlen >= 0 &&
-        inet_addr_match(&dst, &filter.mdst, r->rtm_dst_len))
-        return 0;
-
-    if (filter.rsrc.family && inet_addr_match(&src, &filter.rsrc, filter.rsrc.bitlen))
-        return 0;
-    if (filter.msrc.family && filter.msrc.bitlen >= 0 &&
-        inet_addr_match(&src, &filter.msrc, r->rtm_src_len))
-        return 0;
-
-    if (filter.flushb &&
-        r->rtm_family == AF_INET6 &&
-        r->rtm_dst_len == 0 &&
-        r->rtm_type == RTN_UNREACHABLE &&
-        tb[RTA_PRIORITY] &&
-        *(int*)RTA_DATA(tb[RTA_PRIORITY]) == -1)
-        return 0;
-
-    if (filter.flushb) {
+    if (G_filter.rdst.family
+     && inet_addr_match(&dst, &G_filter.rdst, G_filter.rdst.bitlen)
+    ) {
+        return 0;
+    }
+    if (G_filter.mdst.family
+     && G_filter.mdst.bitlen >= 0
+     && inet_addr_match(&dst, &G_filter.mdst, r->rtm_dst_len)
+    ) {
+        return 0;
+    }
+    if (G_filter.rsrc.family
+     && inet_addr_match(&src, &G_filter.rsrc, G_filter.rsrc.bitlen)
+    ) {
+        return 0;
+    }
+    if (G_filter.msrc.family && G_filter.msrc.bitlen >= 0
+     && inet_addr_match(&src, &G_filter.msrc, r->rtm_src_len)
+    ) {
+        return 0;
+    }
+    if (G_filter.flushb
+     && r->rtm_family == AF_INET6
+     && r->rtm_dst_len == 0
+     && r->rtm_type == RTN_UNREACHABLE
+     && tb[RTA_PRIORITY]
+     && *(int*)RTA_DATA(tb[RTA_PRIORITY]) == -1
+    ) {
+        return 0;
+    }
+
+    if (G_filter.flushb) {
         struct nlmsghdr *fn;
-        if (NLMSG_ALIGN(filter.flushp) + n->nlmsg_len > filter.flushe) {
+        if (NLMSG_ALIGN(G_filter.flushp) + n->nlmsg_len > G_filter.flushe) {
             if (flush_update())
                 bb_error_msg_and_die("flush");
         }
-        fn = (struct nlmsghdr*)(filter.flushb + NLMSG_ALIGN(filter.flushp));
+        fn = (struct nlmsghdr*)(G_filter.flushb + NLMSG_ALIGN(G_filter.flushp));
         memcpy(fn, n, n->nlmsg_len);
         fn->nlmsg_type = RTM_DELROUTE;
         fn->nlmsg_flags = NLM_F_REQUEST;
-        fn->nlmsg_seq = ++filter.rth->seq;
-        filter.flushp = (((char*)fn) + n->nlmsg_len) - filter.flushb;
-        filter.flushed++;
+        fn->nlmsg_seq = ++G_filter.rth->seq;
+        G_filter.flushp = (((char*)fn) + n->nlmsg_len) - G_filter.flushb;
+        G_filter.flushed = 1;
         return 0;
     }
 
     if (n->nlmsg_type == RTM_DELROUTE) {
-        fprintf(fp, "Deleted ");
-    }
-    if (r->rtm_type != RTN_UNICAST && !filter.type) {
-        fprintf(fp, "%s ", rtnl_rtntype_n2a(r->rtm_type, b1, sizeof(b1)));
+        printf("Deleted ");
+    }
+    if (r->rtm_type != RTN_UNICAST /* && !G_filter.type - always 0 */) {
+        printf("%s ", rtnl_rtntype_n2a(r->rtm_type, b1));
     }
 
     if (tb[RTA_DST]) {
         if (r->rtm_dst_len != host_len) {
-            fprintf(fp, "%s/%u ", rt_addr_n2a(r->rtm_family,
-                             RTA_PAYLOAD(tb[RTA_DST]),
-                             RTA_DATA(tb[RTA_DST]),
-                             abuf, sizeof(abuf)),
-                r->rtm_dst_len
-                );
+            printf("%s/%u ", rt_addr_n2a(r->rtm_family,
+                        RTA_DATA(tb[RTA_DST]),
+                        abuf, sizeof(abuf)),
+                    r->rtm_dst_len
+                    );
         } else {
-            fprintf(fp, "%s ", format_host(r->rtm_family,
-                               RTA_PAYLOAD(tb[RTA_DST]),
-                               RTA_DATA(tb[RTA_DST]),
-                               abuf, sizeof(abuf))
-                );
+            printf("%s ", format_host(r->rtm_family,
+                        RTA_PAYLOAD(tb[RTA_DST]),
+                        RTA_DATA(tb[RTA_DST]),
+                        abuf, sizeof(abuf))
+                    );
         }
     } else if (r->rtm_dst_len) {
-        fprintf(fp, "0/%d ", r->rtm_dst_len);
+        printf("0/%d ", r->rtm_dst_len);
     } else {
-        fprintf(fp, "default ");
+        printf("default ");
     }
     if (tb[RTA_SRC]) {
         if (r->rtm_src_len != host_len) {
-            fprintf(fp, "from %s/%u ", rt_addr_n2a(r->rtm_family,
-                             RTA_PAYLOAD(tb[RTA_SRC]),
-                             RTA_DATA(tb[RTA_SRC]),
-                             abuf, sizeof(abuf)),
-                r->rtm_src_len
-                );
+            printf("from %s/%u ", rt_addr_n2a(r->rtm_family,
+                        RTA_DATA(tb[RTA_SRC]),
+                        abuf, sizeof(abuf)),
+                    r->rtm_src_len
+                    );
         } else {
-            fprintf(fp, "from %s ", format_host(r->rtm_family,
-                               RTA_PAYLOAD(tb[RTA_SRC]),
-                               RTA_DATA(tb[RTA_SRC]),
-                               abuf, sizeof(abuf))
-                );
+            printf("from %s ", format_host(r->rtm_family,
+                        RTA_PAYLOAD(tb[RTA_SRC]),
+                        RTA_DATA(tb[RTA_SRC]),
+                        abuf, sizeof(abuf))
+                    );
         }
     } else if (r->rtm_src_len) {
-        fprintf(fp, "from 0/%u ", r->rtm_src_len);
-    }
-    if (tb[RTA_GATEWAY] && filter.rvia.bitlen != host_len) {
-        fprintf(fp, "via %s ",
-            format_host(r->rtm_family,
-                    RTA_PAYLOAD(tb[RTA_GATEWAY]),
-                    RTA_DATA(tb[RTA_GATEWAY]),
-                    abuf, sizeof(abuf)));
-    }
-    if (tb[RTA_OIF] && filter.oifmask != -1) {
-        fprintf(fp, "dev %s ", ll_index_to_name(*(int*)RTA_DATA(tb[RTA_OIF])));
-    }
-
-    if (tb[RTA_PREFSRC] && filter.rprefsrc.bitlen != host_len) {
+        printf("from 0/%u ", r->rtm_src_len);
+    }
+    if (tb[RTA_GATEWAY] && G_filter.rvia.bitlen != host_len) {
+        printf("via %s ", format_host(r->rtm_family,
+                    RTA_PAYLOAD(tb[RTA_GATEWAY]),
+                    RTA_DATA(tb[RTA_GATEWAY]),
+                    abuf, sizeof(abuf)));
+    }
+    if (tb[RTA_OIF] && G_filter.oifmask != -1) {
+        printf("dev %s ", ll_index_to_name(*(int*)RTA_DATA(tb[RTA_OIF])));
+    }
+
+    if (tb[RTA_PREFSRC] && /*G_filter.rprefsrc.bitlen - always 0*/ 0 != host_len) {
         /* Do not use format_host(). It is our local addr
            and symbolic name will not be useful.
          */
-        fprintf(fp, " src %s ",
-            rt_addr_n2a(r->rtm_family,
-                    RTA_PAYLOAD(tb[RTA_PREFSRC]),
-                    RTA_DATA(tb[RTA_PREFSRC]),
-                    abuf, sizeof(abuf)));
+        printf(" src %s ", rt_addr_n2a(r->rtm_family,
+                    RTA_DATA(tb[RTA_PREFSRC]),
+                    abuf, sizeof(abuf)));
     }
     if (tb[RTA_PRIORITY]) {
-        fprintf(fp, " metric %d ", *(uint32_t*)RTA_DATA(tb[RTA_PRIORITY]));
+        printf(" metric %d ", *(uint32_t*)RTA_DATA(tb[RTA_PRIORITY]));
     }
     if (r->rtm_family == AF_INET6) {
@@ -271 +280 @@
         if ((r->rtm_flags & RTM_F_CLONED) || (ci && ci->rta_expires)) {
             if (r->rtm_flags & RTM_F_CLONED) {
-                fprintf(fp, "%c    cache ", _SL_);
+                printf("%c    cache ", _SL_);
             }
             if (ci->rta_expires) {
-                fprintf(fp, " expires %dsec", ci->rta_expires / get_hz());
+                printf(" expires %dsec", ci->rta_expires / get_hz());
             }
             if (ci->rta_error != 0) {
-                fprintf(fp, " error %d", ci->rta_error);
+                printf(" error %d", ci->rta_error);
             }
         } else if (ci) {
             if (ci->rta_error != 0)
-                fprintf(fp, " error %d", ci->rta_error);
-        }
-    }
-    if (tb[RTA_IIF] && filter.iifmask != -1) {
-        fprintf(fp, " iif %s", ll_index_to_name(*(int*)RTA_DATA(tb[RTA_IIF])));
-    }
-    fputc('\n', fp);
-    fflush(fp);
+                printf(" error %d", ci->rta_error);
+        }
+    }
+    if (tb[RTA_IIF] && G_filter.iifmask != -1) {
+        printf(" iif %s", ll_index_to_name(*(int*)RTA_DATA(tb[RTA_IIF])));
+    }
+    bb_putchar('\n');
     return 0;
 }
 
 /* Return value becomes exitcode. It's okay to not return at all */
-static int iproute_modify(int cmd, unsigned flags, int argc, char **argv)
+static int iproute_modify(int cmd, unsigned flags, char **argv)
 {
     static const char keywords[] ALIGN1 =
-        "src\0""via\0""mtu\0""lock\0""protocol\0"USE_FEATURE_IP_RULE("table\0")
-        "dev\0""oif\0""to\0";
+        "src\0""via\0""mtu\0""lock\0""protocol\0"IF_FEATURE_IP_RULE("table\0")
+        "dev\0""oif\0""to\0""metric\0";
     enum {
         ARG_src,
@@ -303 +311 @@
         ARG_mtu, PARM_lock,
         ARG_protocol,
-USE_FEATURE_IP_RULE(ARG_table,)
+IF_FEATURE_IP_RULE(ARG_table,)
         ARG_dev,
         ARG_oif,
-        ARG_to
+        ARG_to,
+        ARG_metric,
     };
     enum {
@@ -316 +325 @@
     struct rtnl_handle rth;
     struct {
-        struct nlmsghdr     n;
-        struct rtmsg        r;
-        char            buf[1024];
+        struct nlmsghdr n;
+        struct rtmsg    r;
+        char            buf[1024];
     } req;
     char mxbuf[256];
@@ -330 +339 @@
 
     req.n.nlmsg_len = NLMSG_LENGTH(sizeof(struct rtmsg));
-    req.n.nlmsg_flags = NLM_F_REQUEST|flags;
+    req.n.nlmsg_flags = NLM_F_REQUEST | flags;
     req.n.nlmsg_type = cmd;
     req.r.rtm_family = preferred_family;
-    req.r.rtm_table = RT_TABLE_MAIN;
-    req.r.rtm_scope = RT_SCOPE_NOWHERE;
+    if (RT_TABLE_MAIN) /* if it is zero, memset already did it */
+        req.r.rtm_table = RT_TABLE_MAIN;
+    if (RT_SCOPE_NOWHERE)
+        req.r.rtm_scope = RT_SCOPE_NOWHERE;
 
     if (cmd != RTM_DELROUTE) {
@@ -345 +356 @@
     mxrta->rta_len = RTA_LENGTH(0);
 
-    while (argc > 0) {
+    while (*argv) {
         arg = index_in_substrings(keywords, *argv);
         if (arg == ARG_src) {
@@ -367 +378 @@
             NEXT_ARG();
             if (index_in_strings(keywords, *argv) == PARM_lock) {
-                mxlock |= (1<<RTAX_MTU);
-                NEXT_ARG();
-            }
-            if (get_unsigned(&mtu, *argv, 0))
-                invarg(*argv, "mtu");
+                mxlock |= (1 << RTAX_MTU);
+                NEXT_ARG();
+            }
+            mtu = get_unsigned(*argv, "mtu");
             rta_addattr32(mxrta, sizeof(mxbuf), RTAX_MTU, mtu);
         } else if (arg == ARG_protocol) {
@@ -391 +401 @@
             NEXT_ARG();
             d = *argv;
+        } else if (arg == ARG_metric) {
+            uint32_t metric;
+            NEXT_ARG();
+            metric = get_u32(*argv, "metric");
+            addattr32(&req.n, sizeof(req), RTA_PRIORITY, metric);
         } else {
             int type;
@@ -399 +414 @@
             }
             if ((**argv < '0' || **argv > '9')
-                && rtnl_rtntype_a2n(&type, *argv) == 0) {
+             && rtnl_rtntype_a2n(&type, *argv) == 0) {
                 NEXT_ARG();
                 req.r.rtm_type = type;
@@ -418 +433 @@
             }
         }
-        argc--; argv++;
+        argv++;
     }
 
@@ -443 +458 @@
     if (req.r.rtm_type == RTN_LOCAL || req.r.rtm_type == RTN_NAT)
         req.r.rtm_scope = RT_SCOPE_HOST;
-    else if (req.r.rtm_type == RTN_BROADCAST ||
-            req.r.rtm_type == RTN_MULTICAST ||
-            req.r.rtm_type == RTN_ANYCAST)
+    else
+    if (req.r.rtm_type == RTN_BROADCAST
+     || req.r.rtm_type == RTN_MULTICAST
+     || req.r.rtm_type == RTN_ANYCAST
+    ) {
         req.r.rtm_scope = RT_SCOPE_LINK;
+    }
     else if (req.r.rtm_type == RTN_UNICAST || req.r.rtm_type == RTN_UNSPEC) {
         if (cmd == RTM_DELROUTE)
@@ -478 +496 @@
 
     req.nlh.nlmsg_len = sizeof(req);
-    req.nlh.nlmsg_type = RTM_GETROUTE;
-    req.nlh.nlmsg_flags = NLM_F_ROOT|NLM_F_REQUEST;
-    req.nlh.nlmsg_pid = 0;
+    if (RTM_GETROUTE)
+        req.nlh.nlmsg_type = RTM_GETROUTE;
+    if (NLM_F_ROOT | NLM_F_REQUEST)
+        req.nlh.nlmsg_flags = NLM_F_ROOT | NLM_F_REQUEST;
+    /*req.nlh.nlmsg_pid = 0; - memset did it already */
     req.nlh.nlmsg_seq = rth->dump = ++rth->seq;
     req.rtm.rtm_family = family;
-    req.rtm.rtm_flags |= RTM_F_CLONED;
+    if (RTM_F_CLONED)
+        req.rtm.rtm_flags = RTM_F_CLONED;
 
     return xsendto(rth->fd, (void*)&req, sizeof(req), (struct sockaddr*)&nladdr, sizeof(nladdr));
@@ -498 +519 @@
 
     if (write(flush_fd, "-1", 2) < 2) {
-        bb_perror_msg("cannot flush routing cache");
+        bb_perror_msg("can't flush routing cache");
         return;
     }
@@ -506 +527 @@
 static void iproute_reset_filter(void)
 {
-    memset(&filter, 0, sizeof(filter));
-    filter.mdst.bitlen = -1;
-    filter.msrc.bitlen = -1;
+    memset(&G_filter, 0, sizeof(G_filter));
+    G_filter.mdst.bitlen = -1;
+    G_filter.msrc.bitlen = -1;
 }
 
 /* Return value becomes exitcode. It's okay to not return at all */
-static int iproute_list_or_flush(int argc, char **argv, int flush)
+static int iproute_list_or_flush(char **argv, int flush)
 {
     int do_ipv6 = preferred_family;
@@ -519 +540 @@
     char *od = NULL;
     static const char keywords[] ALIGN1 =
-        "protocol\0""all\0""dev\0""oif\0""iif\0""via\0""table\0""cache\0" /*all*/
-        "from\0""root\0""match\0""exact\0""to\0"/*root match exact*/;
+        /* "ip route list/flush" parameters: */
+        "protocol\0" "dev\0"   "oif\0"   "iif\0"
+        "via\0"      "table\0" "cache\0"
+        "from\0"     "to\0"
+        /* and possible further keywords */
+        "all\0"
+        "root\0"
+        "match\0"
+        "exact\0"
+        "main\0"
+        ;
     enum {
-        ARG_proto, PARM_all,
-        ARG_dev,
-        ARG_oif,
-        ARG_iif,
-        ARG_via,
-        ARG_table, PARM_cache, /*PARM_all,*/
-        ARG_from, PARM_root, PARM_match, PARM_exact,
-        ARG_to  /*PARM_root, PARM_match, PARM_exact*/
+        KW_proto, KW_dev,   KW_oif,  KW_iif,
+        KW_via,   KW_table, KW_cache,
+        KW_from,  KW_to,
+        /* */
+        KW_all,
+        KW_root,
+        KW_match,
+        KW_exact,
+        KW_main,
     };
     int arg, parm;
+
     iproute_reset_filter();
-    filter.tb = RT_TABLE_MAIN;
-
-    if (flush && argc <= 0)
+    G_filter.tb = RT_TABLE_MAIN;
+
+    if (flush && !*argv)
         bb_error_msg_and_die(bb_msg_requires_arg, "\"ip route flush\"");
 
-    while (argc > 0) {
+    while (*argv) {
         arg = index_in_substrings(keywords, *argv);
-        if (arg == ARG_proto) {
+        if (arg == KW_proto) {
             uint32_t prot = 0;
             NEXT_ARG();
-            filter.protocolmask = -1;
+            //G_filter.protocolmask = -1;
             if (rtnl_rtprot_a2n(&prot, *argv)) {
-                if (index_in_strings(keywords, *argv) != PARM_all)
+                if (index_in_strings(keywords, *argv) != KW_all)
                     invarg(*argv, "protocol");
                 prot = 0;
-                filter.protocolmask = 0;
-            }
-            filter.protocol = prot;
-        } else if (arg == ARG_dev || arg == ARG_oif) {
+                //G_filter.protocolmask = 0;
+            }
+            //G_filter.protocol = prot;
+        } else if (arg == KW_dev || arg == KW_oif) {
             NEXT_ARG();
             od = *argv;
-        } else if (arg == ARG_iif) {
+        } else if (arg == KW_iif) {
             NEXT_ARG();
             id = *argv;
-        } else if (arg == ARG_via) {
-            NEXT_ARG();
-            get_prefix(&filter.rvia, *argv, do_ipv6);
-        } else if (arg == ARG_table) {
+        } else if (arg == KW_via) {
+            NEXT_ARG();
+            get_prefix(&G_filter.rvia, *argv, do_ipv6);
+        } else if (arg == KW_table) { /* table all/cache/main */
             NEXT_ARG();
             parm = index_in_substrings(keywords, *argv);
-            if (parm == PARM_cache)
-                filter.tb = -1;
-            else if (parm == PARM_all)
-                filter.tb = 0;
-            else
+            if (parm == KW_cache)
+                G_filter.tb = -1;
+            else if (parm == KW_all)
+                G_filter.tb = 0;
+            else if (parm != KW_main) {
+#if ENABLE_FEATURE_IP_RULE
+                uint32_t tid;
+                if (rtnl_rttable_a2n(&tid, *argv))
+                    invarg(*argv, "table");
+                G_filter.tb = tid;
+#else
                 invarg(*argv, "table");
-        } else if (arg == ARG_from) {
+#endif
+            }
+        } else if (arg == KW_cache) {
+            /* The command 'ip route flush cache' is used by OpenSWAN.
+             * Assuming it's a synonym for 'ip route flush table cache' */
+            G_filter.tb = -1;
+        } else if (arg == KW_from) {
             NEXT_ARG();
             parm = index_in_substrings(keywords, *argv);
-            if (parm == PARM_root) {
-                NEXT_ARG();
-                get_prefix(&filter.rsrc, *argv, do_ipv6);
-            } else if (parm == PARM_match) {
-                NEXT_ARG();
-                get_prefix(&filter.msrc, *argv, do_ipv6);
+            if (parm == KW_root) {
+                NEXT_ARG();
+                get_prefix(&G_filter.rsrc, *argv, do_ipv6);
+            } else if (parm == KW_match) {
+                NEXT_ARG();
+                get_prefix(&G_filter.msrc, *argv, do_ipv6);
             } else {
-                if (parm == PARM_exact)
+                if (parm == KW_exact)
                     NEXT_ARG();
-                get_prefix(&filter.msrc, *argv, do_ipv6);
-                filter.rsrc = filter.msrc;
-            }
-        } else {
-            /* parm = arg; // would be more plausible, we reuse arg here */
-            if (arg == ARG_to) {
+                get_prefix(&G_filter.msrc, *argv, do_ipv6);
+                G_filter.rsrc = G_filter.msrc;
+            }
+        } else { /* "to" is the default parameter */
+            if (arg == KW_to) {
                 NEXT_ARG();
                 arg = index_in_substrings(keywords, *argv);
             }
-            if (arg == PARM_root) {
-                NEXT_ARG();
-                get_prefix(&filter.rdst, *argv, do_ipv6);
-            } else if (arg == PARM_match) {
-                NEXT_ARG();
-                get_prefix(&filter.mdst, *argv, do_ipv6);
-            } else {
-                if (arg == PARM_exact)
+            /* parm = arg; - would be more plausible, but we reuse 'arg' here */
+            if (arg == KW_root) {
+                NEXT_ARG();
+                get_prefix(&G_filter.rdst, *argv, do_ipv6);
+            } else if (arg == KW_match) {
+                NEXT_ARG();
+                get_prefix(&G_filter.mdst, *argv, do_ipv6);
+            } else { /* "to exact" is the default */
+                if (arg == KW_exact)
                     NEXT_ARG();
-                get_prefix(&filter.mdst, *argv, do_ipv6);
-                filter.rdst = filter.mdst;
-            }
-        }
-        argc--;
+                get_prefix(&G_filter.mdst, *argv, do_ipv6);
+                G_filter.rdst = G_filter.mdst;
+            }
+        }
         argv++;
     }
 
-    if (do_ipv6 == AF_UNSPEC && filter.tb) {
+    if (do_ipv6 == AF_UNSPEC && G_filter.tb) {
         do_ipv6 = AF_INET;
     }
 
     xrtnl_open(&rth);
-
     ll_init_map(&rth);
 
@@ -620 +662 @@
         if (id) {
             idx = xll_name_to_index(id);
-            filter.iif = idx;
-            filter.iifmask = -1;
+            G_filter.iif = idx;
+            G_filter.iifmask = -1;
         }
         if (od) {
             idx = xll_name_to_index(od);
-            filter.oif = idx;
-            filter.oifmask = -1;
+            G_filter.oif = idx;
+            G_filter.oifmask = -1;
         }
     }
@@ -633 +675 @@
         char flushb[4096-512];
 
-        if (filter.tb == -1) {
+        if (G_filter.tb == -1) { /* "flush table cache" */
             if (do_ipv6 != AF_INET6)
                 iproute_flush_cache();
@@ -640 +682 @@
         }
 
-        filter.flushb = flushb;
-        filter.flushp = 0;
-        filter.flushe = sizeof(flushb);
-        filter.rth = &rth;
+        G_filter.flushb = flushb;
+        G_filter.flushp = 0;
+        G_filter.flushe = sizeof(flushb);
+        G_filter.rth = &rth;
 
         for (;;) {
             xrtnl_wilddump_request(&rth, do_ipv6, RTM_GETROUTE);
-            filter.flushed = 0;
-            xrtnl_dump_filter(&rth, print_route, stdout);
-            if (filter.flushed == 0)
+            G_filter.flushed = 0;
+            xrtnl_dump_filter(&rth, print_route, NULL);
+            if (G_filter.flushed == 0)
                 return 0;
             if (flush_update())
@@ -656 +698 @@
     }
 
-    if (filter.tb != -1) {
+    if (G_filter.tb != -1) {
         xrtnl_wilddump_request(&rth, do_ipv6, RTM_GETROUTE);
     } else if (rtnl_rtcache_request(&rth, do_ipv6) < 0) {
-        bb_perror_msg_and_die("cannot send dump request");
-    }
-    xrtnl_dump_filter(&rth, print_route, stdout);
+        bb_perror_msg_and_die("can't send dump request");
+    }
+    xrtnl_dump_filter(&rth, print_route, NULL);
 
     return 0;
@@ -668 +710 @@
 
 /* Return value becomes exitcode. It's okay to not return at all */
-static int iproute_get(int argc, char **argv)
+static int iproute_get(char **argv)
 {
     struct rtnl_handle rth;
@@ -688 +730 @@
 
     req.n.nlmsg_len = NLMSG_LENGTH(sizeof(struct rtmsg));
-    req.n.nlmsg_flags = NLM_F_REQUEST;
-    req.n.nlmsg_type = RTM_GETROUTE;
+    if (NLM_F_REQUEST)
+        req.n.nlmsg_flags = NLM_F_REQUEST;
+    if (RTM_GETROUTE)
+        req.n.nlmsg_type = RTM_GETROUTE;
     req.r.rtm_family = preferred_family;
-    req.r.rtm_table = 0;
-    req.r.rtm_protocol = 0;
-    req.r.rtm_scope = 0;
-    req.r.rtm_type = 0;
-    req.r.rtm_src_len = 0;
-    req.r.rtm_dst_len = 0;
-    req.r.rtm_tos = 0;
-
-    while (argc > 0) {
+    /*req.r.rtm_table = 0; - memset did this already */
+    /*req.r.rtm_protocol = 0;*/
+    /*req.r.rtm_scope = 0;*/
+    /*req.r.rtm_type = 0;*/
+    /*req.r.rtm_src_len = 0;*/
+    /*req.r.rtm_dst_len = 0;*/
+    /*req.r.rtm_tos = 0;*/
+
+    while (*argv) {
         switch (index_in_strings(options, *argv)) {
             case 0: /* from */
@@ -745 +789 @@
                 req.r.rtm_dst_len = addr.bitlen;
             }
-            argc--; argv++;
-        }
+        }
+        argv++;
     }
 
@@ -783 +827 @@
         struct rtattr * tb[RTA_MAX+1];
 
-        print_route(NULL, &req.n, (void*)stdout);
+        print_route(NULL, &req.n, NULL);
 
         if (req.n.nlmsg_type != RTM_NEWROUTE) {
@@ -800 +844 @@
             r->rtm_src_len = 8*RTA_PAYLOAD(tb[RTA_PREFSRC]);
         } else if (!tb[RTA_SRC]) {
-            bb_error_msg_and_die("failed to connect the route");
+            bb_error_msg_and_die("can't connect the route");
         }
         if (!odev && tb[RTA_OIF]) {
@@ -818 +862 @@
         }
     }
-    print_route(NULL, &req.n, (void*)stdout);
+    print_route(NULL, &req.n, NULL);
     return 0;
 }
 
 /* Return value becomes exitcode. It's okay to not return at all */
-int do_iproute(int argc, char **argv)
+int FAST_FUNC do_iproute(char **argv)
 {
     static const char ip_route_commands[] ALIGN1 =
@@ -829 +873 @@
     /*4-7*/ "delete\0""get\0""list\0""show\0"
     /*8..*/ "prepend\0""replace\0""test\0""flush\0";
-    int command_num = 6;
+    int command_num;
     unsigned flags = 0;
     int cmd = RTM_NEWROUTE;
 
+    if (!*argv)
+        return iproute_list_or_flush(argv, 0);
+
     /* "Standard" 'ip r a' treats 'a' as 'add', not 'append' */
     /* It probably means that it is using "first match" rule */
-    if (*argv) {
-        command_num = index_in_substrings(ip_route_commands, *argv);
-    }
+    command_num = index_in_substrings(ip_route_commands, *argv);
+
     switch (command_num) {
         case 0: /* add */
@@ -853 +899 @@
             break;
         case 5: /* get */
-            return iproute_get(argc-1, argv+1);
+            return iproute_get(argv+1);
         case 6: /* list */
         case 7: /* show */
-            return iproute_list_or_flush(argc-1, argv+1, 0);
+            return iproute_list_or_flush(argv+1, 0);
         case 8: /* prepend */
             flags = NLM_F_CREATE;
+            break;
         case 9: /* replace */
             flags = NLM_F_CREATE|NLM_F_REPLACE;
+            break;
         case 10: /* test */
             flags = NLM_F_EXCL;
+            break;
         case 11: /* flush */
-            return iproute_list_or_flush(argc-1, argv+1, 1);
+            return iproute_list_or_flush(argv+1, 1);
         default:
             bb_error_msg_and_die("unknown command %s", *argv);
     }
 
-    return iproute_modify(cmd, flags, argc-1, argv+1);
+    return iproute_modify(cmd, flags, argv+1);
 }