X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fmemif%2Fmemif_test.c;h=1ec6703d135c54372903549e0cc0d5bd279c3971;hb=2dbee9361e74d03727a8b618ba80a5e28c006011;hp=510462ef6a83d00fe59b81ad7bada2e0908b96ba;hpb=0aa14ed8f56cda4135766471d32755392f92bda7;p=vpp.git diff --git a/src/plugins/memif/memif_test.c b/src/plugins/memif/memif_test.c index 510462ef6a8..1ec6703d135 100644 --- a/src/plugins/memif/memif_test.c +++ b/src/plugins/memif/memif_test.c @@ -30,35 +30,11 @@ #include /* declare message IDs */ -#include - -/* Get CRC codes of the messages defined outside of this plugin */ -#define vl_msg_name_crc_list -#include -#undef vl_msg_name_crc_list - -/* define message structures */ -#define vl_typedefs -#include -#include -#undef vl_typedefs - -/* declare message handlers for each api */ - -#define vl_endianfun /* define message structures */ -#include -#undef vl_endianfun - -/* instantiate all the print functions we know about */ -#define vl_print(handle, ...) -#define vl_printfun -#include -#undef vl_printfun - -/* Get the API version number. */ -#define vl_api_version(n,v) static u32 api_version=(v); -#include -#undef vl_api_version +#include +#include +#include +#include +//#include typedef struct { @@ -70,37 +46,6 @@ typedef struct memif_test_main_t memif_test_main; -/* standard reply handlers */ -#define foreach_standard_reply_retval_handler \ -_(memif_delete_reply) - -#define _(n) \ - static void vl_api_##n##_t_handler \ - (vl_api_##n##_t * mp) \ - { \ - vat_main_t * vam = memif_test_main.vat_main; \ - i32 retval = ntohl(mp->retval); \ - if (vam->async_mode) { \ - vam->async_errors += (retval < 0); \ - } else { \ - vam->retval = retval; \ - vam->result_ready = 1; \ - } \ - } -foreach_standard_reply_retval_handler; -#undef _ - -/* - * Table of message reply handlers, must include boilerplate handlers - * we just generated - */ -#define foreach_vpe_api_reply_msg \ -_(MEMIF_CREATE_REPLY, memif_create_reply) \ -_(MEMIF_DELETE_REPLY, memif_delete_reply) \ -_(MEMIF_DETAILS, memif_details) \ -_(MEMIF_SOCKET_FILENAME_DETAILS, memif_socket_filename_details) \ -_(MEMIF_SOCKET_FILENAME_ADD_DEL_REPLY, memif_socket_filename_add_del_reply) - static uword unformat_memif_queues (unformat_input_t * input, va_list * args) { @@ -162,12 +107,12 @@ api_memif_socket_filename_add_del (vat_main_t * vam) return -99; } - M (MEMIF_SOCKET_FILENAME_ADD_DEL, mp); + M2 (MEMIF_SOCKET_FILENAME_ADD_DEL, mp, strlen ((char *) socket_filename)); mp->is_add = is_add; mp->socket_id = htonl (socket_id); - strncpy ((char *) mp->socket_filename, - (char *) socket_filename, sizeof (mp->socket_filename) - 1); + char *p = (char *) &mp->socket_filename; + p += vl_api_vec_to_api_string (socket_filename, (vl_api_string_t *) p); vec_free (socket_filename); @@ -178,6 +123,7 @@ api_memif_socket_filename_add_del (vat_main_t * vam) } /* memif_socket_filename_add_del reply handler */ +#define VL_API_MEMIF_SOCKET_FILENAME_ADD_DEL_REPLY_T_HANDLER static void vl_api_memif_socket_filename_add_del_reply_t_handler (vl_api_memif_socket_filename_add_del_reply_t * mp) { @@ -259,7 +205,7 @@ api_memif_create (vat_main_t * vam) return -99; } - M (MEMIF_CREATE, mp); + M2 (MEMIF_CREATE, mp, strlen ((char *) secret)); mp->mode = mode; mp->id = clib_host_to_net_u32 (id); @@ -269,7 +215,8 @@ api_memif_create (vat_main_t * vam) mp->socket_id = clib_host_to_net_u32 (socket_id); if (secret != 0) { - strncpy ((char *) mp->secret, (char *) secret, 16); + char *p = (char *) &mp->secret; + p += vl_api_vec_to_api_string (secret, (vl_api_string_t *) p); vec_free (secret); } memcpy (mp->hw_addr, hw_addr, 6); @@ -354,6 +301,8 @@ api_memif_dump (vat_main_t * vam) S (mp); /* Use a control ping for synchronization */ + if (!mm->ping_id) + mm->ping_id = vl_msg_api_get_msg_index ((u8 *) (VL_API_CONTROL_PING_CRC)); mp_ping = vl_msg_api_alloc_as_if_client (sizeof (*mp_ping)); mp_ping->_vl_msg_id = htons (mm->ping_id); mp_ping->client_index = vam->my_client_index; @@ -382,8 +331,8 @@ vl_api_memif_details_t_handler (vl_api_memif_details_t * mp) clib_net_to_host_u32 (mp->socket_id), mp->role ? "slave" : "master", ntohl (mp->ring_size), ntohs (mp->buffer_size), - mp->admin_up_down ? "up" : "down", - mp->link_up_down ? "up" : "down"); + (mp->flags & IF_STATUS_API_FLAG_ADMIN_UP) ? "up" : "down", + (mp->flags & IF_STATUS_API_FLAG_LINK_UP) ? "up" : "down"); } /* memif_socket_filename_dump API */ @@ -406,6 +355,8 @@ api_memif_socket_filename_dump (vat_main_t * vam) S (mp); /* Use a control ping for synchronization */ + if (!mm->ping_id) + mm->ping_id = vl_msg_api_get_msg_index ((u8 *) (VL_API_CONTROL_PING_CRC)); mp_ping = vl_msg_api_alloc_as_if_client (sizeof (*mp_ping)); mp_ping->_vl_msg_id = htons (mm->ping_id); mp_ping->client_index = vam->my_client_index; @@ -430,73 +381,7 @@ static void vl_api_memif_socket_filename_details_t_handler ntohl (mp->socket_id), mp->socket_filename); } -/* - * List of messages that the api test plugin sends, - * and that the data plane plugin processes - */ -#define foreach_vpe_api_msg \ -_(memif_create, "[id ] [socket-id ] [ring_size ] " \ - "[buffer_size ] [hw_addr ] " \ - "[secret ] [mode ip] ") \ -_(memif_delete, "") \ -_(memif_dump, "") \ -_(memif_socket_filename_dump, "") \ -_(memif_socket_filename_add_del, "[add|del] id filename ") - -static void -memif_vat_api_hookup (vat_main_t * vam) -{ - memif_test_main_t *mm __attribute__ ((unused)) = &memif_test_main; - /* Hook up handlers for replies from the data plane plug-in */ -#define _(N,n) \ - vl_msg_api_set_handlers((VL_API_##N + mm->msg_id_base), \ - #n, \ - vl_api_##n##_t_handler, \ - vl_noop_handler, \ - vl_api_##n##_t_endian, \ - vl_api_##n##_t_print, \ - sizeof(vl_api_##n##_t), 1); - foreach_vpe_api_reply_msg; -#undef _ - - /* API messages we can send */ -#define _(n,h) \ - hash_set_mem (vam->function_by_name, #n, api_##n); - foreach_vpe_api_msg; -#undef _ - - /* Help strings */ -#define _(n,h) hash_set_mem (vam->help_by_name, #n, h); - foreach_vpe_api_msg; -#undef _ -} - -clib_error_t * -vat_plugin_register (vat_main_t * vam) -{ - memif_test_main_t *mm = &memif_test_main; - u8 *name; - - mm->vat_main = vam; - - /* Ask the vpp engine for the first assigned message-id */ - name = format (0, "memif_%08x%c", api_version, 0); - mm->msg_id_base = vl_client_get_first_plugin_msg_id ((char *) name); - - /* Get the control ping ID */ -#define _(id,n,crc) \ - const char *id ## _CRC __attribute__ ((unused)) = #n "_" #crc; - foreach_vl_msg_name_crc_vpe; -#undef _ - mm->ping_id = vl_msg_api_get_msg_index ((u8 *) (VL_API_CONTROL_PING_CRC)); - - if (mm->msg_id_base != (u16) ~ 0) - memif_vat_api_hookup (vam); - - vec_free (name); - - return 0; -} +#include /* * fd.io coding-style-patch-verification: ON