commits December 2018

commits@lists.open-mesh.org

1 participants
26 discussions

[linux-merge]linux integration; annotated tag, v3.16.62, created. v3.16.62
by postmaster＠open-mesh.org 30 Dec '18

30 Dec '18

The annotated tag, v3.16.62 has been created at 5d4dbc3613151d8f30a89c00957608b6c69502a0 (tag) tagging 6c2f633cbed5c0231802c69a8e4e55a0169df917 (commit) replaces v3.16.59 tagged by Ben Hutchings on Sun Dec 16 22:09:53 2018 +0000 - Shortlog ------------------------------------------------------------ This is the 3.16.62 stable release -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEErCspvTSmr92z9o8157/I7JWGEQkFAlwWzTEACgkQ57/I7JWG EQnD0w//cd70Ub/tCk0c7I/AIS/zcTATs/+6pn32OIWTWny3EMiXeZ9baKKr7N6c /CAO0eoIPJqPpr2GZmM37lYAoiKfgikkwee8exFAQVMxsYQKf6XvnWdq3voNYhqf /L0Z7weDE74XUm8UjXzsHOjjAi4dSmcHEQDqHIQtGIlgkon4+iJGcuwhPHEQiD+F 5fHnw03y7P/vZXfwxmytCxenTe0CvtyYdIRZ0SuDQgxfRCgdzsv1Xw/9x5tBh5N9 Xz14NwYz19vQUBLAtEOl9iaSuHbhAfKPNRPmXgm0doMhy6m9tGrj7yici48SWaLF mCJx7Q/YDe4XH7iN6n01pS1gy/ISFuXdMVTksAo/k3xypfyJADHcpY9lS2MRCdwQ ivfUPH/93tzqoIijoMUYZ2pU17x/370MyWXkUXiCtXbnpxDKDtmhnboE14AKSbc9 O+9dJ6QqyyXBmBfjmI6b2cVhcSHq44dpWCFZjhcIvjOjElDbvt4ivzMHtKfOPRhd pPt17pAW2wjay6mhsY2ZIAPgisR0+COYc4juC1AmO4hg6ADbR0BQRWnuxe3KhRtz S1VvglKtMU11NuCrjMGO18qjmyjMfGXYCDpnIVvmZzt48+9aNSBNQcHnQu7ejYCx 6wzHChOvzFsPrwwp1Hd7XnSHLtkMdmu6VFcNZh9XkgV/mXAIIKc= =CX8A -----END PGP SIGNATURE----- Linus Lüssing (3): batman-adv: Fix TT sync flags for intermediate TT responses batman-adv: Avoid storing non-TT-sync flags on singular entries too batman-adv: Fix multicast TT issues with bogus ROAM flags Marek Lindner (1): batman-adv: prevent TT request storms by not sending inconsistent TT TLVLs Markus Pargmann (1): batman-adv: debugfs, avoid compiling for !DEBUG_FS Simon Wunderlich (1): batman-adv: unify flags access style in tt global add Sven Eckelmann (10): batman-adv: Avoid race in TT TVLV allocator helper batman-adv: Fix debugfs path for renamed hardif batman-adv: Fix debugfs path for renamed softif batman-adv: Prevent duplicated gateway_node entry batman-adv: Use kref_get for batadv_nc_get_nc_node batman-adv: Prevent duplicated nc_node entry batman-adv: Place kref_get for softif_vlan near use batman-adv: Prevent duplicated softif_vlan entry batman-adv: Prevent duplicated global TT entry batman-adv: Prevent duplicated tvlv handler ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; annotated tag, v4.20, created. v4.20
by postmaster＠open-mesh.org 24 Dec '18

24 Dec '18

The annotated tag, v4.20 has been created at 012caf0bb40788cf3c7b876bababe810007b9996 (tag) tagging 8fe28cb58bcb235034b64cbbb7550a8a43fd88be (commit) replaces v4.20-rc7 tagged by Linus Torvalds on Sun Dec 23 15:56:06 2018 -0800 - Shortlog ------------------------------------------------------------ Linux 4.20 -----BEGIN PGP SIGNATURE----- iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAlwgIJYeHHRvcnZhbGRz QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiG0F4H/jwv83AI9qxd4Zsj geztCq0w1Vc48Gz/yDvl5MxZ74//q7Wz01qRTKisMNJla+Z0VuUReL12w0BGT0ko ZwPqrvPtM04pA7A6J+vLM8t6k7Ck0q7xC3z/Y9eN5qxtC7yOX/X8RziiXBmyMzM5 nVpFYQwlk9/hSUHjPwMgf2dV32vNYl3FEph3g6nrqQLLdtsHiii9N8rC+cAU2jKg sZ8Cp6REYYxt9LWEilsGof+oLnH+oUkXecB7WKKvSaAVHqR20xdpZ3ZvRcVyLfQ4 XCXBu8PIYYBWsa/iwuu0h4NuosGzEYbWOjnXKozOaV2KoqCT/Rk1egKIgb55EpyA kFH4wfc= =WAE7 -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

[batctl] maint's head updated: batctl: Drop incorrect check for existing meshif directory (8c5a028)
by postmaster＠open-mesh.org 24 Dec '18

24 Dec '18

Repository : ssh://git@open-mesh.org/batctl Branch 'maint' now includes: 13e32a2 batctl: Rename option_watch_interval to option_timeout_interval f11e64a batctl: Remove check of compiled_out files 8c5a028 batctl: Drop incorrect check for existing meshif directory

1 0

