X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Ffib%2Fip4_fib.h;h=7fc2d3f53c958b3e9f25cd23bb58270a3dd3eb52;hb=285434a858d2b53b15c572ad491b9ca3b40fcef3;hp=4cf9e58a380ade6b7bf9b71deb592fa29476cf12;hpb=a3af337e06a79f7d1dacf42a319f241c907122fc;p=vpp.git

diff --git a/src/vnet/fib/ip4_fib.h b/src/vnet/fib/ip4_fib.h
index 4cf9e58a380..7fc2d3f53c9 100644
--- a/src/vnet/fib/ip4_fib.h
+++ b/src/vnet/fib/ip4_fib.h
@@ -53,13 +53,12 @@ typedef struct ip4_fib_t_
   /* Index into FIB vector. */
   u32 index;
 
-  /* flow hash configuration */
-  flow_hash_config_t flow_hash_config;
-
   /* N-tuple classifier indices */
   u32 fwd_classify_table_index;
   u32 rev_classify_table_index;
 
+  /* Required for pool_get_aligned */
+  CLIB_CACHE_LINE_ALIGN_MARK(cacheline0);
 } ip4_fib_t;
 
 extern fib_node_index_t ip4_fib_table_lookup(const ip4_fib_t *fib,
@@ -101,6 +100,16 @@ extern void ip4_fib_table_walk(ip4_fib_t *fib,
                                fib_table_walk_fn_t fn,
                                void *ctx);
 
+/**
+ * @brief Walk all entries in a sub-tree of the FIB table
+ * N.B: This is NOT safe to deletes. If you need to delete walk the whole
+ * table and store elements in a vector, then delete the elements
+ */
+extern void ip4_fib_table_sub_tree_walk(ip4_fib_t *fib,
+                                        const fib_prefix_t *root,
+                                        fib_table_walk_fn_t fn,
+                                        void *ctx);
+
 /**
  * @brief Get the FIB at the given index
  */
@@ -130,9 +139,11 @@ ip4_fib_lookup (ip4_main_t * im, u32 sw_if_index, ip4_address_t * dst)
  * @returns A pointer to the retrieved or created fib.
  *
  */
-extern u32 ip4_fib_table_find_or_create_and_lock(u32 table_id);
-extern u32 ip4_fib_table_create_and_lock(void);
+extern u32 ip4_fib_table_find_or_create_and_lock(u32 table_id,
+                                                 fib_source_t src);
+extern u32 ip4_fib_table_create_and_lock(fib_source_t src);
 
+extern u8 *format_ip4_fib_table_memory(u8 * s, va_list * args);
 
 static inline 
 u32 ip4_fib_index_from_table_id (u32 table_id)
@@ -149,9 +160,6 @@ u32 ip4_fib_index_from_table_id (u32 table_id)
 
 extern u32 ip4_fib_table_get_index_for_sw_if_index(u32 sw_if_index);
 
-extern flow_hash_config_t ip4_fib_table_get_flow_hash_config(u32 fib_index);
-
-
 always_inline index_t
 ip4_fib_forwarding_lookup (u32 fib_index,
                            const ip4_address_t * addr)