Fix - sh ip fib mtrie sum

[vpp.git] / src / vnet / fib / ip4_fib.c

diff --git a/src/vnet/fib/ip4_fib.c b/src/vnet/fib/ip4_fib.c
index 98d4e52..36cf6e7 100644 (file)
--- a/src/vnet/fib/ip4_fib.c
+++ b/src/vnet/fib/ip4_fib.c
@@ -101,7 +101,8 @@ static const ip4_fib_table_special_prefix_t ip4_specials[] = {
 
 
 static u32
-ip4_create_fib_with_table_id (u32 table_id)
+ip4_create_fib_with_table_id (u32 table_id,
+                              fib_source_t src)
 {
     fib_table_t *fib_table;
     ip4_fib_t *v4_fib;
@@ -124,13 +125,11 @@ ip4_create_fib_with_table_id (u32 table_id)
     fib_table->ft_table_id =
        v4_fib->table_id =
            table_id;
-    fib_table->ft_flow_hash_config = 
-       v4_fib->flow_hash_config =
-           IP_FLOW_HASH_DEFAULT;
+    fib_table->ft_flow_hash_config = IP_FLOW_HASH_DEFAULT;
     v4_fib->fwd_classify_table_index = ~0;
     v4_fib->rev_classify_table_index = ~0;
     
-    fib_table_lock(fib_table->ft_index, FIB_PROTOCOL_IP4);
+    fib_table_lock(fib_table->ft_index, FIB_PROTOCOL_IP4, src);
 
     ip4_mtrie_init(&v4_fib->mtrie);
 
@@ -149,8 +148,7 @@ ip4_create_fib_with_table_id (u32 table_id)
        fib_table_entry_special_add(fib_table->ft_index,
                                    &prefix,
                                    ip4_specials[ii].ift_source,
-                                   ip4_specials[ii].ift_flag,
-                                   ADJ_INDEX_INVALID);
+                                   ip4_specials[ii].ift_flag);
     }
 
     return (fib_table->ft_index);
@@ -201,23 +199,24 @@ ip4_fib_table_destroy (u32 fib_index)
 
 
 u32
-ip4_fib_table_find_or_create_and_lock (u32 table_id)
+ip4_fib_table_find_or_create_and_lock (u32 table_id,
+                                       fib_source_t src)
 {
     u32 index;
 
     index = ip4_fib_index_from_table_id(table_id);
     if (~0 == index)
-       return ip4_create_fib_with_table_id(table_id);
+       return ip4_create_fib_with_table_id(table_id, src);
 
-    fib_table_lock(index, FIB_PROTOCOL_IP4);
+    fib_table_lock(index, FIB_PROTOCOL_IP4, src);
 
     return (index);
 }
 
 u32
-ip4_fib_table_create_and_lock (void)
+ip4_fib_table_create_and_lock (fib_source_t src)
 {
-    return (ip4_create_fib_with_table_id(~0));
+    return (ip4_create_fib_with_table_id(~0, src));
 }
 
 u32
@@ -234,12 +233,6 @@ ip4_fib_table_get_index_for_sw_if_index (u32 sw_if_index)
     return (ip4_main.fib_index_by_sw_if_index[sw_if_index]);
 }
 
