B.A.T.M.A.N November 2015

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

18 participants
45 discussions

[B.A.T.M.A.N.] [PATCH] batman-adv: Add missing forward declaration for net_device
by Sven Eckelmann 22 Nov '15

22 Nov '15

A new function batadv_bla_status_update was introduced which uses the not yet defined struct net_device as parameter. Add the forward declaration to avoid compiler warnings about type declarations inside parameter list. Fixes: 07ed3c31d795 ("batman-adv: purge bridge loop avoidance when its disabled") Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- net/batman-adv/bridge_loop_avoidance.h | 1 + 1 file changed, 1 insertion(+) diff --git a/net/batman-adv/bridge_loop_avoidance.h b/net/batman-adv/bridge_loop_avoidance.h index db1aeb5..7ea199b 100644 --- a/net/batman-adv/bridge_loop_avoidance.h +++ b/net/batman-adv/bridge_loop_avoidance.h @@ -22,6 +22,7 @@ #include <linux/types.h> +struct net_device; struct seq_file; struct sk_buff; -- 2.6.2

2 1

[B.A.T.M.A.N.] [PATCH 0/2] batman-adv: Deletion of some unnecessary checks
by SF Markus Elfring 21 Nov '15

21 Nov '15

From: Markus Elfring <elfring(a)users.sourceforge.net> Date: Sun, 15 Nov 2015 09:34:12 +0100 Another update suggestion was taken into account after a patch was applied from static source code analysis. Markus Elfring (2): Delete unnecessary checks before the function call "kfree_skb" Less checks in batadv_tvlv_unicast_send() net/batman-adv/main.c | 15 +++++---------- net/batman-adv/network-coding.c | 4 +--- net/batman-adv/send.c | 3 +-- 3 files changed, 7 insertions(+), 15 deletions(-) -- 2.6.2

2 4

[B.A.T.M.A.N.] [PATCH 0/2] Bridge loop avoidance startup fixes
by Simon Wunderlich 21 Nov '15

21 Nov '15

From: Simon Wunderlich <simon(a)open-mesh.com> When changing configuration on top of batman-adv, for example in firmwares, there are two cases which appeared to be problematic and causing initial temporary loops when starting batman-adv. * when activating batman-adv with vlans and bridges, it may take longer than 30 seconds to start up the bridges. If the grace period is over by that time, the BLA grace period may already be over. Therefore increase the grace period to 60 seconds. * When changing the network configuration, e.g. adding or removing wired interface in a bridge, it may be useful to re-start the grace period. Therefore the bridge loop avoidance state is dropped when BLA is turned off, so turning off/on bla can be used to restart the grace period. These two fixes addressed the problems we had in our setups. The patches are based on top of the current master (since its technically more a feature than a fix), plus the kerneldoc fix sent last week. Cheers, Simon Simon Wunderlich (2): batman-adv: purge bridge loop avoidance when its disabled batman-adv: increase BLA wait periods to 6 net/batman-adv/bridge_loop_avoidance.c | 20 ++++++++++++++++++++ net/batman-adv/bridge_loop_avoidance.h | 1 + net/batman-adv/main.h | 2 +- net/batman-adv/sysfs.c | 4 +++- 4 files changed, 25 insertions(+), 2 deletions(-) -- 2.6.2

2 6

[B.A.T.M.A.N.] [PATCH] batman-adv: only call post function if something changed
by Simon Wunderlich 21 Nov '15

21 Nov '15

