Commit 980d55b2 authored by Antonio Quartulli's avatar Antonio Quartulli Committed by Marek Lindner

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: default avatarAntonio Quartulli <ordex@autistici.org>
Signed-off-by: default avatarMarek Lindner <lindner_marek@yahoo.de>
parent 058d0e26
...@@ -230,8 +230,9 @@ void tt_local_add(struct net_device *soft_iface, const uint8_t *addr) ...@@ -230,8 +230,9 @@ void tt_local_add(struct net_device *soft_iface, const uint8_t *addr)
if (tt_global_entry) { if (tt_global_entry) {
/* This node is probably going to update its tt table */ /* This node is probably going to update its tt table */
tt_global_entry->orig_node->tt_poss_change = true; tt_global_entry->orig_node->tt_poss_change = true;
_tt_global_del(bat_priv, tt_global_entry, /* The global entry has to be marked as PENDING and has to be
"local tt received"); * kept for consistency purpose */
tt_global_entry->flags |= TT_CLIENT_PENDING;
send_roam_adv(bat_priv, tt_global_entry->addr, send_roam_adv(bat_priv, tt_global_entry->addr,
tt_global_entry->orig_node); tt_global_entry->orig_node);
} }
...@@ -787,6 +788,11 @@ struct orig_node *transtable_search(struct bat_priv *bat_priv, ...@@ -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)) if (!atomic_inc_not_zero(&tt_global_entry->orig_node->refcount))
goto free_tt; 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; orig_node = tt_global_entry->orig_node;
free_tt: free_tt:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment