fib: A 16-8-8 and a 8-8-8-8 versions of an ip4_fib_t
Type: feature
The difference being the MTRIE type they contain.
THE FIB continues to use the 16-8-8 version.
Signed-off-by: Neale Ranns <neale@graphiant.com>
Change-Id: I5a54d4e6e6cc639f18a3fb65ef2925507a7ef1de
diff --git a/src/vnet/ip/ip4.h b/src/vnet/ip/ip4.h
index bc971a2..dba2785 100644
--- a/src/vnet/ip/ip4.h
+++ b/src/vnet/ip/ip4.h
@@ -111,9 +111,6 @@
/** Vector of FIBs. */
struct fib_table_t_ *fibs;
- /** Vector of MTries. */
- struct ip4_fib_t_ *v4_fibs;
-
/** Vector of MFIBs. */
struct mfib_table_t_ *mfibs;
diff --git a/src/vnet/ip/ip_container_proxy.c b/src/vnet/ip/ip_container_proxy.c
index 2c94b70..18d07ba 100644
--- a/src/vnet/ip/ip_container_proxy.c
+++ b/src/vnet/ip/ip_container_proxy.c
@@ -132,27 +132,23 @@
void
ip_container_proxy_walk (ip_container_proxy_cb_t cb, void *ctx)
{
- fib_table_t *fib_table;
ip_container_proxy_walk_ctx_t wctx = {
.cb = cb,
.ctx = ctx,
};
+ u32 fib_index;
/* *INDENT-OFF* */
- pool_foreach (fib_table, ip4_main.fibs)
- {
- fib_table_walk(fib_table->ft_index,
- FIB_PROTOCOL_IP4,
- ip_container_proxy_fib_table_walk,
- &wctx);
- }
- pool_foreach (fib_table, ip6_main.fibs)
- {
- fib_table_walk(fib_table->ft_index,
- FIB_PROTOCOL_IP6,
- ip_container_proxy_fib_table_walk,
- &wctx);
- }
+ pool_foreach_index (fib_index, ip4_main.fibs)
+ {
+ fib_table_walk (fib_index, FIB_PROTOCOL_IP4,
+ ip_container_proxy_fib_table_walk, &wctx);
+ }
+ pool_foreach_index (fib_index, ip6_main.fibs)
+ {
+ fib_table_walk (fib_index, FIB_PROTOCOL_IP6,
+ ip_container_proxy_fib_table_walk, &wctx);
+ }
/* *INDENT-ON* */
}