From: Antonio Quartulli <ordex@autistici.org>
To: "B.A.T.M.A.N" <b.a.t.m.a.n@lists.open-mesh.org>
Subject: [B.A.T.M.A.N.] [PATCHv3 3/4] batman-adv: keep global table consistency in case of roaming
Date: Thu, 7 Jul 2011 15:25:05 +0200 [thread overview]
Message-ID: <1310045106-23202-4-git-send-email-ordex@autistici.org> (raw)
In-Reply-To: <1310045106-23202-1-git-send-email-ordex@autistici.org>
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>
---
translation-table.c | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/translation-table.c b/translation-table.c
index 7cc67c0..fb6931d 100644
--- a/translation-table.c
+++ b/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:
--
1.7.3.4
next prev parent reply other threads:[~2011-07-07 13:25 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-07 13:25 [B.A.T.M.A.N.] [PATCHv3 0/3] Implement the AP-Isolation mechanism Antonio Quartulli
2011-07-07 13:25 ` [B.A.T.M.A.N.] [PATCHv3 1/4] batman-adv: initialise last_ttvn and tt_crc for the orig_node structure Antonio Quartulli
2011-07-07 13:25 ` [B.A.T.M.A.N.] [PATCHv3 2/4] batman-adv: keep local table consistency for further TT_RESPONSE Antonio Quartulli
2011-07-07 13:25 ` Antonio Quartulli [this message]
2011-07-07 13:25 ` [B.A.T.M.A.N.] [PATCHv4 4/4] batman-adv: request the full table if tt_crc doesn't match Antonio Quartulli
2011-07-07 13:27 ` Antonio Quartulli
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1310045106-23202-4-git-send-email-ordex@autistici.org \
--to=ordex@autistici.org \
--cc=b.a.t.m.a.n@lists.open-mesh.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).