X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fhs_apps%2Fvcl%2Fsock_test_client.c;h=ed43e7faaf1f9e70cb8f17fab2bcfbcd8f100c1e;hb=57c88938f8a80e63e7307cacaca23b0ab3a51b6c;hp=13227f282652447ca62c15693930bdeb0ba19089;hpb=a495a3ea146a8484dac9f6b594fb2b044437c7a4;p=vpp.git

diff --git a/src/plugins/hs_apps/vcl/sock_test_client.c b/src/plugins/hs_apps/vcl/sock_test_client.c
index 13227f28265..ed43e7faaf1 100644
--- a/src/plugins/hs_apps/vcl/sock_test_client.c
+++ b/src/plugins/hs_apps/vcl/sock_test_client.c
@@ -651,14 +651,6 @@ sock_test_connect_test_sockets (uint32_t num_test_sockets)
 		       errno_val);
 	      return tsock->fd;
 	    }
-	  if (fcntl (tsock->fd, F_SETFL, O_NONBLOCK) < 0)
-	    {
-	      errno_val = errno;
-	      perror ("ERROR in sock_test_connect_test_sockets()");
-	      fprintf (stderr, "CLIENT: ERROR: fcntl failed (errno = %d)!\n",
-		       errno_val);
-	      return -1;
-	    }
 
 #ifdef VCL_TEST
 	  rv = vppcom_session_connect (tsock->fd, &scm->server_endpt);
@@ -668,9 +660,8 @@ sock_test_connect_test_sockets (uint32_t num_test_sockets)
 	      rv = -1;
 	    }
 #else
-	  rv =
-	    connect (tsock->fd, (struct sockaddr *) &scm->server_addr,
-		     scm->server_addr_size);
+	  rv = connect (tsock->fd, (struct sockaddr *) &scm->server_addr,
+			scm->server_addr_size);
 #endif
 	  if (rv < 0)
 	    {
@@ -680,6 +671,14 @@ sock_test_connect_test_sockets (uint32_t num_test_sockets)
 		       "(errno = %d)!\n", errno_val);
 	      return -1;
 	    }
+	  if (fcntl (tsock->fd, F_SETFL, O_NONBLOCK) < 0)
+	    {
+	      errno_val = errno;
+	      perror ("ERROR in sock_test_connect_test_sockets()");
+	      fprintf (stderr, "CLIENT: ERROR: fcntl failed (errno = %d)!\n",
+		       errno_val);
+	      return -1;
+	    }
 	  tsock->cfg = ctrl->cfg;
 	  vcl_test_session_buf_alloc (tsock);
 	  sock_test_cfg_sync (tsock);