B.A.T.M.A.N April 2011

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

16 participants
31 discussions

[B.A.T.M.A.N.] [PATCH] batman-adv: orig_hash_find() manages rcu_lock/unlock internally
by Antonio Quartulli 18 Apr '11

18 Apr '11

orig_hash_find() manages rcu_lock/unlock internally and doesn't need to be surrounded by rcu_read_lock() / rcu_read_unlock() anymore Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- routing.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/routing.c b/routing.c index f6c6422..634a44d 100644 --- a/routing.c +++ b/routing.c @@ -1310,14 +1310,11 @@ int route_unicast_packet(struct sk_buff *skb, struct hard_iface *recv_if) } /* get routing information */ - rcu_read_lock(); orig_node = orig_hash_find(bat_priv, unicast_packet->dest); if (!orig_node) goto unlock; - rcu_read_unlock(); - /* find_router() increases neigh_nodes refcount if found. */ neigh_node = find_router(bat_priv, orig_node, recv_if); @@ -1464,14 +1461,11 @@ int recv_bcast_packet(struct sk_buff *skb, struct hard_iface *recv_if) if (bcast_packet->ttl < 2) goto out; - rcu_read_lock(); orig_node = orig_hash_find(bat_priv, bcast_packet->orig); if (!orig_node) goto rcu_unlock; - rcu_read_unlock(); - spin_lock_bh(&orig_node->bcast_seqno_lock); /* check whether the packet is a duplicate */ -- 1.7.3.4

3 3

[B.A.T.M.A.N.] pull request: batman-adv 2011-04-17
by Sven Eckelmann 18 Apr '11

18 Apr '11

Hi, I would like to propose following patches for net-next-2.6/2.6.40. Most of the stuff is cleanup work to reduce the locking complexity. The only exception is Andrew Lunn's patch, which only adds the initialisation of tx_queue_len. thanks, Sven The following changes since commit 0ce790e7d736cedc563e1fb4e998babf5a4dbc3d: Linux 2.6.39-rc1 (2011-03-29 12:09:47 -0700) are available in the git repository at: git://git.open-mesh.org/ecsv/linux-merge.git batman-adv/next Andrew Lunn (1): batman-adv: Set the txqueuelen to zero when creating soft interface Linus Lüssing (5): batman-adv: Move bonding / iface alternating router search to own functions batman-adv: Make gateway_get_selected type safe batman-adv: Simplify gw_check_election(), use gw_get_selected() batman-adv: Make orig_node->router an rcu protected pointer batman-adv: Protect global TQ window with a spinlock Marek Lindner (1): batman-adv: concentrate all curr_gw related rcu operations in select/deselect functions Simon Wunderlich (1): batman-adv: protect softif_neigh by rcu net/batman-adv/gateway_client.c | 259 ++++++++++++++++----------- net/batman-adv/gateway_client.h | 2 +- net/batman-adv/icmp_socket.c | 18 +-- net/batman-adv/originator.c | 38 +++- net/batman-adv/originator.h | 1 + net/batman-adv/routing.c | 378 +++++++++++++++++++++------------------ net/batman-adv/send.c | 19 ++- net/batman-adv/soft-interface.c | 115 +++++++++--- net/batman-adv/types.h | 7 +- net/batman-adv/unicast.c | 2 +- net/batman-adv/vis.c | 91 +++++----- 11 files changed, 537 insertions(+), 393 deletions(-)

2 9

[B.A.T.M.A.N.] [PATCH] batctl: avoid error message when command was successful
by Marek Lindner 17 Apr '11

17 Apr '11

Reported-by: Linus Lüssing <linus.luessing(a)web.de> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> --- sys.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys.c b/sys.c index 729f898..3511b40 100644 --- a/sys.c +++ b/sys.c @@ -420,10 +420,10 @@ int handle_gw_setting(char *mesh_iface, int argc, char **argv) case GW_MODE_SERVER: res = write_file(path_buff, SYS_GW_BW, argv[2], NULL); break; - default: - goto out; } + goto out; + opt_err: printf("Error - the supplied argument is invalid: %s\n", argv[1]); printf("The following values are allowed:\n"); -- 1.7.2.3

3 2

Re: [B.A.T.M.A.N.] Batman-adv hna balancing
by Marek Lindner 16 Apr '11

16 Apr '11

