svn commit: r360762 - stable/11/sys/netinet

[Michael Tuexen]

Author: tuexen
Date: Thu May  7 03:15:59 2020
New Revision: 360762
URL: https://svnweb.freebsd.org/changeset/base/360762

Log:
  MFC r357708: More timer cleanups
  
  Stop the PMTU and HB timer when removing a net, not when freeing it.
  
  Submitted by:	Taylor Brandstetter

Modified:
  stable/11/sys/netinet/sctp_pcb.c
  stable/11/sys/netinet/sctp_var.h
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/netinet/sctp_pcb.c
==============================================================================
--- stable/11/sys/netinet/sctp_pcb.c	Thu May  7 03:14:00 2020	(r360761)
+++ stable/11/sys/netinet/sctp_pcb.c	Thu May  7 03:15:59 2020	(r360762)
@@ -4428,8 +4428,10 @@ sctp_aloc_assoc(struct sctp_inpcb *inp, struct sockadd
 void
 sctp_remove_net(struct sctp_tcb *stcb, struct sctp_nets *net)
 {
+	struct sctp_inpcb *inp;
 	struct sctp_association *asoc;
 
+	inp = stcb->sctp_ep;
 	asoc = &stcb->asoc;
 	asoc->numnets--;
 	TAILQ_REMOVE(&asoc->nets, net, sctp_next);
@@ -4477,6 +4479,10 @@ out:
 		sctp_free_remote_addr(stcb->asoc.alternate);
 		stcb->asoc.alternate = NULL;
 	}
+	sctp_timer_stop(SCTP_TIMER_TYPE_PATHMTURAISE, inp, stcb, net,
+	    SCTP_FROM_SCTP_PCB + SCTP_LOC_9);
+	sctp_timer_stop(SCTP_TIMER_TYPE_HEARTBEAT, inp, stcb, net,
+	    SCTP_FROM_SCTP_PCB + SCTP_LOC_10);
 	sctp_free_remote_addr(net);
 }
 
@@ -6997,7 +7003,7 @@ sctp_drain_mbufs(struct sctp_tcb *stcb)
 		 */
 		asoc->last_revoke_count = cnt;
 		sctp_timer_stop(SCTP_TIMER_TYPE_RECV, stcb->sctp_ep, stcb, NULL,
-		    SCTP_FROM_SCTP_PCB + SCTP_LOC_16);
+		    SCTP_FROM_SCTP_PCB + SCTP_LOC_11);
 		/* sa_ignore NO_NULL_CHK */
 		sctp_send_sack(stcb, SCTP_SO_NOT_LOCKED);
 		sctp_chunk_output(stcb->sctp_ep, stcb, SCTP_OUTPUT_FROM_DRAIN, SCTP_SO_NOT_LOCKED);

Modified: stable/11/sys/netinet/sctp_var.h
==============================================================================
--- stable/11/sys/netinet/sctp_var.h	Thu May  7 03:14:00 2020	(r360761)
+++ stable/11/sys/netinet/sctp_var.h	Thu May  7 03:15:59 2020	(r360762)
@@ -185,8 +185,6 @@ extern struct pr_usrreqs sctp_usrreqs;
 	if ((__net)) {  \
 		if (SCTP_DECREMENT_AND_CHECK_REFCOUNT(&(__net)->ref_count)) { \
 			(void)SCTP_OS_TIMER_STOP(&(__net)->rxt_timer.timer); \
-			(void)SCTP_OS_TIMER_STOP(&(__net)->pmtu_timer.timer); \
-			(void)SCTP_OS_TIMER_STOP(&(__net)->hb_timer.timer); \
 			if ((__net)->ro.ro_rt) { \
 				RTFREE((__net)->ro.ro_rt); \
 				(__net)->ro.ro_rt = NULL; \