B.A.T.M.A.N February 2015

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

14 participants
32 discussions

by Marek Lindner

Hi, at the battlemesh we had plenty of time to discuss and test the tvlv patchset. Therefore, a number of changes/fixes found their way into v2 touching the tvlv API, network coding, unicast sending and gateway announcements. This looks like the final version which is going to be merged unless objections are raised soon-ish. Cheers, Marek

7 years, 9 months

[B.A.T.M.A.N.] [PATCHv14 0/6] Basic Multicast Optimizations

by Linus Lüssing

This is the fourteenth revision of the basic multicast optimization patches. Changes in v14 include: * fixed compilation for CONFIG_BATMAN_ADV_MCAST=n (issue was introduced by v13) * fixed potential null pointer exception (moved ethhdr assignment in batadv_mcast_forw_mode() to after the check methods / pskb_may_pull()s) * removed flag-list-"helper" functions * removed methods which were performing both counting and orig_node retrieval in batadv_mcast_forw_mode(), instead doing that in two logical, seperate sections in batadv_mcast_forw_mode() Cheers, Linus

7 years, 9 months

[B.A.T.M.A.N.] [PATCH 1/2] alfred: Update copyright years for 2015

by Sven Eckelmann

Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- Makefile | 2 +- alfred.h | 2 +- batadv_query.c | 2 +- batadv_query.h | 2 +- client.c | 2 +- gpsd/Makefile | 2 +- gpsd/alfred-gpsd.c | 2 +- gpsd/alfred-gpsd.h | 2 +- hash.c | 2 +- hash.h | 2 +- main.c | 2 +- netsock.c | 2 +- packet.h | 2 +- recv.c | 2 +- send.c | 2 +- server.c | 2 +- unix_sock.c | 2 +- util.c | 2 +- vis/Makefile | 2 +- vis/vis.c | 2 +- vis/vis.h | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/Makefile b/Makefile index 531339a..8e944c9 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ #!/usr/bin/make -f # -*- makefile -*- # -# Copyright (C) 2012-2014 B.A.T.M.A.N. contributors +# Copyright (C) 2012-2015 B.A.T.M.A.N. contributors # # This program is free software; you can redistribute it and/or # modify it under the terms of version 2 of the GNU General Public diff --git a/alfred.h b/alfred.h index f758fc9..ef00551 100644 --- a/alfred.h +++ b/alfred.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012-2014 B.A.T.M.A.N. contributors: + * Copyright (C) 2012-2015 B.A.T.M.A.N. contributors: * * Simon Wunderlich * diff --git a/batadv_query.c b/batadv_query.c index cf90554..473ab40 100644 --- a/batadv_query.c +++ b/batadv_query.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012-2014 B.A.T.M.A.N. contributors: + * Copyright (C) 2012-2015 B.A.T.M.A.N. contributors: * * Simon Wunderlich * diff --git a/batadv_query.h b/batadv_query.h index 463c8e1..6b938ea 100644 --- a/batadv_query.h +++ b/batadv_query.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2014 B.A.T.M.A.N. contributors: + * Copyright (C) 2006-2015 B.A.T.M.A.N. contributors: * * Simon Wunderlich, Marek Lindner * diff --git a/client.c b/client.c index cff5270..32fdd54 100644 --- a/client.c +++ b/client.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012-2014 B.A.T.M.A.N. contributors: + * Copyright (C) 2012-2015 B.A.T.M.A.N. contributors: * * Simon Wunderlich * diff --git a/gpsd/Makefile b/gpsd/Makefile index 7ac6288..5055987 100644 --- a/gpsd/Makefile +++ b/gpsd/Makefile @@ -1,7 +1,7 @@ #!/usr/bin/make -f # -*- makefile -*- # -# Copyright (C) 2013-2014 B.A.T.M.A.N. contributors +# Copyright (C) 2013-2015 B.A.T.M.A.N. contributors # # This program is free software; you can redistribute it and/or # modify it under the terms of version 2 of the GNU General Public diff --git a/gpsd/alfred-gpsd.c b/gpsd/alfred-gpsd.c index d736ad1..86414cf 100644 --- a/gpsd/alfred-gpsd.c +++ b/gpsd/alfred-gpsd.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013-2014 B.A.T.M.A.N. contributors: + * Copyright (C) 2013-2015 B.A.T.M.A.N. contributors: * * Andrew Lunn, Simon Wunderlich * diff --git a/gpsd/alfred-gpsd.h b/gpsd/alfred-gpsd.h index e287110..297f4e4 100644 --- a/gpsd/alfred-gpsd.h +++ b/gpsd/alfred-gpsd.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013-2014 B.A.T.M.A.N. contributors: + * Copyright (C) 2013-2015 B.A.T.M.A.N. contributors: * * Andrew Lunn, Simon Wunderlich * diff --git a/hash.c b/hash.c index fd85a0f..87e8484 100644 --- a/hash.c +++ b/hash.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2014 B.A.T.M.A.N. contributors: + * Copyright (C) 2006-2015 B.A.T.M.A.N. contributors: * * Simon Wunderlich, Marek Lindner * diff --git a/hash.h b/hash.h index c9c8fb1..aa27f25 100644 --- a/hash.h +++ b/hash.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2014 B.A.T.M.A.N. contributors: + * Copyright (C) 2006-2015 B.A.T.M.A.N. contributors: * * Simon Wunderlich, Marek Lindner * diff --git a/main.c b/main.c index 7eb8baa..d298d65 100644 --- a/main.c +++ b/main.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012-2014 B.A.T.M.A.N. contributors: + * Copyright (C) 2012-2015 B.A.T.M.A.N. contributors: * * Simon Wunderlich * diff --git a/netsock.c b/netsock.c index 45c03e9..cc2e9a5 100644 --- a/netsock.c +++ b/netsock.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012-2014 B.A.T.M.A.N. contributors: + * Copyright (C) 2012-2015 B.A.T.M.A.N. contributors: * * Simon Wunderlich * diff --git a/packet.h b/packet.h index 87ad263..27ee6e5 100644 --- a/packet.h +++ b/packet.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012-2014 B.A.T.M.A.N. contributors: + * Copyright (C) 2012-2015 B.A.T.M.A.N. contributors: * * Simon Wunderlich, Sven Eckelmann * diff --git a/recv.c b/recv.c index 870485f..34a16fc 100644 --- a/recv.c +++ b/recv.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012-2014 B.A.T.M.A.N. contributors: + * Copyright (C) 2012-2015 B.A.T.M.A.N. contributors: * * Simon Wunderlich * diff --git a/send.c b/send.c index 19cc867..f1843fe 100644 --- a/send.c +++ b/send.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012-2014 B.A.T.M.A.N. contributors: + * Copyright (C) 2012-2015 B.A.T.M.A.N. contributors: * * Simon Wunderlich * diff --git a/server.c b/server.c index 66809d9..1a3d876 100644 --- a/server.c +++ b/server.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012-2014 B.A.T.M.A.N. contributors: + * Copyright (C) 2012-2015 B.A.T.M.A.N. contributors: * * Simon Wunderlich * diff --git a/unix_sock.c b/unix_sock.c index 8a99327..d203c50 100644 --- a/unix_sock.c +++ b/unix_sock.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012-2014 B.A.T.M.A.N. contributors: + * Copyright (C) 2012-2015 B.A.T.M.A.N. contributors: * * Simon Wunderlich * diff --git a/util.c b/util.c index 9f357cd..84d4b2d 100644 --- a/util.c +++ b/util.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012-2014 B.A.T.M.A.N. contributors: + * Copyright (C) 2012-2015 B.A.T.M.A.N. contributors: * * Simon Wunderlich * diff --git a/vis/Makefile b/vis/Makefile index 9421ae2..32a578e 100644 --- a/vis/Makefile +++ b/vis/Makefile @@ -1,7 +1,7 @@ #!/usr/bin/make -f # -*- makefile -*- # -# Copyright (C) 2013-2014 B.A.T.M.A.N. contributors +# Copyright (C) 2013-2015 B.A.T.M.A.N. contributors # # This program is free software; you can redistribute it and/or # modify it under the terms of version 2 of the GNU General Public diff --git a/vis/vis.c b/vis/vis.c index 3dd5c8c..038d89d 100644 --- a/vis/vis.c +++ b/vis/vis.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013-2014 B.A.T.M.A.N. contributors: + * Copyright (C) 2013-2015 B.A.T.M.A.N. contributors: * * Simon Wunderlich * diff --git a/vis/vis.h b/vis/vis.h index ac2afb5..a23dc83 100644 --- a/vis/vis.h +++ b/vis/vis.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013-2014 B.A.T.M.A.N. contributors: + * Copyright (C) 2013-2015 B.A.T.M.A.N. contributors: * * Simon Wunderlich * -- 2.1.4