From: Simon Wunderlich <simon(a)open-mesh.com> Currently, the post function is also called on errors or if there were no changes, which is redundant for the functions currently using these facilities. Signed-off-by: Simon Wunderlich <simon(a)open-mesh.com> --- net/batman-adv/sysfs.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/net/batman-adv/sysfs.c b/net/batman-adv/sysfs.c index 6d6df12..f38d7b7 100644 --- a/net/batman-adv/sysfs.c +++ b/net/batman-adv/sysfs.c @@ -243,10 +243,13 @@ ssize_t batadv_show_vlan_##_name(struct kobject *kobj, \ static int batadv_store_bool_attr(char *buff, size_t count, struct net_device *net_dev, - const char *attr_name, atomic_t *attr) + const char *attr_name, atomic_t *attr, + bool *changed) { int enabled = -1; + *changed = false; + if (buff[count - 1] == '\n') buff[count - 1] = '\0'; @@ -273,6 +276,8 @@ static int batadv_store_bool_attr(char *buff, size_t count, atomic_read(attr) == 1 ? "enabled" : "disabled", enabled == 1 ? "enabled" : "disabled"); + *changed = true; + atomic_set(attr, (unsigned int)enabled); return count; } @@ -283,11 +288,12 @@ __batadv_store_bool_attr(char *buff, size_t count, struct attribute *attr, atomic_t *attr_store, struct net_device *net_dev) { + bool changed; int ret; ret = batadv_store_bool_attr(buff, count, net_dev, attr->name, - attr_store); - if (post_func && ret) + attr_store, &changed); + if (post_func && changed) post_func(net_dev); return ret; -- 2.6.2

2 1

[B.A.T.M.A.N.] Integrity checks for packets, who does it?
by Patrick Bosch 20 Nov '15

20 Nov '15

Hi everyone I have a little uncertainty regarding integrity checks in batman advanced. I was wondering which encapsulation does it. The situation: - Ping to a batman node - Normal ping, no batman ping (nodes have an IP) - WPA2 active ICMP should be encapsulated by IP, which is encapsulated by the Wi-Fi mac header. Now I know that batman advanced inserts it's own header. The question is, where exactly? Does it encapsulate the Wi-Fi mac and takes over the integrity check or not? Also, how does it behave in the case of enabled encryption? WPA2 has it's own integrity check. The reason I ask, is that in Wireshark, it appears as ICMP when I sniff the traffic without encryption enabled. It would be great, if someone could shed light in this affair! Thank you in advance! Kind regards Patrick -- Patrick Bosch, PhD Student University of Antwerp - iMinds Dept. Mathematics and Computer Science MOSAIC research group Middelheimlaan 1 - Room M.G.215 2020 Antwerpen - Belgium Email: patrick.bosch(a)uantwerpen.be Phone: +3232653858

2 1

[B.A.T.M.A.N.] batctl file errors
by no name 19 Nov '15

19 Nov '15

I am using BATMAN on a raspberry pi b+ with a kernel version of 4.1.13+ but my problem also occured on an older kernel (I tried updating, which did not help). My BATMAN is on batctl debian-2012.1.0-1 [batman-adv: 2015.0]. I try to get the vis_mode up and running, which fails in multiple ways, because I can't even create logs. sudo batctl loglevel -> "Error - can't open file '/sys/class/net/bat0/mesh/log_level': No such file or directory" sudo batctl vm -> "Error - can't open file '/sys/class/net/bat0/mesh/log_level': No such file or directory" and so on. The thing is, when I try: sudo batmand s -> "Not using interface s (retrying later): interface not active" whereas if I try: sudo batmand s IP bat0 -> batman cannot be pinged from any other interface any more did I forget to install something? Thanks Richard

3 2

[B.A.T.M.A.N.] [PATCH 1/3] batman-adv: fix kerneldoc for DAT functions
by Antonio Quartulli 18 Nov '15

18 Nov '15

