X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fstn%2Fstn_api.c;h=a22bbffd2fed8f662fee18ed5c5a5f845e23041d;hb=7929f9f5c;hp=2f52c74659f09870d10db4022033e5ca2ae8c968;hpb=34ae9b1a5463405d7fa9826605c2becceed38253;p=vpp.git diff --git a/src/plugins/stn/stn_api.c b/src/plugins/stn/stn_api.c index 2f52c74659f..a22bbffd2fe 100644 --- a/src/plugins/stn/stn_api.c +++ b/src/plugins/stn/stn_api.c @@ -18,36 +18,18 @@ #include #include - +#include +#include #include /* define message IDs */ -#include - -/* define message structures */ -#define vl_typedefs -#include -#undef vl_typedefs - -/* define generated endian-swappers */ -#define vl_endianfun -#include -#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 -#undef vl_printfun - -/* Get the API version number */ -#define vl_api_version(n,v) static u32 api_version=(v); -#include -#undef vl_api_version +#include +#include #define REPLY_MSG_ID_BASE stn_main.msg_id_base #include +#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__) /* Macro to finish up custom dump fns */ #define FINISH \ vec_add1 (s, 0); \ @@ -67,10 +49,7 @@ static void *vl_api_stn_add_del_rule_t_print u8 *s; s = format (0, "SCRIPT: stn_add_del_rule "); - if (mp->is_ip4) - s = format (s, "address %U ", format_ip4_address, mp->ip_address); - else - s = format (s, "address %U ", format_ip6_address, mp->ip_address); + s = format (s, "address %U ", format_ip46_address, mp->ip_address); s = format (s, "sw_if_index %d is_add %d", mp->sw_if_index, mp->is_add); FINISH; @@ -83,15 +62,7 @@ vl_api_stn_add_del_rule_t_handler (vl_api_stn_add_del_rule_t * mp) vl_api_stn_add_del_rule_reply_t *rmp; int rv = 0; - if (mp->is_ip4) - { - ip4_address_t a; - memcpy (&a, mp->ip_address, sizeof (a)); - ip46_address_set_ip4 (&args.address, &a); - } - else - memcpy (&args.address.ip6, mp->ip_address, sizeof (ip6_address_t)); - + ip_address_decode (&mp->ip_address, &args.address); args.sw_if_index = clib_net_to_host_u32 (mp->sw_if_index); args.del = !mp->is_add; @@ -101,26 +72,19 @@ vl_api_stn_add_del_rule_t_handler (vl_api_stn_add_del_rule_t * mp) } static void -send_stn_rule_details (stn_rule_t * r, vl_api_registration_t * reg, - u32 context) +send_stn_rules_details (stn_rule_t * r, vl_api_registration_t * reg, + u32 context) { - vl_api_stn_rule_details_t *rmp; + vl_api_stn_rules_details_t *rmp; rmp = vl_msg_api_alloc (sizeof (*rmp)); - memset (rmp, 0, sizeof (*rmp)); + clib_memset (rmp, 0, sizeof (*rmp)); rmp->_vl_msg_id = - clib_host_to_net_u16 (VL_API_STN_RULE_DETAILS + stn_main.msg_id_base); - - if (ip46_address_is_ip4 (&r->address)) - { - clib_memcpy (rmp->ip_address, &r->address.ip4, sizeof (ip4_address_t)); - rmp->is_ip4 = 1; - } - else - { - clib_memcpy (rmp->ip_address, &r->address.ip6, sizeof (ip6_address_t)); - } + clib_host_to_net_u16 (VL_API_STN_RULES_DETAILS + stn_main.msg_id_base); + ip_address_encode (&r->address, + ip46_address_is_ip4 (&r->address) ? IP46_TYPE_IP4 : + IP46_TYPE_IP6, &rmp->ip_address); rmp->context = context; rmp->sw_if_index = clib_host_to_net_u32 (r->sw_if_index); @@ -140,85 +104,19 @@ vl_api_stn_rules_dump_t_handler (vl_api_stn_rules_dump_t * mp) /* *INDENT-OFF* */ pool_foreach (r, stn->rules,({ - send_stn_rule_details (r, reg, mp->context); + send_stn_rules_details (r, reg, mp->context); })); /* *INDENT-ON* */ } - -/* List of message types that this plugin understands */ -#define foreach_stn_plugin_api_msg \ -_(STN_ADD_DEL_RULE, stn_add_del_rule) \ -_(STN_RULES_DUMP, stn_rules_dump) - -/** - * @brief Set up the API message handling tables - * @param vm vlib_main_t * vlib main data structure pointer - * @returns 0 to indicate all is well - */ -static clib_error_t * -stn_plugin_api_hookup (vlib_main_t * vm) -{ - stn_main_t *stn = &stn_main; -#define _(N,n) \ - vl_msg_api_set_handlers((VL_API_##N + stn->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_stn_plugin_api_msg; -#undef _ - - return 0; -} - -#define vl_msg_name_crc_list -#include -#undef vl_msg_name_crc_list - -static void -setup_message_id_table (stn_main_t * stn, api_main_t * am) -{ -#define _(id,n,crc) \ - vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id + stn->msg_id_base); - foreach_vl_msg_name_crc_stn; -#undef _ -} - -static void -plugin_custom_dump_configure (stn_main_t * stn) -{ -#define _(n,f) api_main.msg_print_handlers \ - [VL_API_##n + stn->msg_id_base] \ - = (void *) vl_api_##f##_t_print; - foreach_stn_plugin_api_msg; -#undef _ -} - +#include clib_error_t * stn_api_init (vlib_main_t * vm, stn_main_t * sm) { - u8 *name; - clib_error_t *error = 0; - - name = format (0, "stn_%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 = stn_plugin_api_hookup (vm); + sm->msg_id_base = setup_message_id_table (); - /* Add our API messages to the global name_crc hash table */ - setup_message_id_table (sm, &api_main); - - plugin_custom_dump_configure (sm); - - vec_free (name); - - return error; + return 0; } /*