diff options
Diffstat (limited to 'src/vnet')
| -rw-r--r-- | src/vnet/vxlan/vxlan.api | 42 | ||||
| -rw-r--r-- | src/vnet/vxlan/vxlan_api.c | 43 |
2 files changed, 47 insertions, 38 deletions
diff --git a/src/vnet/vxlan/vxlan.api b/src/vnet/vxlan/vxlan.api index 9e969de7bc5..907d7d32ce7 100644 --- a/src/vnet/vxlan/vxlan.api +++ b/src/vnet/vxlan/vxlan.api @@ -13,31 +13,32 @@ * limitations under the License. */ -option version = "1.1.0"; +option version = "2.0.0"; + +import "vnet/interface_types.api"; +import "vnet/ip/ip_types.api"; /** \brief Create or delete a VXLAN tunnel @param client_index - opaque cookie to identify the sender @param context - sender context, to match reply w/ request @param is_add - Use 1 to create the tunnel, 0 to remove it - @param is_ipv6 - Use 0 for IPv4, 1 for IPv6 @param instance - optional unique custom device instance, else ~0. @param src_address - Source IP address @param dst_address - Destination IP address, can be multicast @param mcast_sw_if_index - Interface for multicast destination @param encap_vrf_id - Encap route table FIB index - @param decap_next_index - Name of decap next graph node + @param decap_next_index - index of decap next graph node @param vni - The VXLAN Network Identifier, uint24 */ define vxlan_add_del_tunnel { u32 client_index; u32 context; - u8 is_add; - u8 is_ipv6; + bool is_add [default=true]; u32 instance; /* If non-~0, specifies a custom dev instance */ - u8 src_address[16]; - u8 dst_address[16]; - u32 mcast_sw_if_index; + vl_api_address_t src_address; + vl_api_address_t dst_address; + vl_api_interface_index_t mcast_sw_if_index; u32 encap_vrf_id; u32 decap_next_index; u32 vni; @@ -47,28 +48,27 @@ define vxlan_add_del_tunnel_reply { u32 context; i32 retval; - u32 sw_if_index; + vl_api_interface_index_t sw_if_index; }; define vxlan_tunnel_dump { u32 client_index; u32 context; - u32 sw_if_index; + vl_api_interface_index_t sw_if_index; }; define vxlan_tunnel_details { u32 context; - u32 sw_if_index; + vl_api_interface_index_t sw_if_index; u32 instance; - u8 src_address[16]; - u8 dst_address[16]; - u32 mcast_sw_if_index; + vl_api_address_t src_address; + vl_api_address_t dst_address; + vl_api_interface_index_t mcast_sw_if_index; u32 encap_vrf_id; u32 decap_next_index; u32 vni; - u8 is_ipv6; }; /** \brief Interface set vxlan-bypass request @@ -82,9 +82,9 @@ autoreply define sw_interface_set_vxlan_bypass { u32 client_index; u32 context; - u32 sw_if_index; - u8 is_ipv6; - u8 enable; + vl_api_interface_index_t sw_if_index; + bool is_ipv6; + bool enable [default=true]; }; /** \brief Offload vxlan rx request @@ -98,7 +98,7 @@ autoreply define vxlan_offload_rx { u32 client_index; u32 context; - u32 hw_if_index; - u32 sw_if_index; - u8 enable; + vl_api_interface_index_t hw_if_index; + vl_api_interface_index_t sw_if_index; + bool enable [default=true]; }; diff --git a/src/vnet/vxlan/vxlan_api.c b/src/vnet/vxlan/vxlan_api.c index 8efd1e6a7e0..8e5b346c394 100644 --- a/src/vnet/vxlan/vxlan_api.c +++ b/src/vnet/vxlan/vxlan_api.c @@ -26,6 +26,8 @@ #include <vnet/vxlan/vxlan.h> #include <vnet/fib/fib_table.h> +#include <vnet/ip/ip_types_api.h> + #include <vnet/vnet_msg_enum.h> #define vl_typedefs /* define message structures */ @@ -124,9 +126,22 @@ static void vl_api_vxlan_add_del_tunnel_t_handler { vl_api_vxlan_add_del_tunnel_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 (mp->is_ipv6), + fib_index = fib_table_find (fib_ip_proto (is_ipv6), ntohl (mp->encap_vrf_id)); if (fib_index == ~0) { @@ -136,14 +151,14 @@ static void vl_api_vxlan_add_del_tunnel_t_handler vnet_vxlan_add_del_tunnel_args_t a = { .is_add = mp->is_add, - .is_ip6 = mp->is_ipv6, + .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 = to_ip46 (mp->is_ipv6, mp->dst_address), - .src = to_ip46 (mp->is_ipv6, mp->src_address), + .dst = dst, + .src = src, }; /* Check src & dst are different */ @@ -177,30 +192,24 @@ static void send_vxlan_tunnel_details vl_api_vxlan_tunnel_details_t *rmp; 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)); clib_memset (rmp, 0, sizeof (*rmp)); rmp->_vl_msg_id = ntohs (VL_API_VXLAN_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); - } + + ip_address_encode (&t->src, IP46_TYPE_ANY, &rmp->src_address); + ip_address_encode (&t->dst, IP46_TYPE_ANY, &rmp->dst_address); + + if (ip46_address_is_ip4 (&t->dst)) + rmp->encap_vrf_id = htonl (im4->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); - } + 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->is_ipv6 = is_ipv6; rmp->context = context; vl_api_send_msg (reg, (u8 *) rmp); |