X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fsession%2Fapplication_namespace.c;h=1c43c79ce4710301a36c24bf3ac565fae2f1ff8d;hb=61ae056bd;hp=ce44547a86d25a81b6a572da134bbbd90f010993;hpb=56b39f6a9e1e467b3e7413092e20882df3d59ced;p=vpp.git diff --git a/src/vnet/session/application_namespace.c b/src/vnet/session/application_namespace.c index ce44547a86d..1c43c79ce47 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: @@ -14,9 +14,12 @@ */ #include +#include #include #include #include +#include +#include /** * Hash table of application namespaces by app ns ids @@ -28,6 +31,8 @@ uword *app_namespace_lookup_table; */ static app_namespace_t *app_namespace_pool; +static u8 app_sapi_enabled; + app_namespace_t * app_namespace_get (u32 index) { @@ -54,14 +59,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 +75,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) { @@ -86,9 +91,8 @@ vnet_app_namespace_add_del (vnet_app_namespace_add_del_args_t * a) } 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) { @@ -106,11 +110,14 @@ vnet_app_namespace_add_del (vnet_app_namespace_add_del_args_t * a) app_ns->ip6_fib_index = fib_table_find (FIB_PROTOCOL_IP6, a->ip6_fib_id); session_lookup_set_tables_appns (app_ns); + + /* Add socket for namespace */ + if (app_sapi_enabled) + appns_sapi_add_ns_socket (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; } @@ -153,6 +160,18 @@ app_namespace_get_local_table (app_namespace_t * app_ns) return session_table_get (app_ns->local_table_index); } +void +appns_sapi_enable (void) +{ + app_sapi_enabled = 1; +} + +u8 +appns_sapi_enabled (void) +{ + return app_sapi_enabled; +} + void app_namespaces_init (void) { @@ -184,6 +203,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 (); @@ -228,7 +248,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; @@ -253,14 +274,52 @@ format_app_namespace (u8 * s, va_list * args) return s; } +static void +app_namespace_show_api (vlib_main_t * vm, app_namespace_t * app_ns) +{ + app_ns_api_handle_t *handle; + app_worker_t *app_wrk; + clib_socket_t *cs; + clib_file_t *cf; + + if (!app_sapi_enabled) + { + vlib_cli_output (vm, "app socket api not enabled!"); + return; + } + + vlib_cli_output (vm, "socket: %v\n", app_ns->sock_name); + + if (!pool_elts (app_ns->app_sockets)) + return; + + vlib_cli_output (vm, "%12s%12s%5s", "app index", "wrk index", "fd"); + + + /* *INDENT-OFF* */ + pool_foreach (cs, app_ns->app_sockets, ({ + handle = (app_ns_api_handle_t *) &cs->private_data; + cf = clib_file_get (&file_main, handle->aah_file_index); + if (handle->aah_app_wrk_index == APP_INVALID_INDEX) + { + vlib_cli_output (vm, "%12d%12d%5u", -1, -1, cf->file_descriptor); + continue; + } + app_wrk = app_worker_get (handle->aah_app_wrk_index); + vlib_cli_output (vm, "%12d%12d%5u", app_wrk->app_index, + app_wrk->wrk_map_index, cf->file_descriptor); + })); + /* *INDENT-ON* */ +} + static clib_error_t * 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; + u8 *ns_id, do_table = 0, had_input = 1, do_api = 0; app_namespace_t *app_ns; session_table_t *st; - u8 *ns_id, do_table = 0, had_input = 1; session_cli_return_if_not_enabled (); @@ -274,6 +333,8 @@ show_app_ns_fn (vlib_main_t * vm, unformat_input_t * main_input, { if (unformat (line_input, "table %_%v%_", &ns_id)) do_table = 1; + else if (unformat (line_input, "api-clients")) + do_api = 1; else { vlib_cli_output (vm, "unknown input [%U]", format_unformat_error, @@ -282,6 +343,17 @@ show_app_ns_fn (vlib_main_t * vm, unformat_input_t * main_input, } } + if (do_api) + { + if (!do_table) + { + vlib_cli_output (vm, "must specify a table for api"); + goto done; + } + app_ns = app_namespace_get_from_id (ns_id); + app_namespace_show_api (vm, app_ns); + goto done; + } if (do_table) { app_ns = app_namespace_get_from_id (ns_id); @@ -321,7 +393,7 @@ done: VLIB_CLI_COMMAND (show_app_ns_command, static) = { .path = "show app ns", - .short_help = "show app ns", + .short_help = "show app ns [table [api-clients]]", .function = show_app_ns_fn, }; /* *INDENT-ON* */