Fixes for 0.9.7

	- error checking
	- handle upto 1000's of bridges
	- -V version
	- don't initialize bridge till have to.

4 files changed, 125 insertions, 73 deletions

diff --git a/brctl/Makefile.in b/brctl/Makefile.in
index d238e5e..23515ef 100644
--- a/brctl/Makefile.in
+++ b/brctl/Makefile.in
@@ -25,7 +25,8 @@ brctld_OBJECTS= $(brctld_SOURCES:.c=.o)
 
 OBJECTS= $(common_OBJECTS) $(brctl_OBJECTS) $(brctld_OBJECTS)
 
-PROGRAMS= brctl brctld
+# brctld is for debug only, not production use
+PROGRAMS= brctl 
 
 
 all:	$(PROGRAMS)
diff --git a/brctl/brctl.c b/brctl/brctl.c
index f4d137a..1849373 100644
--- a/brctl/brctl.c
+++ b/brctl/brctl.c
@@ -19,12 +19,13 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/time.h>
-#include <asm/param.h>
+#include <sys/errno.h>
 #include "libbridge.h"
 #include "brctl.h"
 
-char *help_message =
+const char *version = "0.9.7";
+
+const char *help_message =
 "commands:\n"
 "\taddbr\t\t<bridge>\t\tadd bridge\n"
 "\taddif\t\t<bridge> <device>\tadd interface to bridge\n"
@@ -37,7 +38,6 @@ char *help_message =
 "\tsetageing\t<bridge> <time>\t\tset ageing time\n"
 "\tsetbridgeprio\t<bridge> <prio>\t\tset bridge priority\n"
 "\tsetfd\t\t<bridge> <time>\t\tset bridge forward delay\n"
-"\tsetgcint\t<bridge> <time>\t\tset garbage collection interval\n"
 "\tsethello\t<bridge> <time>\t\tset hello time\n"
 "\tsetmaxage\t<bridge> <time>\t\tset max message age\n"
 "\tsetpathcost\t<bridge> <port> <cost>\tset path cost\n"
@@ -55,11 +55,20 @@ int main(int argc, char *argv[])
 	struct bridge *br;
 	struct command *cmd;
 
-	br_init();
-
 	if (argc < 2)
 		goto help;
 
+	if (strcmp(argv[1], "-V") == 0) {
+		fprintf(stderr, "bridge-utils %s\n", version);
+		return 0;
+	}
+
+	if (br_init()) {
+		fprintf(stderr, "can't setup bridge control: %s\n",
+			strerror(errno));
+		return 1;
+	}
+
 	if ((cmd = br_command_lookup(argv[1])) == NULL) {
 		fprintf(stderr, "never heard of command [%s]\n", argv[1]);
 		goto help;
@@ -74,9 +83,9 @@ int main(int argc, char *argv[])
 		}
 
 		br = br_find_bridge(argv[argindex]);
-
+	
 		if (br == NULL) {
-			fprintf(stderr, "bridge %s doesn't exist!\n", argv[argindex]);
+			fprintf(stderr, "bridge %s doesn't exist?\n", argv[argindex]);
 			return 1;
 		}
 
diff --git a/brctl/brctl.h b/brctl/brctl.h
index c582f47..c8a6c0c 100644
--- a/brctl/brctl.h
+++ b/brctl/brctl.h
@@ -28,10 +28,10 @@ struct command
 };
 
 struct command *br_command_lookup(char *cmd);
-void br_dump_bridge_id(unsigned char *x);
-void br_show_timer(struct timeval *tv);
-void br_dump_interface_list(struct bridge *br);
-void br_dump_port_info(struct port *p);
-void br_dump_info(struct bridge *br);
+void br_dump_bridge_id(const unsigned char *x);
+void br_show_timer(const struct timeval *tv);
+void br_dump_interface_list(const struct bridge *br);
+void br_dump_port_info(const struct port *p);
+void br_dump_info(const struct bridge *br);
 
 #endif
diff --git a/brctl/brctl_cmd.c b/brctl/brctl_cmd.c
index b56b0c0..5a5e87d 100644
--- a/brctl/brctl_cmd.c
+++ b/brctl/brctl_cmd.c
@@ -25,6 +25,16 @@
 #include "libbridge.h"
 #include "brctl.h"
 
