X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=extras%2Flibmemif%2Ftest%2Fsocket_test.c;h=589bfd84cb788114cfd70c086bec91395d5ba0da;hb=8f554b793c68fd5271334bf0e167dabc4c9ac73d;hp=f148495afb2e63e3c9793291e9d0244c93f8b008;hpb=7c5c40db2a8d71a857ae63b6238cfac6e257da6d;p=vpp.git

diff --git a/extras/libmemif/test/socket_test.c b/extras/libmemif/test/socket_test.c
index f148495afb2..589bfd84cb7 100644
--- a/extras/libmemif/test/socket_test.c
+++ b/extras/libmemif/test/socket_test.c
@@ -46,10 +46,17 @@ queue_free (memif_msg_queue_elt_t ** e)
 
 START_TEST (test_msg_queue)
 {
+  int err;
+  if ((err =
+       memif_init (control_fd_update, TEST_APP_NAME, NULL,
+		   NULL, NULL)) != MEMIF_ERR_SUCCESS)
+    ck_abort_msg ("err code: %u, err msg: %s", err, memif_strerror (err));
+
   memif_connection_t conn;
   conn.msg_queue = NULL;
   conn.fd = -1;
 
+
   int i, len = 10;
 
   for (i = 0; i < len; i++)
@@ -88,6 +95,10 @@ END_TEST
 START_TEST (test_enq_ack)
 {
   int err;
+  if ((err =
+       memif_init (control_fd_update, TEST_APP_NAME, NULL,
+		   NULL, NULL)) != MEMIF_ERR_SUCCESS)
+    ck_abort_msg ("err code: %u, err msg: %s", err, memif_strerror (err));
   memif_connection_t conn;
   conn.msg_queue = NULL;
 
@@ -104,14 +115,16 @@ END_TEST
 START_TEST (test_enq_init)
 {
   int err;
+  if ((err =
+       memif_init (control_fd_update, TEST_APP_NAME, NULL,
+		   NULL, NULL)) != MEMIF_ERR_SUCCESS)
+    ck_abort_msg ("err code: %u, err msg: %s", err, memif_strerror (err));
   memif_connection_t conn;
   conn.msg_queue = NULL;
 
   conn.args.interface_id = 69;
   conn.args.mode = 0;
 
-  strncpy ((char *) conn.args.instance_name, TEST_APP_NAME,
-	   strlen (TEST_APP_NAME));
   strncpy ((char *) conn.args.secret, TEST_SECRET, strlen (TEST_SECRET));
 
   if ((err = memif_msg_enq_init (&conn)) != MEMIF_ERR_SUCCESS)
@@ -127,8 +140,7 @@ START_TEST (test_enq_init)
   ck_assert_uint_eq (i->version, MEMIF_VERSION);
   ck_assert_uint_eq (i->id, conn.args.interface_id);
   ck_assert_uint_eq (i->mode, conn.args.mode);
-  ck_assert_str_eq (i->name, conn.args.instance_name);
-  ck_assert_str_eq (i->secret, conn.args.secret);
+  ck_assert_str_eq ((char *)i->secret, (char *)conn.args.secret);
   queue_free (&conn.msg_queue);
 }
 
@@ -136,6 +148,10 @@ END_TEST
 START_TEST (test_enq_add_region)
 {
   int err;
+  if ((err =
+       memif_init (control_fd_update, TEST_APP_NAME, NULL,
+		   NULL, NULL)) != MEMIF_ERR_SUCCESS)
+    ck_abort_msg ("err code: %u, err msg: %s", err, memif_strerror (err));
   memif_connection_t conn;
   conn.msg_queue = NULL;
   conn.regions = (memif_region_t *) malloc (sizeof (memif_region_t));
@@ -168,6 +184,11 @@ END_TEST
 START_TEST (test_enq_add_ring)
 {
   int err;
+  if ((err =
+       memif_init (control_fd_update, TEST_APP_NAME, NULL,
+		   NULL, NULL)) != MEMIF_ERR_SUCCESS)
+    ck_abort_msg ("err code: %u, err msg: %s", err, memif_strerror (err));
+
   memif_connection_t conn;
   conn.msg_queue = NULL;
   conn.rx_queues = (memif_queue_t *) malloc (sizeof (memif_queue_t));
@@ -204,6 +225,10 @@ END_TEST
 START_TEST (test_enq_connect)
 {
   int err;
+  if ((err =
+       memif_init (control_fd_update, TEST_APP_NAME, NULL,
+		   NULL, NULL)) != MEMIF_ERR_SUCCESS)
+    ck_abort_msg ("err code: %u, err msg: %s", err, memif_strerror (err));
   memif_connection_t conn;
   conn.msg_queue = NULL;
   memset (conn.args.interface_name, 0, sizeof (conn.args.interface_name));
@@ -217,7 +242,7 @@ START_TEST (test_enq_connect)
 
   ck_assert_uint_eq (e->msg.type, MEMIF_MSG_TYPE_CONNECT);
   ck_assert_int_eq (e->fd, -1);
-  ck_assert_str_eq (e->msg.connect.if_name, TEST_IF_NAME);
+  ck_assert_str_eq ((char *)e->msg.connect.if_name, TEST_IF_NAME);
   queue_free (&conn.msg_queue);
 }
 
@@ -225,6 +250,10 @@ END_TEST
 START_TEST (test_enq_connected)
 {
   int err;
+  if ((err =
+       memif_init (control_fd_update, TEST_APP_NAME, NULL,
+		   NULL, NULL)) != MEMIF_ERR_SUCCESS)
+    ck_abort_msg ("err code: %u, err msg: %s", err, memif_strerror (err));
   memif_connection_t conn;
   conn.msg_queue = NULL;
   memset (conn.args.interface_name, 0, sizeof (conn.args.interface_name));
@@ -238,7 +267,7 @@ START_TEST (test_enq_connected)
 
   ck_assert_uint_eq (e->msg.type, MEMIF_MSG_TYPE_CONNECTED);
   ck_assert_int_eq (e->fd, -1);
-  ck_assert_str_eq (e->msg.connect.if_name, TEST_IF_NAME);
+  ck_assert_str_eq ((char *)e->msg.connect.if_name, TEST_IF_NAME);
   queue_free (&conn.msg_queue);
 }
 
@@ -261,12 +290,10 @@ START_TEST (test_send_hello)
   int err;
   memif_connection_t conn;
   conn.fd = -1;
-  memset (conn.args.instance_name, 0, sizeof (conn.args.instance_name));
-  strncpy ((char *) conn.args.instance_name, TEST_APP_NAME,
-	   strlen (TEST_APP_NAME));
 
   if ((err =
-       memif_init (control_fd_update, TEST_APP_NAME)) != MEMIF_ERR_SUCCESS)
+       memif_init (control_fd_update, TEST_APP_NAME, NULL,
+		   NULL, NULL)) != MEMIF_ERR_SUCCESS)
     ck_abort_msg ("err code: %u, err msg: %s", err, memif_strerror (err));
 
   if ((err = memif_msg_send_hello (conn.fd)) != MEMIF_ERR_SUCCESS)
@@ -284,7 +311,7 @@ START_TEST (test_send_disconnect)
   /* only possible fail if memif_msg_send fails...  */
   /* obsolete without socket */
   if ((err =
-       memif_msg_send_disconnect (conn.fd, "unit_test_dc",
+       memif_msg_send_disconnect (conn.fd, (uint8_t *)"unit_test_dc",
 				  0)) != MEMIF_ERR_SUCCESS)
     ck_assert_msg (err == MEMIF_ERR_BAD_FD, "err code: %u, err msg: %s", err,
 		   memif_strerror (err));
@@ -319,7 +346,7 @@ START_TEST (test_recv_hello)
   ck_assert_uint_eq (conn.run_args.num_s2m_rings, 2);
   ck_assert_uint_eq (conn.run_args.num_m2s_rings, 2);
   ck_assert_uint_eq (conn.run_args.log2_ring_size, 10);
-  ck_assert_str_eq (conn.remote_name, TEST_IF_NAME);
+  ck_assert_str_eq ((char *)conn.remote_name, TEST_IF_NAME);
 
   h->max_version = 9;
   if ((err = memif_msg_receive_hello (&conn, &msg)) != MEMIF_ERR_SUCCESS)
@@ -363,7 +390,8 @@ START_TEST (test_recv_init)
   add_list_elt (&elt, &ms.interface_list, &ms.interface_list_len);
 
   if ((err =
-       memif_init (control_fd_update, TEST_APP_NAME)) != MEMIF_ERR_SUCCESS)
+       memif_init (control_fd_update, TEST_APP_NAME, NULL,
+		   NULL, NULL)) != MEMIF_ERR_SUCCESS)
     ck_abort_msg ("err code: %u, err msg: %s", err, memif_strerror (err));
 
   if ((err = memif_msg_receive_init (&ms, -1, &msg)) != MEMIF_ERR_SUCCESS)
@@ -426,7 +454,7 @@ START_TEST (test_recv_add_region)
 
   ck_assert_uint_eq (mr->fd, fd);
   ck_assert_uint_eq (mr->region_size, 2048);
-  ck_assert_ptr_eq (mr->shm, NULL);
+  ck_assert_ptr_eq (mr->addr, NULL);
 }
 
 END_TEST
