B.A.T.M.A.N February 2014

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

25 participants
68 discussions

[B.A.T.M.A.N.] [PATCH] batman-adv: make the use of braces in if-else consistent
by Martin Hundebøll 19 Feb '14

19 Feb '14

To avoid confusion, the linux kernel coding style discourage the use of one if-else branch with braces and another without braces. Introduced-by: 65d8217193427026169c48112c561c5ca4d1bd18 ("batman-adv: compat: fix null pointer exception for kernels < 3.9") Signed-off-by: Martin Hundebøll <martin(a)hundeboll.net> --- compat.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/compat.h b/compat.h index 7beba36..0ceb2b1 100644 --- a/compat.h +++ b/compat.h @@ -167,8 +167,9 @@ static inline int batadv_param_set_copystring(const char *val, rcu_read_unlock(); \ dev_hold(dev); \ return dev; \ - } else \ - dev = NULL; + } else {\ + dev = NULL; \ + } #endif /* < KERNEL_VERSION(2, 6, 36) */ -- 1.9.0

2 1

[B.A.T.M.A.N.] Hiding the ad-hoc network
by Dirk van der Walt 18 Feb '14

18 Feb '14

Hi List, Although not strictly Batman-adv related I was wondering if someone here knows how to 'hide' the Ad-hoc network of the mesh. Another person asked the same on the OpenWrt forum but no-one gave him a proper or clear answer: https://forum.openwrt.org/viewtopic.php?id=44665 I've managed to get hold of him and he said he still has no clear answer on this one. Kind regards

3 2

[B.A.T.M.A.N.] [PATCH] batman-adv: compat: fix null pointer exception for kernels < 3.9
by Linus Lüssing 18 Feb '14

18 Feb '14

