mirror of
https://git.FreeBSD.org/src.git
synced 2024-12-23 11:18:54 +00:00
Fix a bug where two SHUTDOWN_ACK chunks were sent if a SHUTDOWN chunk was
received acking all outstanding data.
This commit is contained in:
parent
14bdbaf2e4
commit
aa1cfca969
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=287444
@ -867,6 +867,7 @@ sctp_handle_shutdown(struct sctp_shutdown_chunk *cp,
|
||||
{
|
||||
struct sctp_association *asoc;
|
||||
int some_on_streamwheel;
|
||||
int old_state;
|
||||
|
||||
#if defined(__APPLE__) || defined(SCTP_SO_LOCK_TESTING)
|
||||
struct socket *so;
|
||||
@ -885,11 +886,11 @@ sctp_handle_shutdown(struct sctp_shutdown_chunk *cp,
|
||||
if (ntohs(cp->ch.chunk_length) != sizeof(struct sctp_shutdown_chunk)) {
|
||||
/* Shutdown NOT the expected size */
|
||||
return;
|
||||
} else {
|
||||
sctp_update_acked(stcb, cp, abort_flag);
|
||||
if (*abort_flag) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
old_state = SCTP_GET_STATE(asoc);
|
||||
sctp_update_acked(stcb, cp, abort_flag);
|
||||
if (*abort_flag) {
|
||||
return;
|
||||
}
|
||||
if (asoc->control_pdapi) {
|
||||
/*
|
||||
@ -959,12 +960,16 @@ sctp_handle_shutdown(struct sctp_shutdown_chunk *cp,
|
||||
(SCTP_GET_STATE(asoc) == SCTP_STATE_SHUTDOWN_RECEIVED)) {
|
||||
SCTP_STAT_DECR_GAUGE32(sctps_currestab);
|
||||
}
|
||||
SCTP_SET_STATE(asoc, SCTP_STATE_SHUTDOWN_ACK_SENT);
|
||||
SCTP_CLEAR_SUBSTATE(asoc, SCTP_STATE_SHUTDOWN_PENDING);
|
||||
sctp_stop_timers_for_shutdown(stcb);
|
||||
sctp_send_shutdown_ack(stcb, net);
|
||||
sctp_timer_start(SCTP_TIMER_TYPE_SHUTDOWNACK, stcb->sctp_ep,
|
||||
stcb, net);
|
||||
if (SCTP_GET_STATE(asoc) != SCTP_STATE_SHUTDOWN_ACK_SENT) {
|
||||
SCTP_SET_STATE(asoc, SCTP_STATE_SHUTDOWN_ACK_SENT);
|
||||
sctp_stop_timers_for_shutdown(stcb);
|
||||
sctp_send_shutdown_ack(stcb, net);
|
||||
sctp_timer_start(SCTP_TIMER_TYPE_SHUTDOWNACK,
|
||||
stcb->sctp_ep, stcb, net);
|
||||
} else if (old_state == SCTP_STATE_SHUTDOWN_ACK_SENT) {
|
||||
sctp_send_shutdown_ack(stcb, net);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user