Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/networking/libiproute/iprule.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/iprule.c (modified) (15 diffs)

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

@@ -45 +45 @@
     int host_len = -1;
     struct rtattr * tb[RTA_MAX+1];
-    char abuf[256];
-    SPRINT_BUF(b1);
 
     if (n->nlmsg_type != RTM_NEWRULE)
@@ -73 +71 @@
     if (tb[RTA_SRC]) {
         if (r->rtm_src_len != host_len) {
-            printf("%s/%u", rt_addr_n2a(r->rtm_family,
-                            RTA_DATA(tb[RTA_SRC]),
-                            abuf, sizeof(abuf)),
+            printf("%s/%u",
+                rt_addr_n2a(r->rtm_family, RTA_DATA(tb[RTA_SRC])),
                 r->rtm_src_len
             );
@@ -81 +78 @@
             fputs(format_host(r->rtm_family,
                         RTA_PAYLOAD(tb[RTA_SRC]),
-                        RTA_DATA(tb[RTA_SRC]),
-                        abuf, sizeof(abuf)),
+                        RTA_DATA(tb[RTA_SRC])),
                 stdout
             );
@@ -96 +92 @@
         if (r->rtm_dst_len != host_len) {
             printf("to %s/%u ", rt_addr_n2a(r->rtm_family,
-                             RTA_DATA(tb[RTA_DST]),
-                             abuf, sizeof(abuf)),
+                             RTA_DATA(tb[RTA_DST])),
                 r->rtm_dst_len
                 );
@@ -103 +98 @@
             printf("to %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) {
@@ -111 +105 @@
 
     if (r->rtm_tos) {
-        printf("tos %s ", rtnl_dsfield_n2a(r->rtm_tos, b1));
+        printf("tos %s ", rtnl_dsfield_n2a(r->rtm_tos));
     }
     if (tb[RTA_PROTOINFO]) {
@@ -122 +116 @@
 
     if (r->rtm_table)
-        printf("lookup %s ", rtnl_rttable_n2a(r->rtm_table, b1));
+        printf("lookup %s ", rtnl_rttable_n2a(r->rtm_table));
 
     if (tb[RTA_FLOW]) {
@@ -130 +124 @@
         if (from) {
             printf("realms %s/",
-                rtnl_rtrealm_n2a(from, b1));
+                rtnl_rtrealm_n2a(from));
         }
         printf("%s ",
-            rtnl_rtrealm_n2a(to, b1));
+            rtnl_rtrealm_n2a(to));
     }
 
@@ -141 +135 @@
                 format_host(r->rtm_family,
                         RTA_PAYLOAD(tb[RTA_GATEWAY]),
-                        RTA_DATA(tb[RTA_GATEWAY]),
-                        abuf, sizeof(abuf)));
+                        RTA_DATA(tb[RTA_GATEWAY]))
+            );
         } else
             printf("masquerade");
     } else if (r->rtm_type != RTN_UNICAST)
-        fputs(rtnl_rtntype_n2a(r->rtm_type, b1), stdout);
+        fputs(rtnl_rtntype_n2a(r->rtm_type), stdout);
 
     bb_putchar('\n');
@@ -216 +210 @@
         key = index_in_substrings(keywords, *argv) + 1;
         if (key == 0) /* no match found in keywords array, bail out. */
-            bb_error_msg_and_die(bb_msg_invalid_arg, *argv, applet_name);
+            invarg_1_to_2(*argv, applet_name);
         if (key == ARG_from) {
             inet_prefix dst;
@@ -241 +235 @@
             NEXT_ARG();
             if (rtnl_dsfield_a2n(&tos, *argv))
-                invarg(*argv, "TOS");
+                invarg_1_to_2(*argv, "TOS");
             req.r.rtm_tos = tos;
         } else if (key == ARG_fwmark) {
@@ -252 +246 @@
             NEXT_ARG();
             if (get_rt_realms(&realm, *argv))
-                invarg(*argv, "realms");
+                invarg_1_to_2(*argv, "realms");
             addattr32(&req.n, sizeof(req), RTA_FLOW, realm);
         } else if (key == ARG_table ||
@@ -260 +254 @@
             NEXT_ARG();
             if (rtnl_rttable_a2n(&tid, *argv))
-                invarg(*argv, "table ID");
+                invarg_1_to_2(*argv, "table ID");
             req.r.rtm_table = tid;
             table_ok = 1;
@@ -283 +277 @@
                 bb_show_usage();
             if (rtnl_rtntype_a2n(&type, *argv))
-                invarg(*argv, "type");
+                invarg_1_to_2(*argv, "type");
             req.r.rtm_type = type;
         }
@@ -309 +303 @@
         "add\0""delete\0""list\0""show\0";
     if (*argv) {
-        smalluint cmd = index_in_substrings(ip_rule_commands, *argv);
-        if (cmd > 3)
-            bb_error_msg_and_die(bb_msg_invalid_arg, *argv, applet_name);
+        int cmd = index_in_substrings(ip_rule_commands, *argv);
+        if (cmd < 0)
+            invarg_1_to_2(*argv, applet_name);
         argv++;
         if (cmd < 2)