From patchwork Fri Oct 15 15:43:37 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Lindner X-Patchwork-Id: 489 Return-Path: Received: from nm9-vm0.bullet.mail.ukl.yahoo.com (nm9-vm0.bullet.mail.ukl.yahoo.com [217.146.183.240]) by open-mesh.org (Postfix) with SMTP id 618771544BE for ; Fri, 15 Oct 2010 17:46:07 +0200 (CEST) Received: from [217.146.183.210] by nm9.bullet.mail.ukl.yahoo.com with NNFMP; 15 Oct 2010 15:46:06 -0000 Received: from [217.146.183.60] by tm3.bullet.mail.ukl.yahoo.com with NNFMP; 15 Oct 2010 15:46:02 -0000 Received: from [127.0.0.1] by omp1029.mail.ukl.yahoo.com with NNFMP; 15 Oct 2010 15:45:58 -0000 X-Yahoo-Newman-Id: 744652.49650.bm@omp1029.mail.ukl.yahoo.com Received: (qmail 9724 invoked from network); 15 Oct 2010 15:45:58 -0000 DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=s1024; d=yahoo.de; h=DKIM-Signature:Received:X-Yahoo-SMTP:X-YMail-OSG:X-Yahoo-Newman-Property:From:To:Cc:Subject:Date:Message-Id:X-Mailer:In-Reply-To:References; b=DtGaY+mN6y8BJTusWPJ1Cd+VVPDNiOsp+QFhNl+UBgApkVAs379KlfBsiypN1ZPfn7pqDwkCbNBMqe6JyFqx9GS6EX+Ot5i4CqzI9Qxd+Fb1iTgUFwbF0jEAzqeSNRXoneDwbNFuEY0g18QJeYIDDxO6NFPD1zRJVS0wpKqIYJU= ; DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.de; s=s1024; t=1287157558; bh=b4U4UKrOzhR4uKNcOVKpYDxWH8h5GV1PXE9sjy3afhM=; h=Received:X-Yahoo-SMTP:X-YMail-OSG:X-Yahoo-Newman-Property:From:To:Cc:Subject:Date:Message-Id:X-Mailer:In-Reply-To:References; b=3VRIx7kJZMU0rpbznE4e+QoW3FpZ6aT6tm1z1PImz1xVN0RGerErGMSiUEwSPklcCJhe1Zxg1kg3Ge1SqB03ElkIk7MQLlqJUW2EOrc/M0gWjhbcwIG36A5M01uSbCldTPZU/7Hy4/sJZZstos7ghlF4fb6iiHAfxR1s9lvdnpQ= Received: from localhost (lindner_marek@78.225.40.81 with plain) by smtp147.mail.ukl.yahoo.com with SMTP; 15 Oct 2010 15:45:58 +0000 GMT X-Yahoo-SMTP: tW.h3tiswBBMXO2coYcbPigGD5Lt6zY_.Zc- X-YMail-OSG: 1GenkGMVM1leWnFG5n7Onr.VZN6UeaN9ceQtW1juYaArBMm LL3vnVcObwcrYt2VPS_qoxjNfL2La2Qf1.XNXyufxsJU7v5TwPiXyM8JRsml ZFxZ_egTpF0Z1yG9Q1u8EMyFrkPo7JwpNbFsIjSwe1HYsp4KBInTZ4W2v.vE znfvVgBcdmL458KgcPUBERsRU96t7AaK3QB.SCXNurH2MUz1UwLMzwz1NkiU DdqmpzPIKG_Tk6ohYc_q07Qh32Yy02IaszmwI2tPg X-Yahoo-Newman-Property: ymail-3 From: Marek Lindner To: b.a.t.m.a.n@lists.open-mesh.org Date: Fri, 15 Oct 2010 17:43:37 +0200 Message-Id: <1287157417-15369-3-git-send-email-lindner_marek@yahoo.de> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1287157417-15369-1-git-send-email-lindner_marek@yahoo.de> References: <1287157417-15369-1-git-send-email-lindner_marek@yahoo.de> Cc: Marek Lindner Subject: [B.A.T.M.A.N.] [PATCH 3/3] batman-adv: process OGMs bigger than MAX_AGGREGATION_BYTES 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: Fri, 15 Oct 2010 15:46:07 -0000 Reported-by: Sam Yeung Signed-off-by: Marek Lindner --- batman-adv/aggregation.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/batman-adv/aggregation.c b/batman-adv/aggregation.c index 16b268e..08624d4 100644 --- a/batman-adv/aggregation.c +++ b/batman-adv/aggregation.c @@ -257,9 +257,7 @@ void receive_aggr_bat_packet(struct ethhdr *ethhdr, unsigned char *packet_buff, batman_packet = (struct batman_packet *)packet_buff; - while (aggregated_packet(buff_pos, packet_len, - batman_packet->num_hna)) { - + do { /* network to host order for our 32bit seqno, and the orig_interval. */ batman_packet->seqno = ntohl(batman_packet->seqno); @@ -272,5 +270,6 @@ void receive_aggr_bat_packet(struct ethhdr *ethhdr, unsigned char *packet_buff, buff_pos += BAT_PACKET_LEN + hna_len(batman_packet); batman_packet = (struct batman_packet *) (packet_buff + buff_pos); - } + } while (aggregated_packet(buff_pos, packet_len, + batman_packet->num_hna)); }