Hi, > Here you can see our topology, there is two nodes at moment they are > connected to the same switch and should see same hnas but they are > announced mostly by one of the two > http://eigenlab.org/batman-adv_status.php > > If i turn off the cc:c8 node the hna pass to the other nodes but when > i turn it on all hna pass on it > > Why this? Is not better to balance hna announcing? the 2 batman-adv nodes probably detected they are connected to the same switch and activated the bridge loop avoidance [1]. With 'batctl sn' you can retrieve the bridge loop neighbor list. Regards, Marek [1] http://www.open-mesh.org/wiki/batman-adv/Bridge-loop-avoidance

2 1

Re: [B.A.T.M.A.N.] Batman-adv hna balancing
by Marek Lindner 16 Apr '11

16 Apr '11

On Friday 15 April 2011 13:03:26 Gioacchino Mazzurco wrote: > I think batman shouldn't handle mac duplication as conflict but simply > act as the two nodes see the same clients, like olsrd do when multiple > nodes announces the same hna The HNA IP addresses have the same functionality as (HNA) mac addresses for batman-adv, therefore we talking about the same thing. Regards, Marek

1 0

[B.A.T.M.A.N.] [PATCHv2] batman-adv: orig_hash_find() manages rcu_lock/unlock internally
by Antonio Quartulli 16 Apr '11

16 Apr '11

1 0

[B.A.T.M.A.N.] Batman-adv hna balancing
by Gioacchino Mazzurco 15 Apr '11

15 Apr '11

Hi! I am installing batman-adv on nodes on our mesh networks in Pisa, but i have a question Here you can see our topology, there is two nodes at moment they are connected to the same switch and should see same hnas but they are announced mostly by one of the two http://eigenlab.org/batman-adv_status.php If i turn off the cc:c8 node the hna pass to the other nodes but when i turn it on all hna pass on it Why this? Is not better to balance hna announcing? Very thanks!

2 2

[B.A.T.M.A.N.] Gateway
by Ryan Hughes 11 Apr '11

11 Apr '11

Okay, so I'm putting aside my concerns about running batman side-by-side with something else. The WBMv3 script looks like a pretty good guide to that. I'm having more basic problems right now. I don't seem to understand how to set up the gateway. I'm using bmx6 right now (is that on-topic for this list? I assume the same things apply to batmand). I started the node that has the gateway (node1) with: bmxd -g 5mbit/1024kbit dev=wlan0 and the one without the gateway (node2) with: bmxd -r 3 dev=wlan0 node2 is aware of node1's gateway, as evidenced by bmxd -c -d 2: Originator bestNextHop # preferred gateway: 0.0.0.0 => 10.0.1.1 10.0.1.1 94, gw_class 49 - 4MBit/1024KBit, reliability: 0, supported tunnel types 2WT, 1WT but I am unable to ping out to the internet from node2. Is this a firewall problem? What should I be doing differently with the firewall? I think I have node1's firewall forwarding (and masquerading) from the tunnel interface to my lan interface (where the gateway is plugged in). batmand documentation refers to the tunnel interface as gate0, but bmxd calls this interface bat0. I attached my /etc/config/firewall. Also, here is a little snippet from iftop -i bat0 run on node1 while node2 was trying to ping 141.1.1.1. It shows that the pings make it as far as node1, but don't make it out. That's why I'm thinking firewall. 169.254.0.0 => 169.254.0.132 896b 896b 896b <= 0b 0b 0b 169.254.0.132 => cns1.cw.net 672b 672b 672b <= 0b 0b 0b Is there some other step I'm supposed to do? bridging the tunnel interface with my lan interface? (I doubt it). Thanks. --Ryan

2 1

[B.A.T.M.A.N.] batman-adv coexisting with olsr?
by Ryan Hughes 11 Apr '11

11 Apr '11

Hi. Is it possible to get batman-adv to coexist with olsr, working with different network prefixes? Cuz it seems to me that the olsr traffic would all get routed by batman, and every node would think it could see every other node, and olsr would add all kinds of nonsense to the routing table. Thanks. --Ryan

4 4

[B.A.T.M.A.N.] [PATCH 1/2] batman-adv: Add missing static for softif_neigh_deselect
by Sven Eckelmann 01 Apr '11

01 Apr '11

053e6e6c30c161c218eacf2eb2eb4c7ecc0f387c forgot to mark the only locally used function softif_neigh_deselect as static. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- soft-interface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/soft-interface.c b/soft-interface.c index 599b668..58ce440 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -123,7 +123,7 @@ static void softif_neigh_select(struct bat_priv *bat_priv, spin_unlock_bh(&bat_priv->softif_neigh_lock); } -void softif_neigh_deselect(struct bat_priv *bat_priv) +static void softif_neigh_deselect(struct bat_priv *bat_priv) { softif_neigh_select(bat_priv, NULL); } -- 1.7.4.1

2 4

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N April 2011