From 0ded8518cd3bc24f5f528bd42a5d2ff5c4602faf Mon Sep 17 00:00:00 2001 From: Eyal Bari Date: Thu, 19 Jan 2017 17:01:09 +0200 Subject: VXLAN - Add IPv6 tunnels src ref count and refactored hash table mem keys access hash_set_key_dup - same as hash_set_mem but duplicates the key hash_unset_key_free - same as hash_unset_mem but frees the key Change-Id: I18cdcf7e41c57faa615d6337acaf8d1ad058a4c1 Signed-off-by: Eyal Bari --- src/vnet/vxlan/vxlan.h | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) (limited to 'src/vnet/vxlan/vxlan.h') diff --git a/src/vnet/vxlan/vxlan.h b/src/vnet/vxlan/vxlan.h index 1ebb89489cf..ab9b2333a20 100644 --- a/src/vnet/vxlan/vxlan.h +++ b/src/vnet/vxlan/vxlan.h @@ -72,12 +72,6 @@ typedef struct { /* FIB DPO for IP forwarding of VXLAN encap packet */ dpo_id_t next_dpo; - /* storage for the hash key */ - union { - vxlan4_tunnel_key_t *key4; /* unused for now */ - vxlan6_tunnel_key_t *key6; - }; - /* vxlan VNI in HOST byte order */ u32 vni; @@ -137,12 +131,6 @@ typedef enum { VXLAN_N_ERROR, } vxlan_input_error_t; -typedef struct { - ip46_address_t * ip; - fib_node_index_t fib_entry_index; - adj_index_t mcast_adj_index; -} mcast_remote_t; - typedef struct { /* vector of encap tunnel instances */ vxlan_tunnel_t * tunnels; @@ -156,9 +144,8 @@ typedef struct { uword * vtep4; /* local ip4 VTEPs keyed on their ip4 addr */ uword * vtep6; /* local ip6 VTEPs keyed on their ip6 addr */ - /* set of active remote mcast VTEP */ - mcast_remote_t * mcast_eps; - uword * mcast_ep_by_ip; /* mcast VTEPs keyed on their ip46 addr */ + /* mcast shared info */ + uword * mcast_shared; /* keyed on mcast ip46 addr */ /* Free vlib hw_if_indices */ u32 * free_vxlan_tunnel_hw_if_indices; -- cgit 1.2.3-korg