B.A.T.M.A.N

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

15 participants
4308 discussions

[B.A.T.M.A.N.] switch routing algorithm at runtime (v2)
by Marek Lindner 22 Dec '11

22 Dec '11

Hi, next round for the selectable routing algorithm patches. The major change which comes with this patchset is the module parameter that allows to set the routing algorithm. This setting only affects batX interfaces created after the change has been made. The list of available routing algorithms moved to the batman-adv debugfs root directory, so that it is visible even before the first batX interface has been created. The sysfs entry still shows the configured routing algorithm but does not allow to change it. Big kudos to Sven for helping me out with the compat macros. Cheers, Marek

1 8

[B.A.T.M.A.N.] [PATCH] batman-adv: checkpatch cleanup - remove lines longer than 80 chars
by Marek Lindner 20 Dec '11

20 Dec '11

The long line was introduced with b26e478f8f. Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> --- net/batman-adv/translation-table.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index ab8dea8..58361ed 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -679,7 +679,7 @@ void tt_global_del(struct bat_priv *bat_priv, * 2) the client roamed to us => we can directly delete * the global entry, since it is useless now. */ tt_local_entry = tt_local_hash_find(bat_priv, - tt_global_entry->common.addr); + tt_global_entry->common.addr); if (!tt_local_entry) { tt_global_entry->common.flags |= TT_CLIENT_ROAM; tt_global_entry->roam_at = jiffies; -- 1.7.5.4

3 5

[B.A.T.M.A.N.] pull request: batman-adv 2011-12-12
by Marek Lindner 13 Dec '11

13 Dec '11

Hi David, here comes the next batch I'd like to get the pulled into net-next-2.6/3.3. We have a couple of minor fixes for unregister_netdevice(), compat flags, return value checks and a readme update. Plus the regression fix from Dan that addresses a bug introduced with the previous batch. Security researcher Paul Kot checked our kernelland / user space communication and found a subtle bug which would make batman-adv write to memory locations it should not write to. However, he did not find a way to exploit this bug, therefore we classified it as "non-critical". Please let us know if that is not ok with you. Thanks, Marek The following changes since commit 76e8d7b0d1b0091929e8cd18551a87b6bb6ef2c1: batman-adv: Fix range check for expected packets (2011-11-20 13:08:35 +0100) are available in the git repository at: git://git.open-mesh.org/linux-merge.git batman-adv/next Antonio Quartulli (3): batman-adv: create a common substructure for tt_global/local_entry batman-adv: generalise tt_local_reset_flags() batman-adv: format multi-line if in the correct way Dan Carpenter (1): batman-adv: remove extra negation in gw_out_of_range() Marek Lindner (2): batman-adv: report compat_version in version field in case of version mismatch batman-adv: readme update (mention ap isolation and new log level) Paul Kot (1): batman-adv: bat_socket_read missing checks Simon Wunderlich (2): batman-adv: check return value for hash_add() batman-adv: use unregister_netdevice() when softif_create fails Sven Eckelmann (2): batman-adv: Directly check read of icmp packet in copy_from_user batman-adv: Only write requested number of byte to user buffer Documentation/networking/batman-adv.txt | 7 +- net/batman-adv/gateway_client.c | 2 +- net/batman-adv/icmp_socket.c | 14 +- net/batman-adv/routing.c | 3 +- net/batman-adv/soft-interface.c | 2 +- net/batman-adv/translation-table.c | 336 ++++++++++++++++++------------- net/batman-adv/types.h | 14 +- net/batman-adv/vis.c | 6 +- 8 files changed, 216 insertions(+), 168 deletions(-)

2 12

[B.A.T.M.A.N.] bat_socket_read missing checks
by Paul 12 Dec '11

12 Dec '11

Writing a icmp_packet_rr and then reading icmp_packet can lead to kernel memory corruption, if __user *buf is just below TASK_SIZE. -- Regards, Paul

3 7

[B.A.T.M.A.N.] [PATCH] batctl: fix log level 'all'
by Marek Lindner 10 Dec '11

10 Dec '11

Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> --- sys.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/sys.c b/sys.c index e510bee..105bb51 100644 --- a/sys.c +++ b/sys.c @@ -213,7 +213,7 @@ int handle_loglevel(char *mesh_iface, int argc, char **argv) log_level = 0; break; } else if (strcmp(argv[i], "all") == 0) { - log_level = 15; + log_level = 7; break; } else if (strcmp(argv[i], "batman") == 0) log_level |= (1 << 0); -- 1.7.5.4

1 1

[B.A.T.M.A.N.] [PATCH] batman-adv: Generate config compatible with kbuild macros
by Sven Eckelmann 10 Dec '11

10 Dec '11

