svn commit: r357775 - head/sys/netinet

[Michael Tuexen]

Author: tuexen
Date: Tue Feb 11 20:02:20 2020
New Revision: 357775
URL: https://svnweb.freebsd.org/changeset/base/357775

Log:
  Revert https://svnweb.freebsd.org/changeset/base/357761
  
  This was suggested by cem@

Modified:
  head/sys/netinet/sctp_pcb.c
  head/sys/netinet/sctputil.c
  head/sys/netinet/sctputil.h

Modified: head/sys/netinet/sctp_pcb.c
==============================================================================
--- head/sys/netinet/sctp_pcb.c	Tue Feb 11 19:39:59 2020	(r357774)
+++ head/sys/netinet/sctp_pcb.c	Tue Feb 11 20:02:20 2020	(r357775)
@@ -4767,7 +4767,7 @@ sctp_free_assoc(struct sctp_inpcb *inp, struct sctp_tc
 		}
 	}
 	/* Now clean up any other timers */
-	sctp_stop_association_timers(stcb, 0);
+	sctp_stop_association_timers(stcb, false);
 	/* Now the read queue needs to be cleaned up (only once) */
 	if ((stcb->asoc.state & SCTP_STATE_ABOUT_TO_BE_FREED) == 0) {
 		SCTP_ADD_SUBSTATE(stcb, SCTP_STATE_ABOUT_TO_BE_FREED);
@@ -4935,7 +4935,7 @@ sctp_free_assoc(struct sctp_inpcb *inp, struct sctp_tc
 	/*
 	 * Now restop the timers to be sure this is paranoia at is finest!
 	 */
-	sctp_stop_association_timers(stcb, 1);
+	sctp_stop_association_timers(stcb, true);
 
 	/*
 	 * The chunk lists and such SHOULD be empty but we check them just

Modified: head/sys/netinet/sctputil.c
==============================================================================
--- head/sys/netinet/sctputil.c	Tue Feb 11 19:39:59 2020	(r357774)
+++ head/sys/netinet/sctputil.c	Tue Feb 11 20:02:20 2020	(r357775)
@@ -802,7 +802,7 @@ sctp_stop_timers_for_shutdown(struct sctp_tcb *stcb)
 }
 
 void
-sctp_stop_association_timers(struct sctp_tcb *stcb, int stop_assoc_kill_timer)
+sctp_stop_association_timers(struct sctp_tcb *stcb, bool stop_assoc_kill_timer)
 {
 	struct sctp_inpcb *inp;
 	struct sctp_nets *net;
@@ -812,7 +812,7 @@ sctp_stop_association_timers(struct sctp_tcb *stcb, in
 	    SCTP_FROM_SCTPUTIL + SCTP_LOC_18);
 	sctp_timer_stop(SCTP_TIMER_TYPE_STRRESET, inp, stcb, NULL,
 	    SCTP_FROM_SCTPUTIL + SCTP_LOC_19);
-	if (stop_assoc_kill_timer != 0) {
+	if (stop_assoc_kill_timer) {
 		sctp_timer_stop(SCTP_TIMER_TYPE_ASOCKILL, inp, stcb, NULL,
 		    SCTP_FROM_SCTPUTIL + SCTP_LOC_20);
 	}

Modified: head/sys/netinet/sctputil.h
==============================================================================
--- head/sys/netinet/sctputil.h	Tue Feb 11 19:39:59 2020	(r357774)
+++ head/sys/netinet/sctputil.h	Tue Feb 11 20:02:20 2020	(r357775)
@@ -165,7 +165,7 @@ sctp_pull_off_control_to_new_inp(struct sctp_inpcb *ol
 void sctp_stop_timers_for_shutdown(struct sctp_tcb *);
 
 /* Stop all timers for association and remote addresses. */
-void sctp_stop_association_timers(struct sctp_tcb *, int);
+void sctp_stop_association_timers(struct sctp_tcb *, bool);
 
 void
 sctp_report_all_outbound(struct sctp_tcb *, uint16_t, int, int