diff options
Diffstat (limited to 'src/plugins/flowprobe/flowprobe_test.c')
| -rw-r--r-- | src/plugins/flowprobe/flowprobe_test.c | 87 |
1 files changed, 3 insertions, 84 deletions
diff --git a/src/plugins/flowprobe/flowprobe_test.c b/src/plugins/flowprobe/flowprobe_test.c index 53fdb23be5d..245707d417d 100644 --- a/src/plugins/flowprobe/flowprobe_test.c +++ b/src/plugins/flowprobe/flowprobe_test.c @@ -30,29 +30,8 @@ uword unformat_sw_if_index (unformat_input_t * input, va_list * args); /* Declare message IDs */ -#include <flowprobe/flowprobe_msg_enum.h> - -/* define message structures */ -#define vl_typedefs -#include <flowprobe/flowprobe_all_api_h.h> -#undef vl_typedefs - -/* declare message handlers for each api */ - -#define vl_endianfun /* define message structures */ -#include <flowprobe/flowprobe_all_api_h.h> -#undef vl_endianfun - -/* instantiate all the print functions we know about */ -#define vl_print(handle, ...) -#define vl_printfun -#include <flowprobe/flowprobe_all_api_h.h> -#undef vl_printfun - -/* Get the API version number. */ -#define vl_api_version(n,v) static u32 api_version=(v); -#include <flowprobe/flowprobe_all_api_h.h> -#undef vl_api_version +#include <flowprobe/flowprobe.api_enum.h> +#include <flowprobe/flowprobe.api_types.h> typedef struct { @@ -64,35 +43,6 @@ typedef struct flowprobe_test_main_t flowprobe_test_main; -#define foreach_standard_reply_retval_handler \ -_(flowprobe_tx_interface_add_del_reply) \ -_(flowprobe_params_reply) - -#define _(n) \ - static void vl_api_##n##_t_handler \ - (vl_api_##n##_t * mp) \ - { \ - vat_main_t * vam = flowprobe_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 \ -_(FLOWPROBE_TX_INTERFACE_ADD_DEL_REPLY, \ - flowprobe_tx_interface_add_del_reply) \ -_(FLOWPROBE_PARAMS_REPLY, flowprobe_params_reply) - static int api_flowprobe_tx_interface_add_del (vat_main_t * vam) { @@ -201,38 +151,7 @@ api_flowprobe_params (vat_main_t * vam) * List of messages that the api test plugin sends, * and that the data plane plugin processes */ -#define foreach_vpe_api_msg \ -_(flowprobe_tx_interface_add_del, "<intfc> [disable]") \ -_(flowprobe_params, "record <[l2] [l3] [l4]> [active <timer> passive <timer>]") - -static void -flowprobe_api_hookup (vat_main_t * vam) -{ - flowprobe_test_main_t *sm = &flowprobe_test_main; - /* Hook up handlers for replies from the data plane plug-in */ -#define _(N,n) \ - vl_msg_api_set_handlers((VL_API_##N + sm->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 _ -} - -VAT_PLUGIN_REGISTER (flowprobe); +#include <flowprobe/flowprobe.api_test.c> /* * fd.io coding-style-patch-verification: ON |