diff options
Diffstat (limited to 'src/plugins/http_static/http_static_test.c')
| -rw-r--r-- | src/plugins/http_static/http_static_test.c | 90 |
1 files changed, 3 insertions, 87 deletions
diff --git a/src/plugins/http_static/http_static_test.c b/src/plugins/http_static/http_static_test.c index 545980b38dd..023d78a4f0d 100644 --- a/src/plugins/http_static/http_static_test.c +++ b/src/plugins/http_static/http_static_test.c @@ -22,30 +22,8 @@ uword unformat_sw_if_index (unformat_input_t * input, va_list * args); /* Declare message IDs */ -#include <http_static/http_static_msg_enum.h> - -/* define message structures */ -#define vl_typedefs -#include <http_static/http_static_all_api_h.h> -#undef vl_typedefs - -/* declare message handlers for each api */ - -#define vl_endianfun /* define message structures */ -#include <http_static/http_static_all_api_h.h> -#undef vl_endianfun - -/* instantiate all the print functions we know about */ -#define vl_print(handle, ...) -#define vl_printfun -#include <http_static/http_static_all_api_h.h> -#undef vl_printfun - -/* Get the API version number. */ -#define vl_api_version(n,v) static u32 api_version=(v); -#include <http_static/http_static_all_api_h.h> -#undef vl_api_version - +#include <http_static/http_static.api_enum.h> +#include <http_static/http_static.api_types.h> typedef struct { @@ -59,33 +37,6 @@ http_static_test_main_t http_static_test_main; #define __plugin_msg_base http_static_test_main.msg_id_base #include <vlibapi/vat_helper_macros.h> -#define foreach_standard_reply_retval_handler \ -_(http_static_enable_reply) - -#define _(n) \ - static void vl_api_##n##_t_handler \ - (vl_api_##n##_t * mp) \ - { \ - vat_main_t * vam = http_static_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 \ -_(HTTP_STATIC_ENABLE_REPLY, http_static_enable_reply) - - static int api_http_static_enable (vat_main_t * vam) { @@ -173,42 +124,7 @@ api_http_static_enable (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 \ -_(http_static_enable, "www-root <path> [prealloc-fios <nn>]\n" \ -"[private-segment-size <nnMG>] [fifo-size <nbytes>] [uri <uri>]\n") - -static void -http_static_api_hookup (vat_main_t * vam) -{ - http_static_test_main_t *htmp = &http_static_test_main; - /* Hook up handlers for replies from the data plane plug-in */ -#define _(N,n) \ - vl_msg_api_set_handlers((VL_API_##N + htmp->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 (http_static); +#include <http_static/http_static.api_test.c> /* * fd.io coding-style-patch-verification: ON |