The compat code of the new multicast patchset leads to null pointer derefernces for kernels 3.9 in netdev_master_upper_dev_get_rcu(). This is because the initially NULL is assigned to upper, which is equal to dev. dev is dereferenced one line later, though, leading to a crash. Fixing this by assigning NULL only when we are sure that the according pointer is not going to be dereferenced anymore. Introduced by: 532cadf26cfbb1099ef31fae9ccafcbbfc37b9b5 ("batman-adv: Multicast Listener Announcements via Translation Table") Reported-by: Marek Lindner <mareklindner(a)neomailbox.ch> Signed-off-by: Linus Lüssing <linus.luessing(a)web.de> --- compat.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/compat.h b/compat.h index 7a3d235..7beba36 100644 --- a/compat.h +++ b/compat.h @@ -162,12 +162,13 @@ static inline int batadv_param_set_copystring(const char *val, #define NET_ADDR_RANDOM 0 #define netdev_master_upper_dev_get_rcu(dev) \ - NULL; \ + upper; \ if (dev->br_port ? 1 : 0) { \ rcu_read_unlock(); \ dev_hold(dev); \ return dev; \ - } + } else \ + dev = NULL; #endif /* < KERNEL_VERSION(2, 6, 36) */ @@ -371,12 +372,13 @@ static int __batadv_interface_tx(struct sk_buff *skb, \ #ifndef netdev_master_upper_dev_get_rcu #define netdev_master_upper_dev_get_rcu(dev) \ - NULL; \ + upper; \ if (dev->priv_flags & IFF_BRIDGE_PORT) { \ rcu_read_unlock(); \ dev_hold(dev); \ return dev; \ - } + } else \ + dev = NULL; #endif /* netdev_master_upper_dev_get_rcu */ -- 1.7.10.4

3 3

[B.A.T.M.A.N.] [PATCH] batman-adv: use ether_addr_copy instead of memcpy in multicast code
by Linus Lüssing 18 Feb '14

18 Feb '14

ether_addr_copy is supposed to be slightly more efficient for copying mac addresses, so let's use it. This makes recent versions of checkpatch happy, too. Reported-by: Antonio Quartulli <antonio(a)meshcoding.com> Signed-off-by: Linus Lüssing <linus.luessing(a)web.de> --- multicast.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/multicast.c b/multicast.c index 00bb30e..e69143b 100644 --- a/multicast.c +++ b/multicast.c @@ -45,7 +45,7 @@ static int batadv_mcast_mla_softif_get(struct net_device *dev, break; } - memcpy(&new->addr, &mc_list_entry->addr, ETH_ALEN); + ether_addr_copy(&new->addr, &mc_list_entry->addr); hlist_add_head(&new->list, mcast_list); ret++; } -- 1.7.10.4

2 1

[B.A.T.M.A.N.] batman-adv and 802.xx
by Harms, Hannes 17 Feb '14

17 Feb '14

Dear list, I have a problems to understand whre are the borders of batman-adv. For exampel if I use enddvices that support 802.n, I will achive a higher throughput than with 802.g devices. I tested this in practice. But what happens if I use devices that support 802.ac ? Will the throughput also be higher in my network, and would the devices use beamforming? I assume that all devices in the network are the same. Best regrads and thanks for your time Hannes

2 1

[B.A.T.M.A.N.] [A.L.F.R.E.D] Can not get data from alfred client.
by Le Tran Dat 17 Feb '14

17 Feb '14

Hi list, I have trouble with Alfred server and client. I have a Batman-adv serve as a server and another as client. In the server node (batman-adv server) I start alfred as master. In the client node (batman-adv client) I start alfred as slave. Then I try to set data from server node by command: echo "data from server" | alfred -s 65 I can see the data in server side by command alfred -r 65 But I can not read the data from client by using the same command. How can I troubleshoot this issue since I have successfully set and get data via alfred before. I have no ideas why it is not working now. Thanks, Dat

2 1

[B.A.T.M.A.N.] Bridge loop avoidance required?
by tjhowse 16 Feb '14

16 Feb '14

Behold my shitty diagram: http://i.imgur.com/9tODwRu.png In this configuration, where the only route out of the batman-adv-supported layer 2 network is via a layer 3 router to the WAN port on the nodes, is there any benefit to enabling bridge loop avoidance? My understanding is that forming a loop would only be accidentally possible if the link to the non-mesh LAN doesn't go via a gateway. The gateway is configured to block all WAN->LAN traffic, except SSH to the node itself. The reason I ask is that the operator of the non-mesh network has demanded that we cease connecting any form of mesh routers to their network on the basis that it could mesh a route between two routers connected to their network and form a loop. The situation is quite political, and the facts aren't necessarily the most important factors. Thanks for your time, Travis.

1 0

[B.A.T.M.A.N.] [PATCH] batman-adv: silence smatch errors in multicast compat code
by Simon Wunderlich 16 Feb '14

16 Feb '14

smatch is reporting problems of unreachable code parts: multicast.c:170 batadv_mcast_get_bridge() info: ignoring unreachable code. tmp/multicast.c:172 batadv_mcast_get_bridge() info: ignoring unreachable code. These are caused by compat code which returns within a loop, never giving the rest of the function a chance to be processed. This can be changed by slightly adjusting the compat code, setting the iterator variable to NULL and let the original function handle the rest. This does not introduce any functional change. Introduced by: a3f58139efedb96222dffdda89896c243fdff49e ("batman-adv: Multicast Listener Announcements via Translation Table") Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> --- compat.h | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/compat.h b/compat.h index 186547b..a99c9d5 100644 --- a/compat.h +++ b/compat.h @@ -160,14 +160,12 @@ static inline int batadv_param_set_copystring(const char *val, #define NET_ADDR_RANDOM 0 #define netdev_master_upper_dev_get_rcu(dev) \ - upper; \ - rcu_read_unlock(); \ + NULL; \ if (dev->br_port ? 1 : 0) { \ + rcu_read_unlock(); \ dev_hold(dev); \ return dev; \ } \ -\ - return NULL\ #endif /* < KERNEL_VERSION(2, 6, 36) */ @@ -344,14 +342,12 @@ static int __batadv_interface_set_mac_addr(x, y) #ifndef netdev_master_upper_dev_get_rcu #define netdev_master_upper_dev_get_rcu(dev) \ - upper; \ - rcu_read_unlock(); \ + NULL; \ if (dev->priv_flags & IFF_BRIDGE_PORT) { \ + rcu_read_unlock(); \ dev_hold(dev); \ return dev; \ - } \ -\ - return NULL\ + } #endif /* netdev_master_upper_dev_get_rcu */ -- 1.7.10.4

2 1

[B.A.T.M.A.N.] [PATCHv2] batman-adv: return NULL instead of 0 in batadv_mcast_forw_ip_node_get()
by Linus Lüssing 16 Feb '14

16 Feb '14

batadv_mcast_forw_ip_node_get() returns a pointer, so returning NULL in error cases is always more appropriate than 0. Introduced by: c8fedbea81eac41a4971bb43353fd52a903d7c4c ("batman-adv: Send multicast packets to nodes with a WANT_ALL flag") Reported-by: Antonio Quartulli <antonio(a)meshcoding.com> Signed-off-by: Linus Lüssing <linus.luessing(a)web.de> --- * added Reported-by multicast.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/multicast.c b/multicast.c index b2abe00..00bb30e 100644 --- a/multicast.c +++ b/multicast.c @@ -498,7 +498,7 @@ batadv_mcast_forw_ip_node_get(struct batadv_priv *bat_priv, return batadv_mcast_forw_ipv6_node_get(bat_priv); default: /* we shouldn't be here... */ - return 0; + return NULL; } } -- 1.7.10.4

2 1

[B.A.T.M.A.N.] [PATCH] batman-adv: return NULL instead of 0 in batadv_mcast_forw_ip_node_get()
by Linus Lüssing 16 Feb '14

16 Feb '14

batadv_mcast_forw_ip_node_get() returns a pointer, so returning NULL in error cases is always more appropriate than 0. Introduced by: c8fedbea81eac41a4971bb43353fd52a903d7c4c ("batman-adv: Send multicast packets to nodes with a WANT_ALL flag") Signed-off-by: Linus Lüssing <linus.luessing(a)web.de> --- multicast.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/multicast.c b/multicast.c index b2abe00..00bb30e 100644 --- a/multicast.c +++ b/multicast.c @@ -498,7 +498,7 @@ batadv_mcast_forw_ip_node_get(struct batadv_priv *bat_priv, return batadv_mcast_forw_ipv6_node_get(bat_priv); default: /* we shouldn't be here... */ - return 0; + return NULL; } } -- 1.7.10.4

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N February 2014