From patchwork Sun Oct 30 15:22:43 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Wunderlich X-Patchwork-Id: 1310 Return-Path: Received: from cora.hrz.tu-chemnitz.de (cora.hrz.tu-chemnitz.de [134.109.228.40]) by open-mesh.org (Postfix) with ESMTPS id 7A69B60066D for ; Sun, 30 Oct 2011 16:22:52 +0100 (CET) Authentication-Results: open-mesh.org; dkim=pass (1024-bit key) header.i=@tu-chemnitz.de; dkim-adsp=none DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tu-chemnitz.de; s=dkim2010; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=MZIDAND1BF1jY1uY9EEwgv5RPosE+1N1yy6BPqCkzJk=; b=tKOmCDzKmHBIpO3UioHSmi5g3BW/f9uI+1KgsdicLdSOOtVOpaAtyKQX8U6tjlIkD5H16B2Fz6P8muT0cqij4JNrexlI75iSiQ9TuPWonw50z3YPgRROst1iygsJMb4WL+z4tFKeuolOdHWTdyHLOBA7Jc1MukTdutpQ5RvKico=; Received: from p57aa138b.dip0.t-ipconnect.de ([87.170.19.139] helo=pandem0nium) by cora.hrz.tu-chemnitz.de with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.76) (envelope-from ) id 1RKXDn-0002du-KU; Sun, 30 Oct 2011 16:22:51 +0100 Received: from dotslash by pandem0nium with local (Exim 4.72) (envelope-from ) id 1RKXDm-0000qv-Ce; Sun, 30 Oct 2011 16:22:50 +0100 From: Simon Wunderlich To: b.a.t.m.a.n@lists.open-mesh.org Date: Sun, 30 Oct 2011 16:22:43 +0100 Message-Id: <1319988163-3249-1-git-send-email-siwu@hrz.tu-chemnitz.de> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <4EAC49D7.2060609@intra2net.com> References: <4EAC49D7.2060609@intra2net.com> 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 X-Scan-Signature: e3260060fbba42ba6f18958e4f5000eb Cc: netdev@vger.kernel.org, Simon Wunderlich Subject: [B.A.T.M.A.N.] [PATCH] batman-adv: Fix range check for expected packets 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: Sun, 30 Oct 2011 15:22:52 -0000 The check for new packets in the future used a wrong binary operator, which makes the check expression always true and accepting too many packets. Reported-by: Thomas Jarosch Signed-off-by: Simon Wunderlich --- bitarray.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/bitarray.c b/bitarray.c index 0be9ff3..9bc63b2 100644 --- a/bitarray.c +++ b/bitarray.c @@ -155,7 +155,7 @@ int bit_get_packet(void *priv, unsigned long *seq_bits, /* sequence number is much newer, probably missed a lot of packets */ if ((seq_num_diff >= TQ_LOCAL_WINDOW_SIZE) - || (seq_num_diff < EXPECTED_SEQNO_RANGE)) { + && (seq_num_diff < EXPECTED_SEQNO_RANGE)) { bat_dbg(DBG_BATMAN, bat_priv, "We missed a lot of packets (%i) !\n", seq_num_diff - 1);