Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/networking/libiproute/iproute.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/networking/libiproute/iproute.c (modified) (21 diffs)

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

@@ -12 +12 @@
 
 #include "ip_common.h"  /* #include "libbb.h" is inside */
+#include "common_bufsiz.h"
 #include "rt_names.h"
 #include "utils.h"
@@ -44 +45 @@
 typedef struct filter_t filter_t;
 
-#define G_filter (*(filter_t*)&bb_common_bufsiz1)
+#define G_filter (*(filter_t*)bb_common_bufsiz1)
+#define INIT_G() do { setup_common_bufsiz(); } while (0)
 
 static int flush_update(void)
@@ -54 +56 @@
     G_filter.flushp = 0;
     return 0;
-}
-
-static unsigned get_hz(void)
-{
-    static unsigned hz_internal;
-    FILE *fp;
-
-    if (hz_internal)
-        return hz_internal;
-
-    fp = fopen_for_read("/proc/net/psched");
-    if (fp) {
-        unsigned nom, denom;
-
-        if (fscanf(fp, "%*08x%*08x%08x%08x", &nom, &denom) == 2)
-            if (nom == 1000000)
-                hz_internal = denom;
-        fclose(fp);
-    }
-    if (!hz_internal)
-        hz_internal = sysconf(_SC_CLK_TCK);
-    return hz_internal;
 }
 
@@ -84 +64 @@
     int len = n->nlmsg_len;
     struct rtattr *tb[RTA_MAX+1];
-    char abuf[256];
     inet_prefix dst;
     inet_prefix src;
     int host_len = -1;
-    SPRINT_BUF(b1);
 
     if (n->nlmsg_type != RTM_NEWROUTE && n->nlmsg_type != RTM_DELROUTE) {
@@ -219 +197 @@
         if (NLMSG_ALIGN(G_filter.flushp) + n->nlmsg_len > G_filter.flushe) {
             if (flush_update())
-                bb_error_msg_and_die("flush");
+                xfunc_die();
         }
         fn = (void*)(G_filter.flushb + NLMSG_ALIGN(G_filter.flushp));
@@ -237 +215 @@
     }
     if (r->rtm_type != RTN_UNICAST /* && !G_filter.type - always 0 */) {
-        printf("%s ", rtnl_rtntype_n2a(r->rtm_type, b1));
+        printf("%s ", rtnl_rtntype_n2a(r->rtm_type));
     }
 
     if (tb[RTA_DST]) {
         if (r->rtm_dst_len != host_len) {
-            printf("%s/%u ", rt_addr_n2a(r->rtm_family,
-                        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])),
+                r->rtm_dst_len
+            );
         } else {
             printf("%s ", format_host(r->rtm_family,
                         RTA_PAYLOAD(tb[RTA_DST]),
-                        RTA_DATA(tb[RTA_DST]),
-                        abuf, sizeof(abuf))
-                    );
+                        RTA_DATA(tb[RTA_DST]))
+            );
         }
     } else if (r->rtm_dst_len) {
@@ -261 +237 @@
     if (tb[RTA_SRC]) {
         if (r->rtm_src_len != host_len) {
-            printf("from %s/%u ", rt_addr_n2a(r->rtm_family,
-                        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])),
+                r->rtm_src_len
+            );
         } else {
             printf("from %s ", format_host(r->rtm_family,
                         RTA_PAYLOAD(tb[RTA_SRC]),
-                        RTA_DATA(tb[RTA_SRC]),
-                        abuf, sizeof(abuf))
-                    );
+                        RTA_DATA(tb[RTA_SRC]))
+            );
         }
     } else if (r->rtm_src_len) {
@@ -279 +253 @@
         printf("via %s ", format_host(r->rtm_family,
                     RTA_PAYLOAD(tb[RTA_GATEWAY]),
-                    RTA_DATA(tb[RTA_GATEWAY]),
-                    abuf, sizeof(abuf)));
+                    RTA_DATA(tb[RTA_GATEWAY]))
+        );
     }
     if (tb[RTA_OIF]) {
@@ -293 +267 @@
          */
         printf(" src %s ", rt_addr_n2a(r->rtm_family,
-                    RTA_DATA(tb[RTA_PREFSRC]),
-                    abuf, sizeof(abuf)));
+                    RTA_DATA(tb[RTA_PREFSRC])));
     }
     if (tb[RTA_PRIORITY]) {
         printf(" metric %d ", *(uint32_t*)RTA_DATA(tb[RTA_PRIORITY]));
     }
