From: Sepherosa Ziehau <sephe@dragonflybsd.org>
Date: Sat, 26 Jul 2008 15:42:06 +0000 (+0000)
Subject: MFC rev 1.89:
X-Git-Tag: v2.0.1~55
X-Git-Url: https://repo.or.cz/w/dragonfly.git/commitdiff_plain/e29d65fb688308cb33f8e92165fb17da10acea50

MFC rev 1.89:
  Bring following change from FreeBSD (yar@freebsd.org):
    uipc_syscall.c rev 1.154

    If connect(2) has been interrupted by a signal and therefore the
    connection is to be established asynchronously, behave as in the

    - keep the SS_ISCONNECTING bit set thus indicating that
      the connection establishment is in progress, which is the case
      (clearing the bit in this case was just a bug);

    - return EALREADY, instead of the confusing and unreasonable
      EADDRINUSE, upon further connect(2) attempts on this socket
      until the connection is established (this also brings our
      connect(2) into accord with IEEE Std 1003.1.)

  Tested-by: y0netan1@
  Reviewed-by: hsu@
  Dragonfly-bug: <http://bugs.dragonflybsd.org/issue1079>
---

diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c
index c54a4061d4..ce0d793814 100644
--- a/sys/kern/uipc_syscalls.c
+++ b/sys/kern/uipc_syscalls.c
@@ -35,7 +35,7 @@
  *
  *	@(#)uipc_syscalls.c	8.4 (Berkeley) 2/21/94
  * $FreeBSD: src/sys/kern/uipc_syscalls.c,v 1.65.2.17 2003/04/04 17:11:16 tegge Exp $
- * $DragonFly: src/sys/kern/uipc_syscalls.c,v 1.88 2008/07/10 00:19:27 aggelos Exp $
+ * $DragonFly: src/sys/kern/uipc_syscalls.c,v 1.88.2.1 2008/07/26 15:42:06 sephe Exp $
  */
 
 #include "opt_ktrace.h"
@@ -453,7 +453,7 @@ kern_connect(int s, int fflags, struct sockaddr *sa)
 	struct proc *p = td->td_proc;
 	struct file *fp;
 	struct socket *so;
-	int error;
+	int error, interrupted = 0;
 
 	error = holdsock(p->p_fd, s, &fp);
 	if (error)
@@ -467,7 +467,7 @@ kern_connect(int s, int fflags, struct sockaddr *sa)
 	else
 		fflags = fp->f_flag;
 
-	if ((fflags & FNONBLOCK) && (so->so_state & SS_ISCONNECTING)) {
+	if (so->so_state & SS_ISCONNECTING) {
 		error = EALREADY;
 		goto done;
 	}
@@ -492,13 +492,16 @@ kern_connect(int s, int fflags, struct sockaddr *sa)
 		msg.nm_so = so;
 		msg.nm_etype = NM_REVENT;
 		error = lwkt_domsg(port, &msg.nm_netmsg.nm_lmsg, PCATCH);
+		if (error == EINTR || error == ERESTART)
+			interrupted = 1;
 	}
 	if (error == 0) {
 		error = so->so_error;
 		so->so_error = 0;
 	}
 bad:
-	so->so_state &= ~SS_ISCONNECTING;
+	if (!interrupted)
+		so->so_state &= ~SS_ISCONNECTING;
 	if (error == ERESTART)
 		error = EINTR;
 done: