batctl; branch, master, updated. v2012.0.0-10-g7dd21c8 - commits - lists.open-mesh.org

9 Feb 2012

The following commit has been merged in the master branch:
commit 7dd21c88f6c1484ce0cbf52dca7b9fc86c2c9bb0
Author: Simon Wunderlich simon.wunderlich@s2003.tu-chemnitz.de
Date:   Tue Feb 7 20:05:25 2012 +0100
batctl: add bridge loop avoidance code and remove softif_neigh stuff
Signed-off-by: Simon Wunderlich siwu@hrz.tu-chemnitz.de

diff --git a/debug.c b/debug.c
index 6a553ff..155f499 100644
--- a/debug.c
+++ b/debug.c
@@ -61,13 +61,13 @@ void trans_global_usage(void)
    printf(" \t -w [interval] watch mode - refresh the global translation table continuously\n");
 }
-void softif_neigh_usage(void)
+void bla_claim_table_usage(void)
 {
-	printf("Usage: batctl [options] softif_neigh \n");
+	printf("Usage: batctl [options] claimtable \n");
    printf("options:\n");
    printf(" \t -h print this help\n");
    printf(" \t -n don't replace mac addresses with bat-host names\n");
-	printf(" \t -w [interval] watch mode - refresh the soft-interface neighbor table continuously\n");
+	printf(" \t -w [interval] watch mode - refresh the bridge loop avoidance claim table continuously\n");
 }
void gateways_usage(void) diff --git a/debug.h b/debug.h index 939f281..50d0e24 100644 --- a/debug.h +++ b/debug.h @@ -24,7 +24,7 @@ #define DEBUG_ORIGINATORS #define DEBUG_TRANSTABLE_LOCAL #define DEBUG_TRANSTABLE_GLOBAL -#define DEBUG_SOFTIF_NEIGH +#define DEBUG_BLA_CLAIM_TABLE #define DEBUG_GATEWAYS #define DEBUG_VIS_DATA #define DEBUG_LOG "log" @@ -32,7 +32,7 @@ void originators_usage(void); void trans_local_usage(void); void trans_global_usage(void); -void softif_neigh_usage(void); +void bla_claim_table_usage(void); void gateways_usage(void); int handle_debug_table(char char *file_path, diff --git a/main.c b/main.c index 0dfdb8e..86e2078 100644 --- a/main.c +++ b/main.c @@ -45,27 +45,28 @@ char void print_usage(void) { printf("Usage: printf("commands:\n"); -	printf(" \tinterface|if -	printf(" \toriginators|o -	printf(" \tinterval|it -	printf(" \tloglevel|ll -	printf(" \tlog|l -	printf(" \tgw_mode|gw -	printf(" \tgateways|gwl -	printf(" \ttranslocal|tl -	printf(" \ttransglobal|tg -	printf(" \tsoftif_neigh|sn -	printf(" \tvis_mode|vm -	printf(" \tvis_data|vd -	printf(" \taggregation|ag  [0|1] -	printf(" \tbonding|b -	printf(" \tfragmentation|f [0|1] -	printf(" \tap_isolation|ap [0|1] +	printf(" \tinterface|if +	printf(" \toriginators|o +	printf(" \tinterval|it +	printf(" \tloglevel|ll +	printf(" \tlog|l +	printf(" \tgw_mode|gw +	printf(" \tgateways|gwl +	printf(" \ttranslocal|tl +	printf(" \ttransglobal|tg +	printf(" \tclaimtable|cl +	printf(" \tvis_mode|vm +	printf(" \tvis_data|vd +	printf(" \taggregation|ag +	printf(" \tbonding|b +	printf(" \tbridge_loop_avoidance|bl +	printf(" \tfragmentation|f +	printf(" \tap_isolation|ap printf("\n"); -	printf(" \tping|p -	printf(" \ttraceroute|tr -	printf(" \ttcpdump|td -	printf(" \tbisect +	printf(" \tping|p +	printf(" \ttraceroute|tr +	printf(" \ttcpdump|td +	printf(" \tbisect printf("options:\n"); printf(" \t-m printf(" \t-h @@ -151,10 +152,10 @@ ret = handle_debug_table(mesh_iface, DEBUG_TRANSTABLE_GLOBAL,

