X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=networking%2Fbrctl.c;h=a36ab45c39a2853db6b9280519f676c9eaab7221;hb=765b0eed3ef29a80115708c3249d3a541509cd24;hp=69e3c869c1c9b2a0a16c8ab699e4ba3d0b926e4a;hpb=360d9661b6a33b0358104623058f1c3629a469ea;p=oweals%2Fbusybox.git

diff --git a/networking/brctl.c b/networking/brctl.c
index 69e3c869c..a36ab45c3 100644
--- a/networking/brctl.c
+++ b/networking/brctl.c
@@ -16,9 +16,23 @@
 #include <linux/sockios.h>
 #include <net/if.h>
 
+#ifndef SIOCBRADDBR
+# define SIOCBRADDBR BRCTL_ADD_BRIDGE
+#endif
+#ifndef SIOCBRDELBR
+# define SIOCBRDELBR BRCTL_DEL_BRIDGE
+#endif
+#ifndef SIOCBRADDIF
+# define SIOCBRADDIF BRCTL_ADD_IF
+#endif
+#ifndef SIOCBRDELIF
+# define SIOCBRDELIF BRCTL_DEL_IF
+#endif
+
+
 /* Maximum number of ports supported per bridge interface.  */
 #ifndef MAX_PORTS
-#define MAX_PORTS 32
+# define MAX_PORTS 32
 #endif
 
 /* Use internal number parsing and not the "exact" conversion.  */
@@ -26,25 +40,26 @@
 #define BRCTL_USE_INTERNAL 1
 
 #if ENABLE_FEATURE_BRCTL_FANCY
-#include <linux/if_bridge.h>
+# include <linux/if_bridge.h>
 
 /* FIXME: These 4 funcs are not really clean and could be improved */
 static ALWAYS_INLINE void strtotimeval(struct timeval *tv,
 		const char *time_str)
 {
 	double secs;
-#if BRCTL_USE_INTERNAL
-	secs = /*bb_*/strtod(time_str, NULL);
-	if (!secs)
-#else
+# if BRCTL_USE_INTERNAL
+	char *endptr;
+	secs = /*bb_*/strtod(time_str, &endptr);
+	if (endptr == time_str)
+# else
 	if (sscanf(time_str, "%lf", &secs) != 1)
-#endif
-		bb_error_msg_and_die (bb_msg_invalid_arg, time_str, "timespec");
+# endif
+		bb_error_msg_and_die(bb_msg_invalid_arg, time_str, "timespec");
 	tv->tv_sec = secs;
 	tv->tv_usec = 1000000 * (secs - tv->tv_sec);
 }
 
-static ALWAYS_INLINE unsigned long __tv_to_jiffies(const struct timeval *tv)
+static ALWAYS_INLINE unsigned long tv_to_jiffies(const struct timeval *tv)
 {
 	unsigned long long jif;
 
@@ -53,7 +68,7 @@ static ALWAYS_INLINE unsigned long __tv_to_jiffies(const struct timeval *tv)
 	return jif/10000;
 }
 # if 0
-static void __jiffies_to_tv(struct timeval *tv, unsigned long jiffies)
+static void jiffies_to_tv(struct timeval *tv, unsigned long jiffies)
 {
 	unsigned long long tvusec;
 
@@ -66,7 +81,7 @@ static unsigned long str_to_jiffies(const char *time_str)
 {
 	struct timeval tv;
 	strtotimeval(&tv, time_str);
-	return __tv_to_jiffies(&tv);
+	return tv_to_jiffies(&tv);
 }
 
 static void arm_ioctl(unsigned long *args,
@@ -85,20 +100,20 @@ int brctl_main(int argc UNUSED_PARAM, char **argv)
 {
 	static const char keywords[] ALIGN1 =
 		"addbr\0" "delbr\0" "addif\0" "delif\0"
-	USE_FEATURE_BRCTL_FANCY(
+	IF_FEATURE_BRCTL_FANCY(
 		"stp\0"
 		"setageing\0" "setfd\0" "sethello\0" "setmaxage\0"
 		"setpathcost\0" "setportprio\0" "setbridgeprio\0"
 	)
-	USE_FEATURE_BRCTL_SHOW("showmacs\0" "show\0");
+	IF_FEATURE_BRCTL_SHOW("showmacs\0" "show\0");
 
 	enum { ARG_addbr = 0, ARG_delbr, ARG_addif, ARG_delif
-		USE_FEATURE_BRCTL_FANCY(,
+		IF_FEATURE_BRCTL_FANCY(,
 		   ARG_stp,
 		   ARG_setageing, ARG_setfd, ARG_sethello, ARG_setmaxage,
 		   ARG_setpathcost, ARG_setportprio, ARG_setbridgeprio
 		)
-		USE_FEATURE_BRCTL_SHOW(, ARG_showmacs, ARG_show)
+		IF_FEATURE_BRCTL_SHOW(, ARG_showmacs, ARG_show)
 	};
 
 	int fd;
@@ -188,7 +203,7 @@ int brctl_main(int argc UNUSED_PARAM, char **argv)
 			goto done;
 		}
 
-		if (!*argv) /* all but 'addif/delif' need at least two arguments */
+		if (!*argv) /* all but 'addbr/delbr' need at least two arguments */
 			bb_show_usage();
 
 		strncpy_IFNAMSIZ(ifr.ifr_name, br);
@@ -205,9 +220,14 @@ int brctl_main(int argc UNUSED_PARAM, char **argv)
 		}
 #if ENABLE_FEATURE_BRCTL_FANCY
 		if (key == ARG_stp) { /* stp */
-			/* FIXME: parsing yes/y/on/1 versus no/n/off/0 is too involved */
-			arm_ioctl(args, BRCTL_SET_BRIDGE_STP_STATE,
-					  (unsigned)(**argv - '0'), 0);
+			static const char no_yes[] ALIGN1 =
+				"0\0" "off\0" "n\0" "no\0"   /* 0 .. 3 */
+				"1\0" "on\0"  "y\0" "yes\0"; /* 4 .. 7 */
+			int onoff = index_in_strings(no_yes, *argv);
+			if (onoff < 0)
+				bb_error_msg_and_die(bb_msg_invalid_arg, *argv, applet_name);
+			onoff = (unsigned)onoff / 4;
+			arm_ioctl(args, BRCTL_SET_BRIDGE_STP_STATE, onoff, 0);
 			goto fire;
 		}
 		if ((unsigned)(key - ARG_setageing) < 4) { /* time related ops */