From owner-freebsd-current@FreeBSD.ORG Sat Mar 14 20:22:53 2009 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 58A33106568B; Sat, 14 Mar 2009 20:22:53 +0000 (UTC) (envelope-from yanefbsd@gmail.com) Received: from rv-out-0506.google.com (rv-out-0506.google.com [209.85.198.233]) by mx1.freebsd.org (Postfix) with ESMTP id 11D4E8FC2A; Sat, 14 Mar 2009 20:22:52 +0000 (UTC) (envelope-from yanefbsd@gmail.com) Received: by rv-out-0506.google.com with SMTP id f6so2360810rvb.43 for ; Sat, 14 Mar 2009 13:22:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:date:message-id:subject :from:to:cc:content-type:content-transfer-encoding; bh=lbKEk7bESW79d6smCh4L9J1375nu/bVri8h1nbA+Dbc=; b=HWzEjPgtyqtEb9hwNnEPy8axbfdNSzD595eK/dAyY7XQxXcVe11KtH38cY16Izoiwz KB0hvkJKiT8dvxoUb50btnQkjLSN1j9/DZ8CzocwWW6TtDnBOpLm3PU6zkdEttRog3it GrOvq0n1aj+zyYphnh5Mygcvkyn17+j+GG7Pg= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:date:message-id:subject:from:to:cc:content-type :content-transfer-encoding; b=TleXNCL+G4iA+hZcVEcsT7ngkOzkYYitIK9QNERsy3NWBM+bn6cmX38w3IFyw3Pd7P sIKpACCT0/SwdK7hr7XWYp0BYJat4Vn7j30+ISVF6sGvRpDjd7T8vaE1O98d4uLhBQy/ 0baERqeZLlTnz3r7BoOxAwu9MKNP5T7smWmFs= MIME-Version: 1.0 Received: by 10.143.6.19 with SMTP id j19mr1302964wfi.128.1237062172661; Sat, 14 Mar 2009 13:22:52 -0700 (PDT) Date: Sat, 14 Mar 2009 13:22:52 -0700 Message-ID: <7d6fde3d0903141322m2171e0d9h84788db92d5eaa14@mail.gmail.com> From: Garrett Cooper To: Kostik Belousov Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Cc: svn-src-head@freebsd.org, Randall Stewart , svn-src-all@freebsd.org, src-committers@freebsd.org, FreeBSD Current Subject: Fixes for SCTP compile errors on CURRENT [was Re: svn commit: r189790 - head/sys/netinet] X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Mar 2009 20:22:54 -0000 On Sat, Mar 14, 2009 at 12:54 PM, Garrett Cooper wrote= : > On Sat, Mar 14, 2009 at 9:06 AM, Kostik Belousov wr= ote: >> On Sat, Mar 14, 2009 at 01:42:14PM +0000, Randall Stewart wrote: >>> Author: rrs >>> Date: Sat Mar 14 13:42:13 2009 >>> New Revision: 189790 >>> URL: http://svn.freebsd.org/changeset/base/189790 >>> >>> Log: >>> =A0 Fixes several PR-SCTP releated bugs. >>> =A0 =A0- When sending large PR-SCTP messages over a >>> =A0 =A0 =A0lossy link we would incorrectly calculate the fwd-tsn >>> =A0 =A0- When receiving large multipart pr-sctp packets we would >>> =A0 =A0 =A0incorrectly send back a SACK that would renege improperly >>> =A0 =A0 =A0on already received packets thus causing unneeded retransmis= sions. >> >> With this commit, I get >> /usr/home/kostik/work/build/bsd/DEV/src/sys/netinet/sctp_indata.c: In fu= nction 'sctp_express_handle_sack': >> /usr/home/kostik/work/build/bsd/DEV/src/sys/netinet/sctp_indata.c:4772: = error: 'struct sctp_data_chunkrec' has no member named 'fwd_tsn_cnt' >> /usr/home/kostik/work/build/bsd/DEV/src/sys/netinet/sctp_indata.c:4773: = error: 'struct sctp_data_chunkrec' has no member named 'fwd_tsn_cnt' >> /usr/home/kostik/work/build/bsd/DEV/src/sys/netinet/sctp_indata.c:4775: = error: 'struct sctp_data_chunkrec' has no member named 'fwd_tsn_cnt' > > As do I. > -Garrett The attached patch fixes all SCTP related compile errors, but I'm a bit worried about whether or not discard_rest is set anywhere in the code, or the entire data struct is properly zero'ed out (haven't inspected it yet): Thanks, -Garrett Index: sys/netinet/sctp_structs.h =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- sys/netinet/sctp_structs.h (revision 189829) +++ sys/netinet/sctp_structs.h (working copy) @@ -31,7 +31,7 @@ /* $KAME: sctp_structs.h,v 1.13 2005/03/06 16:04:18 itojun Exp $ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/sys/netinet/sctp_structs.h,v 1.30 2009/02/20 15:03:54 rrs Exp $"); #ifndef __sctp_structs_h__ #define __sctp_structs_h__ @@ -310,6 +310,8 @@ /* ECN Nonce: Nonce Value for this chunk */ uint8_t ect_nonce; + uint8_t fwd_tsn_cnt; + /* * part of the Highest sacked algorithm to be able to stroke counts * on ones that are FR'd. @@ -445,6 +447,7 @@ uint8_t pr_sctp_on; uint8_t sender_all_done; uint8_t put_last_out; + uint8_t discard_rest; }; /*