Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/networking/libiproute/iproute.c

Timestamp:

Jan 1, 2014, 12:47:38 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.21.1

File:

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

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

@@ -32 +32 @@
     //int typemask; - unused
     //int tos, tosmask; - unused
-    int iif, iifmask;
-    int oif, oifmask;
+    int iif;
+    int oif;
     //int realm, realmmask; - unused
     //inet_prefix rprefsrc; - read-only
@@ -83 +83 @@
     struct rtmsg *r = NLMSG_DATA(n);
     int len = n->nlmsg_len;
-    struct rtattr * tb[RTA_MAX+1];
+    struct rtattr *tb[RTA_MAX+1];
     char abuf[256];
     inet_prefix dst;
@@ -160 +160 @@
 
     memset(tb, 0, sizeof(tb));
+    memset(&src, 0, sizeof(src));
+    memset(&dst, 0, sizeof(dst));
     parse_rtattr(tb, RTA_MAX, RTM_RTA(r), len);
+
+    if (tb[RTA_SRC]) {
+        src.bitlen = r->rtm_src_len;
+        src.bytelen = (r->rtm_family == AF_INET6 ? 16 : 4);
+        memcpy(src.data, RTA_DATA(tb[RTA_SRC]), src.bytelen);
+    }
+    if (tb[RTA_DST]) {
+        dst.bitlen = r->rtm_dst_len;
+        dst.bytelen = (r->rtm_family == AF_INET6 ? 16 : 4);
+        memcpy(dst.data, RTA_DATA(tb[RTA_DST]), dst.bytelen);
+    }
 
     if (G_filter.rdst.family
@@ -183 +196 @@
         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.oif != 0) {
+        if (!tb[RTA_OIF])
+            return 0;
+        if (G_filter.oif != *(int*)RTA_DATA(tb[RTA_OIF]))
+            return 0;
     }
 
     if (G_filter.flushb) {
         struct nlmsghdr *fn;
+
+        /* We are creating route flush commands */
+
+        if (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 (NLMSG_ALIGN(G_filter.flushp) + n->nlmsg_len > G_filter.flushe) {
             if (flush_update())
                 bb_error_msg_and_die("flush");
         }
-        fn = (struct nlmsghdr*)(G_filter.flushb + NLMSG_ALIGN(G_filter.flushp));
+        fn = (void*)(G_filter.flushb + NLMSG_ALIGN(G_filter.flushp));
         memcpy(fn, n, n->nlmsg_len);
         fn->nlmsg_type = RTM_DELROUTE;
@@ -208 +230 @@
         return 0;
     }
+
+    /* We are printing routes */
 
     if (n->nlmsg_type == RTM_DELROUTE) {
@@ -258 +282 @@
                     abuf, sizeof(abuf)));
     }
-    if (tb[RTA_OIF] && G_filter.oifmask != -1) {
+    if (tb[RTA_OIF]) {
         printf("dev %s ", ll_index_to_name(*(int*)RTA_DATA(tb[RTA_OIF])));
     }
+
+    /* Todo: parse & show "proto kernel", "scope link" here */
 
     if (tb[RTA_PREFSRC] && /*G_filter.rprefsrc.bitlen - always 0*/ 0 != host_len) {
@@ -293 +319 @@
         }
     }
-    if (tb[RTA_IIF] && G_filter.iifmask != -1) {
+    if (tb[RTA_IIF] && G_filter.iif == 0) {
         printf(" iif %s", ll_index_to_name(*(int*)RTA_DATA(tb[RTA_IIF])));
     }
@@ -414 +440 @@
             }
             if ((**argv < '0' || **argv > '9')
-             && rtnl_rtntype_a2n(&type, *argv) == 0) {
+             && rtnl_rtntype_a2n(&type, *argv) == 0
+            ) {
                 NEXT_ARG();
                 req.r.rtm_type = type;
@@ -663 +690 @@
             idx = xll_name_to_index(id);
             G_filter.iif = idx;
-            G_filter.iifmask = -1;
         }
         if (od) {
             idx = xll_name_to_index(od);
             G_filter.oif = idx;
-            G_filter.oifmask = -1;
         }
     }