B.A.T.M.A.N December 2011

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

22 participants
40 discussions

[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

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

07 Dec '11

David, we have to more fixes that we would like to get pulled into net-next/linux-3.2. Both patches address TT protocol misbehavior. Upon merging these patches into net-next you'll run into merge conflicts. Patch1: ++<<<<<<< + tt_global_entry->common.flags |= TT_CLIENT_PENDING; + send_roam_adv(bat_priv, tt_global_entry->common.addr, ++======= + tt_global_entry->flags |= TT_CLIENT_ROAM; + tt_global_entry->roam_at = jiffies; + + send_roam_adv(bat_priv, tt_global_entry->addr, ++>>>>>>> Resolution1: +====== tt_global_entry->common.flags |= TT_CLIENT_ROAM; tt_global_entry->roam_at = jiffies; send_roam_adv(bat_priv, tt_global_entry->common.addr, +====== Patch2: ++<<<<<<< + tt_global_entry->common.flags |= TT_CLIENT_ROAM; + tt_global_entry->roam_at = jiffies; + goto out; ++======= + /* if we are deleting a global entry due to a roam + * event, there are two possibilities: + * 1) the client roamed from node A to node B => we mark + * it with TT_CLIENT_ROAM, we start a timer and we + * wait for node B to claim it. In case of timeout + * the entry is purged. + * 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->addr); + if (!tt_local_entry) { + tt_global_entry->flags |= TT_CLIENT_ROAM; + tt_global_entry->roam_at = jiffies; + goto out; + } ++>>>>>>> Resolution2: +====== /* if we are deleting a global entry due to a roam * event, there are two possibilities: * 1) the client roamed from node A to node B => we mark * it with TT_CLIENT_ROAM, we start a timer and we * wait for node B to claim it. In case of timeout * the entry is purged. * 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); if (!tt_local_entry) { tt_global_entry->common.flags |= TT_CLIENT_ROAM; tt_global_entry->roam_at = jiffies; goto out; } +====== Let me know if you have any further question. Thanks, Marek The following changes since commit 1ea6b8f48918282bdca0b32a34095504ee65bab5: Linux 3.2-rc1 (2011-11-07 16:16:02 -0800) are available in the git repository at: git://git.open-mesh.org/linux-merge.git batman-adv/maint Antonio Quartulli (2): batman-adv: in case of roaming mark the client with TT_CLIENT_ROAM batman-adv: delete global entry in case of roaming net/batman-adv/translation-table.c | 27 ++++++++++++++++++++++----- 1 files changed, 22 insertions(+), 5 deletions(-)

2 3

Re: [B.A.T.M.A.N.] about batman performance
by zb1981gm 07 Dec '11

07 Dec '11

> Hello zb1981gm (btw, do you have a real name?), I am sorry,you can call me Ice_zheng > What is batman version 2.0? We have batmand (layer 3), but I guess you are using batman advanced > as you talk about bonding/interface alternating later. These have 0.X (for old releases) or 201X.Y.Z > version schemes (since 2 years). Please clarify. It's Batman_adv 2011.2.0 > Have you compared this to static routing? So, you think the test result is abnormal,right? As regard to the IP address configuration of routerA and routerB, I bridge the eth0,wlan0 ,wlan1 all together,so routerA and routerB has only 1 IP address respectively batman channel1 channel 36 channel 11 notebook1(wlan0) -------- (wlan0)routerA(wlan1) -------------------- (wlan1)routerB(wlan0)---------- (wlan0)notebook2 10.10.10.1 10.10.10.2 10.10.10.3 10.10.10.4 you suggest static routing,means without batman routing,just use ad-hoc mode,than add static route on each node,right? notebook1(wlan0) routerA(wlan0) routerA(wlan1) routerB(wlan1) routerB(wlan0) notebook2(wlan0) 10.10.10.1 10.10.10.2 20.20.20.1 20.20.20.2 30.30.30.1 30.30.30.2 then add next hop gateway at each node(route add .....) that is what you mean? If no batman routing protocol,It certainly should has a better performance actually,my test result shows that(single radio mesh,if relay node are equiped with dual radio worked on interface alternating,it would be better) if via 1 hop,bandwidth has x then via 2 hop,bandwidth remain x/2 then via 3 hop,bandwidth remain x/4 ....... > It should not, as different radio modules are used (and correctly tuned on different channels). > However, you may have a limitation in your CPU power or something else. > You may want to try static routing to find this out. I check the cpu(ar7161) loading (using top utility),less than 30% ,memory still remain 16M, so it has nothing to do with cpu loading and memory consumation As regard to the channel assignment of different wireless card,I still have some puzzle. I originally think that no interference should be available if radios are configured on non_overlap channel such as 1,6,11. but,actually not.interference is still available though radios are configured on channel 1 and channel 11 channel 1 routerA(wlan0) ------------------ routerB(wlan0) channel 11 routerA(wlan1) ------------------ routerB(wlan1) if start iperf only on wlan0 or wlan1 singlely , bandwidth has 50Mbps almost. if start 2 iperf simultaneously,both drop sharply you must think that interference should be absolutely not available at 2.4g channel and 5g channel. but still has a little, because I change channel 11 to channel 36,if start 2 iperf simultaneously,bandwidth still drop when I turn down the txpower of wlan0 or wlan1 ,drop degree would be better. so channel interference is still a problem,OMHO.But I can't fix that except turn down the txpower. do you have some advice? the two radio's antenna distance is about 10cm by the way, have you ever used the atheros 9220 wireless minipci card,the best bandwidth you have ever test is how much? the ar9220 wireless card is 802.11n 300Mbps ,so I think 100Mbps should be available at least and It looks as if HT40 mode doesn't take effect, performance has almost no difference with HT20 mode > To make bonding work, there are a few conditions: > * routers must be equipped with multiple radios which can connect to each other > * activate bonding (batctl bonding 1) > * make sure the transmit qualities are similar (check with batctl o), should not be more than a difference of 50 > If everything is fine, you can get a boost of approx. 50%. I promise that all the conditions you mentioned are met.but no boost with bonding mode > Yup, it should help. Alternating is not helping in your scenario as far as I understand (your > mesh is only 1 hop long, as notebooks are connected via infrastructure mode). Bonding may > help as described above. I try the 3 point scene test,alternating did take effect channel1 channel 36 channel 11 channel 36 notebook1(wlan0) -------- (wlan0)routerA(wlan1) -------------------- (wlan1)routerB(wlan0)---------- (wlan0)routerC(wlan1)------------(wlan1)notebook2 routeA-wlan0:AP routeA-wlan1:mesh routerC-wlan1:AP routerC-wlan0:mesh notebook1 iperf routerA:40Mbps routerA iperf routerB:36Mbps routerB iperf routerC:40Mbps routerC iperf notebook2:40Mbps when routerB is configured as single radio for batman notebook1 iperf routerC : 18Mbps notebook1 iperf notebook2:9Mbps when routerB is configured as dual radio work on interface alternaing(2.4g and 5g alternating) notebook1 iperf routerC : 25Mbps notebook1 iperf notebook2:9.5Mbps so my conclution is still that,if batman_adv work on single radio router,bandwidth would be halfed when 1 hop increase,if the relay node equiped with dual radio work on interface alternating,it would be better a little by the way,I still have another 2 problems,could you give me some advice 1.is there some approach to add static route for batman,configure nexthop forcely ,just ignore the TQ value,I want to measure the bandwidth performace via wireless hop exactly 2.could you give me some advice about testplan for about 20 nodes mesh network (besides ping,iperf,ftp...). best regards, ice_zheng 2011/12/7

2 1

[B.A.T.M.A.N.] [PATCH] batmand: Don't override CPPFLAGS set by user
by Sven Eckelmann 07 Dec '11

07 Dec '11

Users or build servers may want to enable preprocessor specific options like -D_FORTIFY_SOURCE=2 that are usually placed in CPPFLAGS. The batmand makefile should not override these options to add own preprocessor variables. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index 346b14a..65e0cf2 100755 --- a/Makefile +++ b/Makefile @@ -55,7 +55,7 @@ MANPAGE = man/batmand.8 # batmand flags and options CFLAGS += -pedantic -Wall -W -std=gnu99 -MD -CPPFLAGS = -DDEBUG_MALLOC -DMEMORY_USAGE -DPROFILE_DATA $(NO_POLICY_ROUTING) +CPPFLAGS += -DDEBUG_MALLOC -DMEMORY_USAGE -DPROFILE_DATA $(NO_POLICY_ROUTING) LDLIBS += -lpthread # disable verbose output -- 1.7.7.3

2 3

[B.A.T.M.A.N.] [PATCH 1/4] batman-adv: Don't automatically build in parallel
by Sven Eckelmann 07 Dec '11

07 Dec '11

Distributions like Gentoo and Debian have policies which make it necessary to use some kind of environmental variable to control the parallel build. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- Makefile | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 3374687..15f099e 100644 --- a/Makefile +++ b/Makefile @@ -33,12 +33,10 @@ REVISION= $(shell if [ -d .git ]; then \ echo $$(git describe --always --dirty --match "v*" |sed 's/^v//' 2> /dev/null || echo "[unknown]"); \ fi) -NUM_CPUS = $(shell nproc 2> /dev/null || echo 1) - include $(PWD)/Makefile.kbuild all: - $(MAKE) -C $(KERNELPATH) REVISION=$(REVISION) M=$(PWD) PWD=$(PWD) -j $(NUM_CPUS) modules + $(MAKE) -C $(KERNELPATH) REVISION=$(REVISION) M=$(PWD) PWD=$(PWD) modules clean: $(MAKE) -C $(KERNELPATH) M=$(PWD) PWD=$(PWD) clean -- 1.7.7.3

2 8

[B.A.T.M.A.N.] [PATCH] batman-adv: simplify bat_ogm_receive API call
by Marek Lindner 07 Dec '11

07 Dec '11

Most of the values in that call are derived from the skb, so we can hand over the skb instead. Reported-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> --- bat_iv_ogm.c | 11 +++++++---- bat_ogm.h | 3 +-- routing.c | 4 +--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index d60e1ba..3402fa5 100644 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -1140,13 +1140,16 @@ out: orig_node_free_ref(orig_node); } -void bat_ogm_receive(const struct ethhdr *ethhdr, unsigned char *packet_buff, - int packet_len, struct hard_iface *if_incoming) +void bat_ogm_receive(struct hard_iface *if_incoming, struct sk_buff *skb) { struct batman_ogm_packet *batman_ogm_packet; - int buff_pos = 0; - unsigned char *tt_buff; + struct ethhdr *ethhdr; + int buff_pos = 0, packet_len; + unsigned char *tt_buff, *packet_buff; + packet_len = skb_headlen(skb); + ethhdr = (struct ethhdr *)skb_mac_header(skb); + packet_buff = skb->data; batman_ogm_packet = (struct batman_ogm_packet *)packet_buff; /* unpack the aggregated packets and process them one by one */ diff --git a/bat_ogm.h b/bat_ogm.h index 69329c1..47edfde 100644 --- a/bat_ogm.h +++ b/bat_ogm.h @@ -29,7 +29,6 @@ void bat_ogm_init_primary(struct hard_iface *hard_iface); void bat_ogm_update_mac(struct hard_iface *hard_iface); void bat_ogm_schedule(struct hard_iface *hard_iface, int tt_num_changes); void bat_ogm_emit(struct forw_packet *forw_packet); -void bat_ogm_receive(const struct ethhdr *ethhdr, unsigned char *packet_buff, - int packet_len, struct hard_iface *if_incoming); +void bat_ogm_receive(struct hard_iface *if_incoming, struct sk_buff *skb); #endif /* _NET_BATMAN_ADV_OGM_H_ */ diff --git a/routing.c b/routing.c index 4363d19..5bc41c8 100644 --- a/routing.c +++ b/routing.c @@ -272,9 +272,7 @@ int recv_bat_ogm_packet(struct sk_buff *skb, struct hard_iface *hard_iface) if (skb_linearize(skb) < 0) return NET_RX_DROP; - ethhdr = (struct ethhdr *)skb_mac_header(skb); - - bat_ogm_receive(ethhdr, skb->data, skb_headlen(skb), hard_iface); + bat_ogm_receive(hard_iface, skb); kfree_skb(skb); return NET_RX_SUCCESS; -- 1.7.5.4

1 1

[B.A.T.M.A.N.] Rede Mesh Batman-ADV in brazil
by Flavio Leonel "suporte tecnico" 07 Dec '11

07 Dec '11

-------------------------------------------------- From: "Flavio Leonel "suporte tecnico"" <suporte(a)tec-wi.com.br> Sent: Tuesday, December 06, 2011 6:49 AM To: "Sven Eckelmann" <sven(a)narfation.org> Subject: Re: [B.A.T.M.A.N.] Fw: Rede Mesh BatmanADV no brazil > well what is happening here is the following problem. > > jah have some nodes with OpenWRT and Ubiquiti with batman-adv instaldos as > I > said in another e-mail and could see the pictures. > > settings: > radio interfaces: > Physical: 2 a LAN and a WLAN. > built-in OpenWRT: > mode = wlan mesh > = wifi wlan > connected to the router lan = > > All part of a bridge > br-lan > where this batman-adv active > > what happens? .. > when I disconnect any machine "computer" or router > connected to the LAN port of the device or restart. > > the radio will not let me drop, access ... I no more communication. > I have to restart with the same device (computer or router) connected to > reestablish connection. > > already tested it with bridge mode with no firewall > and now I'm experimenting with a way forward iptable > > but without any success not find anything about the forum and do not > understand where this error. > > I hope you can help me, I tried to write my best English > grateful ... > >

3 2

[B.A.T.M.A.N.] [RFC] batman-adv: switch routing algorithm at runtime
by Marek Lindner 06 Dec '11

06 Dec '11

Hi folks, after the previous discussions how to proceed with BATMAN V we came to the conclusion that a runtime switch for changing the routing algorithms would be the best solution. Hence, I drafted a couple of patches that I'd like to get some feedback on. Note, that these patches are not ready to be included. For instance, the rcu locking isn't clean. I'd like to focus your attention towards the following items: * How do we design the algorithm registration. At the moment batman_init() calls bat_iv_init() and possibly other algorithms in the future but this is less than ideal. I had hoped to find a mechanism which allows an init function to be declared and called inside of the respective routing algorithm files. These files can be compiled into the module or not. * The API and its implementation. It is highly likely that this API won't survive for very long as it has been designed to satisfy one routing algorithm only. However, changing it in the future should be easy. * Other ideas / comments ? Cheers, Marek

3 17

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 2011