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.] [PATCH] batman-adv: update copyright years
by Antonio Quartulli 15 Mar '12

15 Mar '12

update copyright years in order to include 2012 Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- bridge_loop_avoidance.c | 2 +- bridge_loop_avoidance.h | 2 +- distributed-arp-table.c | 2 +- distributed-arp-table.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bridge_loop_avoidance.c b/bridge_loop_avoidance.c index 23bfbed..8a17a78 100644 --- a/bridge_loop_avoidance.c +++ b/bridge_loop_avoidance.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2011-2012 B.A.T.M.A.N. contributors: * * Simon Wunderlich * diff --git a/bridge_loop_avoidance.h b/bridge_loop_avoidance.h index 2758b8c..e1a2966 100644 --- a/bridge_loop_avoidance.h +++ b/bridge_loop_avoidance.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2011-2012 B.A.T.M.A.N. contributors: * * Simon Wunderlich * diff --git a/distributed-arp-table.c b/distributed-arp-table.c index c610108..b43bece 100644 --- a/distributed-arp-table.c +++ b/distributed-arp-table.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2011-2012 B.A.T.M.A.N. contributors: * * Antonio Quartulli * diff --git a/distributed-arp-table.h b/distributed-arp-table.h index 0916661..26b98c0 100644 --- a/distributed-arp-table.h +++ b/distributed-arp-table.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2011-2012 B.A.T.M.A.N. contributors: * * Antonio Quartulli * -- 1.7.3.4

2 1

[B.A.T.M.A.N.] [PATCH 1/5] batman-adv: ignore protocol packets if the interface did not enable this protocol
by Marek Lindner 15 Mar '12

15 Mar '12