7 years, 11 months

[B.A.T.M.A.N.] [PATCH v2 00/26] batman-adv: Cleanups

by Markus Pargmann

Hi, this is v2 of this series. I removed the hashtable patches for the moment. The types.h patch is fixed to include linux headers only when compiling for the kernel so that it can still be used in batctl. Major changes (Patch 1-7): - Compiling debugfs.c only when CONFIG_DEBUG_FS is selected. This reduces the amount of unnecessary code that is executed. At the moment all calls to debugfs functions will result in NOOPs. However there is some more code that we simply don't need without DEBUG_FS. - tvlv is separated from the large main.c file into its own tvlv.c. I don't see a reason to have this set of functions for tvlv inside the main.c file. Minor changes (Patch 8-26): - Removing unnecessary return value variables - Fixing some comments - Reordering functions to increase readability - Coding style fixes - Declare boolean return types as bool - Add missing includes Best regards, Markus Markus Pargmann (26): batman-adv: debugfs, avoid compiling for !DEBUG_FS batman-adv: Separate logging header batman-adv: iv_ogm, Reduce code duplication batman-adv: iv_ogm, divide and round for ring buffer avg batman-adv: init, Add some error handling batman-adv: tvlv realloc, move error handling into if block batman-adv: split tvlv into a seperate file batman-adv: Makefile, Sort alphabetically batman-adv: iv_ogm_iface_enable, direct return values batman-adv: iv_ogm_aggr_packet, bool return value batman-adv: iv_ogm_send_to_if, declare char* as const batman-adv: iv_ogm_can_aggregate, code readability batman-adv: iv_ogm_orig_update, remove unnecessary brackets batman-adv: iv_ogm_aggregate_new, simplify error handling batman-adv: iv_ogm_queue_add, Simplify expressions batman-adv: iv_ogm_orig_update, style, add missin brackets batman-adv: iv_ogm, Fix dup_status comment batman-adv: iv_ogm, fix coding style batman-adv: iv_ogm, fix comment function name batman-adv: types, Fix comment on bcast_own batman-adv: main, Convert is_my_mac() to bool batman-adv: main, batadv_compare_eth return bool batman-adv: Remove unnecessary ret variable batman-adv: Remove unnecessary ret variable in algo_register batman-adv: packet.h, add some missing includes batman-adv: types.h, add missing include Makefile.kbuild | 5 +- bat_iv_ogm.c | 239 +++++++++--------- bitarray.c | 1 + bridge_loop_avoidance.c | 1 + debugfs.c | 9 +- debugfs.h | 39 +++ distributed-arp-table.c | 2 + gateway_client.c | 1 + gateway_common.c | 2 + hard-interface.c | 1 + icmp_socket.c | 1 + log.h | 82 +++++++ main.c | 626 +++--------------------------------------------- main.h | 101 +------- multicast.c | 1 + network-coding.c | 2 + originator.c | 1 + packet.h | 5 + routing.c | 2 + send.c | 1 + sysfs.c | 1 + translation-table.c | 2 + tvlv.c | 592 +++++++++++++++++++++++++++++++++++++++++++++ tvlv.h | 62 +++++ types.h | 8 +- 25 files changed, 967 insertions(+), 820 deletions(-) create mode 100644 log.h create mode 100644 tvlv.c create mode 100644 tvlv.h -- 2.1.3

