From owner-svn-src-stable-12@freebsd.org Sun Aug 23 22:17:29 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B7EE23CD707; Sun, 23 Aug 2020 22:17:29 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BZV494XLzz4dmF; Sun, 23 Aug 2020 22:17:29 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 80220E71D; Sun, 23 Aug 2020 22:17:29 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07NMHTqS092434; Sun, 23 Aug 2020 22:17:29 GMT (envelope-from tuexen@FreeBSD.org) Received: (from tuexen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07NMHTWw092433; Sun, 23 Aug 2020 22:17:29 GMT (envelope-from tuexen@FreeBSD.org) Message-Id: <202008232217.07NMHTWw092433@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tuexen set sender to tuexen@FreeBSD.org using -f From: Michael Tuexen Date: Sun, 23 Aug 2020 22:17:29 +0000 (UTC) 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 X-SVN-Group: stable-12 X-SVN-Commit-Author: tuexen X-SVN-Commit-Paths: stable/12/sys/netinet X-SVN-Commit-Revision: 364569 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 23 Aug 2020 22:17:29 -0000 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;