diff options
Diffstat (limited to 'src/examples/sample-plugin/sample/sample.c')
| -rw-r--r-- | src/examples/sample-plugin/sample/sample.c | 81 |
1 files changed, 6 insertions, 75 deletions
diff --git a/src/examples/sample-plugin/sample/sample.c b/src/examples/sample-plugin/sample/sample.c index 91e8939f789..4aeb5358e95 100644 --- a/src/examples/sample-plugin/sample/sample.c +++ b/src/examples/sample-plugin/sample/sample.c @@ -24,38 +24,12 @@ #include <vlibapi/api.h> #include <vlibmemory/api.h> -/* define message IDs */ -#include <sample/sample_msg_enum.h> - -/* define message structures */ -#define vl_typedefs -#include <sample/sample_all_api_h.h> -#undef vl_typedefs - -/* define generated endian-swappers */ -#define vl_endianfun -#include <sample/sample_all_api_h.h> -#undef vl_endianfun - -/* instantiate all the print functions we know about */ -#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__) -#define vl_printfun -#include <sample/sample_all_api_h.h> -#undef vl_printfun - -/* Get the API version number */ -#define vl_api_version(n,v) static u32 api_version=(v); -#include <sample/sample_all_api_h.h> -#undef vl_api_version +#include <sample/sample.api_enum.h> +#include <sample/sample.api_types.h> #define REPLY_MSG_ID_BASE sm->msg_id_base #include <vlibapi/api_helper_macros.h> -/* List of message types that this plugin understands */ - -#define foreach_sample_plugin_api_msg \ -_(SAMPLE_MACSWAP_ENABLE_DISABLE, sample_macswap_enable_disable) - /* *INDENT-OFF* */ VLIB_PLUGIN_REGISTER () = { .version = SAMPLE_PLUGIN_BUILD_VER, @@ -165,39 +139,8 @@ static void vl_api_sample_macswap_enable_disable_t_handler REPLY_MACRO(VL_API_SAMPLE_MACSWAP_ENABLE_DISABLE_REPLY); } -/** - * @brief Set up the API message handling tables. - */ -static clib_error_t * -sample_plugin_api_hookup (vlib_main_t *vm) -{ - sample_main_t * sm = &sample_main; -#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_sample_plugin_api_msg; -#undef _ - - return 0; -} - -#define vl_msg_name_crc_list -#include <sample/sample_all_api_h.h> -#undef vl_msg_name_crc_list - -static void -setup_message_id_table (sample_main_t * sm, api_main_t *am) -{ -#define _(id,n,crc) \ - vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id + sm->msg_id_base); - foreach_vl_msg_name_crc_sample; -#undef _ -} +/* API definitions */ +#include <sample/sample.api.c> /** * @brief Initialize the sample plugin. @@ -205,25 +148,13 @@ setup_message_id_table (sample_main_t * sm, api_main_t *am) static clib_error_t * sample_init (vlib_main_t * vm) { sample_main_t * sm = &sample_main; - clib_error_t * error = 0; - u8 * name; sm->vnet_main = vnet_get_main (); - name = format (0, "sample_%08x%c", api_version, 0); - - /* Ask for a correctly-sized block of API message decode slots */ - sm->msg_id_base = vl_msg_api_get_msg_ids - ((char *) name, VL_MSG_FIRST_AVAILABLE); - - error = sample_plugin_api_hookup (vm); - /* Add our API messages to the global name_crc hash table */ - setup_message_id_table (sm, &api_main); + sm->msg_id_base = setup_message_id_table (); - vec_free(name); - - return error; + return 0; } VLIB_INIT_FUNCTION (sample_init); |