@@ -478,7 +506,8 @@ START_TEST (test_recv_connect)
   args.mode = 0;
 
   if ((err =
-       memif_init (control_fd_update, TEST_APP_NAME)) != MEMIF_ERR_SUCCESS)
+       memif_init (control_fd_update, TEST_APP_NAME, NULL,
+		   NULL, NULL)) != MEMIF_ERR_SUCCESS)
     ck_abort_msg ("err code: %u, err msg: %s", err, memif_strerror (err));
 
   if ((err = memif_create (&c, &args, on_connect,
@@ -506,7 +535,7 @@ START_TEST (test_recv_connect)
   if ((err = memif_msg_receive_connect (conn, &msg)) != MEMIF_ERR_SUCCESS)
     ck_abort_msg ("err code: %u, err msg: %s", err, memif_strerror (err));
 
-  ck_assert_str_eq (conn->remote_if_name, TEST_IF_NAME);
+  ck_assert_str_eq ((char *)conn->remote_if_name, TEST_IF_NAME);
 }
 
 END_TEST
@@ -522,7 +551,8 @@ START_TEST (test_recv_connected)
   args.mode = 0;
 
   if ((err =
-       memif_init (control_fd_update, TEST_APP_NAME)) != MEMIF_ERR_SUCCESS)
+       memif_init (control_fd_update, TEST_APP_NAME, NULL,
+		   NULL, NULL)) != MEMIF_ERR_SUCCESS)
     ck_abort_msg ("err code: %u, err msg: %s", err, memif_strerror (err));
 
   if ((err = memif_create (&c, &args, on_connect,
@@ -550,7 +580,7 @@ START_TEST (test_recv_connected)
   if ((err = memif_msg_receive_connected (conn, &msg)) != MEMIF_ERR_SUCCESS)
     ck_abort_msg ("err code: %u, err msg: %s", err, memif_strerror (err));
 
-  ck_assert_str_eq (conn->remote_if_name, TEST_IF_NAME);
+  ck_assert_str_eq ((char *)conn->remote_if_name, TEST_IF_NAME);
 }
 
 END_TEST
@@ -567,10 +597,11 @@ START_TEST (test_recv_disconnect)
     ck_assert_msg (err == MEMIF_ERR_DISCONNECT,
 		   "err code: %u, err msg: %s", err, memif_strerror (err));
 
-  ck_assert_str_eq (conn.remote_disconnect_string, "unit_test_dc");
+  ck_assert_str_eq ((char *)conn.remote_disconnect_string, "unit_test_dc");
 }
 
-END_TEST Suite * socket_suite ()
+END_TEST Suite *
+socket_suite ()
 {
   Suite *s;
   TCase *tc_msg_queue;