diff options
| author |   Ole Troan <ot@cisco.com> | 2019-09-25 18:20:20 +0200 |
|---|---|---|
| committer |   Neale Ranns <nranns@cisco.com> | 2019-09-27 12:29:05 +0000 |
| commit | 51e70b6f19a66351bff7fe2e22a8dfce82b64ecd (patch) | |
| tree | a257d77ee8e323222035d995b51f63e2ad75948e /src/plugins/builtinurl/builtinurl_test.c | |
| parent | 1bc96680c45237e6ed519e4be36738139a94af2d (diff) | |
builtinurl: remove api boilerplate
Type: refactor
Change-Id: Iaf728642e489acfd63e1da88aa8daa44ceca21e9
Signed-off-by: Ole Troan <ot@cisco.com>
Diffstat (limited to 'src/plugins/builtinurl/builtinurl_test.c')
| -rw-r--r-- | src/plugins/builtinurl/builtinurl_test.c | 91 |
1 files changed, 4 insertions, 87 deletions
diff --git a/src/plugins/builtinurl/builtinurl_test.c b/src/plugins/builtinurl/builtinurl_test.c index c71be664608..9edfb81c525 100644 --- a/src/plugins/builtinurl/builtinurl_test.c +++ b/src/plugins/builtinurl/builtinurl_test.c @@ -23,30 +23,8 @@ uword unformat_sw_if_index (unformat_input_t * input, va_list * args); /* Declare message IDs */ -#include <builtinurl/builtinurl_msg_enum.h> - -/* define message structures */ -#define vl_typedefs -#include <builtinurl/builtinurl_all_api_h.h> -#undef vl_typedefs - -/* declare message handlers for each api */ - -#define vl_endianfun /* define message structures */ -#include <builtinurl/builtinurl_all_api_h.h> -#undef vl_endianfun - -/* instantiate all the print functions we know about */ -#define vl_print(handle, ...) -#define vl_printfun -#include <builtinurl/builtinurl_all_api_h.h> -#undef vl_printfun - -/* Get the API version number. */ -#define vl_api_version(n,v) static u32 api_version=(v); -#include <builtinurl/builtinurl_all_api_h.h> -#undef vl_api_version - +#include <builtinurl/builtinurl.api_enum.h> +#include <builtinurl/builtinurl.api_types.h> typedef struct { @@ -60,35 +38,8 @@ builtinurl_test_main_t builtinurl_test_main; #define __plugin_msg_base builtinurl_test_main.msg_id_base #include <vlibapi/vat_helper_macros.h> -#define foreach_standard_reply_retval_handler \ -_(builtinurl_enable_reply) - -#define _(n) \ - static void vl_api_##n##_t_handler \ - (vl_api_##n##_t * mp) \ - { \ - vat_main_t * vam = builtinurl_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 \ -_(BUILTINURL_ENABLE_REPLY, builtinurl_enable_reply) - - static int -api_builtinurl_enable_disable (vat_main_t * vam) +api_builtinurl_enable (vat_main_t * vam) { vl_api_builtinurl_enable_t *mp; int ret; @@ -104,41 +55,7 @@ api_builtinurl_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 \ -_(builtinurl_enable_disable, "") - -static void -builtinurl_api_hookup (vat_main_t * vam) -{ - builtinurl_test_main_t *btmp = &builtinurl_test_main; - /* Hook up handlers for replies from the data plane plug-in */ -#define _(N,n) \ - vl_msg_api_set_handlers((VL_API_##N + btmp->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 (builtinurl); +#include <builtinurl/builtinurl.api_test.c> /* * fd.io coding-style-patch-verification: ON |