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

Take also the send queue and sent queue into account when triggering

Browse Source 
the sending of outgoing stream reset requests.

MFC after:	3 days
This commit is contained in:
tuexen 2015-11-27 22:11:46 +00:00
parent 1ed55b5a76
commit 899821b413
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/netinet/sctp_output.c
View File

@ -7169,7 +7169,8 @@ one_more_time:
}
atomic_subtract_int(&asoc->stream_queue_cnt, 1);
TAILQ_REMOVE(&strq->outqueue, sp, next);
if (strq->state == SCTP_STREAM_RESET_PENDING &&
if ((strq->state == SCTP_STREAM_RESET_PENDING) &&
(strq->chunks_on_queues == 0) &&
TAILQ_EMPTY(&strq->outqueue)) {
stcb->asoc.trigger_reset = 1;
}
@ -7571,7 +7572,8 @@ dont_do_it:
send_lock_up = 1;
}
TAILQ_REMOVE(&strq->outqueue, sp, next);
if (strq->state == SCTP_STREAM_RESET_PENDING &&
if ((strq->state == SCTP_STREAM_RESET_PENDING) &&
(strq->chunks_on_queues == 0) &&
TAILQ_EMPTY(&strq->outqueue)) {
stcb->asoc.trigger_reset = 1;
}
@ -11561,7 +11563,8 @@ sctp_add_stream_reset_out(struct sctp_tcb *stcb, struct sctp_tmit_chunk *chk,
/* now how long will this param be? */
for (i = 0; i < stcb->asoc.streamoutcnt; i++) {
if ((stcb->asoc.strmout[i].state == SCTP_STREAM_RESET_PENDING) &&
(TAILQ_EMPTY(&stcb->asoc.strmout[i].outqueue))) {
(stcb->asoc.strmout[i].chunks_on_queues == 0) &&
TAILQ_EMPTY(&stcb->asoc.strmout[i].outqueue)) {
number_entries++;
}
}
@ -11584,7 +11587,8 @@ sctp_add_stream_reset_out(struct sctp_tcb *stcb, struct sctp_tmit_chunk *chk,
if (number_entries) {
for (i = 0; i < stcb->asoc.streamoutcnt; i++) {
if ((stcb->asoc.strmout[i].state == SCTP_STREAM_RESET_PENDING) &&
(TAILQ_EMPTY(&stcb->asoc.strmout[i].outqueue))) {
(stcb->asoc.strmout[i].chunks_on_queues == 0) &&
TAILQ_EMPTY(&stcb->asoc.strmout[i].outqueue)) {
req_out->list_of_streams[at] = htons(i);
at++;
stcb->asoc.strmout[i].state = SCTP_STREAM_RESET_IN_FLIGHT;