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

[Giorgos Keramidas]

On Thu, 28 Aug 2008 09:44:07 +0000 (UTC), Randall Stewart <rrs at 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);
%%%