commits June 2012

commits@lists.open-mesh.org

1 participants
236 discussions

batctl; branch, master, updated. v2012.2.0-22-g5ec3a91

by postmaster＠open-mesh.org

The following commit has been merged in the master branch: commit 5ec3a9163b107bb6180e73c445caf3994e6a4cbf Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Sat Jun 23 13:53:23 2012 +0200 batctl: unify settings handling and remove redundant code Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> diff --git a/functions.c b/functions.c index 36a4d40..d08c7a0 100644 --- a/functions.c +++ b/functions.c @@ -44,7 +44,7 @@ char *line_ptr = NULL; const char *sysfs_compile_out_param[] = { SYS_LOG, SYS_LOG_LEVEL, - SYS_BRIDGE_LOOP_AVOIDANCE, + batctl_settings[BATCTL_SETTINGS_BLA].sysfs_name, NULL, }; diff --git a/main.c b/main.c index 1482dbe..ae0b3d2 100644 --- a/main.c +++ b/main.c @@ -45,7 +45,7 @@ char module_ver_path[] = "/sys/module/batman_adv/version"; void print_usage(void) { - int i; + int i, opt_indent; printf("Usage: batctl [options] command|debug table \n"); printf("options:\n"); @@ -56,17 +56,24 @@ void print_usage(void) printf("commands:\n"); printf(" \tinterface|if [add|del iface(s)]\tdisplay or modify the interface settings\n"); - printf(" \tinterval|it [orig_interval] \tdisplay or modify the originator interval (in ms)\n"); + for (i = 0; i < BATCTL_SETTINGS_NUM; i++) { + printf(" \t%s|%s", batctl_settings[i].opt_long, batctl_settings[i].opt_short); + opt_indent = strlen(batctl_settings[i].opt_long) + strlen(batctl_settings[i].opt_short); + + if (batctl_settings[i].params == sysfs_param_enable) + printf("%*s display or modify %s setting\n", + 31 - opt_indent, "[0|1]", batctl_settings[i].opt_long); + else if (batctl_settings[i].params == sysfs_param_server) + printf("%*s display or modify %s setting\n", + 41 - opt_indent, "[client|server]", batctl_settings[i].opt_long); + else + printf(" display or modify %s setting\n", + batctl_settings[i].opt_long); + } printf(" \tloglevel|ll [level] \tdisplay or modify the log level\n"); printf(" \tlog|l \tread the log produced by the kernel module\n"); printf(" \tgw_mode|gw [mode] \tdisplay or modify the gateway mode\n"); - printf(" \tvis_mode|vm [mode] \tdisplay or modify the status of the VIS server\n"); printf(" \tvis_data|vd [dot|JSON] \tdisplay the VIS data in dot or JSON format\n"); - printf(" \taggregation|ag [0|1] \tdisplay or modify the packet aggregation setting\n"); - printf(" \tbonding|b [0|1] \tdisplay or modify the bonding mode setting\n"); - printf(" \tbridge_loop_avoidance|bl [0|1] \tdisplay or modify the bridge loop avoidance setting\n"); - printf(" \tfragmentation|f [0|1] \tdisplay or modify the fragmentation mode setting\n"); - printf(" \tap_isolation|ap [0|1] \tdisplay or modify the ap isolation mode setting\n"); printf("\n"); printf("debug tables: \tdisplay the corresponding debug table\n"); @@ -153,16 +160,6 @@ int main(int argc, char **argv) ret = log_print(mesh_iface, argc - 1, argv + 1); - } else if ((strcmp(argv[1], "interval") == 0) || (strcmp(argv[1], "it") == 0)) { - - ret = handle_sys_setting(mesh_iface, argc - 1, argv + 1, - SYS_ORIG_INTERVAL, orig_interval_usage, NULL); - - } else if ((strcmp(argv[1], "vis_mode") == 0) || (strcmp(argv[1], "vm") == 0)) { - - ret = handle_sys_setting(mesh_iface, argc - 1, argv + 1, - SYS_VIS_MODE, vis_mode_usage, sysfs_param_server); - } else if ((strcmp(argv[1], "vis_data") == 0) || (strcmp(argv[1], "vd") == 0)) { ret = vis_data(mesh_iface, argc - 1, argv + 1); @@ -171,31 +168,6 @@ int main(int argc, char **argv) ret = handle_gw_setting(mesh_iface, argc - 1, argv + 1); - } else if ((strcmp(argv[1], "aggregation") == 0) || (strcmp(argv[1], "ag") == 0)) { - - ret = handle_sys_setting(mesh_iface, argc - 1, argv + 1, - SYS_AGGR, aggregation_usage, sysfs_param_enable); - - } else if ((strcmp(argv[1], "bonding") == 0) || (strcmp(argv[1], "b") == 0)) { - - 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, - SYS_FRAG, fragmentation_usage, sysfs_param_enable); - - } else if ((strcmp(argv[1], "ap_isolation") == 0) || (strcmp(argv[1], "ap") == 0)) { - - ret = handle_sys_setting(mesh_iface, argc - 1, argv + 1, - SYS_AP_ISOLA, ap_isolation_usage, sysfs_param_enable); - } else if ((strcmp(argv[1], "statistics") == 0) || (strcmp(argv[1], "s") == 0)) { ret = ioctl_statistics_get(mesh_iface); @@ -206,6 +178,15 @@ int main(int argc, char **argv) } else { + for (i = 0; i < BATCTL_SETTINGS_NUM; i++) { + if ((strcmp(argv[1], batctl_settings[i].opt_long) != 0) && + (strcmp(argv[1], batctl_settings[i].opt_short) != 0)) + continue; + + ret = handle_sys_setting(mesh_iface, i, argc - 1, argv + 1); + goto out; + } + for (i = 0; i < BATCTL_TABLE_NUM; i++) { if ((strcmp(argv[1], batctl_debug_tables[i].opt_long) != 0) && (strcmp(argv[1], batctl_debug_tables[i].opt_short) != 0)) diff --git a/main.h b/main.h index 782ffde..4c8b60b 100644 --- a/main.h +++ b/main.h @@ -31,6 +31,7 @@ #define OPT_SHORT_MAX_LEN 5 #define DEBUG_TABLE_PATH_MAX_LEN 20 +#define SETTINGS_PATH_MAX_LEN 25 #define __packed __attribute((packed)) /* linux kernel compat */ diff --git a/sys.c b/sys.c index 5702c6c..6a1071a 100644 --- a/sys.c +++ b/sys.c @@ -49,6 +49,52 @@ const char *sysfs_param_server[] = { NULL, }; +const struct settings_data batctl_settings[BATCTL_SETTINGS_NUM] = { + { + .opt_long = "orig_interval", + .opt_short = "it", + .sysfs_name = "orig_interval", + .params = NULL, + }, + { + .opt_long = "ap_isolation", + .opt_short = "ap", + .sysfs_name = "ap_isolation", + .params = sysfs_param_enable, + }, + { + .opt_long = "bridge_loop_avoidance", + .opt_short = "bl", + .sysfs_name = "bridge_loop_avoidance", + .params = sysfs_param_enable, + }, + { + .opt_long = "vis_mode", + .opt_short = "vm", + .sysfs_name = "vis_mode", + .params = sysfs_param_server, + }, + { + .opt_long = "aggregation", + .opt_short = "ag", + .sysfs_name = "aggregated_ogms", + .params = sysfs_param_enable, + }, + { + .opt_long = "bonding", + .opt_short = "b", + .sysfs_name = "bonding", + .params = sysfs_param_enable, + }, + { + .opt_long = "fragmentation", + .opt_short = "f", + .sysfs_name = "fragmentation", + .params = sysfs_param_enable, + }, + +}; + static void interface_usage(void) { printf("Usage: batctl interface [options] [add|del iface(s)] \n"); @@ -276,65 +322,23 @@ out: return res; } -void aggregation_usage(void) -{ - printf("Usage: batctl [options] aggregation [0|1]\n"); - printf("options:\n"); - printf(" \t -h print this help\n"); -} - -void bonding_usage(void) -{ - printf("Usage: batctl [options] bonding [0|1]\n"); - printf("options:\n"); - 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"); - printf("options:\n"); - printf(" \t -h print this help\n"); -} - -void vis_mode_usage(void) +static void settings_usage(int setting) { - printf("Usage: batctl [options] vis_mode [mode]\n"); - printf("options:\n"); - printf(" \t -h print this help\n"); -} + printf("Usage: batctl [options] %s|%s", + (char *)batctl_settings[setting].opt_long, (char *)batctl_settings[setting].opt_short); -void orig_interval_usage(void) -{ - printf("Usage: batctl [options] interval \n"); - printf("options:\n"); - printf(" \t -h print this help\n"); -} - -void fragmentation_usage(void) -{ - printf("Usage: batctl [options] fragmentation [0|1]\n"); - printf("options:\n"); - printf(" \t -h print this help\n"); -} + if (batctl_settings[setting].params == sysfs_param_enable) + printf(" [0|1]\n"); + else if (batctl_settings[setting].params == sysfs_param_server) + printf(" [client|server]\n"); + else + printf("\n"); -void ap_isolation_usage(void) -{ - printf("Usage: batctl [options] ap_isolation [0|1]\n"); printf("options:\n"); printf(" \t -h print this help\n"); } -int handle_sys_setting(char *mesh_iface, int argc, char **argv, - char *file_path, void setting_usage(void), - const char *sysfs_param[]) +int handle_sys_setting(char *mesh_iface, int setting, int argc, char **argv) { int optchar, res = EXIT_FAILURE; char *path_buff; @@ -343,10 +347,10 @@ int handle_sys_setting(char *mesh_iface, int argc, char **argv, while ((optchar = getopt(argc, argv, "h")) != -1) { switch (optchar) { case 'h': - setting_usage(); + settings_usage(setting); return EXIT_SUCCESS; default: - setting_usage(); + settings_usage(setting); return EXIT_FAILURE; } } @@ -355,14 +359,15 @@ int handle_sys_setting(char *mesh_iface, int argc, char **argv, snprintf(path_buff, PATH_BUFF_LEN, SYS_BATIF_PATH_FMT, mesh_iface); if (argc == 1) { - res = read_file(path_buff, file_path, NO_FLAGS, 0, 0); + res = read_file(path_buff, (char *)batctl_settings[setting].sysfs_name, + NO_FLAGS, 0, 0); goto out; } - if (!sysfs_param) + if (!batctl_settings[setting].params) goto write_file; - ptr = sysfs_param; + ptr = batctl_settings[setting].params; while (*ptr) { if (strcmp(*ptr, argv[1]) == 0) goto write_file; @@ -373,7 +378,7 @@ int handle_sys_setting(char *mesh_iface, int argc, char **argv, printf("Error - the supplied argument is invalid: %s\n", argv[1]); printf("The following values are allowed:\n"); - ptr = sysfs_param; + ptr = batctl_settings[setting].params; while (*ptr) { printf(" * %s\n", *ptr); ptr++; @@ -382,13 +387,21 @@ int handle_sys_setting(char *mesh_iface, int argc, char **argv, goto out; write_file: - res = write_file(path_buff, file_path, argv[1], argc > 2 ? argv[2] : NULL); + res = write_file(path_buff, (char *)batctl_settings[setting].sysfs_name, + argv[1], argc > 2 ? argv[2] : NULL); out: free(path_buff); return res; } +static void gw_mode_usage(void) +{ + printf("Usage: batctl [options] gw_mode [mode] [sel_class|bandwidth]\n"); + printf("options:\n"); + printf(" \t -h print this help\n"); +} + int handle_gw_setting(char *mesh_iface, int argc, char **argv) { int optchar, res = EXIT_FAILURE; diff --git a/sys.h b/sys.h index f48902e..1fc473e 100644 --- a/sys.h +++ b/sys.h @@ -23,20 +23,24 @@ #define SYS_BATIF_PATH_FMT "/sys/class/net/%s/mesh/" #define SYS_LOG_LEVEL "log_level" #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" -#define SYS_VIS_MODE "vis_mode" -#define SYS_ORIG_INTERVAL "orig_interval" #define SYS_IFACE_PATH "/sys/class/net" #define SYS_IFACE_DIR SYS_IFACE_PATH"/%s/" #define SYS_MESH_IFACE_FMT SYS_IFACE_PATH"/%s/batman_adv/mesh_iface" #define SYS_IFACE_STATUS_FMT SYS_IFACE_PATH"/%s/batman_adv/iface_status" -#define SYS_FRAG "fragmentation" -#define SYS_AP_ISOLA "ap_isolation" + +enum batctl_settings_list { + BATCTL_SETTINGS_ORIG_INTERVAL, + BATCTL_SETTINGS_AP_ISOLATION, + BATCTL_SETTINGS_BLA, + BATCTL_SETTINGS_VIS_MODE, + BATCTL_SETTINGS_AGGREGATION, + BATCTL_SETTINGS_BONDING, + BATCTL_SETTINGS_FRAGMENTATION, + BATCTL_SETTINGS_NUM, +}; enum gw_modes { GW_MODE_OFF, @@ -44,20 +48,18 @@ enum gw_modes { GW_MODE_SERVER, }; +struct settings_data { + const char opt_long[OPT_LONG_MAX_LEN]; + const char opt_short[OPT_SHORT_MAX_LEN]; + const char sysfs_name[SETTINGS_PATH_MAX_LEN]; + const char **params; +}; + extern const char *sysfs_param_enable[]; extern const char *sysfs_param_server[]; +extern const struct settings_data batctl_settings[BATCTL_SETTINGS_NUM]; -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); -void vis_mode_usage(void); -void orig_interval_usage(void); int interface(char *mesh_iface, int argc, char **argv); int handle_loglevel(char *mesh_iface, int argc, char **argv); -int handle_sys_setting(char *mesh_iface, int argc, char **argv, - char *file_path, void setting_usage(void), - const char *sysfs_param[]); +int handle_sys_setting(char *mesh_iface, int setting, int argc, char **argv); int handle_gw_setting(char *mesh_iface, int argc, char **argv); -- batctl

10 years, 9 months

batctl; branch, master, updated. v2012.2.0-21-g4f6745d

by postmaster＠open-mesh.org

The following commit has been merged in the master branch: commit 4f6745d15d198d4090b9954906bb33527213c785 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Sat Jun 23 13:13:35 2012 +0200 batctl: unify debug table handling and remove redundant code Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> diff --git a/debug.c b/debug.c index 5dca633..8aa36c2 100644 --- a/debug.c +++ b/debug.c @@ -33,64 +33,53 @@ #include "debugfs.h" #include "functions.h" -void originators_usage(void) +const struct debug_table_data batctl_debug_tables[BATCTL_TABLE_NUM] = { + { + .opt_long = "originators", + .opt_short = "o", + .debugfs_name = "originators", + }, + { + .opt_long = "gateways", + .opt_short = "gwl", + .debugfs_name = "gateways", + }, + { + .opt_long = "translocal", + .opt_short = "tl", + .debugfs_name = "transtable_local", + }, + { + .opt_long = "transglobal", + .opt_short = "tg", + .debugfs_name = "transtable_global", + }, + { + .opt_long = "claimtable", + .opt_short = "cl", + .debugfs_name = "bla_claim_table", + }, + { + .opt_long = "backbonetable", + .opt_short = "bbt", + .debugfs_name = "bla_backbone_table", + }, +}; + +void debug_table_usage(int debug_table) { - printf("Usage: batctl [options] originators \n"); + printf("Usage: batctl [options] %s|%s\n", + batctl_debug_tables[debug_table].opt_long, batctl_debug_tables[debug_table].opt_short); 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 originator table continuously\n"); - printf(" \t -t timeout interval - don't print originators not seen for x.y seconds \n"); -} - -void trans_local_usage(void) -{ - printf("Usage: batctl [options] translocal \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 local translation table continuously\n"); -} - -void trans_global_usage(void) -{ - printf("Usage: batctl [options] transglobal \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 global translation table continuously\n"); -} - -void bla_claim_table_usage(void) -{ - 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 bridge loop avoidance claim table continuously\n"); -} + printf(" \t -w [interval] watch mode - refresh the table continuously\n"); -void bla_backbone_table_usage(void) -{ - printf("Usage: batctl [options] backbone table\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 bridge loop avoidance backbone table continuously\n"); -} - - -void gateways_usage(void) -{ - printf("Usage: batctl [options] gateways \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 gateway server list continuously\n"); + if (debug_table == BATCTL_TABLE_ORIGINATORS) + printf(" \t -t timeout interval - don't print originators not seen for x.y seconds \n"); } -int handle_debug_table(char *mesh_iface, int argc, char **argv, - char *file_path, void table_usage(void)) +int handle_debug_table(char *mesh_iface, int debug_table, int argc, char **argv) { int optchar, read_opt = USE_BAT_HOSTS; char full_path[MAX_PATH+1]; @@ -102,7 +91,7 @@ int handle_debug_table(char *mesh_iface, int argc, char **argv, while ((optchar = getopt(argc, argv, "hnw:t:")) != -1) { switch (optchar) { case 'h': - table_usage(); + debug_table_usage(debug_table); return EXIT_SUCCESS; case 'n': read_opt &= ~USE_BAT_HOSTS; @@ -115,36 +104,37 @@ int handle_debug_table(char *mesh_iface, int argc, char **argv, } if (!sscanf(optarg, "%f", &watch_interval)) { - printf("Error - provided argument of -w is not a number\n"); + printf("Error - provided argument of '-%c' is not a number\n", optchar); return EXIT_FAILURE; } break; case 't': - if (table_usage != originators_usage) { - table_usage(); + if (debug_table != BATCTL_TABLE_ORIGINATORS) { + printf("Error - unrecognised option '-%c'\n", optchar); + debug_table_usage(debug_table); return EXIT_FAILURE; } read_opt |= NO_OLD_ORIGS; if (!sscanf(optarg, "%f", &orig_timeout)) { - printf("Error - provided argument of -t is not a number\n"); + printf("Error - provided argument of '-%c' is not a number\n", optchar); return EXIT_FAILURE; } break; case '?': if (optopt == 't') - printf("Error - argument -t needs a number\n"); + printf("Error - option '-t' needs a number as argument\n"); else if (optopt == 'w') { read_opt |= CLR_CONT_READ; break; } else - printf("Error - unrecognised option -%c\n", optopt); + printf("Error - unrecognised option: '-%c'\n", optopt); return EXIT_FAILURE; default: - table_usage(); + debug_table_usage(debug_table); return EXIT_FAILURE; } } @@ -156,7 +146,8 @@ int handle_debug_table(char *mesh_iface, int argc, char **argv, } debugfs_make_path(DEBUG_BATIF_PATH_FMT "/", mesh_iface, full_path, sizeof(full_path)); - return read_file(full_path, file_path, read_opt, orig_timeout, watch_interval); + return read_file(full_path, (char *)batctl_debug_tables[debug_table].debugfs_name, + read_opt, orig_timeout, watch_interval); } static void log_usage(void) diff --git a/debug.h b/debug.h index 2c6d24c..6068c2c 100644 --- a/debug.h +++ b/debug.h @@ -21,21 +21,26 @@ #define DEBUG_BATIF_PATH_FMT "%s/batman_adv/%s" -#define DEBUG_ORIGINATORS "originators" -#define DEBUG_TRANSTABLE_LOCAL "transtable_local" -#define DEBUG_TRANSTABLE_GLOBAL "transtable_global" -#define DEBUG_BLA_CLAIM_TABLE "bla_claim_table" -#define DEBUG_BLA_BACKBONE_TABLE "bla_backbone_table" -#define DEBUG_GATEWAYS "gateways" #define DEBUG_VIS_DATA "vis_data" #define DEBUG_LOG "log" -void originators_usage(void); -void trans_local_usage(void); -void trans_global_usage(void); -void bla_claim_table_usage(void); -void bla_backbone_table_usage(void); -void gateways_usage(void); -int handle_debug_table(char *mesh_iface, int argc, char **argv, - char *file_path, void table_usage(void)); +enum batctl_debug_tables { + BATCTL_TABLE_ORIGINATORS, + BATCTL_TABLE_GATEWAYS, + BATCTL_TABLE_TRANSLOCAL, + BATCTL_TABLE_TRANSGLOBAL, + BATCTL_TABLE_BLA_CLAIMS, + BATCTL_TABLE_BLA_BACKBONES, + BATCTL_TABLE_NUM, +}; + +struct debug_table_data { + const char opt_long[OPT_LONG_MAX_LEN]; + const char opt_short[OPT_SHORT_MAX_LEN]; + const char debugfs_name[DEBUG_TABLE_PATH_MAX_LEN]; +}; + +extern const struct debug_table_data batctl_debug_tables[BATCTL_TABLE_NUM]; + +int handle_debug_table(char *mesh_iface, int debug_table, int argc, char **argv); int log_print(char *mesh_iface, int argc, char **argv); diff --git a/main.c b/main.c index 929b762..1482dbe 100644 --- a/main.c +++ b/main.c @@ -43,20 +43,23 @@ char mesh_dfl_iface[] = "bat0"; char module_ver_path[] = "/sys/module/batman_adv/version"; -void print_usage(void) { - printf("Usage: batctl [options] commands \n"); +void print_usage(void) +{ + int i; + + printf("Usage: batctl [options] command|debug table \n"); + printf("options:\n"); + printf(" \t-m mesh interface (default 'bat0')\n"); + printf(" \t-h print this help (or 'batctl <command|debug table> -h' for the specific help)\n"); + printf(" \t-v print version\n"); + printf("\n"); + printf("commands:\n"); printf(" \tinterface|if [add|del iface(s)]\tdisplay or modify the interface settings\n"); - printf(" \toriginators|o \tdisplay the originator table\n"); printf(" \tinterval|it [orig_interval] \tdisplay or modify the originator interval (in ms)\n"); printf(" \tloglevel|ll [level] \tdisplay or modify the log level\n"); printf(" \tlog|l \tread the log produced by the kernel module\n"); printf(" \tgw_mode|gw [mode] \tdisplay or modify the gateway mode\n"); - printf(" \tgateways|gwl \tdisplay the gateway server list\n"); - printf(" \ttranslocal|tl \tdisplay the local translation table\n"); - printf(" \ttransglobal|tg \tdisplay the global translation table\n"); - printf(" \tclaimtable|cl \tdisplay the bridge loop avoidance claim table\n"); - printf(" \tbackbonetable|bbl \tdisplay the bridge loop avoidance backbone table\n"); printf(" \tvis_mode|vm [mode] \tdisplay or modify the status of the VIS server\n"); printf(" \tvis_data|vd [dot|JSON] \tdisplay the VIS data in dot or JSON format\n"); printf(" \taggregation|ag [0|1] \tdisplay or modify the packet aggregation setting\n"); @@ -65,20 +68,22 @@ void print_usage(void) { printf(" \tfragmentation|f [0|1] \tdisplay or modify the fragmentation mode setting\n"); printf(" \tap_isolation|ap [0|1] \tdisplay or modify the ap isolation mode setting\n"); printf("\n"); + + printf("debug tables: \tdisplay the corresponding debug table\n"); + for (i = 0; i < BATCTL_TABLE_NUM; i++) + printf(" \t%s|%s\n", batctl_debug_tables[i].opt_long, batctl_debug_tables[i].opt_short); + + printf("\n"); printf(" \tstatistics|s \tprint mesh statistics\n"); printf(" \tping|p <destination> \tping another batman adv host via layer 2\n"); printf(" \ttraceroute|tr <destination> \ttraceroute another batman adv host via layer 2\n"); printf(" \ttcpdump|td <interface> \ttcpdump layer 2 traffic on the given interface\n"); printf(" \tbisect <file1> .. <fileN>\tanalyze given log files for routing stability\n"); - printf("options:\n"); - printf(" \t-m mesh interface (default 'bat0')\n"); - printf(" \t-h print this help (or 'batctl <command> -h' for the command specific help)\n"); - printf(" \t-v print version\n"); } int main(int argc, char **argv) { - int ret = EXIT_FAILURE; + int i, ret = EXIT_FAILURE; char *mesh_iface = mesh_dfl_iface; if ((argc > 1) && (strcmp(argv[1], "-m") == 0)) { @@ -140,31 +145,6 @@ int main(int argc, char **argv) ret = interface(mesh_iface, argc - 1, argv + 1); - } else if ((strcmp(argv[1], "originators") == 0) || (strcmp(argv[1], "o") == 0)) { - - ret = handle_debug_table(mesh_iface, argc - 1, argv + 1, - DEBUG_ORIGINATORS, originators_usage); - - } else if ((strcmp(argv[1], "translocal") == 0) || (strcmp(argv[1], "tl") == 0)) { - - ret = handle_debug_table(mesh_iface, argc - 1, argv + 1, - DEBUG_TRANSTABLE_LOCAL, trans_local_usage); - - } else if ((strcmp(argv[1], "transglobal") == 0) || (strcmp(argv[1], "tg") == 0)) { - - ret = handle_debug_table(mesh_iface, argc - 1, argv + 1, - DEBUG_TRANSTABLE_GLOBAL, trans_global_usage); - - } else if ((strcmp(argv[1], "claimtable") == 0) || (strcmp(argv[1], "cl") == 0)) { - - ret = handle_debug_table(mesh_iface, argc - 1, argv + 1, - DEBUG_BLA_CLAIM_TABLE, bla_claim_table_usage); - } else if ((strcmp(argv[1], "backbonetable") == 0) || (strcmp(argv[1], "bbl") == 0)) { - - ret = handle_debug_table(mesh_iface, argc - 1, argv + 1, - DEBUG_BLA_BACKBONE_TABLE, - bla_backbone_table_usage); - } else if ((strcmp(argv[1], "loglevel") == 0) || (strcmp(argv[1], "ll") == 0)) { ret = handle_loglevel(mesh_iface, argc - 1, argv + 1); @@ -191,11 +171,6 @@ int main(int argc, char **argv) ret = handle_gw_setting(mesh_iface, argc - 1, argv + 1); - } else if ((strcmp(argv[1], "gateways") == 0) || (strcmp(argv[1], "gwl") == 0)) { - - ret = handle_debug_table(mesh_iface, argc - 1, argv + 1, - DEBUG_GATEWAYS, gateways_usage); - } else if ((strcmp(argv[1], "aggregation") == 0) || (strcmp(argv[1], "ag") == 0)) { ret = handle_sys_setting(mesh_iface, argc - 1, argv + 1, @@ -230,10 +205,21 @@ int main(int argc, char **argv) ret = bisect(argc - 1, argv + 1); } else { - printf("Error - no command specified\n"); + + for (i = 0; i < BATCTL_TABLE_NUM; i++) { + if ((strcmp(argv[1], batctl_debug_tables[i].opt_long) != 0) && + (strcmp(argv[1], batctl_debug_tables[i].opt_short) != 0)) + continue; + + ret = handle_debug_table(mesh_iface, i, argc - 1, argv + 1); + goto out; + } + + printf("Error - no valid command or debug table specified: %s\n", argv[1]); print_usage(); } +out: return ret; err: diff --git a/main.h b/main.h index 4819cf4..782ffde 100644 --- a/main.h +++ b/main.h @@ -27,6 +27,11 @@ #define EXIT_NOSUCCESS 2 +#define OPT_LONG_MAX_LEN 25 +#define OPT_SHORT_MAX_LEN 5 + +#define DEBUG_TABLE_PATH_MAX_LEN 20 + #define __packed __attribute((packed)) /* linux kernel compat */ extern char module_ver_path[]; -- batctl

10 years, 9 months

batman-adv; branch, master, updated. v2012.2.0-139-g620f45d

by postmaster＠open-mesh.org

The following commit has been merged in the master branch: commit 620f45d57203dcc722534b034157fec55df2a606 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Tue Jun 26 12:00:34 2012 +0200 batman-adv: fix multiline comment complaint Regression introduced with: a81d0f914409c04cbefafb8b4ccf2de4cc50458f Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> diff --git a/soft-interface.c b/soft-interface.c index e06480a..c77473e 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -385,7 +385,8 @@ struct net_device *batadv_softif_create(const char *name) bat_priv = netdev_priv(soft_iface); /* batadv_interface_stats() needs to be available as soon as - * register_netdevice() has been called */ + * register_netdevice() has been called + */ bat_priv->bat_counters = __alloc_percpu(cnt_len, __alignof__(uint64_t)); if (!bat_priv->bat_counters) goto free_soft_iface; -- batman-adv

10 years, 9 months

linux integration; branch, merge/master, updated. v3.5-rc1-1469-g0774610

by postmaster＠open-mesh.org

The following commit has been merged in the merge/master branch: commit 07746107415dab8f1bf89ccc21484e62e0fe2969 Merge: 42f5d8917ac5dd3541cda17a0a56ae583ee21686 ce3dbe0051700790d2e2bdafb14d28850f9a57a9 Author: Antonio Quartulli <ordex(a)autistici.org> Date: Mon Jun 25 21:15:55 2012 +0200 Merge remote-tracking branch 'origin/standalone/next' into merge/master diff --combined net/batman-adv/main.h index 8193650,0000000..b8d4ac1 mode 100644,000000..100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@@ -1,280 -1,0 +1,279 @@@ +/* Copyright (C) 2007-2012 B.A.T.M.A.N. contributors: + * + * Marek Lindner, Simon Wunderlich + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public + * License as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301, USA + */ + +#ifndef _NET_BATMAN_ADV_MAIN_H_ +#define _NET_BATMAN_ADV_MAIN_H_ + +#define BATADV_DRIVER_AUTHOR "Marek Lindner <lindner_marek(a)yahoo.de>, " \ + "Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de>" +#define BATADV_DRIVER_DESC "B.A.T.M.A.N. advanced" +#define BATADV_DRIVER_DEVICE "batman-adv" + +#ifndef BATADV_SOURCE_VERSION +#define BATADV_SOURCE_VERSION "2012.3.0" +#endif + +/* B.A.T.M.A.N. parameters */ + +#define BATADV_TQ_MAX_VALUE 255 +#define BATADV_JITTER 20 + +/* Time To Live of broadcast messages */ +#define BATADV_TTL 50 + +/* purge originators after time in seconds if no valid packet comes in + * -> TODO: check influence on BATADV_TQ_LOCAL_WINDOW_SIZE + */ +#define BATADV_PURGE_TIMEOUT 200000 /* 200 seconds */ +#define BATADV_TT_LOCAL_TIMEOUT 3600000 /* in miliseconds */ +#define BATADV_TT_CLIENT_ROAM_TIMEOUT 600000 /* in miliseconds */ +/* sliding packet range of received originator messages in sequence numbers + * (should be a multiple of our word size) + */ +#define BATADV_TQ_LOCAL_WINDOW_SIZE 64 +/* miliseconds we have to keep pending tt_req */ +#define BATADV_TT_REQUEST_TIMEOUT 3000 + +#define BATADV_TQ_GLOBAL_WINDOW_SIZE 5 +#define BATADV_TQ_LOCAL_BIDRECT_SEND_MINIMUM 1 +#define BATADV_TQ_LOCAL_BIDRECT_RECV_MINIMUM 1 +#define BATADV_TQ_TOTAL_BIDRECT_LIMIT 1 + +/* number of OGMs sent with the last tt diff */ +#define BATADV_TT_OGM_APPEND_MAX 3 + +/* Time in which a client can roam at most ROAMING_MAX_COUNT times in + * miliseconds + */ +#define BATADV_ROAMING_MAX_TIME 20000 +#define BATADV_ROAMING_MAX_COUNT 5 + +#define BATADV_NO_FLAGS 0 + +#define BATADV_NULL_IFINDEX 0 /* dummy ifindex used to avoid iface checks */ + +#define BATADV_NUM_WORDS BITS_TO_LONGS(BATADV_TQ_LOCAL_WINDOW_SIZE) + +#define BATADV_LOG_BUF_LEN 8192 /* has to be a power of 2 */ + +#define BATADV_VIS_INTERVAL 5000 /* 5 seconds */ + +/* how much worse secondary interfaces may be to be considered as bonding + * candidates + */ +#define BATADV_BONDING_TQ_THRESHOLD 50 + +/* should not be bigger than 512 bytes or change the size of + * forw_packet->direct_link_flags + */ +#define BATADV_MAX_AGGREGATION_BYTES 512 +#define BATADV_MAX_AGGREGATION_MS 100 + +#define BATADV_BLA_PERIOD_LENGTH 10000 /* 10 seconds */ +#define BATADV_BLA_BACKBONE_TIMEOUT (BATADV_BLA_PERIOD_LENGTH * 3) +#define BATADV_BLA_CLAIM_TIMEOUT (BATADV_BLA_PERIOD_LENGTH * 10) + +#define BATADV_DUPLIST_SIZE 16 +#define BATADV_DUPLIST_TIMEOUT 500 /* 500 ms */ +/* don't reset again within 30 seconds */ +#define BATADV_RESET_PROTECTION_MS 30000 +#define BATADV_EXPECTED_SEQNO_RANGE 65536 + +enum batadv_mesh_state { + BATADV_MESH_INACTIVE, + BATADV_MESH_ACTIVE, + BATADV_MESH_DEACTIVATING, +}; + +#define BATADV_BCAST_QUEUE_LEN 256 +#define BATADV_BATMAN_QUEUE_LEN 256 + +enum batadv_uev_action { + BATADV_UEV_ADD = 0, + BATADV_UEV_DEL, + BATADV_UEV_CHANGE, +}; + +enum batadv_uev_type { + BATADV_UEV_GW = 0, +}; + +#define BATADV_GW_THRESHOLD 50 + +/* Debug Messages */ +#ifdef pr_fmt +#undef pr_fmt +#endif +/* Append 'batman-adv: ' before kernel messages */ +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + +/* all messages related to routing / flooding / broadcasting / etc */ +enum batadv_dbg_level { + BATADV_DBG_BATMAN = 1 << 0, + BATADV_DBG_ROUTES = 1 << 1, /* route added / changed / deleted */ + BATADV_DBG_TT = 1 << 2, /* translation table operations */ + BATADV_DBG_BLA = 1 << 3, /* bridge loop avoidance */ + BATADV_DBG_ALL = 15, +}; + +/* Kernel headers */ + +#include <linux/mutex.h> /* mutex */ +#include <linux/module.h> /* needed by all modules */ +#include <linux/netdevice.h> /* netdevice */ +#include <linux/etherdevice.h> /* ethernet address classification */ +#include <linux/if_ether.h> /* ethernet header */ +#include <linux/poll.h> /* poll_table */ +#include <linux/kthread.h> /* kernel threads */ +#include <linux/pkt_sched.h> /* schedule types */ +#include <linux/workqueue.h> /* workqueue */ +#include <linux/percpu.h> +#include <linux/slab.h> +#include <net/sock.h> /* struct sock */ +#include <linux/jiffies.h> +#include <linux/seq_file.h> +#include "types.h" + +extern char batadv_routing_algo[]; +extern struct list_head batadv_hardif_list; + +extern unsigned char batadv_broadcast_addr[]; +extern struct workqueue_struct *batadv_event_workqueue; + +int batadv_mesh_init(struct net_device *soft_iface); +void batadv_mesh_free(struct net_device *soft_iface); +void batadv_inc_module_count(void); +void batadv_dec_module_count(void); +int batadv_is_my_mac(const uint8_t *addr); +int batadv_batman_skb_recv(struct sk_buff *skb, struct net_device *dev, + struct packet_type *ptype, + struct net_device *orig_dev); +int +batadv_recv_handler_register(uint8_t packet_type, + int (*recv_handler)(struct sk_buff *, + struct batadv_hard_iface *)); +void batadv_recv_handler_unregister(uint8_t packet_type); +int batadv_algo_register(struct batadv_algo_ops *bat_algo_ops); +int batadv_algo_select(struct batadv_priv *bat_priv, char *name); +int batadv_algo_seq_print_text(struct seq_file *seq, void *offset); + +#ifdef CONFIG_BATMAN_ADV_DEBUG +int batadv_debug_log(struct batadv_priv *bat_priv, const char *fmt, ...) +__printf(2, 3); + +#define batadv_dbg(type, bat_priv, fmt, arg...) \ + do { \ + if (atomic_read(&bat_priv->log_level) & type) \ + batadv_debug_log(bat_priv, fmt, ## arg);\ + } \ + while (0) +#else /* !CONFIG_BATMAN_ADV_DEBUG */ +__printf(3, 4) +static inline void batadv_dbg(int type __always_unused, + struct batadv_priv *bat_priv __always_unused, + const char *fmt __always_unused, ...) +{ +} +#endif + +#define batadv_info(net_dev, fmt, arg...) \ + do { \ + struct net_device *_netdev = (net_dev); \ + struct batadv_priv *_batpriv = netdev_priv(_netdev); \ + batadv_dbg(BATADV_DBG_ALL, _batpriv, fmt, ## arg); \ + pr_info("%s: " fmt, _netdev->name, ## arg); \ + } while (0) +#define batadv_err(net_dev, fmt, arg...) \ + do { \ + struct net_device *_netdev = (net_dev); \ + struct batadv_priv *_batpriv = netdev_priv(_netdev); \ + batadv_dbg(BATADV_DBG_ALL, _batpriv, fmt, ## arg); \ + pr_err("%s: " fmt, _netdev->name, ## arg); \ + } while (0) + +/* returns 1 if they are the same ethernet addr + * + * note: can't use compare_ether_addr() as it requires aligned memory + */ +static inline int batadv_compare_eth(const void *data1, const void *data2) +{ + return (memcmp(data1, data2, ETH_ALEN) == 0 ? 1 : 0); +} + +/* has_timed_out - compares current time (jiffies) and timestamp + timeout + * @timestamp: base value to compare with (in jiffies) + * @timeout: added to base value before comparing (in milliseconds) + * + * Returns true if current time is after timestamp + timeout + */ +static inline bool batadv_has_timed_out(unsigned long timestamp, + unsigned int timeout) +{ + return time_is_before_jiffies(timestamp + msecs_to_jiffies(timeout)); +} + +#define batadv_atomic_dec_not_zero(v) atomic_add_unless((v), -1, 0) + +/* Returns the smallest signed integer in two's complement with the sizeof x */ +#define batadv_smallest_signed_int(x) (1u << (7u + 8u * (sizeof(x) - 1u))) + +/* Checks if a sequence number x is a predecessor/successor of y. + * they handle overflows/underflows and can correctly check for a + * predecessor/successor unless the variable sequence number has grown by + * more then 2**(bitwidth(x)-1)-1. + * This means that for a uint8_t with the maximum value 255, it would think: + * - when adding nothing - it is neither a predecessor nor a successor + * - before adding more than 127 to the starting value - it is a predecessor, + * - when adding 128 - it is neither a predecessor nor a successor, + * - after adding more than 127 to the starting value - it is a successor + */ +#define batadv_seq_before(x, y) ({typeof(x) _d1 = (x); \ + typeof(y) _d2 = (y); \ + typeof(x) _dummy = (_d1 - _d2); \ + (void) (&_d1 == &_d2); \ + _dummy > batadv_smallest_signed_int(_dummy); }) +#define batadv_seq_after(x, y) batadv_seq_before(y, x) + +/* Stop preemption on local cpu while incrementing the counter */ +static inline void batadv_add_counter(struct batadv_priv *bat_priv, size_t idx, + size_t count) +{ + int cpu = get_cpu(); + per_cpu_ptr(bat_priv->bat_counters, cpu)[idx] += count; + put_cpu(); +} + +#define batadv_inc_counter(b, i) batadv_add_counter(b, i, 1) + +/* Sum and return the cpu-local counters for index 'idx' */ +static inline uint64_t batadv_sum_counter(struct batadv_priv *bat_priv, + size_t idx) +{ - uint64_t *counters; ++ uint64_t *counters, sum = 0; + int cpu; - int sum = 0; + + for_each_possible_cpu(cpu) { + counters = per_cpu_ptr(bat_priv->bat_counters, cpu); + sum += counters[idx]; + } + + return sum; +} + +#endif /* _NET_BATMAN_ADV_MAIN_H_ */ -- linux integration

10 years, 9 months

batctl; branch, master, updated. v2012.2.0-20-ga7d1ac6

by postmaster＠open-mesh.org

The following commit has been merged in the master branch: commit a7d1ac6fa14c26bda730c0d3b82bdd93de5f25b3 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Sat Jun 23 02:17:01 2012 +0200 batctl: purge redundant statistic code Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> diff --git a/ioctl.c b/ioctl.c index 92ffdb3..5056d2f 100644 --- a/ioctl.c +++ b/ioctl.c @@ -37,53 +37,6 @@ typedef unsigned long long u64; -const char proc_net_dev_path[] = "/proc/net/dev"; - -static int statistics_common_get(char *mesh_iface) -{ - FILE *fp; - char iface[IFNAMSIZ + 1], *line_ptr = NULL;; - unsigned long long rx_bytes, rx_packets, tx_bytes, tx_packets; - unsigned long tx_errors; - size_t len = 0; - int res, ret = EXIT_FAILURE; - - rx_bytes = rx_packets = tx_bytes = tx_packets = tx_errors = 0; - - fp = fopen(proc_net_dev_path, "r"); - if (!fp) { - printf("Error - can't open '%s' for read: %s\n", - proc_net_dev_path, strerror(errno)); - goto out; - } - - while (getline(&line_ptr, &len, fp) != -1) { - res = sscanf(line_ptr, " %" STR(IFNAMSIZ) "[^: \t]: %llu %llu %*d %*d %*d %*d %*d %*d %llu %llu %lu\n", - iface, &rx_bytes, &rx_packets, &tx_bytes, &tx_packets, &tx_errors); - - if (res != 6) - continue; - - if (strcmp(iface, mesh_iface) != 0) - continue; - - printf("\t%.*s: %llu\n", ETH_GSTRING_LEN, "tx", tx_packets); - printf("\t%.*s: %llu\n", ETH_GSTRING_LEN, "tx_bytes", tx_bytes); - printf("\t%.*s: %lu\n", ETH_GSTRING_LEN, "tx_errors", tx_errors); - printf("\t%.*s: %llu\n", ETH_GSTRING_LEN, "rx", rx_packets); - printf("\t%.*s: %llu\n", ETH_GSTRING_LEN, "rx_bytes", rx_bytes); - ret = EXIT_SUCCESS; - goto out; - } - - printf("Error - interface '%s' not found\n", mesh_iface); - -out: - fclose(fp); - free(line_ptr); - return ret; -} - /* code borrowed from ethtool */ static int statistics_custom_get(int fd, struct ifreq *ifr) { @@ -162,10 +115,6 @@ int ioctl_statistics_get(char *mesh_iface) goto out; } - ret = statistics_common_get(mesh_iface); - if (ret != EXIT_SUCCESS) - goto out; - ret = statistics_custom_get(fd, &ifr); out: -- batctl

10 years, 9 months

batman-adv; branch, master, updated. v2012.2.0-138-ga81d0f9

by postmaster＠open-mesh.org

The following commit has been merged in the master branch: commit a81d0f914409c04cbefafb8b4ccf2de4cc50458f Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Sat Jun 23 11:47:53 2012 +0200 batman-adv: convert remaining packet counters to per_cpu_ptr() infrastructure Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> Acked-by: Martin Hundebøll <martin(a)hundeboll.net> diff --git a/bridge_loop_avoidance.c b/bridge_loop_avoidance.c index 203e06c..6452e2f 100644 --- a/bridge_loop_avoidance.c +++ b/bridge_loop_avoidance.c @@ -339,8 +339,9 @@ static void batadv_bla_send_claim(struct batadv_priv *bat_priv, uint8_t *mac, skb_reset_mac_header(skb); skb->protocol = eth_type_trans(skb, soft_iface); - bat_priv->stats.rx_packets++; - bat_priv->stats.rx_bytes += skb->len + ETH_HLEN; + batadv_inc_counter(bat_priv, BATADV_CNT_RX); + batadv_add_counter(bat_priv, BATADV_CNT_RX_BYTES, + skb->len + ETH_HLEN); soft_iface->last_rx = jiffies; netif_rx(skb); diff --git a/soft-interface.c b/soft-interface.c index b7c655c..e06480a 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -93,7 +93,14 @@ static int batadv_interface_release(struct net_device *dev) static struct net_device_stats *batadv_interface_stats(struct net_device *dev) { struct batadv_priv *bat_priv = netdev_priv(dev); - return &bat_priv->stats; + struct net_device_stats *stats = &bat_priv->stats; + + stats->tx_packets = batadv_sum_counter(bat_priv, BATADV_CNT_TX); + stats->tx_bytes = batadv_sum_counter(bat_priv, BATADV_CNT_TX_BYTES); + stats->tx_dropped = batadv_sum_counter(bat_priv, BATADV_CNT_TX_DROPPED); + stats->rx_packets = batadv_sum_counter(bat_priv, BATADV_CNT_RX); + stats->rx_bytes = batadv_sum_counter(bat_priv, BATADV_CNT_RX_BYTES); + return stats; } static int batadv_interface_set_mac_addr(struct net_device *dev, void *p) @@ -245,14 +252,14 @@ static int batadv_interface_tx(struct sk_buff *skb, goto dropped_freed; } - bat_priv->stats.tx_packets++; - bat_priv->stats.tx_bytes += data_len; + batadv_inc_counter(bat_priv, BATADV_CNT_TX); + batadv_add_counter(bat_priv, BATADV_CNT_TX_BYTES, data_len); goto end; dropped: kfree_skb(skb); dropped_freed: - bat_priv->stats.tx_dropped++; + batadv_inc_counter(bat_priv, BATADV_CNT_TX_DROPPED); end: if (primary_if) batadv_hardif_free_ref(primary_if); @@ -303,8 +310,9 @@ void batadv_interface_rx(struct net_device *soft_iface, /* skb->ip_summed = CHECKSUM_UNNECESSARY; */ - bat_priv->stats.rx_packets++; - bat_priv->stats.rx_bytes += skb->len + ETH_HLEN; + batadv_inc_counter(bat_priv, BATADV_CNT_RX); + batadv_add_counter(bat_priv, BATADV_CNT_RX_BYTES, + skb->len + ETH_HLEN); soft_iface->last_rx = jiffies; @@ -374,15 +382,21 @@ struct net_device *batadv_softif_create(const char *name) if (!soft_iface) goto out; + bat_priv = netdev_priv(soft_iface); + + /* batadv_interface_stats() needs to be available as soon as + * register_netdevice() has been called */ + bat_priv->bat_counters = __alloc_percpu(cnt_len, __alignof__(uint64_t)); + if (!bat_priv->bat_counters) + goto free_soft_iface; + ret = register_netdevice(soft_iface); if (ret < 0) { pr_err("Unable to register the batman interface '%s': %i\n", name, ret); - goto free_soft_iface; + goto free_bat_counters; } - bat_priv = netdev_priv(soft_iface); - atomic_set(&bat_priv->aggregated_ogms, 1); atomic_set(&bat_priv->bonding, 0); atomic_set(&bat_priv->bridge_loop_avoidance, 0); @@ -412,17 +426,13 @@ struct net_device *batadv_softif_create(const char *name) bat_priv->primary_if = NULL; bat_priv->num_ifaces = 0; - bat_priv->bat_counters = __alloc_percpu(cnt_len, __alignof__(uint64_t)); - if (!bat_priv->bat_counters) - goto unreg_soft_iface; - ret = batadv_algo_select(bat_priv, batadv_routing_algo); if (ret < 0) - goto free_bat_counters; + goto unreg_soft_iface; ret = batadv_sysfs_add_meshif(soft_iface); if (ret < 0) - goto free_bat_counters; + goto unreg_soft_iface; ret = batadv_debugfs_add_meshif(soft_iface); if (ret < 0) @@ -438,12 +448,13 @@ unreg_debugfs: batadv_debugfs_del_meshif(soft_iface); unreg_sysfs: batadv_sysfs_del_meshif(soft_iface); -free_bat_counters: - free_percpu(bat_priv->bat_counters); unreg_soft_iface: + free_percpu(bat_priv->bat_counters); unregister_netdevice(soft_iface); return NULL; +free_bat_counters: + free_percpu(bat_priv->bat_counters); free_soft_iface: free_netdev(soft_iface); out: @@ -513,6 +524,11 @@ static u32 batadv_get_link(struct net_device *dev) static const struct { const char name[ETH_GSTRING_LEN]; } batadv_counters_strings[] = { + { "tx" }, + { "tx_bytes" }, + { "tx_dropped" }, + { "rx" }, + { "rx_bytes" }, { "forward" }, { "forward_bytes" }, { "mgmt_tx" }, diff --git a/types.h b/types.h index 2141c13..64b4317 100644 --- a/types.h +++ b/types.h @@ -144,6 +144,11 @@ struct batadv_bcast_duplist_entry { #endif enum batadv_counters { + BATADV_CNT_TX, + BATADV_CNT_TX_BYTES, + BATADV_CNT_TX_DROPPED, + BATADV_CNT_RX, + BATADV_CNT_RX_BYTES, BATADV_CNT_FORWARD, BATADV_CNT_FORWARD_BYTES, BATADV_CNT_MGMT_TX, -- batman-adv

10 years, 9 months

batman-adv; branch, master, updated. v2012.2.0-137-ge59c597

by postmaster＠open-mesh.org

The following commit has been merged in the master branch: commit e59c597a4dff8c239e2c89ea29802ba985caccd9 Merge: f9bb01916485ee9ba485acaf9424f21f1b42b537 ce3dbe0051700790d2e2bdafb14d28850f9a57a9 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Mon Jun 25 16:35:47 2012 +0200 Merge branch 'next' -- batman-adv

10 years, 9 months

batman-adv; branch, next, updated. v2012.2.0-131-gce3dbe0

by postmaster＠open-mesh.org

The following commit has been merged in the next branch: commit ce3dbe0051700790d2e2bdafb14d28850f9a57a9 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Sat Jun 23 11:46:05 2012 +0200 batman-adv: fix counter summary length Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> Acked-by: Martin Hundebøll <martin(a)hundeboll.net> diff --git a/main.h b/main.h index e76f9c6..6dca9c4 100644 --- a/main.h +++ b/main.h @@ -267,9 +267,8 @@ static inline void batadv_add_counter(struct batadv_priv *bat_priv, size_t idx, static inline uint64_t batadv_sum_counter(struct batadv_priv *bat_priv, size_t idx) { - uint64_t *counters; + uint64_t *counters, sum = 0; int cpu; - int sum = 0; for_each_possible_cpu(cpu) { counters = per_cpu_ptr(bat_priv->bat_counters, cpu); -- batman-adv

10 years, 9 months

batctl; branch, master, updated. v2012.2.0-19-gd3bcb9c

by postmaster＠open-mesh.org

The following commit has been merged in the master branch: commit d3bcb9cdfaf5198847b45b2bd4ec4ec7f1fcd99d Author: Simon Wunderlich <simon.wunderlich(a)s2003.tu-chemnitz.de> Date: Sat Jun 23 12:34:18 2012 +0200 batctl: rename bridge loop avoidance claim types for consistency reasons within the code and with the documentation, we should always call it "claim" and "unclaim". Signed-off-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> diff --git a/packet.h b/packet.h index 8d3e55a..65d66e4 100644 --- a/packet.h +++ b/packet.h @@ -92,8 +92,8 @@ enum batadv_tt_client_flags { /* claim frame types for the bridge loop avoidance */ enum batadv_bla_claimframe { - BATADV_CLAIM_TYPE_ADD = 0x00, - BATADV_CLAIM_TYPE_DEL = 0x01, + BATADV_CLAIM_TYPE_CLAIM = 0x00, + BATADV_CLAIM_TYPE_UNCLAIM = 0x01, BATADV_CLAIM_TYPE_ANNOUNCE = 0x02, BATADV_CLAIM_TYPE_REQUEST = 0x03, }; diff --git a/tcpdump.c b/tcpdump.c index cbae9bb..489132f 100644 --- a/tcpdump.c +++ b/tcpdump.c @@ -118,14 +118,14 @@ static int dump_bla2_claim(struct ether_header *eth_hdr, goto out; switch (bla_dst->type) { - case BATADV_CLAIM_TYPE_ADD: + case BATADV_CLAIM_TYPE_CLAIM: printf("BLA CLAIM, backbone %s, ", get_name_by_macaddr((struct ether_addr *)hw_src, read_opt)); printf("client %s, bla group %04x\n", get_name_by_macaddr((struct ether_addr *)eth_hdr->ether_shost, read_opt), ntohs(bla_dst->group)); break; - case BATADV_CLAIM_TYPE_DEL: + case BATADV_CLAIM_TYPE_UNCLAIM: printf("BLA UNCLAIM, backbone %s, ", get_name_by_macaddr((struct ether_addr *)eth_hdr->ether_shost, read_opt)); printf("client %s, bla group %04x\n", -- batctl

10 years, 9 months

batman-adv; branch, master, updated. v2012.2.0-135-gf9bb019

by postmaster＠open-mesh.org

The following commit has been merged in the master branch: commit f9bb01916485ee9ba485acaf9424f21f1b42b537 Author: Simon Wunderlich <simon.wunderlich(a)s2003.tu-chemnitz.de> Date: Sat Jun 23 12:34:18 2012 +0200 batman-adv: rename bridge loop avoidance claim types for consistency reasons within the code and with the documentation, we should always call it "claim" and "unclaim". Signed-off-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> diff --git a/bridge_loop_avoidance.c b/bridge_loop_avoidance.c index 2899104..203e06c 100644 --- a/bridge_loop_avoidance.c +++ b/bridge_loop_avoidance.c @@ -294,7 +294,7 @@ static void batadv_bla_send_claim(struct batadv_priv *bat_priv, uint8_t *mac, /* now we pretend that the client would have sent this ... */ switch (claimtype) { - case BATADV_CLAIM_TYPE_ADD: + case BATADV_CLAIM_TYPE_CLAIM: /* normal claim frame * set Ethernet SRC to the clients mac */ @@ -302,7 +302,7 @@ static void batadv_bla_send_claim(struct batadv_priv *bat_priv, uint8_t *mac, batadv_dbg(BATADV_DBG_BLA, bat_priv, "bla_send_claim(): CLAIM %pM on vid %d\n", mac, vid); break; - case BATADV_CLAIM_TYPE_DEL: + case BATADV_CLAIM_TYPE_UNCLAIM: /* unclaim frame * set HW SRC to the clients mac */ @@ -465,7 +465,7 @@ static void batadv_bla_answer_request(struct batadv_priv *bat_priv, continue; batadv_bla_send_claim(bat_priv, claim->addr, claim->vid, - BATADV_CLAIM_TYPE_ADD); + BATADV_CLAIM_TYPE_CLAIM); } rcu_read_unlock(); } @@ -700,7 +700,7 @@ static int batadv_handle_unclaim(struct batadv_priv *bat_priv, if (primary_if && batadv_compare_eth(backbone_addr, primary_if->net_dev->dev_addr)) batadv_bla_send_claim(bat_priv, claim_addr, vid, - BATADV_CLAIM_TYPE_DEL); + BATADV_CLAIM_TYPE_UNCLAIM); backbone_gw = batadv_backbone_hash_find(bat_priv, backbone_addr, vid); @@ -736,7 +736,7 @@ static int batadv_handle_claim(struct batadv_priv *bat_priv, batadv_bla_add_claim(bat_priv, claim_addr, vid, backbone_gw); if (batadv_compare_eth(backbone_addr, primary_if->net_dev->dev_addr)) batadv_bla_send_claim(bat_priv, claim_addr, vid, - BATADV_CLAIM_TYPE_ADD); + BATADV_CLAIM_TYPE_CLAIM); /* TODO: we could call something like tt_local_del() here. */ @@ -779,12 +779,12 @@ static int batadv_check_claim_group(struct batadv_priv *bat_priv, * otherwise assume it is in the hw_src */ switch (bla_dst->type) { - case BATADV_CLAIM_TYPE_ADD: + case BATADV_CLAIM_TYPE_CLAIM: backbone_addr = hw_src; break; case BATADV_CLAIM_TYPE_REQUEST: case BATADV_CLAIM_TYPE_ANNOUNCE: - case BATADV_CLAIM_TYPE_DEL: + case BATADV_CLAIM_TYPE_UNCLAIM: backbone_addr = ethhdr->h_source; break; default: @@ -900,12 +900,12 @@ static int batadv_bla_process_claim(struct batadv_priv *bat_priv, /* check for the different types of claim frames ... */ switch (bla_dst->type) { - case BATADV_CLAIM_TYPE_ADD: + case BATADV_CLAIM_TYPE_CLAIM: if (batadv_handle_claim(bat_priv, primary_if, hw_src, ethhdr->h_source, vid)) return 1; break; - case BATADV_CLAIM_TYPE_DEL: + case BATADV_CLAIM_TYPE_UNCLAIM: if (batadv_handle_unclaim(bat_priv, primary_if, ethhdr->h_source, hw_src, vid)) return 1; diff --git a/packet.h b/packet.h index 8d3e55a..65d66e4 100644 --- a/packet.h +++ b/packet.h @@ -92,8 +92,8 @@ enum batadv_tt_client_flags { /* claim frame types for the bridge loop avoidance */ enum batadv_bla_claimframe { - BATADV_CLAIM_TYPE_ADD = 0x00, - BATADV_CLAIM_TYPE_DEL = 0x01, + BATADV_CLAIM_TYPE_CLAIM = 0x00, + BATADV_CLAIM_TYPE_UNCLAIM = 0x01, BATADV_CLAIM_TYPE_ANNOUNCE = 0x02, BATADV_CLAIM_TYPE_REQUEST = 0x03, }; -- batman-adv

10 years, 9 months

Jump to page:

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits June 2012