-flow_hash_config_t
-ip4_fib_table_get_flow_hash_config (u32 fib_index)
-{
-    return (ip4_fib_get(fib_index)->flow_hash_config);
-}
-
 /*
  * ip4_fib_table_lookup_exact_match
  *
@@ -477,12 +470,15 @@ static void
 ip4_fib_table_show_one (ip4_fib_t *fib,
                        vlib_main_t * vm,
                        ip4_address_t *address,
-                       u32 mask_len)
+                       u32 mask_len,
+                        int detail)
 {    
     vlib_cli_output(vm, "%U",
                     format_fib_entry,
                     ip4_fib_table_lookup(fib, address, mask_len),
-                    FIB_ENTRY_FORMAT_DETAIL);
+                    (detail ?
+                     FIB_ENTRY_FORMAT_DETAIL2 :
+                     FIB_ENTRY_FORMAT_DETAIL));
 }
 
 static clib_error_t *
@@ -496,6 +492,7 @@ ip4_show_fib (vlib_main_t * vm,
     ip4_address_t matching_address;
     u32 matching_mask = 32;
     int i, table_id = -1, fib_index = ~0;
+    int detail = 0;
 
     verbose = 1;
     matching = 0;
@@ -506,6 +503,9 @@ ip4_show_fib (vlib_main_t * vm,
            || unformat (input, "sum"))
            verbose = 0;
 
+       else if (unformat (input, "detail") || unformat (input, "det"))
+           detail = 1;
+
        else if (unformat (input, "mtrie"))
            mtrie = 1;
 
@@ -527,18 +527,39 @@ ip4_show_fib (vlib_main_t * vm,
     pool_foreach (fib_table, im4->fibs,
     ({
        ip4_fib_t *fib = pool_elt_at_index(im4->v4_fibs, fib_table->ft_index);
+        fib_source_t source;
+        u8 *s = NULL;
 
        if (table_id >= 0 && table_id != (int)fib->table_id)
            continue;
        if (fib_index != ~0 && fib_index != (int)fib->index)
            continue;
 
-       vlib_cli_output (vm, "%U, fib_index %d, flow hash: %U", 
-                        format_fib_table_name, fib->index, FIB_PROTOCOL_IP4,
-                        fib->index,
-                        format_ip_flow_hash_config, fib->flow_hash_config);
+       s = format(s, "%U, fib_index:%d, flow hash:[%U] locks:[",
+                   format_fib_table_name, fib->index,
+                   FIB_PROTOCOL_IP4,
+                   fib->index,
+                   format_ip_flow_hash_config,
+                   fib_table->ft_flow_hash_config);
+       FOR_EACH_FIB_SOURCE(source)
+        {
+            if (0 != fib_table->ft_locks[source])
+            {
+                s = format(s, "%U:%d, ",
+                           format_fib_source, source,
+                           fib_table->ft_locks[source]);
+            }
+        }
+        s = format (s, "]");
+        vlib_cli_output (vm, "%v", s);
+        vec_free(s);
 
        /* Show summary? */
+       if (mtrie)
+        {
+           vlib_cli_output (vm, "%U", format_ip4_fib_mtrie, &fib->mtrie, verbose);
+            continue;
+        }
        if (! verbose)
        {
            vlib_cli_output (vm, "%=20s%=16s", "Prefix length", "Count");
@@ -551,11 +572,6 @@ ip4_show_fib (vlib_main_t * vm,
            }
            continue;
        }
-       if (mtrie)
-        {
-           vlib_cli_output (vm, "%U", format_ip4_fib_mtrie, &fib->mtrie);
-            continue;
-        }
 
        if (!matching)
        {
@@ -563,7 +579,8 @@ ip4_show_fib (vlib_main_t * vm,
        }
        else
        {
-           ip4_fib_table_show_one(fib, vm, &matching_address, matching_mask);
+           ip4_fib_table_show_one(fib, vm, &matching_address,
+                                   matching_mask, detail);
        }
     }));
 
@@ -717,7 +734,7 @@ ip4_show_fib (vlib_main_t * vm,
 /* *INDENT-OFF* */
 VLIB_CLI_COMMAND (ip4_show_fib_command, static) = {
     .path = "show ip fib",
-    .short_help = "show ip fib [summary] [table <table-id>] [index <fib-id>] [<ip4-addr>[/<mask>]] [mtrie]",
+    .short_help = "show ip fib [summary] [table <table-id>] [index <fib-id>] [<ip4-addr>[/<mask>]] [mtrie] [detail]",
     .function = ip4_show_fib,
 };
 /* *INDENT-ON* */