From 7adaa226eaa2401d6bb0dfd38a0d943c9645d7dc Mon Sep 17 00:00:00 2001 From: Ole Troan Date: Tue, 27 Aug 2019 15:05:27 +0200 Subject: api: revert use string type for strings in memclnt.api This reverts commit 2959d42feb576c0e00c28c4e27658b25f6c783e9. Lacks client side fixes. Type: fix Change-Id: Ib94b18e74325cede41ed1733e57896f17a952526 Signed-off-by: Ole Troan --- src/vlibmemory/vlib_api.c | 35 +++++++++++++++-------------------- 1 file changed, 15 insertions(+), 20 deletions(-) (limited to 'src/vlibmemory/vlib_api.c') diff --git a/src/vlibmemory/vlib_api.c b/src/vlibmemory/vlib_api.c index 7d7ed3e68aa..e1a6bd18d55 100644 --- a/src/vlibmemory/vlib_api.c +++ b/src/vlibmemory/vlib_api.c @@ -56,12 +56,10 @@ static inline void * vl_api_trace_plugin_msg_ids_t_print (vl_api_trace_plugin_msg_ids_t * a, void *handle) { - u8 *plugin_name = vl_api_from_api_to_vec (&a->plugin_name); - vl_print (handle, "vl_api_trace_plugin_msg_ids: %v first %u last %u\n", - plugin_name, + vl_print (handle, "vl_api_trace_plugin_msg_ids: %s first %u last %u\n", + a->plugin_name, clib_host_to_net_u16 (a->first_msg_id), clib_host_to_net_u16 (a->last_msg_id)); - vec_free (plugin_name); return handle; } @@ -78,6 +76,7 @@ vl_api_get_first_msg_id_t_handler (vl_api_get_first_msg_id_t * mp) uword *p; api_main_t *am = &api_main; vl_api_msg_range_t *rp; + u8 name[64]; u16 first_msg_id = ~0; int rv = -7; /* VNET_API_ERROR_INVALID_VALUE */ @@ -85,11 +84,10 @@ vl_api_get_first_msg_id_t_handler (vl_api_get_first_msg_id_t * mp) if (!regp) return; - u8 *name = vl_api_from_api_to_vec (&mp->name); - if (am->msg_range_by_name == 0) goto out; - + strncpy ((char *) name, (char *) mp->name, ARRAY_LEN (name)); + name[ARRAY_LEN (name) - 1] = '\0'; p = hash_get_mem (am->msg_range_by_name, name); if (p == 0) goto out; @@ -99,7 +97,6 @@ vl_api_get_first_msg_id_t_handler (vl_api_get_first_msg_id_t * mp) rv = 0; out: - vec_free (name); rmp = vl_msg_api_alloc (sizeof (*rmp)); rmp->_vl_msg_id = ntohs (VL_API_GET_FIRST_MSG_ID_REPLY); rmp->context = mp->context; @@ -136,8 +133,10 @@ vl_api_api_versions_t_handler (vl_api_api_versions_t * mp) rmp->api_versions[i].major = htonl (vl->major); rmp->api_versions[i].minor = htonl (vl->minor); rmp->api_versions[i].patch = htonl (vl->patch); - vl_api_to_api_string (strnlen (vl->name, 64), vl->name, - &rmp->api_versions[i].name); + strncpy ((char *) rmp->api_versions[i].name, vl->name, + ARRAY_LEN (rmp->api_versions[i].name)); + rmp->api_versions[i].name[ARRAY_LEN (rmp->api_versions[i].name) - 1] = + '\0'; } vl_api_send_msg (reg, (u8 *) rmp); @@ -194,8 +193,8 @@ send_one_plugin_msg_ids_msg (u8 * name, u16 first_msg_id, u16 last_msg_id) clib_memset (mp, 0, sizeof (*mp)); mp->_vl_msg_id = clib_host_to_net_u16 (VL_API_TRACE_PLUGIN_MSG_IDS); - vl_api_to_api_string (strnlen_s ((char *) name, 64), (char *) name, - &mp->plugin_name); + strncpy ((char *) mp->plugin_name, (char *) name, + sizeof (mp->plugin_name) - 1); mp->first_msg_id = clib_host_to_net_u16 (first_msg_id); mp->last_msg_id = clib_host_to_net_u16 (last_msg_id); @@ -626,14 +625,11 @@ vl_api_trace_plugin_msg_ids_t_handler (vl_api_trace_plugin_msg_ids_t * mp) if (am->replay_in_progress == 0) return; - u8 *plugin_name = vl_api_from_api_to_vec (&mp->plugin_name); - vec_add1 (plugin_name, 0); - - p = hash_get_mem (am->msg_range_by_name, plugin_name); + p = hash_get_mem (am->msg_range_by_name, mp->plugin_name); if (p == 0) { clib_warning ("WARNING: traced plugin '%s' not in current image", - plugin_name); + mp->plugin_name); return; } @@ -641,17 +637,16 @@ vl_api_trace_plugin_msg_ids_t_handler (vl_api_trace_plugin_msg_ids_t * mp) if (rp->first_msg_id != clib_net_to_host_u16 (mp->first_msg_id)) { clib_warning ("WARNING: traced plugin '%s' first message id %d not %d", - plugin_name, clib_net_to_host_u16 (mp->first_msg_id), + mp->plugin_name, clib_net_to_host_u16 (mp->first_msg_id), rp->first_msg_id); } if (rp->last_msg_id != clib_net_to_host_u16 (mp->last_msg_id)) { clib_warning ("WARNING: traced plugin '%s' last message id %d not %d", - plugin_name, clib_net_to_host_u16 (mp->last_msg_id), + mp->plugin_name, clib_net_to_host_u16 (mp->last_msg_id), rp->last_msg_id); } - vec_free (plugin_name); } #define foreach_rpc_api_msg \ -- cgit 1.2.3-korg