diff options
Diffstat (limited to 'src/vnet/vxlan')
| -rw-r--r-- | src/vnet/vxlan/vxlan_api.c | 66 |
1 files changed, 9 insertions, 57 deletions
diff --git a/src/vnet/vxlan/vxlan_api.c b/src/vnet/vxlan/vxlan_api.c index 381bb832f7a..c97597a2ef2 100644 --- a/src/vnet/vxlan/vxlan_api.c +++ b/src/vnet/vxlan/vxlan_api.c @@ -25,37 +25,17 @@ #include <vnet/feature/feature.h> #include <vnet/vxlan/vxlan.h> #include <vnet/fib/fib_table.h> - #include <vnet/ip/ip_types_api.h> #include <vnet/udp/udp_local.h> +#include <vnet/format_fns.h> +#include <vxlan/vxlan.api_enum.h> +#include <vxlan/vxlan.api_types.h> -#include <vnet/vnet_msg_enum.h> - -#define vl_typedefs /* define message structures */ -#include <vnet/vnet_all_api_h.h> -#undef vl_typedefs - -#define vl_endianfun /* define message structures */ -#include <vnet/vnet_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 <vnet/vnet_all_api_h.h> -#undef vl_printfun +static u16 msg_id_base; +#define REPLY_MSG_ID_BASE msg_id_base #include <vlibapi/api_helper_macros.h> -#define foreach_vpe_api_msg \ - _ (SW_INTERFACE_SET_VXLAN_BYPASS, sw_interface_set_vxlan_bypass) \ - _ (VXLAN_ADD_DEL_TUNNEL, vxlan_add_del_tunnel) \ - _ (VXLAN_TUNNEL_DUMP, vxlan_tunnel_dump) \ - _ (VXLAN_ADD_DEL_TUNNEL_V2, vxlan_add_del_tunnel_v2) \ - _ (VXLAN_ADD_DEL_TUNNEL_V3, vxlan_add_del_tunnel_v3) \ - _ (VXLAN_TUNNEL_V2_DUMP, vxlan_tunnel_v2_dump) \ - _ (VXLAN_OFFLOAD_RX, vxlan_offload_rx) - static void vl_api_vxlan_offload_rx_t_handler (vl_api_vxlan_offload_rx_t * mp) { @@ -254,7 +234,7 @@ static void send_vxlan_tunnel_details rmp = vl_msg_api_alloc (sizeof (*rmp)); clib_memset (rmp, 0, sizeof (*rmp)); - rmp->_vl_msg_id = ntohs (VL_API_VXLAN_TUNNEL_DETAILS); + rmp->_vl_msg_id = ntohs (REPLY_MSG_ID_BASE + VL_API_VXLAN_TUNNEL_DETAILS); ip_address_encode (&t->src, IP46_TYPE_ANY, &rmp->src_address); ip_address_encode (&t->dst, IP46_TYPE_ANY, &rmp->dst_address); @@ -315,7 +295,7 @@ send_vxlan_tunnel_v2_details (vxlan_tunnel_t *t, vl_api_registration_t *reg, rmp = vl_msg_api_alloc (sizeof (*rmp)); clib_memset (rmp, 0, sizeof (*rmp)); - rmp->_vl_msg_id = ntohs (VL_API_VXLAN_TUNNEL_V2_DETAILS); + rmp->_vl_msg_id = ntohs (REPLY_MSG_ID_BASE + VL_API_VXLAN_TUNNEL_V2_DETAILS); ip_address_encode (&t->src, IP46_TYPE_ANY, &rmp->src_address); ip_address_encode (&t->dst, IP46_TYPE_ANY, &rmp->dst_address); @@ -368,46 +348,18 @@ vl_api_vxlan_tunnel_v2_dump_t_handler (vl_api_vxlan_tunnel_v2_dump_t *mp) } } -/* - * vpe_api_hookup - * Add vpe's API message handlers to the table. - * vlib has already mapped shared memory and - * added the client registration handlers. - * See .../vlib-api/vlibmemory/memclnt_vlib.c:memclnt_process() - */ -#define vl_msg_name_crc_list -#include <vnet/vnet_all_api_h.h> -#undef vl_msg_name_crc_list - -static void -setup_message_id_table (api_main_t * am) -{ -#define _(id,n,crc) vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id); - foreach_vl_msg_name_crc_vxlan; -#undef _ -} - +#include <vxlan/vxlan.api.c> static clib_error_t * vxlan_api_hookup (vlib_main_t * vm) { api_main_t *am = vlibapi_get_main (); -#define _(N,n) \ - vl_msg_api_set_handlers(VL_API_##N, #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_msg; -#undef _ - am->api_trace_cfg[VL_API_VXLAN_ADD_DEL_TUNNEL].size += 16 * sizeof (u32); /* * Set up the (msg_name, crc, message-id) table */ - setup_message_id_table (am); + msg_id_base = setup_message_id_table (); return 0; } |