X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Fext%2Fvapi_c_test.c;h=9fbb2a61302a09b22798cb89a0d2fdd2d383e1d3;hb=d6e9aecfd67ebfd012873eb24b72221f13e8f089;hp=622b617b3942648d19d9ab197692b3251d32f4d9;hpb=dc15be2ca7c51772b00e4c5548934a35aa7e4add;p=vpp.git

diff --git a/test/ext/vapi_c_test.c b/test/ext/vapi_c_test.c
index 622b617b394..9fbb2a61302 100644
--- a/test/ext/vapi_c_test.c
+++ b/test/ext/vapi_c_test.c
@@ -22,6 +22,7 @@
 #include <assert.h>
 #include <setjmp.h>
 #include <check.h>
+#include <vppinfra/string.h>
 #include <vapi/vapi.h>
 #include <vapi/vpe.api.vapi.h>
 #include <vapi/interface.api.vapi.h>
@@ -40,6 +41,16 @@ static char *api_prefix = NULL;
 static const int max_outstanding_requests = 64;
 static const int response_queue_size = 32;
 
+/* centos has ancient check so we hack our way around here
+ * to make it work somehow */
+#ifndef ck_assert_ptr_eq
+#define ck_assert_ptr_eq(X,Y) ck_assert_int_eq((long)X, (long)Y)
+#endif
+
+#ifndef ck_assert_ptr_ne
+#define ck_assert_ptr_ne(X,Y) ck_assert_int_ne((long)X, (long)Y)
+#endif
+
 START_TEST (test_invalid_values)
 {
   vapi_ctx_t ctx;
@@ -50,18 +61,18 @@ START_TEST (test_invalid_values)
   rv = vapi_send (ctx, sv);
   ck_assert_int_eq (VAPI_EINVAL, rv);
   rv = vapi_connect (ctx, app_name, api_prefix, max_outstanding_requests,
-		     response_queue_size, VAPI_MODE_BLOCKING);
+		     response_queue_size, VAPI_MODE_BLOCKING, true);
   ck_assert_int_eq (VAPI_OK, rv);
   rv = vapi_send (ctx, NULL);
   ck_assert_int_eq (VAPI_EINVAL, rv);
   rv = vapi_send (NULL, NULL);
   ck_assert_int_eq (VAPI_EINVAL, rv);
-  rv = vapi_recv (NULL, NULL, NULL);
+  rv = vapi_recv (NULL, NULL, NULL, 0, 0);
   ck_assert_int_eq (VAPI_EINVAL, rv);
-  rv = vapi_recv (ctx, NULL, NULL);
+  rv = vapi_recv (ctx, NULL, NULL, 0, 0);
   ck_assert_int_eq (VAPI_EINVAL, rv);
   vapi_msg_show_version_reply *reply;
-  rv = vapi_recv (ctx, (void **) &reply, NULL);
+  rv = vapi_recv (ctx, (void **) &reply, NULL, 0, 0);
   ck_assert_int_eq (VAPI_EINVAL, rv);
   rv = vapi_disconnect (ctx);
   ck_assert_int_eq (VAPI_OK, rv);
@@ -473,7 +484,7 @@ START_TEST (test_connect)
   vapi_error_e rv = vapi_ctx_alloc (&ctx);
   ck_assert_int_eq (VAPI_OK, rv);
   rv = vapi_connect (ctx, app_name, api_prefix, max_outstanding_requests,
-		     response_queue_size, VAPI_MODE_BLOCKING);
+		     response_queue_size, VAPI_MODE_BLOCKING, true);
   ck_assert_int_eq (VAPI_OK, rv);
   rv = vapi_disconnect (ctx);
   ck_assert_int_eq (VAPI_OK, rv);
@@ -490,7 +501,7 @@ setup_blocking (void)
   vapi_error_e rv = vapi_ctx_alloc (&ctx);
   ck_assert_int_eq (VAPI_OK, rv);
   rv = vapi_connect (ctx, app_name, api_prefix, max_outstanding_requests,
-		     response_queue_size, VAPI_MODE_BLOCKING);
+		     response_queue_size, VAPI_MODE_BLOCKING, true);
   ck_assert_int_eq (VAPI_OK, rv);
 }
 
@@ -500,7 +511,7 @@ setup_nonblocking (void)
   vapi_error_e rv = vapi_ctx_alloc (&ctx);
   ck_assert_int_eq (VAPI_OK, rv);
   rv = vapi_connect (ctx, app_name, api_prefix, max_outstanding_requests,
-		     response_queue_size, VAPI_MODE_NONBLOCKING);
+		     response_queue_size, VAPI_MODE_NONBLOCKING, true);
   ck_assert_int_eq (VAPI_OK, rv);
 }
 
