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

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

@@ -295 +295 @@
                 uval = get_unsigned(*argv, "TTL");
                 if (uval > 255)
-                    invarg(*argv, "TTL must be <=255");
+                    invarg_1_to_2(*argv, "TTL");
                 p->iph.ttl = uval;
             }
@@ -306 +306 @@
             if (key != ARG_inherit) {
                 if (rtnl_dsfield_a2n(&uval, *argv))
-                    invarg(*argv, "TOS");
+                    invarg_1_to_2(*argv, "TOS");
                 p->iph.tos = uval;
             } else
@@ -405 +405 @@
 static void print_tunnel(struct ip_tunnel_parm *p)
 {
-    char s1[256];
-    char s2[256];
-    char s3[64];
-    char s4[64];
-
-    format_host(AF_INET, 4, &p->iph.daddr, s1, sizeof(s1));
-    format_host(AF_INET, 4, &p->iph.saddr, s2, sizeof(s2));
-    inet_ntop(AF_INET, &p->i_key, s3, sizeof(s3));
-    inet_ntop(AF_INET, &p->o_key, s4, sizeof(s4));
+    char s3[INET_ADDRSTRLEN];
+    char s4[INET_ADDRSTRLEN];
 
     printf("%s: %s/ip  remote %s  local %s ",
-           p->name,
-           p->iph.protocol == IPPROTO_IPIP ? "ip" :
-           (p->iph.protocol == IPPROTO_GRE ? "gre" :
-        (p->iph.protocol == IPPROTO_IPV6 ? "ipv6" : "unknown")),
-           p->iph.daddr ? s1 : "any", p->iph.saddr ? s2 : "any");
+        p->name,
+        p->iph.protocol == IPPROTO_IPIP ? "ip" :
+            p->iph.protocol == IPPROTO_GRE ? "gre" :
+            p->iph.protocol == IPPROTO_IPV6 ? "ipv6" :
+            "unknown",
+        p->iph.daddr ? format_host(AF_INET, 4, &p->iph.daddr) : "any",
+        p->iph.saddr ? format_host(AF_INET, 4, &p->iph.saddr) : "any"
+    );
     if (p->link) {
         char *n = do_ioctl_get_ifname(p->link);
@@ -433 +429 @@
         printf(" ttl inherit ");
     if (p->iph.tos) {
-        SPRINT_BUF(b1);
         printf(" tos");
         if (p->iph.tos & 1)
@@ -439 +434 @@
         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));
     }
     if (!(p->iph.frag_off & htons(IP_DF)))
         printf(" nopmtudisc");
 
+    inet_ntop(AF_INET, &p->i_key, s3, sizeof(s3));
+    inet_ntop(AF_INET, &p->o_key, s4, sizeof(s4));
     if ((p->i_flags & GRE_KEY) && (p->o_flags & GRE_KEY) && p->o_key == p->i_key)
         printf(" key %s", s3);
-    else if ((p->i_flags | p->o_flags) & GRE_KEY) {
+    else {
         if (p->i_flags & GRE_KEY)
             printf(" ikey %s ", s3);
@@ -562 +559 @@
 
     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_1_to_2(*argv, applet_name);
         argv++;
         if (key == ARG_add)