X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvcl%2Fvcl_test_server.c;h=7b56d497153b1b941a1ba12d5ac47eb7e9ff944f;hb=993683150202254c6ba8dd43e087a7229edd5d4c;hp=5d37b46df93fb352d468b8d814fc401725ca6455;hpb=e4d5a652a392c9f74501da5778a7fe161b183476;p=vpp.git

diff --git a/src/vcl/vcl_test_server.c b/src/vcl/vcl_test_server.c
index 5d37b46df93..7b56d497153 100644
--- a/src/vcl/vcl_test_server.c
+++ b/src/vcl/vcl_test_server.c
@@ -25,6 +25,7 @@
 #include <fcntl.h>
 #include <vcl/vcl_test.h>
 #include <sys/epoll.h>
+#include <vppinfra/mem.h>
 
 typedef struct
 {
@@ -310,6 +311,8 @@ main (int argc, char **argv)
   uint16_t port = SOCK_TEST_SERVER_PORT;
   vppcom_endpt_t endpt;
 
+  clib_mem_init_thread_safe (0, 64 << 20);
+
   opterr = 0;
   while ((c = getopt (argc, argv, "6D")) != -1)
     switch (c)
@@ -422,14 +425,17 @@ main (int argc, char **argv)
       return -1;
     }
 
-  rv = vppcom_session_listen (ssm->listen_fd, 10);
-  if (rv < 0)
+  if (!ssm->cfg.transport_udp)
     {
-      errno_val = errno = -rv;
-      perror ("ERROR in main()");
-      fprintf (stderr, "SERVER: ERROR: listen failed "
-	       "(errno = %d)!\n", errno_val);
-      return -1;
+      rv = vppcom_session_listen (ssm->listen_fd, 10);
+      if (rv < 0)
+	{
+	  errno_val = errno = -rv;
+	  perror ("ERROR in main()");
+	  fprintf (stderr, "SERVER: ERROR: listen failed "
+		   "(errno = %d)!\n", errno_val);
+	  return -1;
+	}
     }
 
   ssm->epfd = vppcom_epoll_create ();
@@ -460,7 +466,7 @@ main (int argc, char **argv)
     {
       int num_ev;
       num_ev = vppcom_epoll_wait (ssm->epfd, ssm->wait_events,
-				  SOCK_SERVER_MAX_EPOLL_EVENTS, 60.0);
+				  SOCK_SERVER_MAX_EPOLL_EVENTS, 60000.0);
       if (num_ev < 0)
 	{
 	  errno = -num_ev;
@@ -623,7 +629,6 @@ main (int argc, char **argv)
 		    printf ("SERVER (fd %d): TX (%d bytes) - '%s'\n",
 			    conn->fd, tx_bytes, conn->buf);
 		}
-
 	      else		// Extraneous read data from non-echo tests???
 		{
 		  xtra++;