*/
#include <vnet/session/application_namespace.h>
+#include <vnet/session/application.h>
#include <vnet/session/session_table.h>
#include <vnet/session/session.h>
#include <vnet/fib/fib_table.h>
+#include <vppinfra/file.h>
+#include <vlib/unix/unix.h>
/**
* Hash table of application namespaces by app ns ids
*/
static app_namespace_t *app_namespace_pool;
+static u8 app_sapi_enabled;
+
app_namespace_t *
app_namespace_get (u32 index)
{
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;
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)
{
}
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->local_table_index = session_table_index (st);
}
app_ns->ns_secret = a->secret;
+ app_ns->netns = a->netns ? vec_dup (a->netns) : 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);
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;
}
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)
{
/*
* Allocate default namespace
*/
+
+ /* clang-format off */
vnet_app_namespace_add_del_args_t a = {
.ns_id = ns_id,
+ .netns = 0,
.secret = 0,
.sw_if_index = APP_NAMESPACE_INVALID_INDEX,
.is_add = 1
};
+ /* clang-format on */
+
vnet_app_namespace_add_del (&a);
vec_free (ns_id);
}
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;
unformat_input_t _line_input, *line_input = &_line_input;
- u8 is_add = 0, *ns_id = 0, secret_set = 0, sw_if_index_set = 0;
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 ();
sw_if_index_set = 1;
else if (unformat (line_input, "fib_id", &fib_id))
;
+ else if (unformat (line_input, "netns %_%v%_", &netns))
+ ;
else
{
error = clib_error_return (0, "unknown input `%U'",
format_unformat_error, line_input);
- unformat_free (line_input);
- return error;
+ goto done;
}
}
- unformat_free (line_input);
if (!ns_id || !secret_set || !sw_if_index_set)
{
vlib_cli_output (vm, "namespace-id, secret and sw_if_index must be "
"provided");
- return 0;
+ goto done;
}
if (is_add)
{
+ /* clang-format off */
vnet_app_namespace_add_del_args_t args = {
.ns_id = ns_id,
+ .netns = netns,
.secret = secret,
.sw_if_index = sw_if_index,
.ip4_fib_id = fib_id,
.is_add = 1
};
- error = vnet_app_namespace_add_del (&args);
+ /* clang-format on */
+
+ if ((rv = vnet_app_namespace_add_del (&args)))
+ error = clib_error_return (0, "app namespace add del returned %d", rv);
}
+done:
+
+ vec_free (ns_id);
+ vec_free (netns);
+ unformat_free (line_input);
+
return error;
}
/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (app_ns_command, static) =
-{
+VLIB_CLI_COMMAND (app_ns_command, static) = {
.path = "app ns",
.short_help = "app ns [add] id <namespace-id> secret <secret> "
- "sw_if_index <sw_if_index>",
+ "sw_if_index <sw_if_index> [netns <ns>]",
.function = app_ns_fn,
};
/* *INDENT-ON* */
format_app_namespace (u8 * s, va_list * args)
{
app_namespace_t *app_ns = va_arg (*args, app_namespace_t *);
- 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);
+
+ 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;
}
+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 ();
{
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,
}
}
+ 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);
}
do_ns_list:
- vlib_cli_output (vm, "%-10s%-20s%-20s%-50s", "Index", "Secret",
- "sw_if_index", "Name");
+ vlib_cli_output (vm, "%-10s%-10s%-15s%-15s%-15s%-40s", "Index", "Secret",
+ "sw_if_index", "Id", "netns", "Socket");
/* *INDENT-OFF* */
- pool_foreach (app_ns, app_namespace_pool, ({
+ pool_foreach (app_ns, app_namespace_pool) {
vlib_cli_output (vm, "%U", format_app_namespace, app_ns);
- }));
+ }
/* *INDENT-ON* */
done:
VLIB_CLI_COMMAND (show_app_ns_command, static) =
{
.path = "show app ns",
- .short_help = "show app ns",
+ .short_help = "show app ns [table <id> [api-clients]]",
.function = show_app_ns_fn,
};
/* *INDENT-ON* */
Code Review / vpp.git / blobdiff