Linux 3.0-rc1-30-g2a11c8e introduced the macros IS_ENABLED, IS_BUILTIN and IS_MODULE that can be used to identify which state a tristate option had. The compat-autoconf.h needs to provide additional precompiler variables that these marcros can use. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- gen-compat-autoconf.sh | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/gen-compat-autoconf.sh b/gen-compat-autoconf.sh index 440accc..1a020c1 100755 --- a/gen-compat-autoconf.sh +++ b/gen-compat-autoconf.sh @@ -12,15 +12,22 @@ gen_config() { VALUE="${2}" echo "#undef ${KEY}" + echo "#undef __enabled_${KEY}" + echo "#undef __enabled_${KEY}_MODULE" case "${VALUE}" in y) echo "#define ${KEY} 1" + echo "#define __enabled_${KEY} 1" + echo "#define __enabled_${KEY}_MODULE 0" ;; m) echo "#define ${KEY} 1" + echo "#define __enabled_${KEY} 0" + echo "#define __enabled_${KEY}_MODULE 1" ;; n) - # leave it undefined + echo "#define __enabled_${KEY} 0" + echo "#define __enabled_${KEY}_MODULE 0" ;; *) echo "#define ${KEY} \"${VALUE}\"" -- 1.7.7.3

2 1

[B.A.T.M.A.N.] [PATCH] batman-adv: warn if added interface is part of a bridge
by Marek Lindner 10 Dec '11

10 Dec '11

Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> --- Thanks to Sven we even have a 'nice' compat.h workaround. :) compat.h | 1 + hard-interface.c | 8 ++++++++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/compat.h b/compat.h index 964c066..dcd92d1 100644 --- a/compat.h +++ b/compat.h @@ -52,6 +52,7 @@ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 36) #define __rcu +#define IFF_BRIDGE_PORT 0 || (hard_iface->net_dev->br_port ? 1 : 0) #endif /* < KERNEL_VERSION(2, 6, 36) */ diff --git a/hard-interface.c b/hard-interface.c index d3e0e32..68b667c 100644 --- a/hard-interface.c +++ b/hard-interface.c @@ -281,6 +281,14 @@ int hardif_enable_interface(struct hard_iface *hard_iface, if (!atomic_inc_not_zero(&hard_iface->refcount)) goto out; + /* hard-interface is part of a bridge */ + if (hard_iface->net_dev->priv_flags & IFF_BRIDGE_PORT) + pr_err("You are about to enable batman-adv on '%s' which " + "already is part of a bridge. Unless you know exactly " + "what you are doing this is probably wrong and won't " + "work the way you think it would.\n", + hard_iface->net_dev->name); + soft_iface = dev_get_by_name(&init_net, iface_name); if (!soft_iface) { -- 1.7.5.4

1 1

[B.A.T.M.A.N.] [PATCH] batman-adv: Move is_out_of_time() to main.c for general use
by Martin Hundebøll 10 Dec '11

10 Dec '11

Both translation tables and network coding use timeouts to do house keeping, so we might as well share the function used to compare a timestamp+timeout with current time. Also, this patch removes a trailing newline in is_my_mac() to satisfy checkpatch Signed-off-by: Martin Hundebøll <martin(a)hundeboll.net> --- main.c | 4 ++++ main.h | 1 + translation-table.c | 8 -------- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/main.c b/main.c index fb87bdc..0930bb4 100644 --- a/main.c +++ b/main.c @@ -170,7 +170,11 @@ int is_my_mac(const uint8_t *addr) } rcu_read_unlock(); return 0; +} +bool is_out_of_time(unsigned long timestamp, unsigned long timeout) +{ + return time_is_before_jiffies(timestamp + msecs_to_jiffies(timeout)); } module_init(batman_init); diff --git a/main.h b/main.h index 464439f..92eb37b 100644 --- a/main.h +++ b/main.h @@ -159,6 +159,7 @@ void mesh_free(struct net_device *soft_iface); void inc_module_count(void); void dec_module_count(void); int is_my_mac(const uint8_t *addr); +bool is_out_of_time(unsigned long timestamp, unsigned long timeout); #ifdef CONFIG_BATMAN_ADV_DEBUG int debug_log(struct bat_priv *bat_priv, const char *fmt, ...) __printf(2, 3); diff --git a/translation-table.c b/translation-table.c index 7a7df4a..b22f8d9 100644 --- a/translation-table.c +++ b/translation-table.c @@ -108,14 +108,6 @@ static struct tt_global_entry *tt_global_hash_find(struct bat_priv *bat_priv, } -static bool is_out_of_time(unsigned long starting_time, unsigned long timeout) -{ - unsigned long deadline; - deadline = starting_time + msecs_to_jiffies(timeout); - - return time_after(jiffies, deadline); -} - static void tt_local_entry_free_ref(struct tt_local_entry *tt_local_entry) { if (atomic_dec_and_test(&tt_local_entry->common.refcount)) -- 1.7.7.4

2 12

Re: [B.A.T.M.A.N.] problem with mesh batman
by Sven Eckelmann 08 Dec '11

08 Dec '11

