summaryrefslogtreecommitdiffstats
path: root/src/vnet/vxlan/vxlan.h
diff options
context:
space:
mode:
authorEyal Bari <ebari@cisco.com>2017-01-19 17:01:09 +0200
committerJohn Lo <loj@cisco.com>2017-01-20 13:37:30 +0000
commit0ded8518cd3bc24f5f528bd42a5d2ff5c4602faf (patch)
tree5c3f4ad05346297ecdf3d78965d6a375b55ce4df /src/vnet/vxlan/vxlan.h
parent5016f99075a8b9c802e675aad6141bdca12175f6 (diff)
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 <ebari@cisco.com>
Diffstat (limited to 'src/vnet/vxlan/vxlan.h')
-rw-r--r--src/vnet/vxlan/vxlan.h17
1 files changed, 2 insertions, 15 deletions
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;
@@ -138,12 +132,6 @@ typedef enum {
} 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;