X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvppinfra%2Fsocket.c;h=4522514bba93eba9fb4f079a2395bfcd912528c9;hb=f2833e42c1e3721ce06b0f510447d8a6dd3e5eb4;hp=bcee3dea9deb79016a8886b674dabc9e238c9600;hpb=178cf493d009995b28fdf220f04c98860ff79a9b;p=vpp.git

diff --git a/src/vppinfra/socket.c b/src/vppinfra/socket.c
index bcee3dea9de..4522514bba9 100644
--- a/src/vppinfra/socket.c
+++ b/src/vppinfra/socket.c
@@ -389,7 +389,7 @@ clib_socket_init (clib_socket_t * s)
     struct sockaddr_un su;
   } addr;
   socklen_t addr_len = 0;
-  int socket_type;
+  int socket_type, rv;
   clib_error_t *error = 0;
   word port;
 
@@ -502,9 +502,11 @@ clib_socket_init (clib_socket_t * s)
 	  goto done;
 	}
 
-      if (connect (s->fd, &addr.sa, addr_len) < 0
-	  && !((s->flags & CLIB_SOCKET_F_NON_BLOCKING_CONNECT) &&
-	       errno == EINPROGRESS))
+      while ((rv = connect (s->fd, &addr.sa, addr_len)) < 0
+	     && errno == EAGAIN)
+	;
+      if (rv < 0 && !((s->flags & CLIB_SOCKET_F_NON_BLOCKING_CONNECT) &&
+		      errno == EINPROGRESS))
 	{
 	  error = clib_error_return_unix (0, "connect (fd %d, '%s')",
 					  s->fd, s->config);