diff options
Diffstat (limited to 'src/plugins/ioam/export')
| -rw-r--r-- | src/plugins/ioam/export/ioam_export.api | 7 | ||||
| -rw-r--r-- | src/plugins/ioam/export/ioam_export.c | 2 | ||||
| -rw-r--r-- | src/plugins/ioam/export/ioam_export_test.c | 99 |
3 files changed, 12 insertions, 96 deletions
diff --git a/src/plugins/ioam/export/ioam_export.api b/src/plugins/ioam/export/ioam_export.api index c127bd2e865..2e77ded6d9d 100644 --- a/src/plugins/ioam/export/ioam_export.api +++ b/src/plugins/ioam/export/ioam_export.api @@ -15,6 +15,7 @@ */ option version = "1.0.0"; +import "vnet/ip/ip_types.api"; /* Define a simple binary API to control the feature */ @@ -26,11 +27,11 @@ autoreply define ioam_export_ip6_enable_disable { u32 context; /* Enable / disable the feature */ - u8 is_disable; + bool is_disable; /* Collector ip address */ - u8 collector_address[4]; - u8 src_address[4]; + vl_api_ip4_address_t collector_address; + vl_api_ip4_address_t src_address; /* Src ip address */ }; diff --git a/src/plugins/ioam/export/ioam_export.c b/src/plugins/ioam/export/ioam_export.c index f4c39a03c5c..21695af3368 100644 --- a/src/plugins/ioam/export/ioam_export.c +++ b/src/plugins/ioam/export/ioam_export.c @@ -25,7 +25,7 @@ #include <vlibapi/api.h> #include <vlibmemory/api.h> #include <vnet/ip/ip6_hop_by_hop.h> - +#include <vnet/format_fns.h> /* define message IDs */ #include <ioam/export/ioam_export.api_enum.h> diff --git a/src/plugins/ioam/export/ioam_export_test.c b/src/plugins/ioam/export/ioam_export_test.c index b7d53c2b0f3..a98a5f5e523 100644 --- a/src/plugins/ioam/export/ioam_export_test.c +++ b/src/plugins/ioam/export/ioam_export_test.c @@ -22,59 +22,23 @@ #include <vlibapi/api.h> #include <vlibmemory/api.h> #include <vppinfra/error.h> +#include <vnet/format_fns.h> -#define __plugin_msg_base export_test_main.msg_id_base +#define __plugin_msg_base ioam_export_test_main.msg_id_base #include <vlibapi/vat_helper_macros.h> - /* Declare message IDs */ #include <ioam/export/ioam_export.api_enum.h> #include <ioam/export/ioam_export.api_types.h> -#define vl_endianfun /* define message structures */ -#define vl_printfun -#define vl_api_version(n,v) static u32 api_version=(v); -#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__) -#include <ioam/export/ioam_export.api.h> -#undef vl_endianfun -#undef vl_printfun -#undef vl_api_version - typedef struct { /* API message ID base */ u16 msg_id_base; vat_main_t *vat_main; -} export_test_main_t; - -static export_test_main_t export_test_main; - -#define foreach_standard_reply_retval_handler \ -_(ioam_export_ip6_enable_disable_reply) - -#define _(n) \ - static void vl_api_##n##_t_handler \ - (vl_api_##n##_t * mp) \ - { \ - vat_main_t * vam = export_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 \ -_(IOAM_EXPORT_IP6_ENABLE_DISABLE_REPLY, ioam_export_ip6_enable_disable_reply) +} ioam_export_test_main_t; +static ioam_export_test_main_t ioam_export_test_main; static int api_ioam_export_ip6_enable_disable (vat_main_t * vam) @@ -105,55 +69,6 @@ api_ioam_export_ip6_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 \ -_(ioam_export_ip6_enable_disable, "<intfc> [disable]") - -static void -ioam_export_vat_api_hookup (vat_main_t * vam) -{ - export_test_main_t *sm = &export_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 _ -} - -clib_error_t * -ioam_export_vat_plugin_register (vat_main_t * vam) -{ - export_test_main_t *sm = &export_test_main; - u8 *name; - - sm->vat_main = vam; - - name = format (0, "ioam_export_%08x%c", api_version, 0); - sm->msg_id_base = vl_client_get_first_plugin_msg_id ((char *) name); - - if (sm->msg_id_base != (u16) ~ 0) - ioam_export_vat_api_hookup (vam); - - vec_free (name); - - return 0; -} +/* Override generated plugin register symbol */ +#define vat_plugin_register ioam_export_vat_plugin_register +#include <ioam/export/ioam_export.api_test.c> |