From patchwork Fri Jun 7 14:52:05 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Wunderlich X-Patchwork-Id: 3148 Return-Path: Received: from nick.hrz.tu-chemnitz.de (nick.hrz.tu-chemnitz.de [134.109.228.11]) by open-mesh.org (Postfix) with ESMTPS id E302F602174 for ; Fri, 7 Jun 2013 16:52:18 +0200 (CEST) Received: from p4ffe57f6.dip0.t-ipconnect.de ([79.254.87.246] helo=pandem0nium) by nick.hrz.tu-chemnitz.de with esmtpsa (TLSv1:DHE-RSA-AES128-SHA:128) (Exim 4.80.1) (envelope-from ) id 1Uky1Z-0003FI-5q; Fri, 07 Jun 2013 16:52:17 +0200 Received: from dotslash by pandem0nium with local (Exim 4.80) (envelope-from ) id 1Uky1Y-0000QJ-Lp; Fri, 07 Jun 2013 16:52:16 +0200 From: Simon Wunderlich To: b.a.t.m.a.n@lists.open-mesh.org Date: Fri, 7 Jun 2013 16:52:05 +0200 Message-Id: <1370616725-1598-1-git-send-email-siwu@hrz.tu-chemnitz.de> X-Mailer: git-send-email 1.7.10.4 X-purgate: clean X-purgate-type: clean X-purgate-ID: 154106::1370616737-000004FE-291A86F3/0-0/0-0 X-Scan-AV: nick.hrz.tu-chemnitz.de; 2013-06-07 16:52:17; 12d43f963b8ce4d05aabc8fde5fe655a X-Scan-SA: nick.hrz.tu-chemnitz.de; 2013-06-07 16:52:17; 3f8d4f68c64c5e02e184f2d86568bf27 X-Spam-Score: -1.0 (-) X-Spam-Report: --- Textanalyse SpamAssassin 3.3.1 (-1.0 Punkte) Fragen an/questions to: Postmaster TU Chemnitz * -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP --- Ende Textanalyse Cc: Simon Wunderlich Subject: [B.A.T.M.A.N.] [PATCH] batman-adv: Don't handle address updates when bla is disabled X-BeenThere: b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 2.1.15 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: Fri, 07 Jun 2013 14:52:19 -0000 From: Simon Wunderlich The bridge loop avoidance has a hook to handle address updates of the originator. These should not be handled when bridge loop avoidance is disabled - it might send some bridge loop avoidance packets which should not appear if bla is disabled. Signed-off-by: Simon Wunderlich --- bridge_loop_avoidance.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/bridge_loop_avoidance.c b/bridge_loop_avoidance.c index ab537ec..6ea7ccf 100644 --- a/bridge_loop_avoidance.c +++ b/bridge_loop_avoidance.c @@ -1073,6 +1073,10 @@ void batadv_bla_update_orig_address(struct batadv_priv *bat_priv, group = htons(crc16(0, primary_if->net_dev->dev_addr, ETH_ALEN)); bat_priv->bla.claim_dest.group = group; + /* purge everything when bridge loop avoidance is turned off. */ + if (!atomic_read(&bat_priv->bridge_loop_avoidance)) + oldif = NULL; + if (!oldif) { batadv_bla_purge_claims(bat_priv, NULL, 1); batadv_bla_purge_backbone_gw(bat_priv, 1);