Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
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
eaf09e8
..
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);
{
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);
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,
a->sw_if_index);
a->ip6_fib_id =
- fib_table_get_table_id_for_sw_if_index (FIB_PROTOCOL_IP
4
,
+ fib_table_get_table_id_for_sw_if_index (FIB_PROTOCOL_IP
6
,
a->sw_if_index);
}
if (a->sw_if_index == APP_NAMESPACE_INVALID_INDEX
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 *);
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;
}
return s;
}
@@
-301,9
+301,10
@@
show_app_ns_fn (vlib_main_t * vm, unformat_input_t * main_input,
goto done;
}
goto done;
}
- vlib_cli_output (vm, "%-20s%-20s%-20s", "Namespace", "Secret",
- "sw_if_index");
do_ns_list:
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, ({
vlib_cli_output (vm, "%U", format_app_namespace, app_ns);
/* *INDENT-OFF* */
pool_foreach (app_ns, app_namespace_pool, ({
vlib_cli_output (vm, "%U", format_app_namespace, app_ns);