D1805.id3694.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D1805.id3694.diff
View Options

	Index: sys/kern/uipc_socket.c
	===================================================================
	--- sys/kern/uipc_socket.c
	+++ sys/kern/uipc_socket.c
	@@ -3439,11 +3439,9 @@
	SOCKBUF_LOCK(&so->so_rcv);
	so->so_state &= ~SS_ISCONNECTING;
	so->so_state \|= SS_ISDISCONNECTING;
	- so->so_rcv.sb_state \|= SBS_CANTRCVMORE;
	- sorwakeup_locked(so);
	+ socantrcvmore_locked(so);
	SOCKBUF_LOCK(&so->so_snd);
	- so->so_snd.sb_state \|= SBS_CANTSENDMORE;
	- sowwakeup_locked(so);
	+ socantsendmore(so);
	wakeup(&so->so_timeo);
	}

	@@ -3458,9 +3456,14 @@
	SOCKBUF_LOCK(&so->so_rcv);
	so->so_state &= ~(SS_ISCONNECTING\|SS_ISCONNECTED\|SS_ISDISCONNECTING);
	so->so_state \|= SS_ISDISCONNECTED;
	- so->so_rcv.sb_state \|= SBS_CANTRCVMORE;
	- sorwakeup_locked(so);
	+ socantrcvmore_locked(so);
	SOCKBUF_LOCK(&so->so_snd);
	+
	+ /*
	+ * XXX: This should use socantsendmore() but it's unclear if
	+ * the call to sbdrop_locked() can be moved without opening
	+ * a race.
	+ */
	so->so_snd.sb_state \|= SBS_CANTSENDMORE;
	sbdrop_locked(&so->so_snd, sbused(&so->so_snd));
	sowwakeup_locked(so);