+static int strtotimeval(struct timeval *tv, const char *time)
+{
+	double secs;
+	if (sscanf(time, "%lf", &secs) != 1) 
+		return -1;
+	tv->tv_sec = secs;
+	tv->tv_usec = 1000000 * (secs - tv->tv_sec);
+	return 0;
+}
+
 void br_cmd_addbr(struct bridge *br, char *brname, char *arg1)
 {
 	int err;
@@ -39,7 +49,8 @@ void br_cmd_addbr(struct bridge *br, char *brname, char *arg1)
 		break;
 
 	default:
-		perror("br_add_bridge");
+		fprintf(stderr, "add bridge failed: %s\n",
+			strerror(err));
 		break;
 	}
 }
@@ -63,7 +74,8 @@ void br_cmd_delbr(struct bridge *br, char *brname, char *arg1)
 		break;
 
 	default:
-		perror("br_del_bridge");
+		fprintf(stderr, "can't delete bridge %s: %s\n",
+			brname, strerror(err));
 		break;
 	}
 }
@@ -96,7 +108,8 @@ void br_cmd_addif(struct bridge *br, char *ifname, char *arg1)
 		break;
 
 	default:
-		perror("br_add_interface");
+		fprintf(stderr, "can't add %s to bridge %s: %s\n",
+			ifname, br->ifname, strerror(err));
 		break;
 	}
 }
@@ -122,111 +135,149 @@ void br_cmd_delif(struct bridge *br, char *ifname, char *arg1)
 		break;
 
 	default:
-		perror("br_del_interface");
+		fprintf(stderr, "can't delete %s from %s: %s\n",
+			ifname, br->ifname, strerror(err));
 		break;
 	}
 }
 
 void br_cmd_setageing(struct bridge *br, char *time, char *arg1)
 {
-	double secs;
+	int err;
 	struct timeval tv;
 
-	sscanf(time, "%lf", &secs);
-	tv.tv_sec = secs;
-	tv.tv_usec = 1000000 * (secs - tv.tv_sec);
-	br_set_ageing_time(br, &tv);
+	if (strtotimeval(&tv, time)) {
+		fprintf(stderr, "bad ageing time value\n");
+		return;
+	}
+	err = br_set_ageing_time(br, &tv);
+	if (err)
+		fprintf(stderr, "set ageing time failed: %s\n",
+			strerror(err));
 }
 
 void br_cmd_setbridgeprio(struct bridge *br, char *_prio, char *arg1)
 {
 	int prio;
+	int err;
 
-	sscanf(_prio, "%i", &prio);
-	br_set_bridge_priority(br, prio);
+	if (sscanf(_prio, "%i", &prio) != 1) {
+		fprintf(stderr,"bad priority\n");
+		return;
+	}
+	err = br_set_bridge_priority(br, prio);
+	if (err)
+		fprintf(stderr, "set bridge priority failed: %s\n",
+			strerror(err));
 }
 
 void br_cmd_setfd(struct bridge *br, char *time, char *arg1)
 {
-	double secs;
 	struct timeval tv;
+	int err;
 
-	sscanf(time, "%lf", &secs);
-	tv.tv_sec = secs;
-	tv.tv_usec = 1000000 * (secs - tv.tv_sec);
-	br_set_bridge_forward_delay(br, &tv);
-}
-
-void br_cmd_setgcint(struct bridge *br, char *time, char *arg1)
-{
-	double secs;
-	struct timeval tv;
+	if (strtotimeval(&tv, time)) {
+		fprintf(stderr, "bad forward delay value\n");
+		return;
+	}
 
-	sscanf(time, "%lf", &secs);
-	tv.tv_sec = secs;
-	tv.tv_usec = 1000000 * (secs - tv.tv_sec);
-	br_set_gc_interval(br, &tv);
+	err = br_set_bridge_forward_delay(br, &tv);
+	if (err)
+		fprintf(stderr, "set forward delay failed: %s\n",
+			strerror(err));
 }
 
 void br_cmd_sethello(struct bridge *br, char *time, char *arg1)
 {
-	double secs;
 	struct timeval tv;
+	int err;
+
+	if (strtotimeval(&tv, time)) {
+		fprintf(stderr, "bad hello timer value\n");
+		return;
+	}
 
-	sscanf(time, "%lf", &secs);
-	tv.tv_sec = secs;
-	tv.tv_usec = 1000000 * (secs - tv.tv_sec);
-	br_set_bridge_hello_time(br, &tv);
+	err = br_set_bridge_hello_time(br, &tv);
+	if (err)
+		fprintf(stderr, "set hello timer failed: %s\n",
+			strerror(err));
 }
 
 void br_cmd_setmaxage(struct bridge *br, char *time, char *arg1)
 {
-	double secs;
 	struct timeval tv;
+	int err;
 
-	sscanf(time, "%lf", &secs);
-	tv.tv_sec = secs;
-	tv.tv_usec = 1000000 * (secs - tv.tv_sec);
-	br_set_bridge_max_age(br, &tv);
+	if (strtotimeval(&tv, time)) {
+		fprintf(stderr, "bad max age value\n");
+		return;
+	}
+	err = br_set_bridge_max_age(br, &tv);
+	if (err)
+		fprintf(stderr, "set max age failed: %s\n",
+			strerror(err));
 }
 
 void br_cmd_setpathcost(struct bridge *br, char *arg0, char *arg1)
 {
-	int cost;
+	int cost, err;
 	struct port *p;
 
+	if (sscanf(arg1, "%i", &cost) != 1) {
+		fprintf(stderr, "bad path cost value\n");
+		return;
+	}
+
 	if ((p = br_find_port(br, arg0)) == NULL) {
 		fprintf(stderr, "can't find port %s in bridge %s\n", arg0, br->ifname);
 		return;
 	}
 
-	sscanf(arg1, "%i", &cost);
-	br_set_path_cost(p, cost);
+	err = br_set_path_cost(p, cost);
+	if (err)
+		fprintf(stderr, "set path cost failed: %s\n",
+			strerror(err));
 }
 
 void br_cmd_setportprio(struct bridge *br, char *arg0, char *arg1)
 {
-	int cost;
+	int cost, err;
 	struct port *p;
 
+	if (sscanf(arg1, "%i", &cost) != 1) {
+		fprintf(stderr, "bad path priority value\n");
+		return;
+	}
+
 	if ((p = br_find_port(br, arg0)) == NULL) {
 		fprintf(stderr, "can't find port %s in bridge %s\n", arg0, br->ifname);
 		return;
 	}
-
-	sscanf(arg1, "%i", &cost);
-	br_set_port_priority(p, cost);
+	err = br_set_port_priority(p, cost);
+	if (err)
+		fprintf(stderr, "set port priority failed: %s\n",
+			strerror(err));
 }
 
 void br_cmd_stp(struct bridge *br, char *arg0, char *arg1)
 {
-	int stp;
+	int stp, err;
 
-	stp = 0;
-	if (!strcmp(arg0, "on") || !strcmp(arg0, "yes") || !strcmp(arg0, "1"))
+	if (!strcmp(arg0, "on") || !strcmp(arg0, "yes") 
+	    || !strcmp(arg0, "1"))
 		stp = 1;
+	else if (!strcmp(arg0, "off") || !strcmp(arg0, "no") 
+		 || !strcmp(arg0, "0"))
+		stp = 0;
+	else {
+		fprintf(stderr, "expect on/off for argument\n");
+		return;
+	}
 
-	br_set_stp_state(br, stp);
+	err = br_set_stp_state(br, stp);
+	if (err)
+		fprintf(stderr, "set stp status failed: %s\n",
+			strerror(err));
 }
 
 void br_cmd_showstp(struct bridge *br, char *arg0, char *arg1)