8 years

[B.A.T.M.A.N.] [PATCH] alfred: Add explanation how to run alfred as non-root user

by Sven Eckelmann

Reported-by: MK <mailing.m1(a)kkk-web.de> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- README | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/README b/README index 90a99de..205c156 100644 --- a/README +++ b/README @@ -256,6 +256,32 @@ To get JSON formatted output, use: See gpsd_json(5) for documentation of the tpv object. +Running alfred as non-root user +------------------------------- + +Alfred currently requires special capabilities and access rights to work +correctly. The user root is normally the only user having these +capabilities/rights on a standard Linux system. + +Operations requiring special capabilities: + + * bind to device + * creating the unix socket + * accessing the debugfs filesystem + +The first operation can still be executed when the admin grants the special +capability CAP_NET_RAW to anyone executing the alfred binary. The unix socket +can also be moved to a different directly which is accessible by the user by +adding the parameter '-u'. + + $ sudo setcap cap_net_raw+ep alfred + $ ./alfred -u alfred.sock -i eth0 + +The user running alfred must still be in a group which is allowed to access +/sys/kernel/debugfs to correctly choose best neighbors for communication. +It is possible (but not recommended) to disable the neighbor +selection/prioritization using the parameter '-b none'. + License ------- -- 2.1.4

8 years