On Wednesday 07 December 2011 19:24:08 Flavio Leonel suporte tecnico wrote: > can you help me? > I've got a problem. > My pigan we do not reboot after the device connects to a LAN > > all interfaces are on the same bridge > WLAN and LAN > after restarting the device connected not ping the Access Point > > not found anything about the Internet On Thursday 08 December 2011 09:19:59 Flavio Leonel suporte tecnico wrote: > I sent an email list of pro batman, but got no answer ... > through that again sent an email asking for your help > > Thank you for your attention. You only wrote two mails [1,2] to the mailing list and both got answers [3,4,5]. Please don't mail me in private without a good reason. At least Cc b.a.t.m.a.n(a)lists.open-mesh.org for batman-adv related things. Kind regards, Sven [1] https://lists.open-mesh.org/pipermail/b.a.t.m.a.n/2011-December/005843.html [2] https://lists.open-mesh.org/pipermail/b.a.t.m.a.n/2011-December/005871.html [3] https://lists.open-mesh.org/pipermail/b.a.t.m.a.n/2011-December/005846.html [4] https://lists.open-mesh.org/pipermail/b.a.t.m.a.n/2011-December/005872.html [5] https://lists.open-mesh.org/pipermail/b.a.t.m.a.n/2011-December/005873.html

1 0

[B.A.T.M.A.N.] [PATCH 1/2] batman-adv: Allow to disable features
by Sven Eckelmann 08 Dec '11

08 Dec '11

The user could not disable features which were enabled in the target kernel as explained in b3d474c54bca76797e88878f29f100a7d5c7e02b. We have to undef batman-adv specific preprocessor variables and generate an own header that sets them according to the user settings. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- Makefile | 17 +++++++++++------ compat.h | 7 +++++++ gen-compat-autoconf.sh | 35 +++++++++++++++++++++++++++++++++++ 3 files changed, 53 insertions(+), 6 deletions(-) create mode 100755 gen-compat-autoconf.sh diff --git a/Makefile b/Makefile index e78e797..99fd366 100644 --- a/Makefile +++ b/Makefile @@ -18,10 +18,9 @@ # 02110-1301, USA # -# uncomment the CONFIG_* line to enable the related feature -# features enabled in the target kernel configuration cannot be disabled +# changing the CONFIG_* line to 'y' enables the related feature # B.A.T.M.A.N. debugging: -# CONFIG_BATMAN_ADV_DEBUG=y +export CONFIG_BATMAN_ADV_DEBUG=n PWD:=$(shell pwd) KERNELPATH ?= /lib/modules/$(shell uname -r)/build @@ -31,6 +30,7 @@ $(warning $(KERNELPATH) is missing, please set KERNELPATH) endif export KERNELPATH +RM ?= rm -f REVISION= $(shell if [ -d .git ]; then \ echo $$(git describe --always --dirty --match "v*" |sed 's/^v//' 2> /dev/null || echo "[unknown]"); \ @@ -41,14 +41,19 @@ batman-adv-y += compat.o ifneq ($(REVISION),) ccflags-y += -DSOURCE_VERSION=\"$(REVISION)\" endif -ccflags-$(CONFIG_BATMAN_ADV_DEBUG) += -DCONFIG_BATMAN_ADV_DEBUG include $(PWD)/Makefile.kbuild -all: +all: config $(MAKE) -C $(KERNELPATH) M=$(PWD) PWD=$(PWD) modules clean: + $(RM) compat-autoconf.h* $(MAKE) -C $(KERNELPATH) M=$(PWD) PWD=$(PWD) clean -install: +install: config $(MAKE) -C $(KERNELPATH) M=$(PWD) PWD=$(PWD) INSTALL_MOD_DIR=kernel/net/batman-adv/ modules_install + +config: + $(PWD)/gen-compat-autoconf.sh $(PWD)/compat-autoconf.h + +.PHONY: all clean install config diff --git a/compat.h b/compat.h index 964c066..6480614 100644 --- a/compat.h +++ b/compat.h @@ -27,6 +27,13 @@ #include <linux/version.h> /* LINUX_VERSION_CODE */ +#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33)) +#include <linux/autoconf.h> +#else +#include <generated/autoconf.h> +#endif +#include "compat-autoconf.h" + #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) #define __always_unused __attribute__((unused)) diff --git a/gen-compat-autoconf.sh b/gen-compat-autoconf.sh new file mode 100755 index 0000000..440accc --- /dev/null +++ b/gen-compat-autoconf.sh @@ -0,0 +1,35 @@ +#! /bin/sh + +set -e + +TARGET=${1:="compat-autoconf.h"} +TMP="${TARGET}.tmp" + +echo -n > "${TMP}" + +gen_config() { + KEY="${1}" + VALUE="${2}" + + echo "#undef ${KEY}" + case "${VALUE}" in + y) + echo "#define ${KEY} 1" + ;; + m) + echo "#define ${KEY} 1" + ;; + n) + # leave it undefined + ;; + *) + echo "#define ${KEY} \"${VALUE}\"" + ;; + esac +} + +# write config variables +gen_config 'CONFIG_BATMAN_ADV_DEBUG' ${CONFIG_BATMAN_ADV_DEBUG:="n"} >> "${TMP}" + +# only regenerate compat-autoconf.h when config was changed +diff "${TMP}" "${TARGET}" > /dev/null 2>&1 || cp "${TMP}" "${TARGET}" -- 1.7.7.3

2 5

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N