api: multiple connections per process

[vpp.git] / src / vpp / api / api.c

diff --git a/src/vpp/api/api.c b/src/vpp/api/api.c
index 989d867..c62e7d0 100644 (file)
--- a/src/vpp/api/api.c
+++ b/src/vpp/api/api.c
@@ -143,7 +143,7 @@ shmem_cli_output (uword arg, u8 * buffer, uword buffer_bytes)
   u8 **shmem_vecp = (u8 **) arg;
   u8 *shmem_vec;
   void *oldheap;
-  api_main_t *am = &api_main;
+  api_main_t *am = vlibapi_get_main ();
   u32 offset;
 
   shmem_vec = *shmem_vecp;
@@ -170,7 +170,7 @@ vl_api_cli_t_handler (vl_api_cli_t * mp)
   vl_api_cli_reply_t *rp;
   vl_api_registration_t *reg;
   vlib_main_t *vm = vlib_get_main ();
-  api_main_t *am = &api_main;
+  api_main_t *am = vlibapi_get_main ();
   unformat_input_t input;
   u8 *shmem_vec = 0;
   void *oldheap;
@@ -439,7 +439,7 @@ vl_api_get_node_graph_t_handler (vl_api_get_node_graph_t * mp)
 {
   int rv = 0;
   u8 *vector = 0;
-  api_main_t *am = &api_main;
+  api_main_t *am = vlibapi_get_main ();
   vlib_main_t *vm = vlib_get_main ();
   void *oldheap;
   vl_api_get_node_graph_reply_t *rmp;
@@ -481,7 +481,11 @@ show_log_details (vl_api_registration_t * reg, u32 context,
   u32 msg_size;
 
   vl_api_log_details_t *rmp;
-  msg_size = sizeof (*rmp) + vec_len (msg_class) + vec_len (message);
+  int class_len =
+    clib_min (vec_len (msg_class) + 1, ARRAY_LEN (rmp->msg_class));
+  int message_len =
+    clib_min (vec_len (message) + 1, ARRAY_LEN (rmp->message));
+  msg_size = sizeof (*rmp) + class_len + message_len;
 
   rmp = vl_msg_api_alloc (msg_size);
   clib_memset (rmp, 0, msg_size);
@@ -491,10 +495,11 @@ show_log_details (vl_api_registration_t * reg, u32 context,
   rmp->timestamp = clib_host_to_net_f64 (timestamp);
   rmp->level = htonl (*level);
 
-  strncpy ((char *) rmp->msg_class, (char *) msg_class,
-          ARRAY_LEN (rmp->msg_class) - 1);
-  strncpy ((char *) rmp->message, (char *) message,
-          ARRAY_LEN (rmp->message) - 1);
+  memcpy (rmp->msg_class, msg_class, class_len - 1);
+  memcpy (rmp->message, message, message_len - 1);
+  /* enforced by memset() above */
+  ASSERT (0 == rmp->msg_class[class_len - 1]);
+  ASSERT (0 == rmp->message[message_len - 1]);
 
   vl_api_send_msg (reg, (u8 *) rmp);
 }
@@ -620,7 +625,7 @@ static void setup_message_id_table (api_main_t * am);
 static clib_error_t *
 vpe_api_hookup (vlib_main_t * vm)
 {
-  api_main_t *am = &api_main;
+  api_main_t *am = vlibapi_get_main ();
 
 #define _(N,n)                                                  \
     vl_msg_api_set_handlers(VL_API_##N, #n,                     \