B.A.T.M.A.N December 2018

b.a.t.m.a.n@lists.open-mesh.org

12 participants
25 discussions

[B.A.T.M.A.N.] short introduction
by Sylvain PRUDENT 20 Dec '18

20 Dec '18

Hello everyone, as it is my first mail to the mailing list I thought I had to introduce myself a bit. I work in a French company providing WiFi mesh networks to campsites. Our WiFi spots are based on OpenWRT and we use a lot batman-adv to build our mesh networks. Batman is a great and powerful tool and I look forward to contribute to the different exchanges on the mailing list. Best regards, sprudent

1 0

[B.A.T.M.A.N.] [PATCH 1/2] batctl: Remove check of compiled_out files
by Sven Eckelmann 07 Dec '18

07 Dec '18

Many files in the sysfs and debugfs of batman-adv can be compiled out. The debugfs support of batman-adv can currently be disabled completely and something similar may happen in the future for sysfs. Printing the information that a file cannot be opened because the feature was disabled should therefore be printed for read/writes from/to all files when the caller didn't ask to disable error messages. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- bridge_loop_avoidance.c | 2 +- distributed_arp_table.c | 2 +- functions.c | 36 +++++------------------------------- loglevel.c | 2 ++ multicast_mode.c | 2 +- network_coding.c | 2 +- sys.h | 6 ------ 7 files changed, 11 insertions(+), 41 deletions(-) diff --git a/bridge_loop_avoidance.c b/bridge_loop_avoidance.c index 0db49f2..04b41e0 100644 --- a/bridge_loop_avoidance.c +++ b/bridge_loop_avoidance.c @@ -24,7 +24,7 @@ #include "sys.h" static struct settings_data batctl_settings_bridge_loop_avoidance = { - .sysfs_name = SYS_BLA, + .sysfs_name = "bridge_loop_avoidance", .params = sysfs_param_enable, }; diff --git a/distributed_arp_table.c b/distributed_arp_table.c index ba6e5b7..c3595fc 100644 --- a/distributed_arp_table.c +++ b/distributed_arp_table.c @@ -24,7 +24,7 @@ #include "sys.h" static struct settings_data batctl_settings_distributed_arp_table = { - .sysfs_name = SYS_DAT, + .sysfs_name = "distributed_arp_table", .params = sysfs_param_enable, }; diff --git a/functions.c b/functions.c index bdede8b..9a130e1 100644 --- a/functions.c +++ b/functions.c @@ -66,21 +66,6 @@ static struct timespec start_time; static char *host_name; char *line_ptr = NULL; -const char *fs_compile_out_param[] = { - SYS_LOG, - SYS_LOG_LEVEL, - SYS_BLA, - SYS_DAT, - SYS_NETWORK_CODING, - SYS_MULTICAST_MODE, - DEBUG_DAT_CACHE, - DEBUG_BACKBONETABLE, - DEBUG_DAT_CACHE, - DEBUG_NC_NODES, - DEBUG_MCAST_FLAGS, - NULL, -}; - void start_timer(void) { clock_gettime(CLOCK_MONOTONIC, &start_time); @@ -147,10 +132,8 @@ int file_exists(const char *fpath) return stat(fpath, &st) == 0; } -static void file_open_problem_dbg(const char *dir, const char *fname, - const char *full_path) +static void file_open_problem_dbg(const char *dir, const char *full_path) { - const char **ptr; struct stat st; if (strstr(dir, "/sys/")) { @@ -172,18 +155,9 @@ static void file_open_problem_dbg(const char *dir, const char *fname, return; } - for (ptr = fs_compile_out_param; *ptr; ptr++) { - if (strcmp(*ptr, fname) != 0) - continue; - - break; - } - fprintf(stderr, "Error - can't open file '%s': %s\n", full_path, strerror(errno)); - if (*ptr) { - fprintf(stderr, "The option you called seems not to be compiled into your batman-adv kernel module.\n"); - fprintf(stderr, "Consult the README if you wish to learn more about compiling options into batman-adv.\n"); - } + fprintf(stderr, "The option you called seems not to be compiled into your batman-adv kernel module.\n"); + fprintf(stderr, "Consult the README if you wish to learn more about compiling options into batman-adv.\n"); } static int str_is_mcast_addr(char *addr) @@ -230,7 +204,7 @@ int read_file(const char *dir, const char *fname, int read_opt, if (!fp) { if (!(read_opt & SILENCE_ERRORS)) - file_open_problem_dbg(dir, fname, full_path); + file_open_problem_dbg(dir, full_path); goto out; } @@ -366,7 +340,7 @@ int write_file(const char *dir, const char *fname, const char *arg1, fd = open(full_path, O_WRONLY); if (fd < 0) { - file_open_problem_dbg(dir, fname, full_path); + file_open_problem_dbg(dir, full_path); goto out; } diff --git a/loglevel.c b/loglevel.c index fed70c8..b5bbd0d 100644 --- a/loglevel.c +++ b/loglevel.c @@ -29,6 +29,8 @@ #include "main.h" #include "sys.h" +#define SYS_LOG_LEVEL "log_level" + static void log_level_usage(void) { fprintf(stderr, "Usage: batctl [options] loglevel [parameters] [level[ level[ level]]...]\n"); diff --git a/multicast_mode.c b/multicast_mode.c index 8542928..b65732d 100644 --- a/multicast_mode.c +++ b/multicast_mode.c @@ -24,7 +24,7 @@ #include "sys.h" static struct settings_data batctl_settings_multicast_mode = { - .sysfs_name = SYS_MULTICAST_MODE, + .sysfs_name = "multicast_mode", .params = sysfs_param_enable, }; diff --git a/network_coding.c b/network_coding.c index a4c4296..076f4cf 100644 --- a/network_coding.c +++ b/network_coding.c @@ -24,7 +24,7 @@ #include "sys.h" static struct settings_data batctl_settings_network_coding = { - .sysfs_name = SYS_NETWORK_CODING, + .sysfs_name = "network_coding", .params = sysfs_param_enable, }; diff --git a/sys.h b/sys.h index 20e1934..b493219 100644 --- a/sys.h +++ b/sys.h @@ -26,12 +26,6 @@ #include "main.h" #define SYS_BATIF_PATH_FMT "/sys/class/net/%s/mesh/" -#define SYS_LOG_LEVEL "log_level" -#define SYS_LOG "log" -#define SYS_BLA "bridge_loop_avoidance" -#define SYS_DAT "distributed_arp_table" -#define SYS_NETWORK_CODING "network_coding" -#define SYS_MULTICAST_MODE "multicast_mode" #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" -- 2.19.2

