summaryrefslogtreecommitdiffstats
path: root/src/vnet/ipip/ipip.h
diff options
context:
space:
mode:
authorNeale Ranns <nranns@cisco.com>2019-03-26 07:02:58 +0000
committerDamjan Marion <dmarion@me.com>2019-03-26 16:33:28 +0000
commit4c3ba81709bab8f9fcdef650e7f742fe9ddbae32 (patch)
treefb8dba665f570749b785bd5dc76dfce317367fca /src/vnet/ipip/ipip.h
parentaf3f0783b0ef189d54bb8fdf0a112347a420e9bb (diff)
ADJ: midchain delegate to performing stacking
this can be used by e.g. tunnels so it doesn't need to be implemented for each tunnel type. Change-Id: I0790f89aa49f83421612b35108cce67693285999 Signed-off-by: Neale Ranns <nranns@cisco.com>
Diffstat (limited to 'src/vnet/ipip/ipip.h')
-rw-r--r--src/vnet/ipip/ipip.h28
1 files changed, 9 insertions, 19 deletions
diff --git a/src/vnet/ipip/ipip.h b/src/vnet/ipip/ipip.h
index 93930aa3337..7eecebb1054 100644
--- a/src/vnet/ipip/ipip.h
+++ b/src/vnet/ipip/ipip.h
@@ -84,25 +84,16 @@ typedef struct
u32 user_instance; /* Instance name being shown to user */
u8 tc_tos;
- union
+ struct
{
- struct
- {
- fib_node_t node;
- fib_node_index_t fib_entry_index;
- u32 sibling_index;
- } p2p;
- struct
- {
- ip6_address_t ip6_prefix;
- ip4_address_t ip4_prefix;
- u8 ip6_prefix_len;
- u8 ip4_prefix_len;
- u8 shift;
- bool security_check;
- u32 ip6_fib_index;
- } sixrd;
- };
+ ip6_address_t ip6_prefix;
+ ip4_address_t ip4_prefix;
+ u8 ip6_prefix_len;
+ u8 ip4_prefix_len;
+ u8 shift;
+ bool security_check;
+ u32 ip6_fib_index;
+ } sixrd;
} ipip_tunnel_t;
typedef struct
@@ -110,7 +101,6 @@ typedef struct
ipip_tunnel_t *tunnels;
uword *tunnel_by_key;
u32 *tunnel_index_by_sw_if_index;
- fib_node_type_t fib_node_type;
/* convenience */
vlib_main_t *vlib_main;