+    if (r->rtm_flags & RTNH_F_DEAD) {
+        printf("dead ");
+    }
+    if (r->rtm_flags & RTNH_F_ONLINK) {
+        printf("onlink ");
+    }
+    if (r->rtm_flags & RTNH_F_PERVASIVE) {
+        printf("pervasive ");
+    }
+    if (r->rtm_flags & RTM_F_NOTIFY) {
+        printf("notify ");
+    }
+
     if (r->rtm_family == AF_INET6) {
         struct rta_cacheinfo *ci = NULL;
@@ -330 +316 @@
 {
     static const char keywords[] ALIGN1 =
-        "src\0""via\0""mtu\0""lock\0""protocol\0"IF_FEATURE_IP_RULE("table\0")
-        "dev\0""oif\0""to\0""metric\0";
+        "src\0""via\0""mtu\0""lock\0""scope\0""protocol\0"IF_FEATURE_IP_RULE("table\0")
+        "dev\0""oif\0""to\0""metric\0""onlink\0";
     enum {
         ARG_src,
         ARG_via,
         ARG_mtu, PARM_lock,
+        ARG_scope,
         ARG_protocol,
 IF_FEATURE_IP_RULE(ARG_table,)
@@ -342 +329 @@
         ARG_to,
         ARG_metric,
+        ARG_onlink,
     };
     enum {
@@ -360 +348 @@
     char *d = NULL;
     smalluint ok = 0;
+    smalluint scope_ok = 0;
     int arg;
 
@@ -368 +357 @@
     req.n.nlmsg_type = cmd;
     req.r.rtm_family = preferred_family;
-    if (RT_TABLE_MAIN) /* if it is zero, memset already did it */
+    if (RT_TABLE_MAIN != 0) /* if it is zero, memset already did it */
         req.r.rtm_table = RT_TABLE_MAIN;
-    if (RT_SCOPE_NOWHERE)
+    if (RT_SCOPE_NOWHERE != 0)
         req.r.rtm_scope = RT_SCOPE_NOWHERE;
 
     if (cmd != RTM_DELROUTE) {
-        req.r.rtm_protocol = RTPROT_BOOT;
         req.r.rtm_scope = RT_SCOPE_UNIVERSE;
-        req.r.rtm_type = RTN_UNICAST;
+        if (RTPROT_BOOT != 0)
+            req.r.rtm_protocol = RTPROT_BOOT;
+        if (RTN_UNICAST != 0)
+            req.r.rtm_type = RTN_UNICAST;
     }
 
@@ -409 +400 @@
             mtu = get_unsigned(*argv, "mtu");
             rta_addattr32(mxrta, sizeof(mxbuf), RTAX_MTU, mtu);
+        } else if (arg == ARG_scope) {
+            uint32_t scope;
+            NEXT_ARG();
+            if (rtnl_rtscope_a2n(&scope, *argv))
+                invarg_1_to_2(*argv, "scope");
+            req.r.rtm_scope = scope;
+            scope_ok = 1;
         } else if (arg == ARG_protocol) {
             uint32_t prot;
             NEXT_ARG();
             if (rtnl_rtprot_a2n(&prot, *argv))
-                invarg(*argv, "protocol");
+                invarg_1_to_2(*argv, "protocol");
             req.r.rtm_protocol = prot;
             ok |= proto_ok;
@@ -421 +419 @@
             NEXT_ARG();
             if (rtnl_rttable_a2n(&tid, *argv))
-                invarg(*argv, "table");
+                invarg_1_to_2(*argv, "table");
             req.r.rtm_table = tid;
 #endif
@@ -432 +430 @@
             metric = get_u32(*argv, "metric");
             addattr32(&req.n, sizeof(req), RTA_PRIORITY, metric);
+        } else if (arg == ARG_onlink) {
+            req.r.rtm_flags |= RTNH_F_ONLINK;
         } else {
             int type;
@@ -483 +483 @@
     }
 
-    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
-    ) {
-        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)
-            req.r.rtm_scope = RT_SCOPE_NOWHERE;
-        else if (!(ok & gw_ok))
+    if (!scope_ok) {
+        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
+        ) {
             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)
+                req.r.rtm_scope = RT_SCOPE_NOWHERE;
+            else if (!(ok & gw_ok))
+                req.r.rtm_scope = RT_SCOPE_LINK;
+        }
     }
 
@@ -605 +607 @@
             if (rtnl_rtprot_a2n(&prot, *argv)) {
                 if (index_in_strings(keywords, *argv) != KW_all)
-                    invarg(*argv, "protocol");
+                    invarg_1_to_2(*argv, "protocol");
                 prot = 0;
                 //G_filter.protocolmask = 0;
@@ -630 +632 @@
                 uint32_t tid;
                 if (rtnl_rttable_a2n(&tid, *argv))
-                    invarg(*argv, "table");
+                    invarg_1_to_2(*argv, "table");
                 G_filter.tb = tid;
 #else
-                invarg(*argv, "table");
+                invarg_1_to_2(*argv, "table");
 #endif
             }
@@ -901 +903 @@
     unsigned flags = 0;
     int cmd = RTM_NEWROUTE;
+
+    INIT_G();
 
     if (!*argv)
@@ -940 +944 @@
             return iproute_list_or_flush(argv+1, 1);
         default:
-            bb_error_msg_and_die("unknown command %s", *argv);
+            invarg_1_to_2(*argv, applet_name);
     }