diff options
Diffstat (limited to 'src/vnet/vxlan/vxlan_api.c')
| -rw-r--r-- | src/vnet/vxlan/vxlan_api.c | 147 |
1 files changed, 136 insertions, 11 deletions
diff --git a/src/vnet/vxlan/vxlan_api.c b/src/vnet/vxlan/vxlan_api.c index 0e51f3dab5a..6975d834e2a 100644 --- a/src/vnet/vxlan/vxlan_api.c +++ b/src/vnet/vxlan/vxlan_api.c @@ -27,6 +27,7 @@ #include <vnet/fib/fib_table.h> #include <vnet/ip/ip_types_api.h> +#include <vnet/udp/udp_local.h> #include <vnet/vnet_msg_enum.h> @@ -46,11 +47,13 @@ #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_OFFLOAD_RX, vxlan_offload_rx) +#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_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) @@ -159,6 +162,8 @@ static void vl_api_vxlan_add_del_tunnel_t_handler .vni = ntohl (mp->vni), .dst = dst, .src = src, + .dst_port = is_ipv6 ? UDP_DST_PORT_vxlan6 : UDP_DST_PORT_vxlan, + .src_port = is_ipv6 ? UDP_DST_PORT_vxlan6 : UDP_DST_PORT_vxlan, }; /* Check src & dst are different */ @@ -178,12 +183,73 @@ static void vl_api_vxlan_add_del_tunnel_t_handler rv = vnet_vxlan_add_del_tunnel (&a, &sw_if_index); out: - /* *INDENT-OFF* */ REPLY_MACRO2(VL_API_VXLAN_ADD_DEL_TUNNEL_REPLY, ({ rmp->sw_if_index = ntohl (sw_if_index); })); - /* *INDENT-ON* */ +} + +static void +vl_api_vxlan_add_del_tunnel_v2_t_handler (vl_api_vxlan_add_del_tunnel_v2_t *mp) +{ + vl_api_vxlan_add_del_tunnel_v2_reply_t *rmp; + int rv = 0; + bool is_ipv6; + u32 fib_index; + ip46_address_t src, dst; + + ip_address_decode (&mp->src_address, &src); + ip_address_decode (&mp->dst_address, &dst); + + if (ip46_address_is_ip4 (&src) != ip46_address_is_ip4 (&dst)) + { + rv = VNET_API_ERROR_INVALID_VALUE; + goto out; + } + + is_ipv6 = !ip46_address_is_ip4 (&src); + + fib_index = + fib_table_find (fib_ip_proto (is_ipv6), ntohl (mp->encap_vrf_id)); + if (fib_index == ~0) + { + rv = VNET_API_ERROR_NO_SUCH_FIB; + goto out; + } + + vnet_vxlan_add_del_tunnel_args_t a = { + .is_add = mp->is_add, + .is_ip6 = is_ipv6, + .instance = ntohl (mp->instance), + .mcast_sw_if_index = ntohl (mp->mcast_sw_if_index), + .encap_fib_index = fib_index, + .decap_next_index = ntohl (mp->decap_next_index), + .vni = ntohl (mp->vni), + .dst = dst, + .src = src, + .dst_port = ntohs (mp->dst_port), + .src_port = ntohs (mp->src_port), + }; + + /* Check src & dst are different */ + if (ip46_address_cmp (&a.dst, &a.src) == 0) + { + rv = VNET_API_ERROR_SAME_SRC_DST; + goto out; + } + if (ip46_address_is_multicast (&a.dst) && + !vnet_sw_if_index_is_api_valid (a.mcast_sw_if_index)) + { + rv = VNET_API_ERROR_INVALID_SW_IF_INDEX; + goto out; + } + + u32 sw_if_index = ~0; + rv = vnet_vxlan_add_del_tunnel (&a, &sw_if_index); + +out: + REPLY_MACRO2 (VL_API_VXLAN_ADD_DEL_TUNNEL_V2_REPLY, + ({ rmp->sw_if_index = ntohl (sw_if_index); })); } static void send_vxlan_tunnel_details @@ -231,12 +297,8 @@ static void vl_api_vxlan_tunnel_dump_t_handler if (~0 == sw_if_index) { - /* *INDENT-OFF* */ pool_foreach (t, vxm->tunnels) - { send_vxlan_tunnel_details(t, reg, mp->context); - } - /* *INDENT-ON* */ } else { @@ -250,6 +312,69 @@ static void vl_api_vxlan_tunnel_dump_t_handler } } +static void +send_vxlan_tunnel_v2_details (vxlan_tunnel_t *t, vl_api_registration_t *reg, + u32 context) +{ + vl_api_vxlan_tunnel_v2_details_t *rmp; + ip4_main_t *im4 = &ip4_main; + ip6_main_t *im6 = &ip6_main; + + rmp = vl_msg_api_alloc (sizeof (*rmp)); + clib_memset (rmp, 0, sizeof (*rmp)); + rmp->_vl_msg_id = ntohs (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); + rmp->src_port = htons (t->src_port); + rmp->dst_port = htons (t->dst_port); + + if (ip46_address_is_ip4 (&t->dst)) + rmp->encap_vrf_id = htonl (im4->fibs[t->encap_fib_index].ft_table_id); + else + rmp->encap_vrf_id = htonl (im6->fibs[t->encap_fib_index].ft_table_id); + + rmp->instance = htonl (t->user_instance); + rmp->mcast_sw_if_index = htonl (t->mcast_sw_if_index); + rmp->vni = htonl (t->vni); + rmp->decap_next_index = htonl (t->decap_next_index); + rmp->sw_if_index = htonl (t->sw_if_index); + rmp->context = context; + + vl_api_send_msg (reg, (u8 *) rmp); +} + +static void +vl_api_vxlan_tunnel_v2_dump_t_handler (vl_api_vxlan_tunnel_v2_dump_t *mp) +{ + vl_api_registration_t *reg; + vxlan_main_t *vxm = &vxlan_main; + vxlan_tunnel_t *t; + u32 sw_if_index; + + reg = vl_api_client_index_to_registration (mp->client_index); + if (!reg) + return; + + sw_if_index = ntohl (mp->sw_if_index); + + if (~0 == sw_if_index) + { + pool_foreach (t, vxm->tunnels) + send_vxlan_tunnel_v2_details (t, reg, mp->context); + } + else + { + if ((sw_if_index >= vec_len (vxm->tunnel_index_by_sw_if_index)) || + (~0 == vxm->tunnel_index_by_sw_if_index[sw_if_index])) + { + return; + } + t = &vxm->tunnels[vxm->tunnel_index_by_sw_if_index[sw_if_index]]; + send_vxlan_tunnel_v2_details (t, reg, mp->context); + } +} + /* * vpe_api_hookup * Add vpe's API message handlers to the table. |