From 6150211538ef37e317a1a68cd4d8f169d87becd2 Mon Sep 17 00:00:00 2001 From: Neale Ranns Date: Wed, 22 Aug 2018 00:21:14 -0700 Subject: IPIP and SIXRD tunnels create API needs table-IDs not fib-indexes Change-Id: Ifaef196a24fa9b6924f2b9692318f69763cee5e1 Signed-off-by: Neale Ranns --- src/vnet/ipip/ipip.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/vnet/ipip/ipip.h') diff --git a/src/vnet/ipip/ipip.h b/src/vnet/ipip/ipip.h index 28833df9755..93930aa3337 100644 --- a/src/vnet/ipip/ipip.h +++ b/src/vnet/ipip/ipip.h @@ -52,10 +52,10 @@ typedef enum typedef struct { - ipip_transport_t transport; - u32 fib_index; ip46_address_t src; ip46_address_t dst; + ipip_transport_t transport; + u32 fib_index; } __attribute__ ((packed)) ipip_tunnel_key_t; typedef enum @@ -100,6 +100,7 @@ typedef struct u8 ip4_prefix_len; u8 shift; bool security_check; + u32 ip6_fib_index; } sixrd; }; } ipip_tunnel_t; @@ -155,7 +156,8 @@ int ipip_del_tunnel (u32 sw_if_index); int sixrd_add_tunnel (ip6_address_t * ip6_prefix, u8 ip6_prefix_len, ip4_address_t * ip4_prefix, u8 ip4_prefix_len, ip4_address_t * ip4_src, bool security_check, - u32 fib_index, u32 * sw_if_index); + u32 ip4_fib_index, u32 ip6_fib_index, + u32 * sw_if_index); int sixrd_del_tunnel (u32 sw_if_index); void ipip_tunnel_db_add (ipip_tunnel_t * t, ipip_tunnel_key_t * key); void ipip_tunnel_db_remove (ipip_tunnel_t * t); -- cgit 1.2.3-korg