From owner-svn-src-head@FreeBSD.ORG Sat Mar 14 23:17:52 2009 Return-Path: Delivered-To: svn-src-head@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 608D61065673; Sat, 14 Mar 2009 23:17:52 +0000 (UTC) (envelope-from rrs@lakerest.net) Received: from lakerest.net (unknown [IPv6:2001:240:585:2:203:6dff:fe1a:4ddc]) by mx1.freebsd.org (Postfix) with ESMTP id EEFC28FC08; Sat, 14 Mar 2009 23:17:51 +0000 (UTC) (envelope-from rrs@lakerest.net) Received: from [10.1.1.53] ([10.1.1.53]) (authenticated bits=0) by lakerest.net (8.14.3/8.14.3) with ESMTP id n2ENI0Zu004271 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NOT); Sat, 14 Mar 2009 19:18:00 -0400 (EDT) (envelope-from rrs@lakerest.net) Message-Id: <591E79E9-26A4-4616-B99E-D44FFCEABC9F@lakerest.net> From: Randall Stewart To: Garrett Cooper In-Reply-To: <7d6fde3d0903141322m2171e0d9h84788db92d5eaa14@mail.gmail.com> Content-Type: text/plain; charset=US-ASCII; format=flowed; delsp=yes Content-Transfer-Encoding: 7bit Mime-Version: 1.0 (Apple Message framework v930.3) Date: Sat, 14 Mar 2009 19:17:51 -0400 References: <7d6fde3d0903141322m2171e0d9h84788db92d5eaa14@mail.gmail.com> X-Mailer: Apple Mail (2.930.3) Cc: src-committers@FreeBSD.org, svn-src-all@FreeBSD.org, Randall Stewart , FreeBSD Current , Kostik Belousov , svn-src-head@FreeBSD.org Subject: Re: Fixes for SCTP compile errors on CURRENT [was Re: svn commit: r189790 - head/sys/netinet] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Mar 2009 23:17:52 -0000 Garret: That was my bad.. I missed a file on the commit (sctp_structs.h).. Its now committed :-) As far as it being set.. of course it is.. basically the flag is used for large messages when doing PR-SCTP (something that is probably not wise.. but I had someone in Chile doing this).. and it highlighted a few problems in the way PR-SCTP with large messages worked... Still an issue that will cause a print out if you do mixed mode sending PR-SCTP and reliable SCTP.. I need to hunt that down.. its a flight size accounting problem that the audit code catches and fixes.. but I need to figure out what's going on with that :-D R On Mar 14, 2009, at 4:22 PM, Garrett Cooper wrote: > On Sat, Mar 14, 2009 at 12:54 PM, Garrett Cooper > wrote: >> On Sat, Mar 14, 2009 at 9:06 AM, Kostik Belousov >> wrote: >>> 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: >>>> Fixes several PR-SCTP releated bugs. >>>> - When sending large PR-SCTP messages over a >>>> lossy link we would incorrectly calculate the fwd-tsn >>>> - When receiving large multipart pr-sctp packets we would >>>> incorrectly send back a SACK that would renege improperly >>>> on already received packets thus causing unneeded >>>> retransmissions. >>> >>> With this commit, I get >>> /usr/home/kostik/work/build/bsd/DEV/src/sys/netinet/sctp_indata.c: >>> In function '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 > =================================================================== > --- 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; > }; > > /* > ------------------------------ Randall Stewart 803-317-4952 (cell) 803-345-0391(direct)