commit 86b8c028f640a5869989b794a4bf65b6a06899fd
author Michael Tuexen <tuexen@fh-muenster.de> Mon Jul 15 17:15:26 2019 +0200
committer Michael Tuexen <tuexen@fh-muenster.de> Mon Jul 15 17:15:26 2019 +0200
tree 26e71d421b10f8d0224a7c0a67181bba5193ea3b
parent bfb04f3afb25f7f6d43ac042b9cd43fbabca70b5

Improve socket state handling when closing an end-point.

usrsctplib/netinet/sctp_pcb.c

diff --git a/usrsctplib/netinet/sctp_pcb.c b/usrsctplib/netinet/sctp_pcb.c
index 29d9161..a26d893 100755
--- a/usrsctplib/netinet/sctp_pcb.c
+++ b/usrsctplib/netinet/sctp_pcb.c
@@ -34,7 +34,7 @@
 
 #ifdef __FreeBSD__
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/netinet/sctp_pcb.c 349986 2019-07-14 12:04:39Z tuexen $");
+__FBSDID("$FreeBSD: head/sys/netinet/sctp_pcb.c 349998 2019-07-15 14:52:52Z tuexen $");
 #endif
 
 #include <netinet/sctp_os.h>
@@ -5681,12 +5681,11 @@
 			inp->sctp_flags |= SCTP_PCB_FLAGS_WAS_CONNECTED;
 			if (so) {
 				SOCKBUF_LOCK(&so->so_rcv);
-				if (so->so_rcv.sb_cc == 0) {
-					so->so_state &= ~(SS_ISCONNECTING |
-							  SS_ISDISCONNECTING |
-							  SS_ISCONFIRMING |
-							  SS_ISCONNECTED);
-				}
+				so->so_state &= ~(SS_ISCONNECTING |
+				    SS_ISDISCONNECTING |
+				    SS_ISCONFIRMING |
+				    SS_ISCONNECTED);
+				so->so_state |= SS_ISDISCONNECTED;
 #if defined(__APPLE__)
 				socantrcvmore(so);
 #else