[B.A.T.M.A.N.] [PATCH] alfred: Drop capabilities when not needed

by Sven Eckelmann

The alfred process only requires the capability to bind to a raw socket (CAP_NET_RAW). It is enough to mark this capability as permitted on program startup and mark it again as effective whenever a new netsock is initialized. All other capabilities can be dropped completely. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- Makefile | 24 ++++++++++++++++++ main.c | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- netsock.c | 44 +++++++++++++++++++++++++++++++++ 3 files changed, 151 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 8e944c9..4e22d76 100644 --- a/Makefile +++ b/Makefile @@ -27,6 +27,9 @@ MANPAGE = man/alfred.8 CFLAGS += -pedantic -Wall -W -std=gnu99 -fno-strict-aliasing -MD -MP LDLIBS += -lrt +# B.A.T.M.A.N. debugging: +export CONFIG_ALFRED_CAPABILITIES=y + # disable verbose output ifneq ($(findstring $(MAKEFLAGS),s),s) ifndef V @@ -70,6 +73,27 @@ ifneq ($(CONFIG_ALFRED_GPSD),n) GPSD_INSTALL=gpsd-install endif +ifneq ($(CONFIG_ALFRED_CAPABILITIES),n) + ifeq ($(origin PKG_CONFIG), undefined) + PKG_CONFIG = pkg-config + ifeq ($(shell which $(PKG_CONFIG) 2>/dev/null),) + $(error $(PKG_CONFIG) not found) + endif + endif + + ifeq ($(origin LIBCAP_CFLAGS) $(origin LIBCAP_LDLIBS), undefined undefined) + LIBCAP_NAME ?= libcap + ifeq ($(shell $(PKG_CONFIG) --modversion $(LIBCAP_NAME) 2>/dev/null),) + $(error No $(LIBCAP_NAME) development libraries found!) + endif + LIBCAP_CFLAGS += $(shell $(PKG_CONFIG) --cflags $(LIBCAP_NAME)) + LIBCAP_LDLIBS += $(shell $(PKG_CONFIG) --libs $(LIBCAP_NAME)) + endif + CFLAGS += $(LIBCAP_CFLAGS) + CPPFLAGS += -DCONFIG_ALFRED_CAPABILITIES + LDLIBS += $(LIBCAP_LDLIBS) +endif + # default target all: $(BINARY_NAME) $(VIS_ALL) $(GPSD_ALL) diff --git a/main.c b/main.c index d298d65..982bd2a 100644 --- a/main.c +++ b/main.c @@ -24,6 +24,11 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> +#ifdef CONFIG_ALFRED_CAPABILITIES +#include <sys/prctl.h> +#include <sys/capability.h> +#include <unistd.h> +#endif #include "alfred.h" #include "packet.h" #include "list.h" @@ -60,9 +65,82 @@ static void alfred_usage(void) printf("\n"); } +static int reduce_capabilities(void) +{ + int ret = 0; + +#ifdef CONFIG_ALFRED_CAPABILITIES + cap_t cap_cur; + cap_t cap_new; + cap_flag_value_t cap_flag; + cap_value_t cap_net_raw = CAP_NET_RAW; + + /* get current process capabilities */ + cap_cur = cap_get_proc(); + if (!cap_cur) { + perror("cap_get_proc"); + return -1; + } + + /* create new capabilities */ + cap_new = cap_init(); + if (!cap_new) { + perror("cap_init"); + cap_free(cap_new); + return -1; + } + + /* copy capability as non-effictive but permitted */ + cap_flag = CAP_CLEAR; + cap_get_flag(cap_cur, CAP_NET_RAW, CAP_PERMITTED, &cap_flag); + if (cap_flag != CAP_CLEAR) { + ret = cap_set_flag(cap_new, CAP_PERMITTED, 1, &cap_net_raw, + CAP_SET); + if (ret < 0) { + perror("cap_set_flag"); + goto out; + } + } + + /* set minimal capabilities field */ + ret = cap_set_proc(cap_new); + if (ret < 0) { + perror("cap_set_proc"); + goto out; + } + + /* don't drop capabilities with setuid */ + ret = prctl(PR_SET_KEEPCAPS, 1); + if (ret < 0) { + perror("prctl PR_SET_KEEPCAPS(1)"); + goto out; + } + + /* drop euid */ + ret = setuid(getuid()); + if (ret < 0) { + perror("setuid"); + goto out; + } + + /* drop capabilities with setuid */ + ret = prctl(PR_SET_KEEPCAPS, 0); + if (ret < 0) { + perror("prctl PR_SET_KEEPCAPS(0)"); + goto out; + } + +out: + cap_free(cap_new); + cap_free(cap_cur); +#endif + + return ret; +} + static struct globals *alfred_init(int argc, char *argv[]) { - int opt, opt_ind, i; + int opt, opt_ind, i, ret; struct globals *globals; struct option long_options[] = { {"set-data", required_argument, NULL, 's'}, @@ -78,6 +156,10 @@ static struct globals *alfred_init(int argc, char *argv[]) {NULL, 0, NULL, 0}, }; + ret = reduce_capabilities(); + if (ret < 0) + return NULL; + globals = &alfred_globals; memset(globals, 0, sizeof(*globals)); diff --git a/netsock.c b/netsock.c index cc2e9a5..592f3e3 100644 --- a/netsock.c +++ b/netsock.c @@ -34,6 +34,9 @@ #include <sys/types.h> #include <stdlib.h> #include <sys/select.h> +#ifdef CONFIG_ALFRED_CAPABILITIES +#include <sys/capability.h> +#endif #include "alfred.h" #include "batadv_query.h" #include "packet.h" @@ -165,6 +168,45 @@ int netsock_set_interfaces(struct globals *globals, char *interfaces) return 0; } +static int enable_raw_bind_capability(int enable) +{ + int ret = 0; + +#ifdef CONFIG_ALFRED_CAPABILITIES + cap_t cap_cur; + cap_flag_value_t cap_flag; + cap_value_t cap_net_raw = CAP_NET_RAW; + + if (enable) + cap_flag = CAP_SET; + else + cap_flag = CAP_CLEAR; + + cap_cur = cap_get_proc(); + if (!cap_cur) { + perror("cap_get_proc"); + return -1; + } + + ret = cap_set_flag(cap_cur, CAP_EFFECTIVE, 1, &cap_net_raw, cap_flag); + if (ret < 0) { + perror("cap_set_flag"); + goto out; + } + + ret = cap_set_proc(cap_cur); + if (ret < 0) { + perror("cap_set_proc"); + goto out; + } + +out: + cap_free(cap_cur); +#endif + + return ret; +} + static int netsock_open(struct interface *interface) { int sock; @@ -204,11 +246,13 @@ static int netsock_open(struct interface *interface) memcpy(&interface->hwaddr, &ifr.ifr_hwaddr.sa_data, 6); mac_to_ipv6(&interface->hwaddr, &interface->address); + enable_raw_bind_capability(1); if (setsockopt(sock, SOL_SOCKET, SO_BINDTODEVICE, interface->interface, strlen(interface->interface) + 1)) { perror("can't bind to device"); goto err; } + enable_raw_bind_capability(0); if (bind(sock, (struct sockaddr *)&sin6, sizeof(sin6)) < 0) { perror("can't bind"); -- 2.1.4

