X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=vnet%2Fvnet%2Flisp-cp%2Fgid_dictionary.h;h=c5aaf8cb30dc91fee689819750cece9a12fdf7e7;hb=d5fcc468f33189c64c638c146812c534bcecac61;hp=5b1a59b0161396c4dd6d1fcc8bb4a740f1468ee5;hpb=e127a7e4528472a320bf1cc343d3656dcdd4b108;p=vpp.git

diff --git a/vnet/vnet/lisp-cp/gid_dictionary.h b/vnet/vnet/lisp-cp/gid_dictionary.h
index 5b1a59b0161..c5aaf8cb30d 100644
--- a/vnet/vnet/lisp-cp/gid_dictionary.h
+++ b/vnet/vnet/lisp-cp/gid_dictionary.h
@@ -31,42 +31,90 @@
 #define IP6_LOOKUP_DEFAULT_HASH_NUM_BUCKETS (64 * 1024)
 #define IP6_LOOKUP_DEFAULT_HASH_MEMORY_SIZE (32<<20)
 
+/* Default size of the MAC hash table */
+#define MAC_LOOKUP_DEFAULT_HASH_NUM_BUCKETS (64 * 1024)
+#define MAC_LOOKUP_DEFAULT_HASH_MEMORY_SIZE (32<<20)
+
+typedef void (*foreach_subprefix_match_cb_t) (u32, void *);
+
 typedef struct
 {
-  BVT(clib_bihash) ip4_lookup_table;
+  BVT (clib_bihash) ip4_lookup_table;
 
   /* bitmap/vector of mask widths to search */
-  uword * ip4_non_empty_dst_address_length_bitmap;
-  u8 * ip4_prefix_lengths_in_search_order;
+  uword *ip4_non_empty_dst_address_length_bitmap;
+  u8 *ip4_prefix_lengths_in_search_order;
   ip4_address_t ip4_fib_masks[33];
   u32 ip4_prefix_len_refcount[33];
 
   /* ip4 lookup table config parameters */
   u32 ip4_lookup_table_nbuckets;
   uword ip4_lookup_table_size;
+} gid_ip4_table_t;
 
-  BVT(clib_bihash) ip6_lookup_table;
+typedef struct
+{
+  BVT (clib_bihash) ip6_lookup_table;
 
   /* bitmap/vector of mask widths to search */
-  uword * ip6_non_empty_dst_address_length_bitmap;
-  u8 * ip6_prefix_lengths_in_search_order;
+  uword *ip6_non_empty_dst_address_length_bitmap;
+  u8 *ip6_prefix_lengths_in_search_order;
   ip6_address_t ip6_fib_masks[129];
   u64 ip6_prefix_len_refcount[129];
 
   /* ip6 lookup table config parameters */
   u32 ip6_lookup_table_nbuckets;
   uword ip6_lookup_table_size;
+} gid_ip6_table_t;
+
+typedef struct gid_mac_table
+{
+  BVT (clib_bihash) mac_lookup_table;
+
+  /* mac lookup table config parameters */
+  u32 mac_lookup_table_nbuckets;
+  uword mac_lookup_table_size;
+} gid_mac_table_t;
+
+typedef struct
+{
+  /** destination IP LPM ip4 lookup table */
+  gid_ip4_table_t dst_ip4_table;
+
+  /** pool of source IP LPM ip4 lookup tables */
+  gid_ip4_table_t *src_ip4_table_pool;
+
+  /** destination IP LPM ip6 lookup table */
+  gid_ip6_table_t dst_ip6_table;
+
+  /** pool of source IP LPM ip6 lookup tables */
+  gid_ip6_table_t *src_ip6_table_pool;
+
+  /** flat source/dest mac lookup table */
+  gid_mac_table_t sd_mac_table;
 
 } gid_dictionary_t;
 
 u32
-gid_dictionary_add_del (gid_dictionary_t *db, gid_address_t *key, u32 value,
+gid_dictionary_add_del (gid_dictionary_t * db, gid_address_t * key, u32 value,
 			u8 is_add);
 
-u32
-gid_dictionary_lookup (gid_dictionary_t * db, gid_address_t *key);
+u32 gid_dictionary_lookup (gid_dictionary_t * db, gid_address_t * key);
+u32 gid_dictionary_sd_lookup (gid_dictionary_t * db, gid_address_t * dst,
+			      gid_address_t * src);
+
+void gid_dictionary_init (gid_dictionary_t * db);
 
 void
-gid_dictionary_init (gid_dictionary_t * db);
+gid_dict_foreach_subprefix (gid_dictionary_t * db, gid_address_t * eid,
+			    foreach_subprefix_match_cb_t cb, void *arg);
 
 #endif /* VNET_LISP_GPE_GID_DICTIONARY_H_ */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */