diff options
Diffstat (limited to 'src/vnet/ip')
| -rw-r--r-- | src/vnet/ip/ip4.h | 3 | ||||
| -rw-r--r-- | src/vnet/ip/ip_container_proxy.c | 26 |
2 files changed, 11 insertions, 18 deletions
diff --git a/src/vnet/ip/ip4.h b/src/vnet/ip/ip4.h index bc971a2b7ca..dba27851c8f 100644 --- a/src/vnet/ip/ip4.h +++ b/src/vnet/ip/ip4.h @@ -111,9 +111,6 @@ typedef struct ip4_main_t /** 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 2c94b70ec85..18d07ba6082 100644 --- a/src/vnet/ip/ip_container_proxy.c +++ b/src/vnet/ip/ip_container_proxy.c @@ -132,27 +132,23 @@ ip_container_proxy_fib_table_walk (fib_node_index_t fei, void *arg) 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* */ } |