svn commit: r361471 - stable/11/sys/netinet
Michael Tuexen
tuexen at FreeBSD.org
Mon May 25 20:07:25 UTC 2020
Author: tuexen
Date: Mon May 25 20:07:23 2020
New Revision: 361471
URL: https://svnweb.freebsd.org/changeset/base/361471
Log:
MFC r360878, r360942: Improve SCTP timer handling
Ensure that we have a path when starting the T3 RXT timer.
Modified:
stable/11/sys/netinet/sctp_asconf.c
stable/11/sys/netinet/sctp_indata.c
stable/11/sys/netinet/sctp_input.c
stable/11/sys/netinet/sctp_timer.c
stable/11/sys/netinet/sctputil.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sys/netinet/sctp_asconf.c
==============================================================================
--- stable/11/sys/netinet/sctp_asconf.c Mon May 25 20:07:13 2020 (r361470)
+++ stable/11/sys/netinet/sctp_asconf.c Mon May 25 20:07:23 2020 (r361471)
@@ -1032,9 +1032,14 @@ sctp_assoc_immediate_retrans(struct sctp_tcb *stcb, st
(stcb->asoc.sent_queue_cnt > 0)) {
struct sctp_tmit_chunk *chk;
- chk = TAILQ_FIRST(&stcb->asoc.sent_queue);
- sctp_timer_start(SCTP_TIMER_TYPE_SEND, stcb->sctp_ep,
- stcb, chk->whoTo);
+ TAILQ_FOREACH(chk, &stcb->asoc.sent_queue, sctp_next) {
+ if (chk->whoTo != NULL) {
+ break;
+ }
+ }
+ if (chk != NULL) {
+ sctp_timer_start(SCTP_TIMER_TYPE_SEND, stcb->sctp_ep, stcb, chk->whoTo);
+ }
}
}
return;
Modified: stable/11/sys/netinet/sctp_indata.c
==============================================================================
--- stable/11/sys/netinet/sctp_indata.c Mon May 25 20:07:13 2020 (r361470)
+++ stable/11/sys/netinet/sctp_indata.c Mon May 25 20:07:23 2020 (r361471)
@@ -4439,7 +4439,12 @@ again:
}
}
}
- if (lchk) {
+ for (; lchk != NULL; lchk = TAILQ_NEXT(lchk, sctp_next)) {
+ if (lchk->whoTo != NULL) {
+ break;
+ }
+ }
+ if (lchk != NULL) {
/* Assure a timer is up */
sctp_timer_start(SCTP_TIMER_TYPE_SEND,
stcb->sctp_ep, stcb, lchk->whoTo);
@@ -5281,7 +5286,12 @@ again:
}
}
}
- if (lchk) {
+ for (; lchk != NULL; lchk = TAILQ_NEXT(lchk, sctp_next)) {
+ if (lchk->whoTo != NULL) {
+ break;
+ }
+ }
+ if (lchk != NULL) {
/* Assure a timer is up */
sctp_timer_start(SCTP_TIMER_TYPE_SEND,
stcb->sctp_ep, stcb, lchk->whoTo);
Modified: stable/11/sys/netinet/sctp_input.c
==============================================================================
--- stable/11/sys/netinet/sctp_input.c Mon May 25 20:07:13 2020 (r361470)
+++ stable/11/sys/netinet/sctp_input.c Mon May 25 20:07:23 2020 (r361471)
@@ -2960,6 +2960,7 @@ sctp_handle_cookie_ack(struct sctp_cookie_ack_chunk *c
{
/* cp must not be used, others call this without a c-ack :-) */
struct sctp_association *asoc;
+ struct sctp_tmit_chunk *chk;
SCTPDBG(SCTP_DEBUG_INPUT2,
"sctp_handle_cookie_ack: handling COOKIE-ACK\n");
@@ -3063,11 +3064,13 @@ sctp_handle_cookie_ack(struct sctp_cookie_ack_chunk *c
closed_socket:
/* Toss the cookie if I can */
sctp_toss_old_cookies(stcb, asoc);
- if (!TAILQ_EMPTY(&asoc->sent_queue)) {
- /* Restart the timer if we have pending data */
- struct sctp_tmit_chunk *chk;
-
- chk = TAILQ_FIRST(&asoc->sent_queue);
+ /* Restart the timer if we have pending data */
+ TAILQ_FOREACH(chk, &asoc->sent_queue, sctp_next) {
+ if (chk->whoTo != NULL) {
+ break;
+ }
+ }
+ if (chk != NULL) {
sctp_timer_start(SCTP_TIMER_TYPE_SEND, stcb->sctp_ep, stcb, chk->whoTo);
}
}
@@ -5151,6 +5154,7 @@ process_control_chunks:
} else {
struct mbuf *ret_buf;
struct sctp_inpcb *linp;
+ struct sctp_tmit_chunk *chk;
if (stcb) {
linp = NULL;
@@ -5212,14 +5216,13 @@ process_control_chunks:
got_auth = 1;
auth_skipped = 0;
}
- if (!TAILQ_EMPTY(&stcb->asoc.sent_queue)) {
- /*
- * Restart the timer if we have
- * pending data
- */
- struct sctp_tmit_chunk *chk;
-
- chk = TAILQ_FIRST(&stcb->asoc.sent_queue);
+ /* Restart the timer if we have pending data */
+ TAILQ_FOREACH(chk, &stcb->asoc.sent_queue, sctp_next) {
+ if (chk->whoTo != NULL) {
+ break;
+ }
+ }
+ if (chk != NULL) {
sctp_timer_start(SCTP_TIMER_TYPE_SEND, stcb->sctp_ep, stcb, chk->whoTo);
}
}
Modified: stable/11/sys/netinet/sctp_timer.c
==============================================================================
--- stable/11/sys/netinet/sctp_timer.c Mon May 25 20:07:13 2020 (r361470)
+++ stable/11/sys/netinet/sctp_timer.c Mon May 25 20:07:23 2020 (r361471)
@@ -975,7 +975,12 @@ sctp_t3rxt_timer(struct sctp_inpcb *inp,
/* C3. See if we need to send a Fwd-TSN */
if (SCTP_TSN_GT(stcb->asoc.advanced_peer_ack_point, stcb->asoc.last_acked_seq)) {
send_forward_tsn(stcb, &stcb->asoc);
- if (lchk) {
+ for (; lchk != NULL; lchk = TAILQ_NEXT(lchk, sctp_next)) {
+ if (lchk->whoTo != NULL) {
+ break;
+ }
+ }
+ if (lchk != NULL) {
/* Assure a timer is up */
sctp_timer_start(SCTP_TIMER_TYPE_SEND, stcb->sctp_ep, stcb, lchk->whoTo);
}
Modified: stable/11/sys/netinet/sctputil.c
==============================================================================
--- stable/11/sys/netinet/sctputil.c Mon May 25 20:07:13 2020 (r361470)
+++ stable/11/sys/netinet/sctputil.c Mon May 25 20:07:23 2020 (r361471)
@@ -1759,14 +1759,19 @@ sctp_timeout_handler(void *t)
struct sctp_tmit_chunk *chk;
/*
- * safeguard. If there on some on the sent queue
+ * Safeguard. If there on some on the sent queue
* somewhere but no timers running something is
* wrong... so we start a timer on the first chunk
* on the send queue on whatever net it is sent to.
*/
- chk = TAILQ_FIRST(&stcb->asoc.sent_queue);
- sctp_timer_start(SCTP_TIMER_TYPE_SEND, inp, stcb,
- chk->whoTo);
+ TAILQ_FOREACH(chk, &stcb->asoc.sent_queue, sctp_next) {
+ if (chk->whoTo != NULL) {
+ break;
+ }
+ }
+ if (chk != NULL) {
+ sctp_timer_start(SCTP_TIMER_TYPE_SEND, stcb->sctp_ep, stcb, chk->whoTo);
+ }
}
break;
case SCTP_TIMER_TYPE_INIT:
More information about the svn-src-all
mailing list