Cc: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Antonio Quartulli <antonio(a)meshcoding.com> --- net/batman-adv/distributed-arp-table.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c index 9daccdc..193ea33 100644 --- a/net/batman-adv/distributed-arp-table.c +++ b/net/batman-adv/distributed-arp-table.c @@ -738,6 +738,8 @@ static void batadv_dat_hash_free(struct batadv_priv *bat_priv) /** * batadv_dat_init - initialise the DAT internals * @bat_priv: the bat priv with all the soft interface information + * + * Return: 0 in case of success, a negative error code otherwise */ int batadv_dat_init(struct batadv_priv *bat_priv) { @@ -776,6 +778,8 @@ void batadv_dat_free(struct batadv_priv *bat_priv) * batadv_dat_cache_seq_print_text - print the local DAT hash table * @seq: seq file to print on * @offset: not used + * + * Return: always 0 */ int batadv_dat_cache_seq_print_text(struct seq_file *seq, void *offset) { -- 2.6.3

2 5

[B.A.T.M.A.N.] [PATCH] batman-adv: Fix variable declaration warning in batadv_compare_tt
by Sven Eckelmann 18 Nov '15

18 Nov '15

checkpatch is warning about the wrong way a pointer is declared in batadv_compare_tt. ERROR: "foo* bar" should be "foo *bar" #80: FILE: ./net/batman-adv/translation-table.c:80: + const struct batadv_tt_common_entry* tt1 = data1; Fixes: af5fa950cbb6 ("batman-adv: fix erroneous client entry duplicate detection") Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- net/batman-adv/translation-table.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index 92af58b..c02f68e 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -77,8 +77,8 @@ static int batadv_compare_tt(const struct hlist_node *node, const void *data2) { const void *data1 = container_of(node, struct batadv_tt_common_entry, hash_entry); - const struct batadv_tt_common_entry* tt1 = data1; - const struct batadv_tt_common_entry* tt2 = data2; + const struct batadv_tt_common_entry *tt1 = data1; + const struct batadv_tt_common_entry *tt2 = data2; return (tt1->vid == tt2->vid) && batadv_compare_eth(data1, data2); } -- 2.6.2

2 1

[B.A.T.M.A.N.] [PATCH v2] batman-adv: Change ifconfig examples to iproute2
by Sven Eckelmann 17 Nov '15

17 Nov '15

Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- v2: fixed "NodeA" in NodeB block Documentation/networking/batman-adv.txt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Documentation/networking/batman-adv.txt b/Documentation/networking/batman-adv.txt index 58e4904..ff23b75 100644 --- a/Documentation/networking/batman-adv.txt +++ b/Documentation/networking/batman-adv.txt @@ -115,14 +115,17 @@ The "bat0" interface can be used like any other regular inter- face. It needs an IP address which can be either statically con- figured or dynamically (by using DHCP or similar services): -# NodeA: ifconfig bat0 192.168.0.1 -# NodeB: ifconfig bat0 192.168.0.2 +# NodeA: ip link set up dev bat0 +# NodeA: ip addr add 192.168.0.1/24 dev bat0 + +# NodeB: ip link set up dev bat0 +# NodeB: ip addr add 192.168.0.2/24 dev bat0 # NodeB: ping 192.168.0.1 Note: In order to avoid problems remove all IP addresses previ- ously assigned to interfaces now used by batman advanced, e.g. -# ifconfig eth0 0.0.0.0 +# ip addr flush dev eth0 LOGGING/DEBUGGING -- 2.6.2

2 1

[B.A.T.M.A.N.] [PATCHv2] batman-adv: Fix invalid stack access in batadv_dat_select_candidates
by Sven Eckelmann 17 Nov '15

17 Nov '15

batadv_dat_select_candidates provides an u32 to batadv_hash_dat but it needs a batadv_dat_entry with at least ip and vid filled in. Fixes: 3e26722bc9f2 ("batman-adv: make the Distributed ARP Table vlan aware") Signed-off-by: Sven Eckelmann <sven(a)open-mesh.com> Acked-by: Antonio Quartulli <antonio(a)meshcoding.com> --- v2: Send with @open-mesh.com address for correct sponsor attribution net/batman-adv/distributed-arp-table.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c index 7d75e67..79b9993 100644 --- a/net/batman-adv/distributed-arp-table.c +++ b/net/batman-adv/distributed-arp-table.c @@ -566,6 +566,7 @@ batadv_dat_select_candidates(struct batadv_priv *bat_priv, __be32 ip_dst) int select; batadv_dat_addr_t last_max = BATADV_DAT_ADDR_MAX, ip_key; struct batadv_dat_candidate *res; + struct batadv_dat_entry dat; if (!bat_priv->orig_hash) return NULL; @@ -575,7 +576,9 @@ batadv_dat_select_candidates(struct batadv_priv *bat_priv, __be32 ip_dst) if (!res) return NULL; - ip_key = (batadv_dat_addr_t)batadv_hash_dat(&ip_dst, + dat.ip = ip_dst; + dat.vid = 0; + ip_key = (batadv_dat_addr_t)batadv_hash_dat(&dat, BATADV_DAT_ADDR_MAX); batadv_dbg(BATADV_DBG_DAT, bat_priv, -- 2.6.2

2 1

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N November 2015