batman-adv: keep global table consistency in case of roaming

To keep consistency of other originator tables, new clients detected as
roamed, are kept in the global table but are marked as TT_CLIENT_PENDING
They are purged only when the new ttvn is received by the corresponding
originator. Moreover they need to be considered as removed in case of global
transtable lookup.

Signed-off-by: Antonio Quartulli <ordex@autistici.org>
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>

diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c
index 7cc67c0f491519b6d9bcf3ca0a7b76e2bfb7def8..fb6931d00cd7f3ae73f46a354f62ce7e82613360 100644 (file)
--- a/net/batman-adv/translation-table.c
+++ b/net/batman-adv/translation-table.c
@@ -230,8 +230,9 @@ void tt_local_add(struct net_device *soft_iface, const uint8_t *addr)
        if (tt_global_entry) {
                /* This node is probably going to update its tt table */
                tt_global_entry->orig_node->tt_poss_change = true;
-               _tt_global_del(bat_priv, tt_global_entry,
-                              "local tt received");
+               /* The global entry has to be marked as PENDING and has to be
+                * kept for consistency purpose */
+               tt_global_entry->flags |= TT_CLIENT_PENDING;
                send_roam_adv(bat_priv, tt_global_entry->addr,
                              tt_global_entry->orig_node);
        }
@@ -787,6 +788,11 @@ struct orig_node *transtable_search(struct bat_priv *bat_priv,
        if (!atomic_inc_not_zero(&tt_global_entry->orig_node->refcount))
                goto free_tt;
 
+       /* A global client marked as PENDING has already moved from that
+        * originator */
+       if (tt_global_entry->flags & TT_CLIENT_PENDING)
+               goto free_tt;
+
        orig_node = tt_global_entry->orig_node;
 
 free_tt: