From patchwork Sat Mar 20 03:31:48 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Linus_L=C3=BCssing?= X-Patchwork-Id: 71 Return-Path: Received: from fmmailgate02.web.de (fmmailgate02.web.de [217.72.192.227]) by open-mesh.net (Postfix) with ESMTP id BBAFA1540DD for ; Sat, 20 Mar 2010 04:31:59 +0100 (CET) Received: from smtp08.web.de (fmsmtp08.dlan.cinetic.de [172.20.5.216]) by fmmailgate02.web.de (Postfix) with ESMTP id 1BAE21565B516 for ; Sat, 20 Mar 2010 04:31:59 +0100 (CET) Received: from [78.54.12.205] (helo=localhost) by smtp08.web.de with asmtp (TLSv1:AES128-SHA:128) (WEB.DE 4.110 #4) id 1NspPq-0003hh-00; Sat, 20 Mar 2010 04:31:58 +0100 From: =?UTF-8?q?Linus=20L=C3=BCssing?= To: b.a.t.m.a.n@lists.open-mesh.org Date: Sat, 20 Mar 2010 04:31:48 +0100 Message-Id: <1269055908-20369-2-git-send-email-linus.luessing@web.de> X-Mailer: git-send-email 1.7.0 In-Reply-To: <1269055908-20369-1-git-send-email-linus.luessing@web.de> References: <1269055908-20369-1-git-send-email-linus.luessing@web.de> MIME-Version: 1.0 Sender: linus.luessing@web.de X-Sender: linus.luessing@web.de X-Provags-ID: V01U2FsdGVkX18MM5MojTxDENyCo1xJDx3oJmnZafOPWphV/k/F MZ7l9UVqb0MM/GkzdTczax1n9CbinZnhGozb41r1/+s6PItY17 rct7BFTBtwGJkL5I1JAw== Subject: [B.A.T.M.A.N.] [PATCH 2/2] batman-adv: Fix aggregation direct-link bug X-BeenThere: b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 2.1.11 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: Sat, 20 Mar 2010 03:31:59 -0000 So far, neighbour's secondary interface OGMs can involuntarily piggyback on primary interface OGMs that arrived on the same secondary interface before. Secondary interface OGMs should NEVER leave their direct neighbour broadcast domain! This patch ensures that secondary interface OGMs can only be aggregated to other secondary interface OGMs. Signed-off-by: Linus Lüssing --- aggregation.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/batman-adv-kernelland/aggregation.c b/batman-adv-kernelland/aggregation.c index 0635b5a..567c31a 100644 --- a/batman-adv-kernelland/aggregation.c +++ b/batman-adv-kernelland/aggregation.c @@ -81,9 +81,15 @@ static bool can_aggregate_with(struct batman_packet *new_batman_packet, * interface only - we still can aggregate */ if ((directlink) && (new_batman_packet->ttl == 1) && - (forw_packet->if_incoming == if_incoming)) + (forw_packet->if_incoming == if_incoming) && + + /* packets from direct neighbors or + * own secondary interface packets + * (= secondary interface packets in general) */ + (batman_packet->flags & DIRECTLINK || + (forw_packet->own && + forw_packet->if_incoming->if_num != 0))) return true; - } return false;