summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntonio Quartulli <ordex@autistici.org>2012-11-08 21:55:29 +0100
committerAntonio Quartulli <ordex@autistici.org>2012-11-16 09:36:43 +0100
commit1f36aebcc5fa53c5d98f3329186466b5eb76a168 (patch)
tree9edd603b2a8101c819bc6818ef322078d2b546b8
parent27b37ebfa2d2a1b6acef6f2d21c497475c9b9709 (diff)
downloadlinux-3.10-1f36aebcc5fa53c5d98f3329186466b5eb76a168.tar.gz
linux-3.10-1f36aebcc5fa53c5d98f3329186466b5eb76a168.tar.bz2
linux-3.10-1f36aebcc5fa53c5d98f3329186466b5eb76a168.zip
batman-adv: don't add TEMP clients belonging to other backbone nodes
The "early client detection" mechanism must not add clients belonging to other backbone nodes. Such clients must be reached by directly using the LAN instead of the mesh. This was introduced by 30cfd02b60e1cb16f5effb0a01f826c5bb7e4c59 ("batman-adv: detect not yet announced clients") Reported-by: Glen Page <glen.page@thet.net> Signed-off-by: Antonio Quartulli <ordex@autistici.org> Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
-rw-r--r--net/batman-adv/translation-table.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c
index fec1a00a069..baae7158580 100644
--- a/net/batman-adv/translation-table.c
+++ b/net/batman-adv/translation-table.c
@@ -2456,6 +2456,13 @@ bool batadv_tt_add_temporary_global_entry(struct batadv_priv *bat_priv,
{
bool ret = false;
+ /* if the originator is a backbone node (meaning it belongs to the same
+ * LAN of this node) the temporary client must not be added because to
+ * reach such destination the node must use the LAN instead of the mesh
+ */
+ if (batadv_bla_is_backbone_gw_orig(bat_priv, orig_node->orig))
+ goto out;
+
if (!batadv_tt_global_add(bat_priv, orig_node, addr,
BATADV_TT_CLIENT_TEMP,
atomic_read(&orig_node->last_ttvn)))