"originators" "transtable_local" "transtable_global" "softif_neigh" "bla_claim_table" "gateways" "vis_data" *mesh_iface, int argc, char **argv, void table_usage(void)); module_ver_path[] = "/sys/module/batman_adv/version"; batctl [options] commands \n"); [add|del iface(s)]\tdisplay or modify the interface settings\n"); \tdisplay the originator table\n"); [orig_interval]   \tdisplay or modify the originator interval (in ms)\n"); [level]           \tdisplay or modify the log level\n"); \tread the log produced by the kernel module\n"); [mode]            \tdisplay or modify the gateway mode\n"); \tdisplay the gateway server list\n"); \tdisplay the local translation table\n"); \tdisplay the global translation table\n"); \tdisplay the soft-interface neighbor table\n"); [mode]            \tdisplay or modify the status of the VIS server\n"); [dot|JSON]        \tdisplay the VIS data in dot or JSON format\n"); \tdisplay or modify the packet aggregation setting\n"); [0|1]             \tdisplay or modify the bonding mode setting\n"); \tdisplay or modify the fragmentation mode setting\n"); \tdisplay or modify the ap isolation mode setting\n"); [add|del iface(s)]\tdisplay or modify the interface settings\n"); \tdisplay the originator table\n"); [orig_interval]   \tdisplay or modify the originator interval (in ms)\n"); [level]           \tdisplay or modify the log level\n"); \tread the log produced by the kernel module\n"); [mode]            \tdisplay or modify the gateway mode\n"); \tdisplay the gateway server list\n"); \tdisplay the local translation table\n"); \tdisplay the global translation table\n"); \tdisplay the bridge loop avoidance claim table\n"); [mode]            \tdisplay or modify the status of the VIS server\n"); [dot|JSON]        \tdisplay the VIS data in dot or JSON format\n"); [0|1]             \tdisplay or modify the packet aggregation setting\n"); [0|1]             \tdisplay or modify the bonding mode setting\n"); [0|1]             \tdisplay or modify the bridge loop avoidance setting\n"); [0|1]             \tdisplay or modify the fragmentation mode setting\n"); [0|1]             \tdisplay or modify the ap isolation mode setting\n"); <destination>     \tping another batman adv host via layer 2\n"); <destination>     \ttraceroute another batman adv host via layer 2\n"); <interface>       \ttcpdump layer 2 traffic on the given interface\n"); <file1> .. <fileN>\tanalyze given log files for routing stability\n"); <destination>     \tping another batman adv host via layer 2\n"); <destination>     \ttraceroute another batman adv host via layer 2\n"); <interface>       \ttcpdump layer 2 traffic on the given interface\n"); <file1> .. <fileN>\tanalyze given log files for routing stability\n"); mesh interface (default 'bat0')\n"); print this help (or 'batctl <command> -h' for the command specific help)\n"); int main(int argc, char **argv) argc - 1, argv + 1, trans_global_usage);
-	} else if ((strcmp(argv[1], "softif_neigh") == 0) || (strcmp(argv[1], "sn") == 0)) {
+	} else if ((strcmp(argv[1], "claimtable") == 0) || (strcmp(argv[1], "cl") == 0)) {
ret = handle_debug_table(mesh_iface, argc - 1, argv + 1,
-					 DEBUG_SOFTIF_NEIGH, softif_neigh_usage);
+					 DEBUG_BLA_CLAIM_TABLE, bla_claim_table_usage);
} else if ((strcmp(argv[1], "loglevel") == 0) || (strcmp(argv[1], "ll") == 0)) {
@@ -197,6 +198,11 @@ int main(int argc, char **argv)
    	ret = handle_sys_setting(mesh_iface, argc - 1, argv + 1,
    				 SYS_BONDING, bonding_usage, sysfs_param_enable);
+	} else if ((strcmp(argv[1], "bridge_loop_avoidance") == 0) || (strcmp(argv[1], "bl") == 0)) {
+
+		ret = handle_sys_setting(mesh_iface, argc - 1, argv + 1,
+					 SYS_BRIDGE_LOOP_AVOIDANCE, bridge_loop_avoidance_usage, sysfs_param_enable);
+
    } else if ((strcmp(argv[1], "fragmentation") == 0) || (strcmp(argv[1], "f") == 0)) {
ret = handle_sys_setting(mesh_iface, argc - 1, argv + 1,
diff --git a/man/batctl.8 b/man/batctl.8
index 0cf0a7b..f45a070 100644
--- a/man/batctl.8
+++ b/man/batctl.8
@@ -121,8 +121,8 @@ Display the local translation table. batctl will refresh the list every second i
 .IP "\fBtransglobal\fP|\fBtg\fP   [\fB-w\fP [\fI\interval\fP]][\fB-n\fP]"
 Display the global translation table. batctl will refresh the list every second if the "-w" option was given or add a number to let it refresh at a custom interval in seconds (with optional decimal places). Use "-n" to let batctl not replace the MAC addresses with bat-host names in the output.
 .br
-.IP "\fBsoftif_neigh\fP|\fBsn\fP   [\fB-w\fP [\fI\interval\fP]][\fB-n\fP]"
-Display the soft-interface neighbor table. batctl will refresh the list every second if the "-w" option was given or add a number to let it refresh at a custom interval in seconds (with optional decimal places). Use "-n" to let batctl not replace the MAC addresses with bat-host names in the output.
+.IP "\fBclaimtable\fP|\fBcl\fP   [\fB-w\fP [\fI\interval\fP]][\fB-n\fP]"
+Display the bridge loop avoidance claim table. batctl will refresh the list every second if the "-w" option was given or add a number to let it refresh at a custom interval in seconds (with optional decimal places). Use "-n" to let batctl not replace the MAC addresses with bat-host names in the output.
 .br
 .IP "\fBvis_mode|vm\fP	  [\fBmode\fP]\fP"
 If no parameter is given the current vis mode is displayed otherwise the parameter is used to set the vis mode.
@@ -149,6 +149,9 @@ If no parameter is given the current aggregation setting is displayed. Otherwise
 .IP "\fBbonding\fP|\fBb\fP        [\fB1\fP|\fB0\fP]"
 If no parameter is given the current bonding mode setting is displayed. Otherwise the parameter is used to enable or disable the bonding mode.
 .br
+.IP "\fBbridge_loop_avoidance\fP|\fBbl\fP        [\fB1\fP|\fB0\fP]"
+If no parameter is given the current bridge loop avoidance setting is displayed. Otherwise the parameter is used to enable or disable the bridge loop avoidance.
+.br
 .IP "\fBfragmentation\fP|\fBf\fP   [\fB1\fP|\fB0\fP]"
 If no parameter is given the current fragmentation mode setting is displayed. Otherwise the parameter is used to enable or disable fragmentation.
 .br
diff --git a/sys.c b/sys.c
index 0263ae7..6cf4714 100644
--- a/sys.c
+++ b/sys.c
@@ -183,6 +183,7 @@ static void log_level_usage(void)
    printf(" \t batman  Messages related to routing / flooding / broadcasting\n");
    printf(" \t routes  Messages related to route added / changed / deleted\n");
    printf(" \t tt      Messages related to translation table operations\n");
+	printf(" \t bla     Messages related to bridge loop avoidance\n");
 }
int handle_loglevel(char *mesh_iface, int argc, char **argv)
@@ -221,6 +222,8 @@ int handle_loglevel(char *mesh_iface, int argc, char **argv)
    			log_level |= (1 << 1);
    		else if (strcmp(argv[i], "tt") == 0)
    			log_level |= (1 << 2);
+			else if (strcmp(argv[i], "bla") == 0)
+				log_level |= (1 << 4);
    		else {
    			log_level_usage();
    			goto out;
@@ -248,6 +251,8 @@ int handle_loglevel(char *mesh_iface, int argc, char **argv)
           "messages related to route added / changed / deleted", "routes");
    printf("[%c] %s (%s)\n", (log_level & 4) ? 'x' : ' ',
           "messages related to translation table operations", "tt");
+	printf("[%c] %s (%s)\n", (log_level & 8) ? 'x' : ' ',
+	       "messages related to bridge loop avoidance", "bla");
out:
    if (errno == ENOENT)
@@ -271,6 +276,13 @@ void bonding_usage(void)
    printf(" \t -h print this help\n");
 }
+void bridge_loop_avoidance_usage(void)
+{
+	printf("Usage: batctl [options] bridge_loop_avoidance [0|1]\n");
+	printf("options:\n");
+	printf(" \t -h print this help\n");
+}
+
 void gw_mode_usage(void)
 {
    printf("Usage: batctl [options] gw_mode [mode] [sel_class|bandwidth]\n");
diff --git a/sys.h b/sys.h
index 5dafe85..46a1159 100644
--- a/sys.h
+++ b/sys.h
@@ -25,6 +25,7 @@
 #define SYS_LOG "log"
 #define SYS_AGGR "aggregated_ogms"
 #define SYS_BONDING "bonding"
+#define SYS_BRIDGE_LOOP_AVOIDANCE "bridge_loop_avoidance"
 #define SYS_GW_MODE "gw_mode"
 #define SYS_GW_SEL "gw_sel_class"
 #define SYS_GW_BW "gw_bandwidth"
@@ -47,6 +48,7 @@ extern const char *sysfs_param_server[];
void aggregation_usage(void);
 void bonding_usage(void);
+void bridge_loop_avoidance_usage(void);
 void fragmentation_usage(void);
 void ap_isolation_usage(void);
 void gw_mode_usage(void);
-- 
batctl

    