Skip site navigation (1)Skip section navigation (2) 
Date:      Sun, 23 Aug 2020 22:17:29 +0000 (UTC)
From:      Michael Tuexen <tuexen@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org
Subject:   svn commit: r364569 - stable/12/sys/netinet
Message-ID:  <202008232217.07NMHTWw092433@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: tuexen
Date: Sun Aug 23 22:17:29 2020
New Revision: 364569
URL: https://svnweb.freebsd.org/changeset/base/364569

Log:
  MFC r359305:
  Improve consistency in debug output.

Modified:
  stable/12/sys/netinet/sctputil.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/netinet/sctputil.c
==============================================================================
--- stable/12/sys/netinet/sctputil.c	Sun Aug 23 22:16:03 2020	(r364568)
+++ stable/12/sys/netinet/sctputil.c	Sun Aug 23 22:17:29 2020	(r364569)
@@ -1692,7 +1692,7 @@ sctp_timeout_handler(void *t)
 		}
 	}
 	tmr->stopped_from = 0xa003;
-	SCTPDBG(SCTP_DEBUG_TIMER1, "Timer type %d goes off\n", type);
+	SCTPDBG(SCTP_DEBUG_TIMER2, "Timer type %d goes off.\n", type);
 	if (!SCTP_OS_TIMER_ACTIVE(&tmr->timer)) {
 		if (inp) {
 			SCTP_INP_DECR_REF(inp);
@@ -1729,9 +1729,9 @@ sctp_timeout_handler(void *t)
 	} else {
 		SCTP_WQ_ADDR_LOCK();
 	}
-	/* record in stopped what t-o occurred */
-	tmr->stopped_from = type;
 
+	/* Record in stopped_from which timeout occurred. */
+	tmr->stopped_from = type;
 	/* mark as being serviced now */
 	if (SCTP_OS_TIMER_PENDING(&tmr->timer)) {
 		/*
@@ -2103,14 +2103,14 @@ sctp_timer_start(int t_type, struct sctp_inpcb *inp, s
 		if ((stcb->asoc.state & SCTP_STATE_ABOUT_TO_BE_FREED) &&
 		    (t_type != SCTP_TIMER_TYPE_ASOCKILL)) {
 			SCTPDBG(SCTP_DEBUG_TIMER2,
-			    "timer type %d not started: inp=%p, stcb=%p, net=%p (stcb deleted).\n",
+			    "Timer type %d not started: inp=%p, stcb=%p, net=%p (stcb deleted).\n",
 			    t_type, inp, stcb, net);
 			return;
 		}
 		/* Don't restart timer on net that's been removed. */
 		if (net != NULL && (net->dest_state & SCTP_ADDR_BEING_DELETED)) {
 			SCTPDBG(SCTP_DEBUG_TIMER2,
-			    "timer type %d not started: inp=%p, stcb=%p, net=%p (net deleted).\n",
+			    "Timer type %d not started: inp=%p, stcb=%p, net=%p (net deleted).\n",
 			    t_type, inp, stcb, net);
 			return;
 		}
@@ -2203,7 +2203,7 @@ sctp_timer_start(int t_type, struct sctp_inpcb *inp, s
 		if ((net->dest_state & SCTP_ADDR_NOHB) &&
 		    !(net->dest_state & SCTP_ADDR_UNCONFIRMED)) {
 			SCTPDBG(SCTP_DEBUG_TIMER2,
-			    "timer type %d not started: inp=%p, stcb=%p, net=%p.\n",
+			    "Timer type %d not started: inp=%p, stcb=%p, net=%p.\n",
 			    t_type, inp, stcb, net);
 			return;
 		}
@@ -2282,7 +2282,7 @@ sctp_timer_start(int t_type, struct sctp_inpcb *inp, s
 		}
 		if (net->dest_state & SCTP_ADDR_NO_PMTUD) {
 			SCTPDBG(SCTP_DEBUG_TIMER2,
-			    "timer type %d not started: inp=%p, stcb=%p, net=%p.\n",
+			    "Timer type %d not started: inp=%p, stcb=%p, net=%p.\n",
 			    t_type, inp, stcb, net);
 			return;
 		}
@@ -2447,7 +2447,7 @@ sctp_timer_start(int t_type, struct sctp_inpcb *inp, s
 		 * we leave the current one up unchanged.
 		 */
 		SCTPDBG(SCTP_DEBUG_TIMER2,
-		    "timer type %d already running: inp=%p, stcb=%p, net=%p.\n",
+		    "Timer type %d already running: inp=%p, stcb=%p, net=%p.\n",
 		    t_type, inp, stcb, net);
 		return;
 	}
@@ -2469,7 +2469,7 @@ sctp_timer_start(int t_type, struct sctp_inpcb *inp, s
 	tmr->ticks = sctp_get_tick_count();
 	if (SCTP_OS_TIMER_START(&tmr->timer, to_ticks, sctp_timeout_handler, tmr) == 0) {
 		SCTPDBG(SCTP_DEBUG_TIMER2,
-		    "timer type %d started: ticks=%u, inp=%p, stcb=%p, net=%p.\n",
+		    "Timer type %d started: ticks=%u, inp=%p, stcb=%p, net=%p.\n",
 		    t_type, to_ticks, inp, stcb, net);
 	} else {
 		/*
@@ -2477,7 +2477,7 @@ sctp_timer_start(int t_type, struct sctp_inpcb *inp, s
 		 * above.
 		 */
 		SCTPDBG(SCTP_DEBUG_TIMER2,
-		    "timer type %d restarted: ticks=%u, inp=%p, stcb=%p, net=%p.\n",
+		    "Timer type %d restarted: ticks=%u, inp=%p, stcb=%p, net=%p.\n",
 		    t_type, to_ticks, inp, stcb, net);
 	}
 	return;
@@ -2734,7 +2734,7 @@ sctp_timer_stop(int t_type, struct sctp_inpcb *inp, st
 		 * return.
 		 */
 		SCTPDBG(SCTP_DEBUG_TIMER2,
-		    "shared timer type %d not running: inp=%p, stcb=%p, net=%p.\n",
+		    "Shared timer type %d not running: inp=%p, stcb=%p, net=%p.\n",
 		    t_type, inp, stcb, net);
 		return;
 	}
@@ -2758,14 +2758,14 @@ sctp_timer_stop(int t_type, struct sctp_inpcb *inp, st
 		    ("sctp_timer_stop of type %d: net = %p, tmr->net = %p",
 		    t_type, net, tmr->net));
 		SCTPDBG(SCTP_DEBUG_TIMER2,
-		    "timer type %d stopped: inp=%p, stcb=%p, net=%p.\n",
+		    "Timer type %d stopped: inp=%p, stcb=%p, net=%p.\n",
 		    t_type, inp, stcb, net);
 		tmr->ep = NULL;
 		tmr->tcb = NULL;
 		tmr->net = NULL;
 	} else {
 		SCTPDBG(SCTP_DEBUG_TIMER2,
-		    "timer type %d not stopped: inp=%p, stcb=%p, net=%p.\n",
+		    "Timer type %d not stopped: inp=%p, stcb=%p, net=%p.\n",
 		    t_type, inp, stcb, net);
 	}
 	return;

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202008232217.07NMHTWw092433>