From: Kim F. Storm <storm@cua.dk>
Date: Tue, 9 Nov 2004 09:40:37 +0000 (+0000)
Subject: (Fmake_network_process): Remove kludge for interrupted
X-Git-Tag: ttn-vms-21-2-B4~4070
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4e9dd03b8c61ea20314b74691d5a2f74302e6953;p=emacs.git

(Fmake_network_process): Remove kludge for interrupted
connects on BSD.  If connect is interrupted, just close socket and
start over rather than sleeping and retry with same socket.
---

diff --git a/src/process.c b/src/process.c
index bebcd577e9e..00bac03dc2b 100644
--- a/src/process.c
+++ b/src/process.c
@@ -3023,6 +3023,8 @@ usage: (make-network-process &rest ARGS)  */)
     {
       int optn, optbits;
 
+    retry_connect:
+
       s = socket (lres->ai_family, lres->ai_socktype, lres->ai_protocol);
       if (s < 0)
 	{
@@ -3101,8 +3103,6 @@ usage: (make-network-process &rest ARGS)  */)
 	  break;
 	}
 
-    retry_connect:
-
       immediate_quit = 1;
       QUIT;
 
@@ -3144,22 +3144,13 @@ usage: (make-network-process &rest ARGS)  */)
 
       immediate_quit = 0;
 
-      if (xerrno == EINTR)
-	goto retry_connect;
-      if (xerrno == EADDRINUSE && retry < 20)
-	{
-	  /* A delay here is needed on some FreeBSD systems,
-	     and it is harmless, since this retrying takes time anyway
-	     and should be infrequent.  */
-	  Fsleep_for (make_number (1), Qnil);
-	  retry++;
-	  goto retry_connect;
-	}
-
       /* Discard the unwind protect closing S.  */
       specpdl_ptr = specpdl + count1;
       emacs_close (s);
       s = -1;
+
+      if (xerrno == EINTR)
+	goto retry_connect;
     }
 
   if (s >= 0)