Delete the SS_ISCONFIRMING flag that supported delayed connection

confirmation: it was only used for netiso, which was deleted a *decade* ago

ok mpi@ claudio@  ports scan by sthen@

3 files changed, 7 insertions, 14 deletions

diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c
index 260fade2fa9..fca6deef310 100644
--- a/sys/kern/uipc_socket.c
+++ b/sys/kern/uipc_socket.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uipc_socket.c,v 1.132 2014/09/08 06:24:13 jsg Exp $	*/
+/*	$OpenBSD: uipc_socket.c,v 1.133 2014/09/09 02:07:17 guenther Exp $	*/
 /*	$NetBSD: uipc_socket.c,v 1.21 1996/02/04 02:17:52 christos Exp $	*/
 
 /*
@@ -435,8 +435,7 @@ restart:
 		}
 		if ((so->so_state & SS_ISCONNECTED) == 0) {
 			if (so->so_proto->pr_flags & PR_CONNREQUIRED) {
-				if ((so->so_state & SS_ISCONFIRMING) == 0 &&
-				    !(resid == 0 && clen != 0))
+				if (!(resid == 0 && clen != 0))
 					snderr(ENOTCONN);
 			} else if (addr == 0)
 				snderr(EDESTADDRREQ);
@@ -640,8 +639,6 @@ bad:
 	}
 	if (mp)
 		*mp = NULL;
-	if (so->so_state & SS_ISCONFIRMING && uio->uio_resid)
-		(*pr->pr_usrreq)(so, PRU_RCVD, NULL, NULL, NULL, curproc);
 
 restart:
 	if ((error = sblock(&so->so_rcv, SBLOCKWAIT(flags))) != 0)
@@ -1064,10 +1061,6 @@ sosplice(struct socket *so, int fd, off_t max, struct timeval *tv)
 		return (error);
 	sosp = fp->f_data;
 
-	if (so->so_state & SS_ISCONFIRMING)
-		(*so->so_proto->pr_usrreq)(so, PRU_RCVD, NULL, NULL, NULL,
-		    curproc);
-
 	/* Lock both receive and send buffer. */
 	if ((error = sblock(&so->so_rcv,
 	    (so->so_state & SS_NBIO) ? M_NOWAIT : M_WAITOK)) != 0) {
diff --git a/sys/kern/uipc_socket2.c b/sys/kern/uipc_socket2.c
index 636e4a1efe3..75dac885257 100644
--- a/sys/kern/uipc_socket2.c
+++ b/sys/kern/uipc_socket2.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uipc_socket2.c,v 1.56 2013/04/05 08:25:30 tedu Exp $	*/
+/*	$OpenBSD: uipc_socket2.c,v 1.57 2014/09/09 02:07:17 guenther Exp $	*/
 /*	$NetBSD: uipc_socket2.c,v 1.11 1996/02/04 02:17:55 christos Exp $	*/
 
 /*
@@ -98,7 +98,7 @@ soisconnected(struct socket *so)
 {
 	struct socket *head = so->so_head;
 
-	so->so_state &= ~(SS_ISCONNECTING|SS_ISDISCONNECTING|SS_ISCONFIRMING);
+	so->so_state &= ~(SS_ISCONNECTING|SS_ISDISCONNECTING);
 	so->so_state |= SS_ISCONNECTED;
 	if (head && soqremque(so, 0)) {
 		soqinsque(head, so, 1);
@@ -139,7 +139,7 @@ soisdisconnected(struct socket *so)
  * connection is possible (subject to space constraints, etc.)
  * then we allocate a new structure, properly linked into the
  * data structure of the original socket, and return this.
- * Connstatus may be 0, or SS_ISCONFIRMING, or SS_ISCONNECTED.
+ * Connstatus may be 0 or SS_ISCONNECTED.
  *
  * Must be called at splsoftnet()
  */
diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c
index f1dc4587ea2..e8292078286 100644
--- a/sys/kern/uipc_syscalls.c
+++ b/sys/kern/uipc_syscalls.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uipc_syscalls.c,v 1.92 2014/08/31 01:42:36 guenther Exp $	*/
+/*	$OpenBSD: uipc_syscalls.c,v 1.93 2014/09/09 02:07:17 guenther Exp $	*/
 /*	$NetBSD: uipc_syscalls.c,v 1.19 1996/02/09 19:00:48 christos Exp $	*/
 
 /*
@@ -960,7 +960,7 @@ sys_getpeername(struct proc *p, void *v, register_t *retval)
 	if ((error = getsock(p->p_fd, SCARG(uap, fdes), &fp)) != 0)
 		return (error);
 	so = fp->f_data;
-	if ((so->so_state & (SS_ISCONNECTED|SS_ISCONFIRMING)) == 0) {
+	if ((so->so_state & SS_ISCONNECTED) == 0) {
 		FRELE(fp, p);
 		return (ENOTCONN);
 	}