X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fgtpu%2Fgtpu_api.c;h=0c4a31521bbd1c5e2d71b87abc4d160993dafba4;hb=55636cb62;hp=5a77ab7f851ac8c26e8257f168f4e7f9fd15a0e0;hpb=59b2565cd91a67ced650739f36129650830211ac;p=vpp.git diff --git a/src/plugins/gtpu/gtpu_api.c b/src/plugins/gtpu/gtpu_api.c index 5a77ab7f851..0c4a31521bb 100644 --- a/src/plugins/gtpu/gtpu_api.c +++ b/src/plugins/gtpu/gtpu_api.c @@ -24,61 +24,16 @@ #include #include - +#include #include - -#define vl_msg_id(n,h) n, -typedef enum -{ -#include - /* We'll want to know how many messages IDs we need... */ - VL_MSG_FIRST_AVAILABLE, -} vl_msg_id_t; -#undef vl_msg_id - -/* 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 - -#define vl_msg_name_crc_list -#include -#undef vl_msg_name_crc_list +#include +#include +#include #define REPLY_MSG_ID_BASE gtm->msg_id_base #include -static void -setup_message_id_table (gtpu_main_t * gtm, api_main_t * am) -{ -#define _(id,n,crc) \ - vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id + gtm->msg_id_base); - foreach_vl_msg_name_crc_gtpu; -#undef _ -} - -#define foreach_gtpu_plugin_api_msg \ -_(SW_INTERFACE_SET_GTPU_BYPASS, sw_interface_set_gtpu_bypass) \ -_(GTPU_ADD_DEL_TUNNEL, gtpu_add_del_tunnel) \ -_(GTPU_TUNNEL_DUMP, gtpu_tunnel_dump) - static void vl_api_sw_interface_set_gtpu_bypass_t_handler (vl_api_sw_interface_set_gtpu_bypass_t * mp) @@ -113,14 +68,13 @@ static void vl_api_gtpu_add_del_tunnel_t_handler vnet_gtpu_add_del_tunnel_args_t a = { .is_add = mp->is_add, - .is_ip6 = mp->is_ipv6, .mcast_sw_if_index = ntohl (mp->mcast_sw_if_index), .encap_fib_index = p[0], .decap_next_index = ntohl (mp->decap_next_index), .teid = ntohl (mp->teid), - .dst = to_ip46 (mp->is_ipv6, mp->dst_address), - .src = to_ip46 (mp->is_ipv6, mp->src_address), }; + ip_address_decode (&mp->dst_address, &a.dst); + ip_address_decode (&mp->src_address, &a.src); /* Check src & dst are different */ if (ip46_address_cmp (&a.dst, &a.src) == 0) @@ -148,51 +102,46 @@ out: } static void send_gtpu_tunnel_details - (gtpu_tunnel_t * t, unix_shared_memory_queue_t * q, u32 context) + (gtpu_tunnel_t * t, vl_api_registration_t * reg, u32 context) { vl_api_gtpu_tunnel_details_t *rmp; + gtpu_main_t *gtm = >pu_main; ip4_main_t *im4 = &ip4_main; ip6_main_t *im6 = &ip6_main; u8 is_ipv6 = !ip46_address_is_ip4 (&t->dst); rmp = vl_msg_api_alloc (sizeof (*rmp)); - memset (rmp, 0, sizeof (*rmp)); - rmp->_vl_msg_id = ntohs (VL_API_GTPU_TUNNEL_DETAILS); - if (is_ipv6) - { - memcpy (rmp->src_address, t->src.ip6.as_u8, 16); - memcpy (rmp->dst_address, t->dst.ip6.as_u8, 16); - rmp->encap_vrf_id = htonl (im6->fibs[t->encap_fib_index].ft_table_id); - } - else - { - memcpy (rmp->src_address, t->src.ip4.as_u8, 4); - memcpy (rmp->dst_address, t->dst.ip4.as_u8, 4); - rmp->encap_vrf_id = htonl (im4->fibs[t->encap_fib_index].ft_table_id); - } + clib_memset (rmp, 0, sizeof (*rmp)); + rmp->_vl_msg_id = ntohs (VL_API_GTPU_TUNNEL_DETAILS + gtm->msg_id_base); + + ip_address_encode (&t->src, is_ipv6 ? IP46_TYPE_IP6 : IP46_TYPE_IP4, + &rmp->src_address); + ip_address_encode (&t->dst, is_ipv6 ? IP46_TYPE_IP6 : IP46_TYPE_IP4, + &rmp->dst_address); + + rmp->encap_vrf_id = + is_ipv6 ? htonl (im6->fibs[t->encap_fib_index].ft_table_id) : + htonl (im4->fibs[t->encap_fib_index].ft_table_id); rmp->mcast_sw_if_index = htonl (t->mcast_sw_if_index); rmp->teid = htonl (t->teid); rmp->decap_next_index = htonl (t->decap_next_index); rmp->sw_if_index = htonl (t->sw_if_index); - rmp->is_ipv6 = is_ipv6; rmp->context = context; - vl_msg_api_send_shmem (q, (u8 *) & rmp); + vl_api_send_msg (reg, (u8 *) rmp); } static void vl_api_gtpu_tunnel_dump_t_handler (vl_api_gtpu_tunnel_dump_t * mp) { - unix_shared_memory_queue_t *q; + vl_api_registration_t *reg; gtpu_main_t *gtm = >pu_main; gtpu_tunnel_t *t; u32 sw_if_index; - q = vl_api_client_index_to_input_queue (mp->client_index); - if (q == 0) - { - return; - } + reg = vl_api_client_index_to_registration (mp->client_index); + if (!reg) + return; sw_if_index = ntohl (mp->sw_if_index); @@ -201,7 +150,7 @@ vl_api_gtpu_tunnel_dump_t_handler (vl_api_gtpu_tunnel_dump_t * mp) /* *INDENT-OFF* */ pool_foreach (t, gtm->tunnels, ({ - send_gtpu_tunnel_details(t, q, mp->context); + send_gtpu_tunnel_details(t, reg, mp->context); })); /* *INDENT-ON* */ } @@ -213,34 +162,17 @@ vl_api_gtpu_tunnel_dump_t_handler (vl_api_gtpu_tunnel_dump_t * mp) return; } t = >m->tunnels[gtm->tunnel_index_by_sw_if_index[sw_if_index]]; - send_gtpu_tunnel_details (t, q, mp->context); + send_gtpu_tunnel_details (t, reg, mp->context); } } - +#include static clib_error_t * gtpu_api_hookup (vlib_main_t * vm) { gtpu_main_t *gtm = >pu_main; - u8 *name = format (0, "gtpu_%08x%c", api_version, 0); - gtm->msg_id_base = vl_msg_api_get_msg_ids - ((char *) name, VL_MSG_FIRST_AVAILABLE); - -#define _(N,n) \ - vl_msg_api_set_handlers((VL_API_##N + gtm->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_gtpu_plugin_api_msg; -#undef _ - - /* Add our API messages to the global name_crc hash table */ - setup_message_id_table (gtm, &api_main); - + gtm->msg_id_base = setup_message_id_table (); return 0; }