@@ -253,18 +304,10 @@ static int compare_fdbs(const void *_f0, const void *_f1)
 	const struct fdb_entry *f0 = _f0;
 	const struct fdb_entry *f1 = _f1;
 
-#if 0
-	if (f0->port_no < f1->port_no)
-		return -1;
-
-	if (f0->port_no > f1->port_no)
-		return 1;
-#endif
-
 	return memcmp(f0->mac_addr, f1->mac_addr, 6);
 }
 
-void __dump_fdb_entry(struct fdb_entry *f)
+static void __dump_fdb_entry(const struct fdb_entry *f)
 {
 	printf("%3i\t", f->port_no);
 	printf("%.2x:%.2x:%.2x:%.2x:%.2x:%.2x\t",
@@ -292,10 +335,10 @@ void br_cmd_showmacs(struct bridge *br, char *arg0, char *arg1)
 			fprintf(stderr, "read of forward table failed\n");
 			break;
 		}
-
+				
 		if (!num)
 			break;
-
+		
 		qsort(fdb, num, sizeof(struct fdb_entry), compare_fdbs);
 
 		for (i=0;i<num;i++)
@@ -313,7 +356,6 @@ static struct command commands[] = {
 	{1, 1, "setageing", br_cmd_setageing},
 	{1, 1, "setbridgeprio", br_cmd_setbridgeprio},
 	{1, 1, "setfd", br_cmd_setfd},
-	{1, 1, "setgcint", br_cmd_setgcint},
 	{1, 1, "sethello", br_cmd_sethello},
 	{1, 1, "setmaxage", br_cmd_setmaxage},
 	{1, 2, "setpathcost", br_cmd_setpathcost},