d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve consistency in debug output.

Browse Source 
MFC after:		1 week
This commit is contained in:
Michael Tuexen 2020-03-25 18:14:12 +00:00
parent 69534635ff
commit 37686ccf08
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=359305
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
sys/netinet/sctputil.c
View File

@ -1696,7 +1696,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);
@ -1733,9 +1733,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;
NET_EPOCH_ENTER(et);
/* mark as being serviced now */
if (SCTP_OS_TIMER_PENDING(&tmr->timer)) {
@ -2108,14 +2108,14 @@ sctp_timer_start(int t_type, struct sctp_inpcb *inp, struct sctp_tcb *stcb,
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;
}
@ -2208,7 +2208,7 @@ sctp_timer_start(int t_type, struct sctp_inpcb *inp, struct sctp_tcb *stcb,
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;
}
@ -2287,7 +2287,7 @@ sctp_timer_start(int t_type, struct sctp_inpcb *inp, struct sctp_tcb *stcb,
}
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;
}
@ -2452,7 +2452,7 @@ sctp_timer_start(int t_type, struct sctp_inpcb *inp, struct sctp_tcb *stcb,
* 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;
}
@ -2474,7 +2474,7 @@ sctp_timer_start(int t_type, struct sctp_inpcb *inp, struct sctp_tcb *stcb,
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 {
/*
@ -2482,7 +2482,7 @@ sctp_timer_start(int t_type, struct sctp_inpcb *inp, struct sctp_tcb *stcb,
* 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;
@ -2739,7 +2739,7 @@ sctp_timer_stop(int t_type, struct sctp_inpcb *inp, struct sctp_tcb *stcb,
* 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;
}
@ -2763,14 +2763,14 @@ sctp_timer_stop(int t_type, struct sctp_inpcb *inp, struct sctp_tcb *stcb,
("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;