VCL: add epoll_* functions.

[vpp.git] / src / uri / sock_test_client.c

diff --git a/src/uri/sock_test_client.c b/src/uri/sock_test_client.c
index 26d096b..b53f8f2 100644 (file)
--- a/src/uri/sock_test_client.c
+++ b/src/uri/sock_test_client.c
@@ -429,6 +429,7 @@ exit_client (void)
       tsock = &scm->test_socket[i];
       tsock->cfg.test = SOCK_TEST_TYPE_EXIT;
 
+      /* coverity[COPY_PASTE_ERROR] */
       if (ctrl->cfg.verbose)
        {
          printf ("\nCLIENT (fd %d): Sending exit cfg to server...\n",
@@ -494,6 +495,9 @@ sock_test_connect_test_sockets (uint32_t num_test_sockets)
          return -1;
        }
 
+      if (!scm->test_socket)
+       memset (tsock, 0, sizeof (*tsock));
+
       scm->test_socket = tsock;
       for (i = scm->num_test_sockets; i < num_test_sockets; i++)
        {
@@ -501,7 +505,7 @@ sock_test_connect_test_sockets (uint32_t num_test_sockets)
 #ifdef VCL_TEST
          tsock->fd =
            vppcom_session_create (VPPCOM_VRF_DEFAULT, VPPCOM_PROTO_TCP,
-                                  0 /* is_nonblocking */ );
+                                  1 /* is_nonblocking */ );
          if (tsock->fd < 0)
            {
              errno = -tsock->fd;
@@ -892,6 +896,8 @@ main (int argc, char **argv)
          case 'w':
            fprintf (stderr, "ERROR: Option -%c requires an argument.\n",
                     optopt);
+           break;
+
          default:
            if (isprint (optopt))
              fprintf (stderr, "ERROR: Unknown option `-%c'.\n", optopt);