ip: Move the IP6 fib into ip6_[m]fib.c

[vpp.git] / src / vnet / ip / ip6_ll_table.c

diff --git a/src/vnet/ip/ip6_ll_table.c b/src/vnet/ip/ip6_ll_table.c
index a7440ea..e4010bc 100644 (file)
--- a/src/vnet/ip/ip6_ll_table.c
+++ b/src/vnet/ip/ip6_ll_table.c
@@ -99,6 +99,7 @@ ip6_ll_prefix_to_fib (const ip6_ll_prefix_t * ilp, fib_prefix_t * fp)
   fp->fp_proto = FIB_PROTOCOL_IP6;
   fp->fp_len = 128;
   fp->fp_addr.ip6 = ilp->ilp_addr;
+  fp->___fp___pad = 0;
 }
 
 fib_node_index_t
@@ -210,18 +211,20 @@ typedef struct
   u64 count_by_prefix_length[129];
 } count_routes_in_fib_at_prefix_length_arg_t;
 
-static void
-count_routes_in_fib_at_prefix_length (BVT (clib_bihash_kv) * kvp, void *arg)
+static int
+count_routes_in_fib_at_prefix_length (clib_bihash_kv_24_8_t * kvp, void *arg)
 {
   count_routes_in_fib_at_prefix_length_arg_t *ap = arg;
   int mask_width;
 
   if ((kvp->key[2] >> 32) != ap->fib_index)
-    return;
+    return (BIHASH_WALK_CONTINUE);
 
   mask_width = kvp->key[2] & 0xFF;
 
   ap->count_by_prefix_length[mask_width]++;
+
+  return (BIHASH_WALK_CONTINUE);
 }
 
 static clib_error_t *
@@ -229,7 +232,6 @@ ip6_ll_show_fib (vlib_main_t * vm,
                 unformat_input_t * input, vlib_cli_command_t * cmd)
 {
   count_routes_in_fib_at_prefix_length_arg_t _ca, *ca = &_ca;
-  ip6_main_t *im6 = &ip6_main;
   fib_table_t *fib_table;
   int verbose, matching;
   ip6_address_t matching_address;
@@ -283,7 +285,7 @@ ip6_ll_show_fib (vlib_main_t * vm,
     s = format (s, "%U, fib_index:%d, locks:[",
                format_fib_table_name, fib_index,
                FIB_PROTOCOL_IP6, fib_index);
-    FOR_EACH_FIB_SOURCE (source)
+    vec_foreach_index (source, fib_table->ft_locks)
     {
       if (0 != fib_table->ft_locks[source])
        {
@@ -299,7 +301,7 @@ ip6_ll_show_fib (vlib_main_t * vm,
     if (!verbose)
       {
        clib_bihash_24_8_t *h =
-         &im6->ip6_table[IP6_FIB_TABLE_NON_FWDING].ip6_hash;
+         &ip6_fib_table[IP6_FIB_TABLE_NON_FWDING].ip6_hash;
        int len;
 
        vlib_cli_output (vm, "%=20s%=16s", "Prefix length", "Count");