Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/networking/brctl.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/brctl.c (modified) (5 diffs)

branches/3.2/mindi-busybox/networking/brctl.c

@@ -13 +13 @@
  * At the time of this writing this was considered a feature.
  */
+
+//usage:#define brctl_trivial_usage
+//usage:       "COMMAND [BRIDGE [INTERFACE]]"
+//usage:#define brctl_full_usage "\n\n"
+//usage:       "Manage ethernet bridges\n"
+//usage:     "\nCommands:"
+//usage:    IF_FEATURE_BRCTL_SHOW(
+//usage:     "\n    show            Show a list of bridges"
+//usage:    )
+//usage:     "\n    addbr BRIDGE        Create BRIDGE"
+//usage:     "\n    delbr BRIDGE        Delete BRIDGE"
+//usage:     "\n    addif BRIDGE IFACE  Add IFACE to BRIDGE"
+//usage:     "\n    delif BRIDGE IFACE  Delete IFACE from BRIDGE"
+//usage:    IF_FEATURE_BRCTL_FANCY(
+//usage:     "\n    setageing BRIDGE TIME       Set ageing time"
+//usage:     "\n    setfd BRIDGE TIME       Set bridge forward delay"
+//usage:     "\n    sethello BRIDGE TIME        Set hello time"
+//usage:     "\n    setmaxage BRIDGE TIME       Set max message age"
+//usage:     "\n    setpathcost BRIDGE COST     Set path cost"
+//usage:     "\n    setportprio BRIDGE PRIO     Set port priority"
+//usage:     "\n    setbridgeprio BRIDGE PRIO   Set bridge priority"
+//usage:     "\n    stp BRIDGE [1/yes/on|0/no/off]  STP on/off"
+//usage:    )
+
 #include "libbb.h"
 #include <linux/sockios.h>
@@ -44 +68 @@
 
 /* FIXME: These 4 funcs are not really clean and could be improved */
-static ALWAYS_INLINE void strtotimeval(struct timeval *tv,
+static ALWAYS_INLINE void bb_strtotimeval(struct timeval *tv,
         const char *time_str)
 {
@@ -81 +105 @@
 {
     struct timeval tv;
-    strtotimeval(&tv, time_str);
+    bb_strtotimeval(&tv, time_str);
     return tv_to_jiffies(&tv);
 }
@@ -106 +130 @@
         "setpathcost\0" "setportprio\0" "setbridgeprio\0"
     )
-    IF_FEATURE_BRCTL_SHOW("showmacs\0" "show\0");
+    IF_FEATURE_BRCTL_SHOW("show\0");
 
     enum { ARG_addbr = 0, ARG_delbr, ARG_addif, ARG_delif
         IF_FEATURE_BRCTL_FANCY(,
-           ARG_stp,
-           ARG_setageing, ARG_setfd, ARG_sethello, ARG_setmaxage,
-           ARG_setpathcost, ARG_setportprio, ARG_setbridgeprio
+            ARG_stp,
+            ARG_setageing, ARG_setfd, ARG_sethello, ARG_setmaxage,
+            ARG_setpathcost, ARG_setportprio, ARG_setbridgeprio
         )
-        IF_FEATURE_BRCTL_SHOW(, ARG_showmacs, ARG_show)
+        IF_FEATURE_BRCTL_SHOW(, ARG_show)
     };
 
@@ -262 +286 @@
                 memset(ifidx, 0, sizeof ifidx);
                 arm_ioctl(args, BRCTL_GET_PORT_LIST, (unsigned long)ifidx,
-                          MAX_PORTS);
+                        MAX_PORTS);
                 xioctl(fd, SIOCDEVPRIVATE, &ifr);
                 for (i = 0; i < MAX_PORTS; i++) {