X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fsession%2Fapplication_namespace.c;h=294192ceea161022e997267cc764b55a4fc8bc83;hb=07063b8ea;hp=326b0c0146f7cd9dd8e87e1931ccc7d69938710a;hpb=1c7104514cd40d2377caca36cf40c13b791bc5aa;p=vpp.git diff --git a/src/vnet/session/application_namespace.c b/src/vnet/session/application_namespace.c index 326b0c0146f..294192ceea1 100644 --- a/src/vnet/session/application_namespace.c +++ b/src/vnet/session/application_namespace.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 Cisco and/or its affiliates. + * Copyright (c) 2017-2019 Cisco and/or its affiliates. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at: @@ -54,14 +54,14 @@ 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); return app_ns; } -clib_error_t * +int vnet_app_namespace_add_del (vnet_app_namespace_add_del_args_t * a) { app_namespace_t *app_ns; @@ -70,10 +70,10 @@ vnet_app_namespace_add_del (vnet_app_namespace_add_del_args_t * a) if (a->is_add) { if (a->sw_if_index != APP_NAMESPACE_INVALID_INDEX - && !vnet_get_sw_interface_safe (vnet_get_main (), a->sw_if_index)) - return clib_error_return_code (0, VNET_API_ERROR_INVALID_SW_IF_INDEX, - 0, "sw_if_index %u doesn't exist", - a->sw_if_index); + && !vnet_get_sw_interface_or_null (vnet_get_main (), + a->sw_if_index)) + return VNET_API_ERROR_INVALID_SW_IF_INDEX; + if (a->sw_if_index != APP_NAMESPACE_INVALID_INDEX) { @@ -81,20 +81,21 @@ 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 && a->ip4_fib_id == APP_NAMESPACE_INVALID_INDEX) - return clib_error_return_code (0, VNET_API_ERROR_INVALID_VALUE, 0, - "sw_if_index or fib_id must be " - "configured"); + return VNET_API_ERROR_INVALID_VALUE; + app_ns = app_namespace_get_from_id (a->ns_id); if (!app_ns) { app_ns = app_namespace_alloc (a->ns_id); st = session_table_alloc (); - session_table_init (st); + session_table_init (st, FIB_PROTOCOL_MAX); + st->is_local = 1; + st->appns_index = app_namespace_index (app_ns); app_ns->local_table_index = session_table_index (st); } app_ns->ns_secret = a->secret; @@ -103,11 +104,11 @@ vnet_app_namespace_add_del (vnet_app_namespace_add_del_args_t * a) fib_table_find (FIB_PROTOCOL_IP4, a->ip4_fib_id); app_ns->ip6_fib_index = fib_table_find (FIB_PROTOCOL_IP6, a->ip6_fib_id); + session_lookup_set_tables_appns (app_ns); } else { - return clib_error_return_code (0, VNET_API_ERROR_UNIMPLEMENTED, 0, - "namespace deletion not supported"); + return VNET_API_ERROR_UNIMPLEMENTED; } return 0; } @@ -181,6 +182,7 @@ app_ns_fn (vlib_main_t * vm, unformat_input_t * input, u32 sw_if_index, fib_id = APP_NAMESPACE_INVALID_INDEX; u64 secret; clib_error_t *error = 0; + int rv; session_cli_return_if_not_enabled (); @@ -225,7 +227,8 @@ app_ns_fn (vlib_main_t * vm, unformat_input_t * input, .ip4_fib_id = fib_id, .is_add = 1 }; - error = vnet_app_namespace_add_del (&args); + if ((rv = vnet_app_namespace_add_del (&args))) + return clib_error_return (0, "app namespace add del returned %d", rv); } return error; @@ -245,31 +248,37 @@ 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; } static clib_error_t * -show_app_ns_fn (vlib_main_t * vm, unformat_input_t * input, +show_app_ns_fn (vlib_main_t * vm, unformat_input_t * main_input, vlib_cli_command_t * cmd) { + 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_peek_input (input) != UNFORMAT_END_OF_INPUT) + if (!unformat_user (main_input, unformat_line_input, line_input)) { - if (unformat (input, "table %_%v%_", &ns_id)) + had_input = 0; + goto do_ns_list; + } + + while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (line_input, "table %_%v%_", &ns_id)) do_table = 1; else { - vlib_cli_output (vm, "unknown input [%U]", - format_unformat_error, input); - return clib_error_return (0, "unknown input `%U'", - format_unformat_error, input); + vlib_cli_output (vm, "unknown input [%U]", format_unformat_error, + line_input); + goto done; } } @@ -279,21 +288,22 @@ show_app_ns_fn (vlib_main_t * vm, unformat_input_t * input, if (!app_ns) { vlib_cli_output (vm, "ns %v not found", ns_id); - return 0; + goto done; } st = session_table_get (app_ns->local_table_index); if (!st) { vlib_cli_output (vm, "table for ns %v could not be found", ns_id); - return 0; + goto done; } session_lookup_show_table_entries (vm, st, 0, 1); vec_free (ns_id); - return 0; + 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, ({ @@ -301,6 +311,9 @@ show_app_ns_fn (vlib_main_t * vm, unformat_input_t * input, })); /* *INDENT-ON* */ +done: + if (had_input) + unformat_free (line_input); return 0; }