session: segment handle in accept/connect notifications

[vpp.git] / src / vnet / session / application_namespace.c

diff --git a/src/vnet/session/application_namespace.c b/src/vnet/session/application_namespace.c
index 700f839..1896a72 100644 (file)
--- a/src/vnet/session/application_namespace.c
+++ b/src/vnet/session/application_namespace.c
@@ -54,7 +54,7 @@ app_namespace_alloc (u8 * ns_id)
 {
   app_namespace_t *app_ns;
   pool_get (app_namespace_pool, app_ns);
-  memset (app_ns, 0, sizeof (*app_ns));
+  clib_memset (app_ns, 0, sizeof (*app_ns));
   app_ns->ns_id = vec_dup (ns_id);
   hash_set_mem (app_namespace_lookup_table, app_ns->ns_id,
                app_ns - app_namespace_pool);
@@ -81,7 +81,7 @@ vnet_app_namespace_add_del (vnet_app_namespace_add_del_args_t * a)
            fib_table_get_table_id_for_sw_if_index (FIB_PROTOCOL_IP4,
                                                    a->sw_if_index);
          a->ip6_fib_id =
-           fib_table_get_table_id_for_sw_if_index (FIB_PROTOCOL_IP4,
+           fib_table_get_table_id_for_sw_if_index (FIB_PROTOCOL_IP6,
                                                    a->sw_if_index);
        }
       if (a->sw_if_index == APP_NAMESPACE_INVALID_INDEX
@@ -248,8 +248,8 @@ u8 *
 format_app_namespace (u8 * s, va_list * args)
 {
   app_namespace_t *app_ns = va_arg (*args, app_namespace_t *);
-  s = format (s, "%-20v%-20lu%-20u", app_ns->ns_id, app_ns->ns_secret,
-             app_ns->sw_if_index);
+  s = format (s, "%-10u%-20lu%-20u%-50v", app_namespace_index (app_ns),
+             app_ns->ns_secret, app_ns->sw_if_index, app_ns->ns_id);
   return s;
 }
 
@@ -260,12 +260,15 @@ show_app_ns_fn (vlib_main_t * vm, unformat_input_t * main_input,
   unformat_input_t _line_input, *line_input = &_line_input;
   app_namespace_t *app_ns;
   session_table_t *st;
-  u8 *ns_id, do_table = 0;
+  u8 *ns_id, do_table = 0, had_input = 1;
 
   session_cli_return_if_not_enabled ();
 
   if (!unformat_user (main_input, unformat_line_input, line_input))
-    return 0;
+    {
+      had_input = 0;
+      goto do_ns_list;
+    }
 
   while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
     {
@@ -298,8 +301,9 @@ show_app_ns_fn (vlib_main_t * vm, unformat_input_t * main_input,
       goto done;
     }
 
-  vlib_cli_output (vm, "%-20s%-20s%-20s", "Namespace", "Secret",
-                  "sw_if_index");
+do_ns_list:
+  vlib_cli_output (vm, "%-10s%-20s%-20s%-50s", "Index", "Secret",
+                  "sw_if_index", "Name");
 
   /* *INDENT-OFF* */
   pool_foreach (app_ns, app_namespace_pool, ({
@@ -308,7 +312,8 @@ show_app_ns_fn (vlib_main_t * vm, unformat_input_t * main_input,
   /* *INDENT-ON* */
 
 done:
-  unformat_free (line_input);
+  if (had_input)
+    unformat_free (line_input);
   return 0;
 }