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

branches/3.3/mindi-busybox/networking/tc.c

@@ -30 +30 @@
 
 #include "libbb.h"
+#include "common_bufsiz.h"
 
 #include "libiproute/utils.h"
@@ -64 +65 @@
     uint32_t filter_proto;
 } FIX_ALIASING;
-#define G (*(struct globals*)&bb_common_bufsiz1)
-struct BUG_G_too_big {
-        char BUG_G_too_big[sizeof(G) <= COMMON_BUFSIZE ? 1 : -1];
-};
+#define G (*(struct globals*)bb_common_bufsiz1)
 #define filter_ifindex (G.filter_ifindex)
 #define filter_qdisc (G.filter_qdisc)
@@ -73 +71 @@
 #define filter_prio (G.filter_prio)
 #define filter_proto (G.filter_proto)
-#define INIT_G() do { } while (0)
+#define INIT_G() do { \
+    setup_common_bufsiz(); \
+    BUILD_BUG_ON(sizeof(G) > COMMON_BUFSIZE); \
+} while (0)
 
 /* Allocates a buffer containing the name of a class id.
@@ -152 +153 @@
 
     if (use_iec) {
-        if (tmp >= 1000.0*1024.0*1024.0)
-            snprintf(buf, len, "%.0fMibit", tmp/1024.0*1024.0);
-        else if (tmp >= 1000.0*1024)
+        if (tmp >= 1000*1024*1024)
+            snprintf(buf, len, "%.0fMibit", tmp/(1024*1024));
+        else if (tmp >= 1000*1024)
             snprintf(buf, len, "%.0fKibit", tmp/1024);
         else
             snprintf(buf, len, "%.0fbit", tmp);
     } else {
-        if (tmp >= 1000.0*1000000.0)
-            snprintf(buf, len, "%.0fMbit", tmp/1000000.0);
-        else if (tmp >= 1000.0 * 1000.0)
-            snprintf(buf, len, "%.0fKbit", tmp/1000.0);
+        if (tmp >= 1000*1000000)
+            snprintf(buf, len, "%.0fMbit", tmp/1000000);
+        else if (tmp >= 1000*1000)
+            snprintf(buf, len, "%.0fKbit", tmp/1000);
         else
             snprintf(buf, len, "%.0fbit",  tmp);
@@ -419 +420 @@
                         struct nlmsghdr *hdr, void *arg UNUSED_PARAM)
 {
-    struct tcmsg *msg = NLMSG_DATA(hdr);
-    int len = hdr->nlmsg_len;
-    struct rtattr * tb[TCA_MAX+1];
     return 0;
 }
@@ -464 +462 @@
     obj = index_in_substrings(objects, *argv++);
 
-    if (obj < OBJ_qdisc)
+    if (obj < 0)
         bb_show_usage();
     if (!*argv)
@@ -471 +469 @@
         cmd = index_in_substrings(commands, *argv);
         if (cmd < 0)
-            bb_error_msg_and_die(bb_msg_invalid_arg, *argv, applet_name);
+            invarg_1_to_2(*argv, argv[-1]);
         argv++;
     }
@@ -494 +492 @@
             /* We don't care about duparg2("qdisc handle",*argv) for now */
             if (get_qdisc_handle(&filter_qdisc, *argv))
-                invarg(*argv, "qdisc");
+                invarg_1_to_2(*argv, "qdisc");
         } else
         if (obj != OBJ_qdisc
@@ -504 +502 @@
             /* nothing */
         } else {
-            invarg(*argv, "command");
+            invarg_1_to_2(*argv, "command");
         }
         NEXT_ARG();
@@ -518 +516 @@
                 duparg(*argv, "parent");
             if (get_tc_classid(&handle, *argv))
-                invarg(*argv, "parent");
+                invarg_1_to_2(*argv, "parent");
             msg.tcm_parent = handle;
             if (obj == OBJ_filter)
@@ -543 +541 @@
                 duparg(*argv, "protocol");
             if (ll_proto_a2n(&tmp, *argv))
-                invarg(*argv, "protocol");
+                invarg_1_to_2(*argv, "protocol");
             filter_proto = tmp;
         }