X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fvcl%2Fsock_test_server.c;h=b30dcf949b27e0dd5104e0efa35bfae4ae596a82;hb=d3046598b0954f20031852ad55bcf2d4900c01bf;hp=728a6a7a14e819f05619a1b105a147b8e294fba3;hpb=5917939256af392914d8a648de0c3287042ddbf6;p=vpp.git

diff --git a/src/vcl/sock_test_server.c b/src/vcl/sock_test_server.c
index 728a6a7a14e..b30dcf949b2 100644
--- a/src/vcl/sock_test_server.c
+++ b/src/vcl/sock_test_server.c
@@ -300,7 +300,7 @@ new_client (void)
     }
 
 #ifdef VCL_TEST
-  client_fd = vppcom_session_accept (ssm->listen_fd, &conn->endpt,
+  client_fd = vppcom_session_accept (ssm->listen_fd, &conn->endpt, 0,
 				     -1.0 /* wait forever */ );
   if (client_fd < 0)
     errno = -client_fd;
@@ -315,6 +315,7 @@ new_client (void)
       errno_val = errno;
       perror ("ERROR in new_client()");
       fprintf (stderr, "ERROR: accept failed (errno = %d)!\n", errno_val);
+      return;
     }
 
   printf ("SERVER: Got a connection -- fd = %d (0x%08x)!\n",
@@ -449,15 +450,6 @@ main (int argc, char **argv)
   if (vppcom_session_attr (ssm->listen_fd, VPPCOM_ATTR_GET_FLAGS,
 			   buffer, &buflen) != VPPCOM_OK)
     printf ("\nGET_FLAGS2:Oh no, Mr. Biiiiiiiiiiiilllllll ! ! ! !\n");
-
-  buflen = BUFLEN;
-  if (vppcom_session_attr (ssm->listen_fd, VPPCOM_ATTR_GET_PEER_ADDR,
-			   buffer, &buflen) != VPPCOM_OK)
-    printf ("\nGET_PEER_ADDR: Oh no, Mr. Biiiiiiiiiiiilllllll ! ! ! !\n");
-  buflen = BUFLEN;
-  if (vppcom_session_attr (ssm->listen_fd, VPPCOM_ATTR_GET_LCL_ADDR,
-			   buffer, &buflen) != VPPCOM_OK)
-    printf ("\nGET_LCL_ADDR: Oh no, Mr. Biiiiiiiiiiiilllllll ! ! ! !\n");
 #endif
 #else
   rv =
@@ -611,20 +603,28 @@ main (int argc, char **argv)
 	    {
 #ifdef VCL_TEST
 #if VPPCOM_SESSION_ATTR_UNIT_TEST
-	      buflen = BUFLEN;
-	      if (vppcom_session_attr (client_fd, VPPCOM_ATTR_GET_NREAD,
-				       buffer, &buflen) < VPPCOM_OK)
-		printf ("\nNREAD: Oh no, Mr. Biiiiiiiiiiiilllllll ! ! ! !\n");
-	      if (vppcom_session_attr (client_fd,
-				       VPPCOM_ATTR_GET_PEER_ADDR,
-				       buffer, &buflen) != VPPCOM_OK)
-		printf ("\nGET_PEER_ADDR: Oh no, Mr. "
-			"Biiiiiiiiiiiilllllll ! ! ! !\n");
-	      buflen = BUFLEN;
-	      if (vppcom_session_attr (client_fd, VPPCOM_ATTR_GET_LCL_ADDR,
-				       buffer, &buflen) != VPPCOM_OK)
-		printf ("\nGET_LCL_ADDR: Oh no, Mr. "
-			"Biiiiiiiiiiiilllllll ! ! ! !\n");
+	      {
+		vppcom_endpt_t ep;
+		uint8_t addr[16];
+
+		ep.ip = addr;
+		buflen = BUFLEN;
+		if (vppcom_session_attr (client_fd, VPPCOM_ATTR_GET_NREAD,
+					 buffer, &buflen) < VPPCOM_OK)
+		  printf ("\nNREAD: Oh no, Mr. "
+			  "Biiiiiiiiiiiilllllll ! ! ! !\n");
+		buflen = sizeof (ep);
+		if (vppcom_session_attr (client_fd,
+					 VPPCOM_ATTR_GET_PEER_ADDR,
+					 &ep, &buflen) != VPPCOM_OK)
+		  printf ("\nGET_PEER_ADDR: Oh no, Mr. "
+			  "Biiiiiiiiiiiilllllll ! ! ! !\n");
+		buflen = sizeof (ep);
+		if (vppcom_session_attr (client_fd, VPPCOM_ATTR_GET_LCL_ADDR,
+					 &ep, &buflen) != VPPCOM_OK)
+		  printf ("\nGET_LCL_ADDR: Oh no, Mr. "
+			  "Biiiiiiiiiiiilllllll ! ! ! !\n");
+	      }
 #endif
 #endif
 	      rx_bytes = sock_test_read (client_fd, conn->buf,
@@ -681,6 +681,7 @@ main (int argc, char **argv)
 			  close (client_fd);
 #endif
 			  conn_pool_free (conn);
+			  printf ("SERVER: Closed client fd %d\n", client_fd);
 #if ! SOCK_SERVER_USE_EPOLL
 			  if (ssm->nfds == (ssm->listen_fd + 1))
 #else