8 years

[B.A.T.M.A.N.] [PATCH 1/2] batman-adv: split name from variable for uint mesh attributes

by Marek Lindner

From: Antonio Quartulli <antonio(a)open-mesh.com> Some mesh attributes are behind substructs in the batadv_priv object and for this reason the name cannot be used anymore to refer to them. This patch allows to specify the variable name where the attribute is stored inside batadv_priv instead of using the name Signed-off-by: Antonio Quartulli <antonio(a)open-mesh.com> --- sysfs.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/sysfs.c b/sysfs.c index a63c3eb..97a6192 100644 --- a/sysfs.c +++ b/sysfs.c @@ -151,7 +151,7 @@ ssize_t batadv_show_##_name(struct kobject *kobj, \ static BATADV_ATTR(_name, _mode, batadv_show_##_name, \ batadv_store_##_name) -#define BATADV_ATTR_SIF_STORE_UINT(_name, _min, _max, _post_func) \ +#define BATADV_ATTR_SIF_STORE_UINT(_name, _var, _min, _max, _post_func) \ ssize_t batadv_store_##_name(struct kobject *kobj, \ struct attribute *attr, char *buff, \ size_t count) \ @@ -161,24 +161,24 @@ ssize_t batadv_store_##_name(struct kobject *kobj, \ \ return __batadv_store_uint_attr(buff, count, _min, _max, \ _post_func, attr, \ - &bat_priv->_name, net_dev); \ + &bat_priv->_var, net_dev); \ } -#define BATADV_ATTR_SIF_SHOW_UINT(_name) \ +#define BATADV_ATTR_SIF_SHOW_UINT(_name, _var) \ ssize_t batadv_show_##_name(struct kobject *kobj, \ struct attribute *attr, char *buff) \ { \ struct batadv_priv *bat_priv = batadv_kobj_to_batpriv(kobj); \ \ - return sprintf(buff, "%i\n", atomic_read(&bat_priv->_name)); \ + return sprintf(buff, "%i\n", atomic_read(&bat_priv->_var)); \ } \ /* Use this, if you are going to set [name] in the soft-interface * (bat_priv) to an unsigned integer value */ -#define BATADV_ATTR_SIF_UINT(_name, _mode, _min, _max, _post_func) \ - static BATADV_ATTR_SIF_STORE_UINT(_name, _min, _max, _post_func)\ - static BATADV_ATTR_SIF_SHOW_UINT(_name) \ +#define BATADV_ATTR_SIF_UINT(_name, _var, _mode, _min, _max, _post_func)\ + static BATADV_ATTR_SIF_STORE_UINT(_name, _var, _min, _max, _post_func)\ + static BATADV_ATTR_SIF_SHOW_UINT(_name, _var) \ static BATADV_ATTR(_name, _mode, batadv_show_##_name, \ batadv_store_##_name) @@ -540,19 +540,20 @@ BATADV_ATTR_SIF_BOOL(fragmentation, S_IRUGO | S_IWUSR, batadv_update_min_mtu); static BATADV_ATTR(routing_algo, S_IRUGO, batadv_show_bat_algo, NULL); static BATADV_ATTR(gw_mode, S_IRUGO | S_IWUSR, batadv_show_gw_mode, batadv_store_gw_mode); -BATADV_ATTR_SIF_UINT(orig_interval, S_IRUGO | S_IWUSR, 2 * BATADV_JITTER, - INT_MAX, NULL); -BATADV_ATTR_SIF_UINT(hop_penalty, S_IRUGO | S_IWUSR, 0, BATADV_TQ_MAX_VALUE, - NULL); -BATADV_ATTR_SIF_UINT(gw_sel_class, S_IRUGO | S_IWUSR, 1, BATADV_TQ_MAX_VALUE, - batadv_post_gw_reselect); +BATADV_ATTR_SIF_UINT(orig_interval, orig_interval, S_IRUGO | S_IWUSR, + 2 * BATADV_JITTER, INT_MAX, NULL); +BATADV_ATTR_SIF_UINT(hop_penalty, hop_penalty, S_IRUGO | S_IWUSR, 0, + BATADV_TQ_MAX_VALUE, NULL); +BATADV_ATTR_SIF_UINT(gw_sel_class, gw_sel_class, S_IRUGO | S_IWUSR, 1, + BATADV_TQ_MAX_VALUE, batadv_post_gw_reselect); static BATADV_ATTR(gw_bandwidth, S_IRUGO | S_IWUSR, batadv_show_gw_bwidth, batadv_store_gw_bwidth); #ifdef CONFIG_BATMAN_ADV_MCAST BATADV_ATTR_SIF_BOOL(multicast_mode, S_IRUGO | S_IWUSR, NULL); #endif #ifdef CONFIG_BATMAN_ADV_DEBUG -BATADV_ATTR_SIF_UINT(log_level, S_IRUGO | S_IWUSR, 0, BATADV_DBG_ALL, NULL); +BATADV_ATTR_SIF_UINT(log_level, log_level, S_IRUGO | S_IWUSR, 0, + BATADV_DBG_ALL, NULL); #endif #ifdef CONFIG_BATMAN_ADV_NC BATADV_ATTR_SIF_BOOL(network_coding, S_IRUGO | S_IWUSR, -- 2.1.4