@@ -521,7 +532,7 @@ START_TEST (test_show_version_1)
   ck_assert_int_eq (VAPI_OK, rv);
   vapi_msg_show_version_reply *resp;
   size_t size;
-  rv = vapi_recv (ctx, (void *) &resp, &size);
+  rv = vapi_recv (ctx, (void *) &resp, &size, 0, 0);
   ck_assert_int_eq (VAPI_OK, rv);
   int dummy;
   show_version_cb (NULL, &dummy, VAPI_OK, true, &resp->payload);
@@ -571,7 +582,7 @@ sw_interface_dump_cb (struct vapi_ctx_s *ctx, void *callback_ctx,
     }
   else
     {
-      ck_assert (reply);
+      ck_assert (NULL != reply);
       printf ("Interface dump entry: [%u]: %s\n", reply->sw_if_index,
 	      reply->interface_name);
       size_t i = 0;
@@ -593,13 +604,13 @@ START_TEST (test_loopbacks_1)
   printf ("--- Create/delete loopbacks using blocking API ---\n");
   const size_t num_ifs = 5;
   u8 mac_addresses[num_ifs][6];
-  memset (&mac_addresses, 0, sizeof (mac_addresses));
+  clib_memset (&mac_addresses, 0, sizeof (mac_addresses));
   u32 sw_if_indexes[num_ifs];
-  memset (&sw_if_indexes, 0xff, sizeof (sw_if_indexes));
+  clib_memset (&sw_if_indexes, 0xff, sizeof (sw_if_indexes));
   test_create_loopback_ctx_t clcs[num_ifs];
-  memset (&clcs, 0, sizeof (clcs));
+  clib_memset (&clcs, 0, sizeof (clcs));
   test_delete_loopback_ctx_t dlcs[num_ifs];
-  memset (&dlcs, 0, sizeof (dlcs));
+  clib_memset (&dlcs, 0, sizeof (dlcs));
   int i;
   for (i = 0; i < num_ifs; ++i)
     {
@@ -633,11 +644,11 @@ START_TEST (test_loopbacks_1)
   for (i = 0; i < attempts; ++i)
     {
       dctx.last_called = false;
-      memset (&seen, 0, sizeof (seen));
+      clib_memset (&seen, 0, sizeof (seen));
       dump = vapi_alloc_sw_interface_dump (ctx);
       dump->payload.name_filter_valid = 0;
-      memset (dump->payload.name_filter, 0,
-	      sizeof (dump->payload.name_filter));
+      clib_memset (dump->payload.name_filter, 0,
+		   sizeof (dump->payload.name_filter));
       while (VAPI_EAGAIN ==
 	     (rv =
 	      vapi_sw_interface_dump (ctx, dump, sw_interface_dump_cb,
@@ -650,7 +661,7 @@ START_TEST (test_loopbacks_1)
 	  ck_assert_int_eq (true, seen[j]);
 	}
     }
-  memset (&seen, 0, sizeof (seen));
+  clib_memset (&seen, 0, sizeof (seen));
   for (i = 0; i < num_ifs; ++i)
     {
       vapi_msg_delete_loopback *dl = vapi_alloc_delete_loopback (ctx);
@@ -665,10 +676,11 @@ START_TEST (test_loopbacks_1)
       printf ("Deleted loopback with sw_if_index %u\n", sw_if_indexes[i]);
     }
   dctx.last_called = false;
-  memset (&seen, 0, sizeof (seen));
+  clib_memset (&seen, 0, sizeof (seen));
   dump = vapi_alloc_sw_interface_dump (ctx);
   dump->payload.name_filter_valid = 0;
-  memset (dump->payload.name_filter, 0, sizeof (dump->payload.name_filter));
+  clib_memset (dump->payload.name_filter, 0,
+	       sizeof (dump->payload.name_filter));
   while (VAPI_EAGAIN ==
 	 (rv =
 	  vapi_sw_interface_dump (ctx, dump, sw_interface_dump_cb, &dctx)))
@@ -711,7 +723,7 @@ START_TEST (test_show_version_4)
   vapi_error_e rv;
   const size_t num_req = 5;
   int contexts[num_req];
-  memset (contexts, 0, sizeof (contexts));
+  clib_memset (contexts, 0, sizeof (contexts));
   int i;
   for (i = 0; i < num_req; ++i)
     {
@@ -734,7 +746,7 @@ START_TEST (test_show_version_4)
     {
       ck_assert_int_eq (1, contexts[i]);
     }
-  memset (contexts, 0, sizeof (contexts));
+  clib_memset (contexts, 0, sizeof (contexts));
   rv = vapi_dispatch (ctx);
   ck_assert_int_eq (VAPI_OK, rv);
   for (i = 0; i < num_req; ++i)
@@ -751,13 +763,13 @@ START_TEST (test_loopbacks_2)
   vapi_error_e rv;
   const size_t num_ifs = 5;
   u8 mac_addresses[num_ifs][6];
-  memset (&mac_addresses, 0, sizeof (mac_addresses));
+  clib_memset (&mac_addresses, 0, sizeof (mac_addresses));
   u32 sw_if_indexes[num_ifs];
-  memset (&sw_if_indexes, 0xff, sizeof (sw_if_indexes));
+  clib_memset (&sw_if_indexes, 0xff, sizeof (sw_if_indexes));
   test_create_loopback_ctx_t clcs[num_ifs];
-  memset (&clcs, 0, sizeof (clcs));
+  clib_memset (&clcs, 0, sizeof (clcs));
   test_delete_loopback_ctx_t dlcs[num_ifs];
-  memset (&dlcs, 0, sizeof (dlcs));
+  clib_memset (&dlcs, 0, sizeof (dlcs));
   int i;
   for (i = 0; i < num_ifs; ++i)
     {
@@ -788,11 +800,12 @@ START_TEST (test_loopbacks_2)
 	      sw_if_indexes[i]);
     }
   bool seen[num_ifs];
-  memset (&seen, 0, sizeof (seen));
+  clib_memset (&seen, 0, sizeof (seen));
   sw_interface_dump_ctx dctx = { false, num_ifs, sw_if_indexes, seen, 0 };
   vapi_msg_sw_interface_dump *dump = vapi_alloc_sw_interface_dump (ctx);
   dump->payload.name_filter_valid = 0;
-  memset (dump->payload.name_filter, 0, sizeof (dump->payload.name_filter));
+  clib_memset (dump->payload.name_filter, 0,
+	       sizeof (dump->payload.name_filter));
   while (VAPI_EAGAIN ==
 	 (rv =
 	  vapi_sw_interface_dump (ctx, dump, sw_interface_dump_cb, &dctx)))
@@ -801,7 +814,7 @@ START_TEST (test_loopbacks_2)
     {
       ck_assert_int_eq (false, seen[i]);
     }
-  memset (&seen, 0, sizeof (seen));
+  clib_memset (&seen, 0, sizeof (seen));
   ck_assert_int_eq (false, dctx.last_called);
   rv = vapi_dispatch (ctx);
   ck_assert_int_eq (VAPI_OK, rv);
@@ -809,7 +822,7 @@ START_TEST (test_loopbacks_2)
     {
       ck_assert_int_eq (true, seen[i]);
     }
-  memset (&seen, 0, sizeof (seen));
+  clib_memset (&seen, 0, sizeof (seen));
   ck_assert_int_eq (true, dctx.last_called);
   for (i = 0; i < num_ifs; ++i)
     {
@@ -828,11 +841,12 @@ START_TEST (test_loopbacks_2)
       ck_assert_int_eq (1, dlcs[i].called);
       printf ("Deleted loopback with sw_if_index %u\n", sw_if_indexes[i]);
     }
-  memset (&seen, 0, sizeof (seen));
+  clib_memset (&seen, 0, sizeof (seen));
   dctx.last_called = false;
   dump = vapi_alloc_sw_interface_dump (ctx);
   dump->payload.name_filter_valid = 0;
-  memset (dump->payload.name_filter, 0, sizeof (dump->payload.name_filter));
+  clib_memset (dump->payload.name_filter, 0,
+	       sizeof (dump->payload.name_filter));
   while (VAPI_EAGAIN ==
 	 (rv =
 	  vapi_sw_interface_dump (ctx, dump, sw_interface_dump_cb, &dctx)))
@@ -843,7 +857,7 @@ START_TEST (test_loopbacks_2)
     {
       ck_assert_int_eq (false, seen[i]);
     }
-  memset (&seen, 0, sizeof (seen));
+  clib_memset (&seen, 0, sizeof (seen));
   ck_assert_int_eq (true, dctx.last_called);
 }