From 1a9e2f96d48e346311bbc584510a14e3f721b41c Mon Sep 17 00:00:00 2001 From: Nathan Skrzypczak Date: Wed, 28 Jul 2021 19:35:08 +0200 Subject: session: Add sock_name option to add_ns This adds a new API call to add session namespaces It now takes a netns and a sock_name. (1) If no netns is passed, sock_name will be used as socket path. Defaulting to /run/vpp/app_ns_sockets/${ns_id} (2) If a netns is passed, the sock_name has to be abstract (i.e. start with '@'). It will default to `@vpp/session/${ns_id}` and will be created in the provided netns. Type: feature Change-Id: I90e9a8e5ecca2cabe7c05335663e33c8506dc9e7 Signed-off-by: Nathan Skrzypczak --- src/vnet/session/application_namespace.c | 80 +++++++++++++++++++++++--------- 1 file changed, 59 insertions(+), 21 deletions(-) (limited to 'src/vnet/session/application_namespace.c') diff --git a/src/vnet/session/application_namespace.c b/src/vnet/session/application_namespace.c index 6d91fc362b2..c1061c08e27 100644 --- a/src/vnet/session/application_namespace.c +++ b/src/vnet/session/application_namespace.c @@ -40,7 +40,7 @@ app_namespace_get (u32 index) } app_namespace_t * -app_namespace_get_from_id (const u8 * ns_id) +app_namespace_get_from_id (const u8 *ns_id) { u32 index = app_namespace_index_from_id (ns_id); if (index == APP_NAMESPACE_INVALID_INDEX) @@ -55,14 +55,19 @@ app_namespace_index (app_namespace_t * app_ns) } app_namespace_t * -app_namespace_alloc (u8 * ns_id) +app_namespace_alloc (const u8 *ns_id) { app_namespace_t *app_ns; + pool_get (app_namespace_pool, app_ns); clib_memset (app_ns, 0, sizeof (*app_ns)); - app_ns->ns_id = vec_dup (ns_id); + + app_ns->ns_id = vec_dup ((u8 *) ns_id); + vec_terminate_c_string (app_ns->ns_id); + hash_set_mem (app_namespace_lookup_table, app_ns->ns_id, app_ns - app_namespace_pool); + return app_ns; } @@ -71,6 +76,7 @@ vnet_app_namespace_add_del (vnet_app_namespace_add_del_args_t * a) { app_namespace_t *app_ns; session_table_t *st; + int rv; if (a->is_add) { @@ -105,6 +111,7 @@ vnet_app_namespace_add_del (vnet_app_namespace_add_del_args_t * a) } app_ns->ns_secret = a->secret; app_ns->netns = a->netns ? vec_dup (a->netns) : 0; + app_ns->sock_name = a->sock_name ? vec_dup (a->sock_name) : 0; app_ns->sw_if_index = a->sw_if_index; app_ns->ip4_fib_index = fib_table_find (FIB_PROTOCOL_IP4, a->ip4_fib_id); @@ -114,7 +121,11 @@ vnet_app_namespace_add_del (vnet_app_namespace_add_del_args_t * a) /* Add socket for namespace */ if (app_sapi_enabled) - appns_sapi_add_ns_socket (app_ns); + { + rv = appns_sapi_add_ns_socket (app_ns); + if (rv) + return rv; + } } else { @@ -133,7 +144,13 @@ u32 app_namespace_index_from_id (const u8 * ns_id) { uword *indexp; - indexp = hash_get_mem (app_namespace_lookup_table, ns_id); + u8 *key; + + key = vec_dup ((u8 *) ns_id); + vec_terminate_c_string (key); + + indexp = hash_get_mem (app_namespace_lookup_table, key); + vec_free (key); if (!indexp) return APP_NAMESPACE_INVALID_INDEX; return *indexp; @@ -190,6 +207,7 @@ app_namespaces_init (void) vnet_app_namespace_add_del_args_t a = { .ns_id = ns_id, .netns = 0, + .sock_name = 0, .secret = 0, .sw_if_index = APP_NAMESPACE_INVALID_INDEX, .is_add = 1 @@ -204,9 +222,11 @@ static clib_error_t * app_ns_fn (vlib_main_t * vm, unformat_input_t * input, vlib_cli_command_t * cmd) { - u8 is_add = 0, *ns_id = 0, secret_set = 0, sw_if_index_set = 0, *netns = 0; + u8 is_add = 0, *ns_id = 0, secret_set = 0, sw_if_index_set = 0; + u8 *netns = 0, *sock_name = 0; unformat_input_t _line_input, *line_input = &_line_input; u32 sw_if_index, fib_id = APP_NAMESPACE_INVALID_INDEX; + vnet_main_t *vnm = vnet_get_main (); u64 secret; clib_error_t *error = 0; int rv; @@ -226,10 +246,15 @@ app_ns_fn (vlib_main_t * vm, unformat_input_t * input, secret_set = 1; else if (unformat (line_input, "sw_if_index %u", &sw_if_index)) sw_if_index_set = 1; + else if (unformat (line_input, "if %U", unformat_vnet_sw_interface, vnm, + &sw_if_index)) + sw_if_index_set = 1; else if (unformat (line_input, "fib_id", &fib_id)) ; else if (unformat (line_input, "netns %_%v%_", &netns)) ; + else if (unformat (line_input, "sock-name %_%v%_", &sock_name)) + ; else { error = clib_error_return (0, "unknown input `%U'", @@ -240,8 +265,8 @@ app_ns_fn (vlib_main_t * vm, unformat_input_t * input, if (!ns_id || !secret_set || !sw_if_index_set) { - vlib_cli_output (vm, "namespace-id, secret and sw_if_index must be " - "provided"); + vlib_cli_output (vm, "namespace-id, secret and interface must be " + "provided"); goto done; } @@ -251,6 +276,7 @@ app_ns_fn (vlib_main_t * vm, unformat_input_t * input, vnet_app_namespace_add_del_args_t args = { .ns_id = ns_id, .netns = netns, + .sock_name = sock_name, .secret = secret, .sw_if_index = sw_if_index, .ip4_fib_id = fib_id, @@ -266,6 +292,7 @@ done: vec_free (ns_id); vec_free (netns); + vec_free (sock_name); unformat_free (line_input); return error; @@ -275,7 +302,7 @@ done: VLIB_CLI_COMMAND (app_ns_command, static) = { .path = "app ns", .short_help = "app ns [add] id secret " - "sw_if_index [netns ]", + "if [netns ]", .function = app_ns_fn, }; /* *INDENT-ON* */ @@ -284,11 +311,18 @@ u8 * format_app_namespace (u8 * s, va_list * args) { app_namespace_t *app_ns = va_arg (*args, app_namespace_t *); + vnet_main_t *vnm = vnet_get_main (); + + s = format (s, "Application namespace [%u]\nid: %s\nsecret: %lu", + app_namespace_index (app_ns), app_ns->ns_id, app_ns->ns_secret); + if (app_ns->sw_if_index != (u32) ~0) + s = format (s, "\nInterface: %U", format_vnet_sw_if_index_name, vnm, + app_ns->sw_if_index); + if (app_ns->netns) + s = format (s, "\nNetns: %s", app_ns->netns); + if (app_ns->sock_name) + s = format (s, "\nSocket: %s", app_ns->sock_name); - s = - format (s, "%-10u%-10lu%-15d%-15v%-15v%-40v", app_namespace_index (app_ns), - app_ns->ns_secret, app_ns->sw_if_index, app_ns->ns_id, - app_ns->netns, app_ns->sock_name); return s; } @@ -335,8 +369,9 @@ 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; + u8 *ns_id = 0, do_table = 0, had_input = 1, do_api = 0; app_namespace_t *app_ns; + vnet_main_t *vnm = vnet_get_main (); session_table_t *st; session_cli_return_if_not_enabled (); @@ -349,7 +384,7 @@ show_app_ns_fn (vlib_main_t * vm, unformat_input_t * main_input, while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) { - if (unformat (line_input, "table %_%v%_", &ns_id)) + if (unformat (line_input, "id %_%v%_", &ns_id)) do_table = 1; else if (unformat (line_input, "api-clients")) do_api = 1; @@ -386,18 +421,22 @@ show_app_ns_fn (vlib_main_t * vm, unformat_input_t * main_input, vlib_cli_output (vm, "table for ns %v could not be found", ns_id); goto done; } + vlib_cli_output (vm, "%U", format_app_namespace, app_ns); session_lookup_show_table_entries (vm, st, 0, 1); vec_free (ns_id); goto done; } do_ns_list: - vlib_cli_output (vm, "%-10s%-10s%-15s%-15s%-15s%-40s", "Index", "Secret", - "sw_if_index", "Id", "netns", "Socket"); + vlib_cli_output (vm, "%-10s%-10s%-12s%-15s%-20s%-40s", "Index", "Secret", + "Interface", "Id", "Netns", "Socket"); /* *INDENT-OFF* */ pool_foreach (app_ns, app_namespace_pool) { - vlib_cli_output (vm, "%U", format_app_namespace, app_ns); + vlib_cli_output (vm, "%-10u%-10lu%-12U%-15s%-20s%-40v", + app_namespace_index (app_ns), app_ns->ns_secret, + format_vnet_sw_if_index_name, vnm, app_ns->sw_if_index, + app_ns->ns_id, app_ns->netns, app_ns->sock_name); } /* *INDENT-ON* */ @@ -408,10 +447,9 @@ done: } /* *INDENT-OFF* */ -VLIB_CLI_COMMAND (show_app_ns_command, static) = -{ +VLIB_CLI_COMMAND (show_app_ns_command, static) = { .path = "show app ns", - .short_help = "show app ns [table [api-clients]]", + .short_help = "show app ns [id [api-clients]]", .function = show_app_ns_fn, }; /* *INDENT-ON* */ -- cgit 1.2.3-korg