Reported-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> --- bat_iv_ogm.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index eca2b44..819ae49 100644 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -1186,6 +1186,7 @@ out: static int bat_iv_ogm_receive(struct sk_buff *skb, struct hard_iface *if_incoming) { + struct bat_priv *bat_priv = netdev_priv(if_incoming->soft_iface); struct batman_ogm_packet *batman_ogm_packet; struct ethhdr *ethhdr; int buff_pos = 0, packet_len; @@ -1196,6 +1197,11 @@ static int bat_iv_ogm_receive(struct sk_buff *skb, if (!ret) return NET_RX_DROP; + /* did we receive a B.A.T.M.A.N. IV OGM packet on an interface + * that does not have B.A.T.M.A.N. IV enabled ? */ + if (bat_priv->bat_algo_ops->bat_ogm_emit != bat_iv_ogm_emit) + return NET_RX_DROP; + packet_len = skb_headlen(skb); ethhdr = (struct ethhdr *)skb_mac_header(skb); packet_buff = skb->data; -- 1.7.9.1

3 16

Re: [B.A.T.M.A.N.] [Battlemesh] Battlemesh v5 tests
by Gabriel Kerneis 13 Mar '12

13 Mar '12

[CC: b.a.t.m.a.n(a)lists.open-mesh.org, see note 3 in particular] Antonio, On Wed, Mar 07, 2012 at 06:17:52PM +0100, Antonio Quartulli wrote: > Technical details about what? Interface-alternating? It is there! > Gabriel wrote the link. No. Please re-read my email carefuly. The wiki contains a rough explanation of the general principle (ie. “same interface = bad, different interface = good”). Not the actual algorithm used by batman-adv (quoting from the wiki: “the algorithm tries to avoid forwarding packets on the interface which just received the packet”). Note that the wiki has been updated since then, by Simon with a few more details [1], and by Marek with benchmark results from WBMv3. > Gabriel said he has not enough time to look into it. I'm sorry, but I don't think > this is a good reason to blame batman-adv devs :P I finally decided to settle this issue and spent my breakfast reading batman-adv/routing.c [2] instead of my favorite newspaper. Here is what I understood: At all times, batman-adv maintains a list of "bonding candidates" for each node (bonding_candidate_add, called from bat_iv_ogm.c:699). Some node "neigh" is a bonding candidate for another node "orig" if and only if: - neigh and orig have the same primary address, ie. are in fact the same router, - the links to reach them have the same quality up to some additive constant (BONDING_TQ_THRESHOLD = 50) [3], - orig does not already have another bonding candidate for the same interface, because it could interfere – but what if the neigh has a better link quality, isn’t it a pity to ignore it? Then, assuming that "interface alternating" is enabled, the list of bonding candidates is used on every route selection (find_ifalter_router, called from routing.c:769). More precisely, once batman has chosen a next-hop router for a packet based on its classical routing algorithm, it walks the list of the bonding candidates associated to the primary interface for this router [4]. It selects the actual next-hop on the following criteria: - it must not be on the same interface as the packet came in, - its quality must be as high as possible (given the previous constraint). This is the kind of explanation I would have loved to find on the wiki. By the way, consider it public domain and feel free to copy/paste/correct it if you wish. It is still not clear to me exactly why this works, but I believe this is what the code does, and is definitely easier to discuss than generic, unsubstantiated claims. Best regards, Gabriel [1] “Interface alternating is only performed if the two candidate links to the next hop have a similar quality.” http://www.open-mesh.org/wiki/batman-adv/Multi-link-optimize [2] http://www.open-mesh.org/projects/batman-adv/repository/revisions/master/en… [3] By the way, there is something I don’t understand: neigh_node->tq_avg will be accepted event if it is far greater than router->tq_avg + BONDING_TQ_THRESHOLD. Shouldn’t it be: abs(neigh_node->tq_avg - router->tq_avg) > BONDING_TQ_THRESHOLD? http://www.open-mesh.org/projects/batman-adv/repository/revisions/master/en… [4] Why the primary and not the chosen router directly? Is the bonding candidates list always associated to the primary interface?

11 47

[B.A.T.M.A.N.] pull request: batman-adv 2012-03-11
by Marek Lindner 12 Mar '12

12 Mar '12

Hi David, here are a few late coming patches intended to be merged into net-next-2.6/3.4 if possible. This is nothing fancy: They make peace with the recently introduced checkpatch changes. Let me know if there any problems. Thanks, Marek The following changes since commit 7c64fd98ce512de6c6dae0452dc026446bd368d5: batman-adv: Fix indentation of multiline statements (2012-02-28 19:14:31 +0800) are available in the git repository at: git://git.open-mesh.org/linux-merge.git tags/batman-adv-for-davem or older git versions: git://git.open-mesh.org/linux-merge.git tags/batman-adv-for-davem for you to fetch changes up to 40e0c4f51d3fc3fd54edc797adae314fbe2b96a6: batman-adv: Remove spaces after a cast (2012-03-11 06:29:44 +0800) ---------------------------------------------------------------- checkpatch updates for batman-adv ---------------------------------------------------------------- Sven Eckelmann (4): batman-adv: Ignore 80-chars per line limits for strings batman-adv: Don't begin block comments with only a /* line batman-adv: Use {} braces consistent on the arms of a statement batman-adv: Remove spaces after a cast net/batman-adv/bat_iv_ogm.c | 57 +++++++++-------------- net/batman-adv/bat_sysfs.c | 16 +++--- net/batman-adv/gateway_client.c | 31 +++++------- net/batman-adv/gateway_common.c | 8 ++-- net/batman-adv/hard-interface.c | 36 +++++---------- net/batman-adv/icmp_socket.c | 12 ++--- net/batman-adv/main.c | 8 ++-- net/batman-adv/main.h | 13 +---- net/batman-adv/originator.c | 14 ++--- net/batman-adv/routing.c | 30 ++++++------ net/batman-adv/send.c | 6 +- net/batman-adv/soft-interface.c | 15 +++--- net/batman-adv/translation-table.c | 89 +++++++++++++++++------------------ net/batman-adv/unicast.c | 4 +- 14 files changed, 145 insertions(+), 194 deletions(-)

3 6

[B.A.T.M.A.N.] Fix of nightly checkpatch errors
by Sven Eckelmann 10 Mar '12

10 Mar '12

Hi, it seems that checkpatch in linux-next has new checks. I would like to propose some patches that removes these problems from batman-adv. We have some patches for next and some for master. The master patches can only be applied after merging next (after the next patches are applied). There are still some merge conflicts. Therefore, I would like to send a bundle that can be used to merge my version (for checking purposes or to really apply the patches). Here is an example how to use it: $ git pull checkpatch.bundle master:master $ git pull checkpatch.bundle next:next Regards, Sven

2 17

[B.A.T.M.A.N.] [PATCH] batman-adv: fix PENDING flag behaviour in case of multiple roamings
by Antonio Quartulli 07 Mar '12

07 Mar '12

In case of multiple romaings always between the same two nodes (going back and forth from one to the other) within the same originator interval (this is much more suitable in setups where the orig_interval last longer than one sec), the flags should not be messed up and should eventually converge to a correct status. In particular, if we marked a LOCAL client as PENDING due to the roaming, if the client comes back to us we have to simply reset the PENDING flag and remove the DEL event from the sending queue. This is possible because the DEL operation has not been committed and advertised yet. If we don't do that, the client is deleted and then re-added, this can create connection problems to the client and would also create useless noise in the network due to the advertisement overhead. Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- translation-table.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/translation-table.c b/translation-table.c index 9f4d706..4bd9490 100644 --- a/translation-table.c +++ b/translation-table.c @@ -206,6 +206,15 @@ void tt_local_add(struct net_device *soft_iface, const uint8_t *addr, if (tt_local_entry) { tt_local_entry->last_seen = jiffies; + + /* in case of multiple roaming in the same orig interval we + * should correctly handle the client flags: a client which was + * marked as pending can now be unmarked because it came back */ + if (tt_local_entry->common.flags & TT_CLIENT_PENDING) { + tt_local_entry->common.flags &= ~TT_CLIENT_PENDING; + goto reinsertion; + } + goto out; } @@ -242,7 +251,7 @@ void tt_local_add(struct net_device *soft_iface, const uint8_t *addr, tt_local_entry_free_ref(tt_local_entry); goto out; } - +reinsertion: tt_local_event(bat_priv, addr, tt_local_entry->common.flags); /* remove address from global hash if present */ -- 1.7.3.4

1 1

[B.A.T.M.A.N.] [PATCH] batman-adv: avoid ap_isolated check for broadcast packet
by Antonio Quartulli 05 Mar '12

05 Mar '12

in case of a broadcast packet, the result of the ap_isolated check is always false (since we have no ff:ff:ff:ff:ff:ff client to check for TT_CLIENT_WIFI), therefore we can avoid searching the translation table and we can return false directly Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- - Yes, it's just an optimisation that aims to avoid accessing the hash table when we already know that it is not needed. translation-table.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/translation-table.c b/translation-table.c index 9a07882..2e16882 100644 --- a/translation-table.c +++ b/translation-table.c @@ -2034,6 +2034,11 @@ bool is_ap_isolated(struct bat_priv *bat_priv, uint8_t *src, uint8_t *dst) if (!atomic_read(&bat_priv->ap_isolation)) return false; + /* if we are dealing with a broadcast packet, we can avoid to search the + * translation table */ + if (is_broadcast_ether_addr(dst)) + return false; + tt_local_entry = tt_local_hash_find(bat_priv, dst); if (!tt_local_entry) goto out; -- 1.7.3.4

2 2

[B.A.T.M.A.N.] [PATCH 1/6] batman-adv: introduce is_single_hop_neigh variable to increase readability
by Marek Lindner 05 Mar '12

05 Mar '12

Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> --- bat_iv_ogm.c | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index d9195b3..aba0204 100644 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -483,7 +483,8 @@ static void bat_iv_ogm_queue_add(struct bat_priv *bat_priv, static void bat_iv_ogm_forward(struct orig_node *orig_node, const struct ethhdr *ethhdr, struct batman_ogm_packet *batman_ogm_packet, - int directlink, struct hard_iface *if_incoming) + bool is_single_hop_neigh, + struct hard_iface *if_incoming) { struct bat_priv *bat_priv = netdev_priv(if_incoming->soft_iface); struct neigh_node *router; @@ -537,7 +538,7 @@ static void bat_iv_ogm_forward(struct orig_node *orig_node, /* switch of primaries first hop flag when forwarding */ batman_ogm_packet->flags &= ~PRIMARIES_FIRST_HOP; - if (directlink) + if (is_single_hop_neigh) batman_ogm_packet->flags |= DIRECTLINK; else batman_ogm_packet->flags &= ~DIRECTLINK; @@ -926,7 +927,8 @@ static void bat_iv_ogm_process(const struct ethhdr *ethhdr, struct neigh_node *orig_neigh_router = NULL; int has_directlink_flag; int is_my_addr = 0, is_my_orig = 0, is_my_oldorig = 0; - int is_broadcast = 0, is_bidirectional, is_single_hop_neigh; + int is_broadcast = 0, is_bidirectional; + bool is_single_hop_neigh = false; int is_duplicate; uint32_t if_incoming_seqno; @@ -950,8 +952,8 @@ static void bat_iv_ogm_process(const struct ethhdr *ethhdr, has_directlink_flag = (batman_ogm_packet->flags & DIRECTLINK ? 1 : 0); - is_single_hop_neigh = (compare_eth(ethhdr->h_source, - batman_ogm_packet->orig) ? 1 : 0); + if (compare_eth(ethhdr->h_source, batman_ogm_packet->orig)) + is_single_hop_neigh = true; bat_dbg(DBG_BATMAN, bat_priv, "Received BATMAN packet via NB: %pM, IF: %s [%pM] " @@ -1125,7 +1127,7 @@ static void bat_iv_ogm_process(const struct ethhdr *ethhdr, /* mark direct link on incoming interface */ bat_iv_ogm_forward(orig_node, ethhdr, batman_ogm_packet, - 1, if_incoming); + is_single_hop_neigh, if_incoming); bat_dbg(DBG_BATMAN, bat_priv, "Forwarding packet: " "rebroadcast neighbor packet with direct link flag\n"); @@ -1148,7 +1150,7 @@ static void bat_iv_ogm_process(const struct ethhdr *ethhdr, bat_dbg(DBG_BATMAN, bat_priv, "Forwarding packet: rebroadcast originator packet\n"); bat_iv_ogm_forward(orig_node, ethhdr, batman_ogm_packet, - 0, if_incoming); + is_single_hop_neigh, if_incoming); out_neigh: if ((orig_neigh_node) && (!is_single_hop_neigh)) -- 1.7.9

3 17

[B.A.T.M.A.N.] batman openwrt
by Gioacchino Mazzurco 04 Mar '12

04 Mar '12

Hi! After upgrading to latest batman version on openwt batman stopped adding ethernet or bridge interfaces at start... it add only wireless interfaces I am using backfire for the core and trunk for packages the problem is related to that?

2 10

[B.A.T.M.A.N.] pull request: batman-adv 2012-02-28
by Marek Lindner 28 Feb '12

28 Feb '12

Hi David, here comes the second set of patches I'd like to see pulled into net-next-2.6/3.4. It mostly contains code cleanups, some code refactoring work and a minor fix. Let me know if there any problems. Thanks, Marek The following changes since commit ea3d2fd1b11fb3ef8706a48ece0a49a61bcd08bc: batman-adv: export used routing algorithm via sysfs (2012-02-17 02:50:20 +0800) are available in the git repository at: git://git.open-mesh.org/linux-merge.git batman-adv-for-davem or older git versions: git://git.open-mesh.org/linux-merge.git tags/batman-adv-for-davem for you to fetch changes up to 7c64fd98ce512de6c6dae0452dc026446bd368d5: batman-adv: Fix indentation of multiline statements (2012-02-28 19:14:31 +0800) ---------------------------------------------------------------- code cleanups and code refactoring ---------------------------------------------------------------- Antonio Quartulli (3): batman-adv: set TT_CLIENT_NEW flag before invoking hash_add() batman-adv: code refactoring - move debug print into tt_local_set_pending batman-adv: TT_CLIENT_PENDING is never set in struct tt_global_entry Marek Lindner (1): batman-adv: convert time_after instances to has_timed_out Sven Eckelmann (4): batman-adv: refactor tt_global_del() to avoid misalignment batman-adv: Update copyright years batman-adv: Start new development cycle batman-adv: Fix indentation of multiline statements net/batman-adv/Makefile | 2 +- net/batman-adv/bat_algo.h | 2 +- net/batman-adv/bat_debugfs.c | 2 +- net/batman-adv/bat_debugfs.h | 2 +- net/batman-adv/bat_iv_ogm.c | 2 +- net/batman-adv/bat_sysfs.c | 6 +- net/batman-adv/bat_sysfs.h | 2 +- net/batman-adv/bitarray.c | 10 ++-- net/batman-adv/bitarray.h | 2 +- net/batman-adv/gateway_client.c | 6 +- net/batman-adv/gateway_client.h | 2 +- net/batman-adv/gateway_common.c | 6 +- net/batman-adv/gateway_common.h | 2 +- net/batman-adv/hard-interface.c | 32 +++++----- net/batman-adv/hard-interface.h | 2 +- net/batman-adv/hash.c | 2 +- net/batman-adv/hash.h | 2 +- net/batman-adv/icmp_socket.c | 2 +- net/batman-adv/icmp_socket.h | 2 +- net/batman-adv/main.c | 2 +- net/batman-adv/main.h | 17 +++--- net/batman-adv/originator.c | 18 ++--- net/batman-adv/originator.h | 2 +- net/batman-adv/packet.h | 2 +- net/batman-adv/ring_buffer.c | 2 +- net/batman-adv/ring_buffer.h | 2 +- net/batman-adv/routing.c | 13 ++-- net/batman-adv/routing.h | 2 +- net/batman-adv/send.c | 2 +- net/batman-adv/send.h | 2 +- net/batman-adv/soft-interface.c | 6 +- net/batman-adv/soft-interface.h | 2 +- net/batman-adv/translation-table.c | 119 ++++++++++++++++------------------- net/batman-adv/translation-table.h | 2 +- net/batman-adv/types.h | 2 +- net/batman-adv/unicast.c | 2 +- net/batman-adv/unicast.h | 2 +- net/batman-adv/vis.c | 5 +- net/batman-adv/vis.h | 5 +- 39 files changed, 141 insertions(+), 156 deletions(-)

2 10

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