From owner-cvs-src@FreeBSD.ORG Thu Aug 28 16:24:33 2008
Return-Path: <owner-cvs-src@FreeBSD.ORG>
Delivered-To: cvs-src@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id E7D0B106564A;
Thu, 28 Aug 2008 16:24:33 +0000 (UTC)
(envelope-from keramida@freebsd.org)
Received: from igloo.linux.gr (igloo.linux.gr [62.1.205.36])
by mx1.freebsd.org (Postfix) with ESMTP id 60A9E8FC12;
Thu, 28 Aug 2008 16:24:33 +0000 (UTC)
(envelope-from keramida@freebsd.org)
Received: from kobe.laptop (adsl156-107.kln.forthnet.gr [62.1.247.107])
(authenticated bits=128)
by igloo.linux.gr (8.14.3/8.14.3/Debian-5) with ESMTP id m7SGOMrR011459
(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT);
Thu, 28 Aug 2008 19:24:28 +0300
Received: from kobe.laptop (kobe.laptop [127.0.0.1])
by kobe.laptop (8.14.2/8.14.2) with ESMTP id m7SGOMcH070388;
Thu, 28 Aug 2008 19:24:22 +0300 (EEST)
(envelope-from keramida@freebsd.org)
Received: (from keramida@localhost)
by kobe.laptop (8.14.2/8.14.2/Submit) id m7SGOLi8070387;
Thu, 28 Aug 2008 19:24:21 +0300 (EEST)
(envelope-from keramida@freebsd.org)
From: Giorgos Keramidas <keramida@freebsd.org>
To: Randall Stewart <rrs@freebsd.org>
References: <200808280944.m7S9iN4x065836@repoman.freebsd.org>
Date: Thu, 28 Aug 2008 19:24:20 +0300
In-Reply-To: <200808280944.m7S9iN4x065836@repoman.freebsd.org> (Randall
Stewart's message of "Thu, 28 Aug 2008 09:44:07 +0000 (UTC)")
Message-ID: <87wsi1glaj.fsf@kobe.laptop>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.60 (berkeley-unix)
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
X-MailScanner-ID: m7SGOMrR011459
X-Hellug-MailScanner: Found to be clean
X-Hellug-MailScanner-SpamCheck: not spam, SpamAssassin (not cached,
score=-4.584, required 5, autolearn=not spam, ALL_TRUSTED -1.80,
AWL -0.18, BAYES_00 -2.60)
X-Hellug-MailScanner-From: keramida@freebsd.org
X-Spam-Status: No
Cc: cvs-src@freebsd.org, src-committers@freebsd.org, cvs-all@freebsd.org
Subject: Re: cvs commit: src/sys/netinet sctp_indata.c sctp_lock_bsd.h
sctp_output.c sctp_sysctl.h sctp_timer.c sctp_var.h sctputil.c
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 28 Aug 2008 16:24:34 -0000
On Thu, 28 Aug 2008 09:44:07 +0000 (UTC), Randall Stewart <rrs@freebsd.org> wrote:
> rrs 2008-08-28 09:44:07 UTC
>
> FreeBSD src repository
>
> Modified files:
> sys/netinet sctp_indata.c sctp_lock_bsd.h
> sctp_output.c sctp_sysctl.h sctp_timer.c
> sctp_var.h sctputil.c
> Log:
> SVN rev 182367 on 2008-08-28 09:44:07Z by rrs
>
> - Make strict-sacks be the default.
> - Change it so that without INVARIANTs there are
> no panics in SCTP.
> - sctp_timer changes so that we have a recovery mechanism
> when the sent list is out of order.
This adds a label that is unused when INVARIANTS is enabled, and the
kernel fails to build with:
| cc1: warnings being treated as errors
| /home/build/src/sys/netinet/sctp_timer.c: In function 'sctp_mark_all_for_resend':
| /home/build/src/sys/netinet/sctp_timer.c:682: warning: label 'start_again' defined but not used
| *** Error code 1
I think we also need this patch:
%%%
diff -r 2e31e006d558 sys/netinet/sctp_timer.c
--- a/sys/netinet/sctp_timer.c Thu Aug 28 17:36:53 2008 +0300
+++ b/sys/netinet/sctp_timer.c Thu Aug 28 19:22:04 2008 +0300
@@ -679,7 +679,9 @@
/* Now on to each chunk */
num_mk = cnt_mk = 0;
tsnfirst = tsnlast = 0;
+#ifdef INVARIANTS
start_again:
+#endif
chk = TAILQ_FIRST(&stcb->asoc.sent_queue);
for (; chk != NULL; chk = tp2) {
tp2 = TAILQ_NEXT(chk, sctp_next);
%%%