1 1

[B.A.T.M.A.N.] [PATCH] batctl: Rename option_watch_interval to option_timeout_interval
by Sven Eckelmann 07 Dec '18

07 Dec '18

The watch interval is actually a different option for debug tables which uses the parameter '-w'. The configuration to enable/disable the parameter to set the timeout for not displaying not seen originators should therefore use a different name. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- debug.c | 4 ++-- debug.h | 2 +- originators.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/debug.c b/debug.c index 316312f..182877a 100644 --- a/debug.c +++ b/debug.c @@ -44,7 +44,7 @@ static void debug_table_usage(struct state *state) fprintf(stderr, " \t -H don't show the header\n"); fprintf(stderr, " \t -w [interval] watch mode - refresh the table continuously\n"); - if (debug_table->option_watch_interval) + if (debug_table->option_timeout_interval) fprintf(stderr, " \t -t timeout interval - don't print originators not seen for x.y seconds \n"); if (debug_table->option_orig_iface) @@ -89,7 +89,7 @@ int handle_debug_table(struct state *state, int argc, char **argv) } break; case 't': - if (!debug_table->option_watch_interval) { + if (!debug_table->option_timeout_interval) { fprintf(stderr, "Error - unrecognised option '-%c'\n", optchar); debug_table_usage(state); return EXIT_FAILURE; diff --git a/debug.h b/debug.h index 2dac1b7..f1a3fd4 100644 --- a/debug.h +++ b/debug.h @@ -43,7 +43,7 @@ struct debug_table_data { float orig_timeout, float watch_interval); unsigned int option_unicast_only:1; unsigned int option_multicast_only:1; - unsigned int option_watch_interval:1; + unsigned int option_timeout_interval:1; unsigned int option_orig_iface:1; }; diff --git a/originators.c b/originators.c index c29300a..7dc9b4c 100644 --- a/originators.c +++ b/originators.c @@ -219,7 +219,7 @@ static struct debug_table_data batctl_debug_table_originators = { .debugfs_name = "originators", .header_lines = 2, .netlink_fn = netlink_print_originators, - .option_watch_interval = 1, + .option_timeout_interval = 1, .option_orig_iface = 1, }; -- 2.19.2

1 0

[B.A.T.M.A.N.] [PATCH] batman-adv: Allow to disable depmod
by Sven Eckelmann 06 Dec '18

06 Dec '18

On some build systems, the actual call to depmod is not expected and only the installation of the module is expected. Just allow to overwrite this call with a different (dummy) executable. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index d665c0ba..08ac8f65 100644 --- a/Makefile +++ b/Makefile @@ -45,6 +45,7 @@ export KERNELPATH RM ?= rm -f CP := cp -fpR LN := ln -sf +DEPMOD := depmod -a REVISION= $(shell if [ -d "$(PWD)/.git" ]; then \ echo $$(git --git-dir="$(PWD)/.git" describe --always --dirty --match "v*" |sed 's/^v//' 2> /dev/null || echo "[unknown]"); \ @@ -90,7 +91,7 @@ clean: install: config $(MAKE) -C $(KERNELPATH) $(BUILD_FLAGS) modules_install - depmod -a + $(DEPMOD) config: $(PWD)/gen-compat-autoconf.sh $(PWD)/compat-autoconf.h -- 2.19.2

1 0

[B.A.T.M.A.N.] [PATCH maint] batctl: Fix parsing of optional debug table command parameters
by Sven Eckelmann 06 Dec '18

06 Dec '18

The commands which should have no support for -t/-u/-m/-i were allowed to accept these parameters but commands which should have accepted them were denying them. Fixes: cd2b4047ead9 ("batctl: Convert debug table to command infrastructure") Reported-by: Andreas Ziegler <dev(a)andreas-ziegler.de> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- debug.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/debug.c b/debug.c index 2979dff..316312f 100644 --- a/debug.c +++ b/debug.c @@ -89,7 +89,7 @@ int handle_debug_table(struct state *state, int argc, char **argv) } break; case 't': - if (debug_table->option_watch_interval) { + if (!debug_table->option_watch_interval) { fprintf(stderr, "Error - unrecognised option '-%c'\n", optchar); debug_table_usage(state); return EXIT_FAILURE; @@ -105,7 +105,7 @@ int handle_debug_table(struct state *state, int argc, char **argv) read_opt |= SKIP_HEADER; break; case 'u': - if (debug_table->option_unicast_only) { + if (!debug_table->option_unicast_only) { fprintf(stderr, "Error - unrecognised option '-%c'\n", optchar); debug_table_usage(state); return EXIT_FAILURE; @@ -114,7 +114,7 @@ int handle_debug_table(struct state *state, int argc, char **argv) read_opt |= UNICAST_ONLY; break; case 'm': - if (debug_table->option_multicast_only) { + if (!debug_table->option_multicast_only) { fprintf(stderr, "Error - unrecognised option '-%c'\n", optchar); debug_table_usage(state); return EXIT_FAILURE; @@ -123,7 +123,7 @@ int handle_debug_table(struct state *state, int argc, char **argv) read_opt |= MULTICAST_ONLY; break; case 'i': - if (debug_table->option_orig_iface) { + if (!debug_table->option_orig_iface) { fprintf(stderr, "Error - unrecognised option '-%c'\n", optchar); debug_table_usage(state); return EXIT_FAILURE; -- 2.19.2

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N December 2018