8 years

[B.A.T.M.A.N.] use_count = 1 / device stuck on reboot or netifd restart

by Ufo

in leipzig since months we have problems with batman-adv and these start/stop scripts or netifd-stuff. we thought that this might be our own special problem, because we are using more than one batman-adv instance (separated by vlan). but its still there, also on openwrt-cc-trunk, now also on our batman-adv super-gluon-node-servers (using fastd) on virtualized x86-openwrt. so f.i. i can crash that system in a way by: etc/init.d/fastd stop please help us and have a look at our local ticket number 23 https://github.com/freifunk/firmware-leipzig/issues/23 good luck ufo root@vpnb9:~# batctl -v batctl 2014.4.0 [batman-adv: 2014.4.0] root@vpnb9:~# fastd -v fastd v17 root@vpnb9:~# cat /etc/openwrt_* DISTRIB_ID='OpenWrt' DISTRIB_RELEASE='Bleeding Edge' DISTRIB_REVISION='r44497' DISTRIB_CODENAME='chaos_calmer' DISTRIB_TARGET='x86/kvm_guest' DISTRIB_DESCRIPTION='OpenWrt Chaos Calmer r44497' DISTRIB_TAINTS='' r44497 -- --- Freifunk Leipzig http://leipzig.freifunk.net

