Repository : ssh://git@open-mesh.org/batman-adv

On branch : master

commit 1f1b6c0d96129e6445652061d93a7fb1f0476fa3 Author: Simon Wunderlich sw@simonwunderlich.de Date: Thu Jun 1 17:11:24 2017 +0200

batman-adv: do not add loop detection mac addresses to global tt

This change has been made for local TT already, add another one for global TT - but only for temporary entries (aka speedy join), to prevent inconsistencies between local and global tables in case an older batman-adv version is still announcing those entries from its local table.

Signed-off-by: Simon Wunderlich sw@simonwunderlich.de Signed-off-by: Sven Eckelmann sven@narfation.org

1f1b6c0d96129e6445652061d93a7fb1f0476fa3 net/batman-adv/translation-table.c | 6 ++++++ 1 file changed, 6 insertions(+)

diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index e75b4937..4b64a9a6 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -4012,6 +4012,12 @@ bool batadv_tt_add_temporary_global_entry(struct batadv_priv *bat_priv, { bool ret = false;

+ /* ignore loop detect macs, they are not supposed to be in the tt local + * data as well. + */ + if (batadv_bla_is_loopdetect_mac(addr)) + return false; + if (!batadv_tt_global_add(bat_priv, orig_node, addr, vid, BATADV_TT_CLIENT_TEMP, atomic_read(&orig_node->last_ttvn)))