[batctl] master: batctl: Remove check of compiled_out files (f11e64a)
by postmaster＠open-mesh.org 24 Dec '18

24 Dec '18

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit f11e64ac9cf9d2d99c7655ebd39c058a6ad44f4e Author: Sven Eckelmann <sven(a)narfation.org> Date: Fri Dec 7 22:46:28 2018 +0100 batctl: Remove check of compiled_out files 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> >--------------------------------------------------------------- f11e64ac9cf9d2d99c7655ebd39c058a6ad44f4e 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 @@ open: 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"

1 0

[batctl] master: batctl: Drop incorrect check for existing meshif directory (8c5a028)
by postmaster＠open-mesh.org 24 Dec '18

24 Dec '18

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit 8c5a028cb509349c639cd2adffc7858d50855d32 Author: Sven Eckelmann <sven(a)narfation.org> Date: Fri Dec 7 22:46:29 2018 +0100 batctl: Drop incorrect check for existing meshif directory The (not silenced) read_file/write_file functions will check whether the directory of a file exists. This is used to determine whether the mesh interface was created. In that case, it will print: Error - mesh has not been enabled yet Activate your mesh by adding interfaces to batman-adv This is most of the time wrong because only a limited number of commands will call these function: * gw_mode * log * loglevel * routing_algo * backbonetable * claimtable * dat_cache * gateways * mcast_flags * nc_nodes * neighbors * originators * transglobal * translocal Beside routing_algo, every command is marked as COMMAND_FLAG_MESH_IFACE and therefore already requested a check to make sure that the specified meshif existed at some point. This message is especially confusing because debugfs can be disabled in batman-adv. If it was compiled without debugfs and the user tries to still use `batctl log`, the log command will fail with an incorrect error message instead of showing a more detailed (and more correct): Error - can't open file '/sys/kernel/debug//batman_adv/bat0/log': No such file or directory The option you called seems not to be compiled into your batman-adv kernel module. Consult the README if you wish to learn more about compiling options into batman-adv. And for routing_algo, the problem of the missing batman-adv module should already be catched when the batman-adv module version path is checked. Reported-by: Andre Kasper <andre.kasper(a)gmx.de> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 8c5a028cb509349c639cd2adffc7858d50855d32 functions.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/functions.c b/functions.c index 9a130e1..9d64c62 100644 --- a/functions.c +++ b/functions.c @@ -149,12 +149,6 @@ static void file_open_problem_dbg(const char *dir, const char *full_path) return; } - if (!file_exists(dir)) { - fprintf(stderr, "Error - mesh has not been enabled yet\n"); - fprintf(stderr, "Activate your mesh by adding interfaces to batman-adv\n"); - return; - } - fprintf(stderr, "Error - can't open file '%s': %s\n", full_path, strerror(errno)); 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");

1 0

[batctl] master: Merge branch 'maint' (e24c95f)
by postmaster＠open-mesh.org 24 Dec '18

24 Dec '18

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit e24c95fd27f45721f00aad9672a55c8d4af573c2 Merge: 07d3739 8c5a028 Author: Sven Eckelmann <sven(a)narfation.org> Date: Mon Dec 24 21:49:44 2018 +0100 Merge branch 'maint' >--------------------------------------------------------------- e24c95fd27f45721f00aad9672a55c8d4af573c2 bridge_loop_avoidance.c | 2 +- debug.c | 4 ++-- debug.h | 2 +- distributed_arp_table.c | 2 +- functions.c | 42 +++++------------------------------------- loglevel.c | 2 ++ multicast_mode.c | 2 +- network_coding.c | 2 +- originators.c | 2 +- sys.h | 6 ------ 10 files changed, 15 insertions(+), 51 deletions(-)

1 0

[batctl] master: batctl: Rename option_watch_interval to option_timeout_interval (13e32a2)
by postmaster＠open-mesh.org 24 Dec '18

24 Dec '18

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit 13e32a21de003d40a1607b9838a9d6c1d7cbf73c Author: Sven Eckelmann <sven(a)narfation.org> Date: Fri Dec 7 21:50:13 2018 +0100 batctl: Rename option_watch_interval to option_timeout_interval 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> >--------------------------------------------------------------- 13e32a21de003d40a1607b9838a9d6c1d7cbf73c 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, };

1 0

[batman-adv] maint's head updated: batman-adv: Allow to disable depmod (880190ad)
by postmaster＠open-mesh.org 24 Dec '18

24 Dec '18

Repository : ssh://git@open-mesh.org/batman-adv Branch 'maint' now includes: 880190ad batman-adv: Allow to disable depmod

1 0

[batman-adv] master: Merge branch 'maint' (983e4981)
by postmaster＠open-mesh.org 24 Dec '18

24 Dec '18

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 983e498130cc07fd383edafcd0425e377df3dfb1 Merge: 820a6641 880190ad Author: Sven Eckelmann <sven(a)narfation.org> Date: Mon Dec 24 21:46:16 2018 +0100 Merge branch 'maint' >--------------------------------------------------------------- 983e498130cc07fd383edafcd0425e377df3dfb1 Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

1 0

[batman-adv] master: batman-adv: Allow to disable depmod (880190ad)
by postmaster＠open-mesh.org 24 Dec '18

24 Dec '18

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 880190ad7c5aab3c868324db46ba7f853aa8e741 Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Dec 6 07:36:20 2018 +0100 batman-adv: Allow to disable depmod 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> >--------------------------------------------------------------- 880190ad7c5aab3c868324db46ba7f853aa8e741 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

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits December 2018