diff options
| author |   Ole Troan <ot@cisco.com> | 2019-09-25 18:24:42 +0200 |
|---|---|---|
| committer |   Neale Ranns <nranns@cisco.com> | 2019-09-27 11:49:11 +0000 |
| commit | 1bc96680c45237e6ed519e4be36738139a94af2d (patch) | |
| tree | 86595f5594ff0cb962d3a5c135ec4fed62b28451 /src/plugins/cdp/cdp_test.c | |
| parent | 74af6f081f2360eca7578f04c8ecff617e911b53 (diff) | |
cdp: remove api boilerplate
Type: refactor
Signed-off-by: Ole Troan <ot@cisco.com>
Change-Id: I3b4bbbf2574faf8d06546eb72f127fa47479e988
Signed-off-by: Ole Troan <ot@cisco.com>
Diffstat (limited to 'src/plugins/cdp/cdp_test.c')
| -rw-r--r-- | src/plugins/cdp/cdp_test.c | 81 |
1 files changed, 3 insertions, 78 deletions
diff --git a/src/plugins/cdp/cdp_test.c b/src/plugins/cdp/cdp_test.c index 2e24ddc8c0a..a9365966a0b 100644 --- a/src/plugins/cdp/cdp_test.c +++ b/src/plugins/cdp/cdp_test.c @@ -22,30 +22,8 @@ uword unformat_sw_if_index (unformat_input_t * input, va_list * args); /* Declare message IDs */ -#include <cdp/cdp_msg_enum.h> - -/* define message structures */ -#define vl_typedefs -#include <cdp/cdp_all_api_h.h> -#undef vl_typedefs - -/* declare message handlers for each api */ - -#define vl_endianfun /* define message structures */ -#include <cdp/cdp_all_api_h.h> -#undef vl_endianfun - -/* instantiate all the print functions we know about */ -#define vl_print(handle, ...) -#define vl_printfun -#include <cdp/cdp_all_api_h.h> -#undef vl_printfun - -/* Get the API version number. */ -#define vl_api_version(n,v) static u32 api_version=(v); -#include <cdp/cdp_all_api_h.h> -#undef vl_api_version - +#include <cdp/cdp.api_enum.h> +#include <cdp/cdp.api_types.h> typedef struct { @@ -59,25 +37,6 @@ cdp_test_main_t cdp_test_main; #define __plugin_msg_base cdp_test_main.msg_id_base #include <vlibapi/vat_helper_macros.h> -#define foreach_standard_reply_retval_handler \ -_(cdp_enable_disable_reply) - -#define _(n) \ - static void vl_api_##n##_t_handler \ - (vl_api_##n##_t * mp) \ - { \ - vat_main_t * vam = cdp_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 @@ -116,41 +75,7 @@ api_cdp_enable_disable (vat_main_t * vam) return ret; } -/* - * List of messages that the api test plugin sends, - * and that the data plane plugin processes - */ -#define foreach_vpe_api_msg \ -_(cdp_enable_disable, "enable | disable") - -static void -cdp_api_hookup (vat_main_t * vam) -{ - cdp_test_main_t *sm = &cdp_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 (cdp); +#include <cdp/cdp.api_test.c> /* * fd.io coding-style-patch-verification: ON |