diff options
author | tuexen <tuexen@FreeBSD.org> | 2015-11-21 16:25:09 +0000 |
---|---|---|
committer | tuexen <tuexen@FreeBSD.org> | 2015-11-21 16:25:09 +0000 |
commit | 4dc6ac08561c9a3bcb7f8f1f238abd9f51a4b0b4 (patch) | |
tree | 05ab4aa0a421bfd8f6b3ed6e4c30058acd86dd14 | |
parent | 0fde3af20f01f496bd9116efdff6280a5f7eb551 (diff) | |
download | FreeBSD-src-4dc6ac08561c9a3bcb7f8f1f238abd9f51a4b0b4.zip FreeBSD-src-4dc6ac08561c9a3bcb7f8f1f238abd9f51a4b0b4.tar.gz |
Don't send SHUTDOWN chunk when the association is in a front state
and the applications calls shutdown(..., SHUT_WR) or
shutdown(..., SHUT_RDWR).
MFC after: 1 week.
-rw-r--r-- | sys/netinet/sctp_pcb.c | 6 | ||||
-rw-r--r-- | sys/netinet/sctp_usrreq.c | 7 |
2 files changed, 5 insertions, 8 deletions
diff --git a/sys/netinet/sctp_pcb.c b/sys/netinet/sctp_pcb.c index 92a84d6..c681440 100644 --- a/sys/netinet/sctp_pcb.c +++ b/sys/netinet/sctp_pcb.c @@ -3640,13 +3640,11 @@ sctp_inpcb_free(struct sctp_inpcb *inp, int immediate, int from) * macro here since le_next will get freed as part of the * sctp_free_assoc() call. */ - if (so) { #ifdef IPSEC + if (ip_pcb->inp_sp != NULL) { ipsec_delete_pcbpolicy(ip_pcb); -#endif /* IPSEC */ - - /* Unlocks not needed since the socket is gone now */ } +#endif if (ip_pcb->inp_options) { (void)sctp_m_free(ip_pcb->inp_options); ip_pcb->inp_options = 0; diff --git a/sys/netinet/sctp_usrreq.c b/sys/netinet/sctp_usrreq.c index 537a536..bd1b81a 100644 --- a/sys/netinet/sctp_usrreq.c +++ b/sys/netinet/sctp_usrreq.c @@ -1007,16 +1007,15 @@ sctp_shutdown(struct socket *so) } else { netp = stcb->asoc.primary_destination; } - if (TAILQ_EMPTY(&asoc->send_queue) && + if ((SCTP_GET_STATE(asoc) == SCTP_STATE_OPEN) && + TAILQ_EMPTY(&asoc->send_queue) && TAILQ_EMPTY(&asoc->sent_queue) && (asoc->stream_queue_cnt == 0)) { if (asoc->locked_on_sending) { goto abort_anyway; } /* there is nothing queued to send, so I'm done... */ - if (SCTP_GET_STATE(asoc) == SCTP_STATE_OPEN) { - SCTP_STAT_DECR_GAUGE32(sctps_currestab); - } + SCTP_STAT_DECR_GAUGE32(sctps_currestab); SCTP_SET_STATE(asoc, SCTP_STATE_SHUTDOWN_SENT); SCTP_CLEAR_SUBSTATE(asoc, SCTP_STATE_SHUTDOWN_PENDING); sctp_stop_timers_for_shutdown(stcb); |