8 years

[B.A.T.M.A.N.] [PATCH] batman-adv: Remove uses of return value of seq_printf

by Joe Perches

This function is soon going to return void so remove the return value use. Convert the return value to test seq_has_overflowed() instead. Signed-off-by: Joe Perches <joe(a)perches.com> --- net/batman-adv/gateway_client.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/net/batman-adv/gateway_client.c b/net/batman-adv/gateway_client.c index 27649e8..a0876ea 100644 --- a/net/batman-adv/gateway_client.c +++ b/net/batman-adv/gateway_client.c @@ -592,15 +592,16 @@ static int batadv_write_buffer_text(struct batadv_priv *bat_priv, curr_gw = batadv_gw_get_selected_gw_node(bat_priv); - ret = seq_printf(seq, "%s %pM (%3i) %pM [%10s]: %u.%u/%u.%u MBit\n", - (curr_gw == gw_node ? "=>" : " "), - gw_node->orig_node->orig, - router_ifinfo->bat_iv.tq_avg, router->addr, - router->if_incoming->net_dev->name, - gw_node->bandwidth_down / 10, - gw_node->bandwidth_down % 10, - gw_node->bandwidth_up / 10, - gw_node->bandwidth_up % 10); + seq_printf(seq, "%s %pM (%3i) %pM [%10s]: %u.%u/%u.%u MBit\n", + (curr_gw == gw_node ? "=>" : " "), + gw_node->orig_node->orig, + router_ifinfo->bat_iv.tq_avg, router->addr, + router->if_incoming->net_dev->name, + gw_node->bandwidth_down / 10, + gw_node->bandwidth_down % 10, + gw_node->bandwidth_up / 10, + gw_node->bandwidth_up % 10); + ret = seq_has_overflowed(seq); if (curr_gw) batadv_gw_node_free_ref(curr_gw);

8 years

[B.A.T.M.A.N.] checkpatch: CHECK: No space is necessary after a cast

by Marek Lindner

Hi Joe, we have come across a checkpatch false-positive: >>>> static void batadv_recv_handler_init(void) { int i; for (i = 0; i < ARRAY_SIZE(batadv_rx_handler); i++) batadv_rx_handler[i] = batadv_recv_unhandled_packet; for (i = BATADV_UNICAST_MIN; i <= BATADV_UNICAST_MAX; i++) batadv_rx_handler[i] = batadv_recv_unhandled_unicast_packet; /* compile time checks for sizes */ BUILD_BUG_ON(sizeof(struct batadv_bla_claim_dst) != 6); BUILD_BUG_ON(sizeof(struct batadv_ogm_packet) != 24); BUILD_BUG_ON(sizeof(struct batadv_icmp_header) != 20); .. } <<<<< The following warnings are triggered: CHECK: No space is necessary after a cast #440: FILE: main.c:440: + BUILD_BUG_ON(sizeof(struct batadv_bla_claim_dst) != 6); CHECK: No space is necessary after a cast #441: FILE: main.c:441: + BUILD_BUG_ON(sizeof(struct batadv_ogm_packet) != 24); CHECK: No space is necessary after a cast #442: FILE: main.c:442: + BUILD_BUG_ON(sizeof(struct batadv_icmp_header) != 20); Can you make a suggestion / patch for checkpatch to better handle this case ? Thanks, Marek

8 years, 1 month

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N February 2015