commit 5fe9457fa2ac49ca7134b09c6886192c7001335c
author Florin Coras <fcoras@cisco.com> Mon May 24 08:58:15 2021 -0700
committer Ole Tr�an <otroan@employees.org> Wed May 26 07:37:06 2021 +0000
tree 609c17db379716feaa4b269a3c84ce3643838652
parent 3fb978e2618a6c71152b979c391d0c549937efbd

api: socket client connect set to blocking

Binary api client must otherwise check the returned error and if it was
EAGAIN/EINPROGRESS poll for connect completion.

Type: improvement

Signed-off-by: Florin Coras <fcoras@cisco.com>
Change-Id: I89845b1a59b9fa2ab0968029435ceb203bfa8f6c

src/vlibmemory/socket_client.c

diff --git a/src/vlibmemory/socket_client.c b/src/vlibmemory/socket_client.c
index 530a996..69126f8 100644
--- a/src/vlibmemory/socket_client.c
+++ b/src/vlibmemory/socket_client.c
@@ -462,7 +462,7 @@
 
   sock = &scm->client_socket;
   sock->config = socket_path;
-  sock->flags = CLIB_SOCKET_F_IS_CLIENT | CLIB_SOCKET_F_NON_BLOCKING_CONNECT;
+  sock->flags = CLIB_SOCKET_F_IS_CLIENT;
 
   if ((error = clib_socket_init (sock)))
     {

src/vppinfra/socket.c

diff --git a/src/vppinfra/socket.c b/src/vppinfra/socket.c
index 3271393..1d8b2ca 100644
--- a/src/vppinfra/socket.c
+++ b/src/vppinfra/socket.c
@@ -518,6 +518,14 @@
 					  s->fd, s->config);
 	  goto done;
 	}
+      /* Connect was blocking so set fd to non-blocking now */
+      if (!(s->flags & CLIB_SOCKET_F_NON_BLOCKING_CONNECT) &&
+	  fcntl (s->fd, F_SETFL, O_NONBLOCK) < 0)
+	{
+	  error = clib_error_return_unix (0, "fcntl NONBLOCK2 (fd %d, '%s')",
+					  s->fd, s->config);
+	  goto done;
+	}
     }
 
   return error;