From patchwork Wed Jul 6 23:40:59 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antonio Quartulli X-Patchwork-Id: 1215 Return-Path: Received: from confino.investici.org (investici.nine.ch [217.150.252.179]) by open-mesh.org (Postfix) with ESMTPS id D8295154401 for ; Thu, 7 Jul 2011 01:41:37 +0200 (CEST) Authentication-Results: open-mesh.org; dkim=pass (1024-bit key) header.i=@autistici.org; dkim-adsp=pass Received: from [217.150.252.179] (confino [217.150.252.179]) (Authenticated sender: ordex@autistici.org) by localhost (Postfix) with ESMTPSA id 3EAF7C8655; Wed, 6 Jul 2011 23:41:37 +0000 (UTC) X-DKIM: Sendmail DKIM Filter v2.8.2 confino.investici.org 3EAF7C8655 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=autistici.org; s=stigmate; t=1309995697; bh=QNg9ccO4CK2YbOf/kMuH/pcU13gJoxIAV+fUr0xt1zk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=G+7HwhajO7JntgQjHcj1sQ+HSkSaTY7FgSW+hNXQhjKPErwe0BKZKbjohSqRqFyxj myTCUYDpSt6KOHrV8bUvXUQvjoni3XEOUe6v8pZcZ70Ssx4t68R4j2VGuYclFP05n2 0GFxhyuu593qSi2UqvEPNc9dNvhRcs3hE7Lhv/dA= From: Antonio Quartulli To: "B.A.T.M.A.N" Date: Thu, 7 Jul 2011 01:40:59 +0200 Message-Id: <1309995659-19126-4-git-send-email-ordex@autistici.org> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: <1309995659-19126-1-git-send-email-ordex@autistici.org> References: <1309995659-19126-1-git-send-email-ordex@autistici.org> Subject: [B.A.T.M.A.N.] [PATCHv2 3/3] batman-adv: keep global table consistency in case of roaming X-BeenThere: b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking List-Id: The list for a Better Approach To Mobile Ad-hoc Networking List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Jul 2011 23:41:38 -0000 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 --- translation-table.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/translation-table.c b/translation-table.c index 3267ca2..dfab867 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); } @@ -780,6 +781,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: