"oEjPLVNtx8SOj/M4rhaPT3I=\r\n" "-----END PRIVATE KEY-----\r\n";
const u32 test_srv_key_rsa_len = sizeof (test_srv_key_rsa);
+#define app_interface_check_thread_and_barrier(_fn, _arg) \
+ if (PREDICT_FALSE (!vlib_thread_is_main_w_barrier ())) \
+ { \
+ vlib_rpc_call_main_thread (_fn, (u8 *) _arg, sizeof(*_arg)); \
+ return 0; \
+ }
+
static u8
session_endpoint_is_local (session_endpoint_t * sep)
{
*thread_index = handle & 0xFFFFFFFF;
*session_index = handle >> 32;
- if (*thread_index >= vec_len (smm->sessions))
+ if (*thread_index >= vec_len (smm->wrk))
return VNET_API_ERROR_INVALID_VALUE;
- pool = smm->sessions[*thread_index];
+ pool = smm->wrk[*thread_index].sessions;
if (pool_is_free_index (pool, *session_index))
return VNET_API_ERROR_INVALID_VALUE_2;
}
static void
-session_endpoint_update_for_app (session_endpoint_t * sep,
- application_t * app)
+session_endpoint_update_for_app (session_endpoint_cfg_t * sep,
+ application_t * app, u8 is_connect)
{
app_namespace_t *app_ns;
- app_ns = app_namespace_get (app->ns_index);
- if (app_ns)
+ u32 ns_index, fib_index;
+
+ ns_index = app->ns_index;
+
+ /* App is a transport proto, so fetch the calling app's ns */
+ if (app->flags & APP_OPTIONS_FLAGS_IS_TRANSPORT_APP)
+ {
+ app_worker_t *owner_wrk;
+ application_t *owner_app;
+
+ owner_wrk = app_worker_get (sep->app_wrk_index);
+ owner_app = application_get (owner_wrk->app_index);
+ ns_index = owner_app->ns_index;
+ }
+ app_ns = app_namespace_get (ns_index);
+ if (!app_ns)
+ return;
+
+ /* Ask transport and network to bind to/connect using local interface
+ * that "supports" app's namespace. This will fix our local connection
+ * endpoint.
+ */
+
+ /* If in default namespace and user requested a fib index use it */
+ if (ns_index == 0 && sep->fib_index != ENDPOINT_INVALID_INDEX)
+ fib_index = sep->fib_index;
+ else
+ fib_index = sep->is_ip4 ? app_ns->ip4_fib_index : app_ns->ip6_fib_index;
+ sep->peer.fib_index = fib_index;
+ sep->fib_index = fib_index;
+
+ if (!is_connect)
{
- /* Ask transport and network to bind to/connect using local interface
- * that "supports" app's namespace. This will fix our local connection
- * endpoint.
- */
sep->sw_if_index = app_ns->sw_if_index;
- sep->fib_index =
- sep->is_ip4 ? app_ns->ip4_fib_index : app_ns->ip6_fib_index;
+ }
+ else
+ {
+ if (app_ns->sw_if_index != APP_NAMESPACE_INVALID_INDEX
+ && sep->peer.sw_if_index != ENDPOINT_INVALID_INDEX
+ && sep->peer.sw_if_index != app_ns->sw_if_index)
+ clib_warning ("Local sw_if_index different from app ns sw_if_index");
+
+ sep->peer.sw_if_index = app_ns->sw_if_index;
}
}
-static int
-vnet_bind_i (u32 app_index, session_endpoint_t * sep, u64 * handle)
+static inline int
+vnet_bind_inline (vnet_bind_args_t * a)
{
- u64 lh, ll_handle = SESSION_INVALID_HANDLE;
+ u64 ll_handle = SESSION_INVALID_HANDLE;
+ app_worker_t *app_wrk;
application_t *app;
- u32 table_index;
int rv;
- app = application_get_if_valid (app_index);
+ app = application_get_if_valid (a->app_index);
if (!app)
{
SESSION_DBG ("app not attached");
return VNET_API_ERROR_APPLICATION_NOT_ATTACHED;
}
+ app_wrk = application_get_worker (app, a->wrk_map_index);
+ a->sep_ext.app_wrk_index = app_wrk->wrk_index;
- session_endpoint_update_for_app (sep, app);
- if (!session_endpoint_in_ns (sep))
+ session_endpoint_update_for_app (&a->sep_ext, app, 0 /* is_connect */ );
+ if (!session_endpoint_in_ns (&a->sep))
return VNET_API_ERROR_INVALID_VALUE_2;
- table_index = application_session_table (app,
- session_endpoint_fib_proto (sep));
- lh = session_lookup_endpoint_listener (table_index, sep, 1);
- if (lh != SESSION_INVALID_HANDLE)
- return VNET_API_ERROR_ADDRESS_IN_USE;
-
/*
* Add session endpoint to local session table. Only binds to "inaddr_any"
* (i.e., zero address) are added to local scope table.
*/
- if (application_has_local_scope (app) && session_endpoint_is_local (sep))
+ if (application_has_local_scope (app)
+ && session_endpoint_is_local (&a->sep))
{
- if ((rv = application_start_local_listen (app, sep, handle)))
+ if ((rv = application_start_local_listen (app, &a->sep_ext,
+ &a->handle)))
return rv;
- ll_handle = *handle;
+ ll_handle = a->handle;
}
if (!application_has_global_scope (app))
*/
/* Setup listen path down to transport */
- rv = application_start_listen (app, sep, handle);
+ rv = application_start_listen (app, &a->sep_ext, &a->handle);
if (rv && ll_handle != SESSION_INVALID_HANDLE)
- session_lookup_del_session_endpoint (table_index, sep);
+ {
+ application_stop_local_listen (a->app_index, a->wrk_map_index,
+ ll_handle);
+ return rv;
+ }
/*
* Store in local table listener the index of the transport layer
- * listener. We'll need local listeners are hit and we need to
+ * listener. We'll need if if local listeners are hit and we need to
* return global handle
*/
if (ll_handle != SESSION_INVALID_HANDLE)
local_session_t *ll;
stream_session_t *tl;
ll = application_get_local_listener_w_handle (ll_handle);
- tl = listen_session_get_from_handle (*handle);
- ll->transport_listener_index = tl->session_index;
+ tl = listen_session_get_from_handle (a->handle);
+ if (ll->transport_listener_index == ~0)
+ ll->transport_listener_index = tl->session_index;
}
return rv;
}
-int
-vnet_unbind_i (u32 app_index, session_handle_t handle)
+static inline int
+vnet_unbind_inline (vnet_unbind_args_t * a)
{
application_t *app;
int rv;
- if (!(app = application_get_if_valid (app_index)))
+ if (!(app = application_get_if_valid (a->app_index)))
{
- SESSION_DBG ("app (%d) not attached", app_index);
+ SESSION_DBG ("app (%d) not attached", wrk_map_index);
return VNET_API_ERROR_APPLICATION_NOT_ATTACHED;
}
if (application_has_local_scope (app))
{
- if ((rv = application_stop_local_listen (app, handle)))
+ if ((rv = application_stop_local_listen (a->app_index,
+ a->wrk_map_index, a->handle)))
return rv;
}
* Clear the global scope table of the listener
*/
if (application_has_global_scope (app))
- return application_stop_listen (app, handle);
+ return application_stop_listen (a->app_index, a->wrk_map_index,
+ a->handle);
return 0;
}
-int
-application_connect (u32 client_index, u32 api_context,
- session_endpoint_t * sep)
+static int
+application_connect (vnet_connect_args_t * a)
{
- application_t *server, *client;
+ app_worker_t *server_wrk, *client_wrk;
u32 table_index, server_index, li;
stream_session_t *listener;
+ application_t *client, *server;
local_session_t *ll;
+ u8 fib_proto;
u64 lh;
- if (session_endpoint_is_zero (sep))
+ if (session_endpoint_is_zero (&a->sep))
return VNET_API_ERROR_INVALID_VALUE;
- client = application_get (client_index);
- session_endpoint_update_for_app (sep, client);
+ client = application_get (a->app_index);
+ session_endpoint_update_for_app (&a->sep_ext, client, 1 /* is_connect */ );
+ client_wrk = application_get_worker (client, a->wrk_map_index);
/*
* First check the local scope for locally attached destinations.
if (application_has_local_scope (client))
{
table_index = application_local_session_table (client);
- lh = session_lookup_local_endpoint (table_index, sep);
+ lh = session_lookup_local_endpoint (table_index, &a->sep);
if (lh == SESSION_DROP_HANDLE)
return VNET_API_ERROR_APP_CONNECT_FILTERED;
* can happen if client is a generic proxy. Route connect through
* global table instead.
*/
- if (server_index != client_index)
+ if (server_index != a->app_index)
{
server = application_get (server_index);
ll = application_get_local_listen_session (server, li);
- return application_local_session_connect (table_index, client,
- server, ll, api_context);
+ listener = (stream_session_t *) ll;
+ server_wrk = application_listener_select_worker (listener,
+ 1 /* is_local */ );
+ return application_local_session_connect (client_wrk,
+ server_wrk, ll,
+ a->api_context);
}
}
*/
global_scope:
- if (session_endpoint_is_local (sep))
+ if (session_endpoint_is_local (&a->sep))
return VNET_API_ERROR_SESSION_CONNECT;
if (!application_has_global_scope (client))
return VNET_API_ERROR_APP_CONNECT_SCOPE;
- table_index = application_session_table (client,
- session_endpoint_fib_proto (sep));
- listener = session_lookup_listener (table_index, sep);
+ fib_proto = session_endpoint_fib_proto (&a->sep);
+ table_index = application_session_table (client, fib_proto);
+ listener = session_lookup_listener (table_index, &a->sep);
if (listener)
{
- server = application_get (listener->app_index);
- if (server)
- return application_local_session_connect (table_index, client, server,
- (local_session_t *)
- listener, api_context);
+ server_wrk = application_listener_select_worker (listener,
+ 0 /* is_local */ );
+ ll = (local_session_t *) listener;
+ return application_local_session_connect (client_wrk, server_wrk, ll,
+ a->api_context);
}
/*
* Not connecting to a local server, propagate to transport
*/
- if (application_open_session (client, sep, api_context))
+ if (app_worker_open_session (client_wrk, &a->sep, a->api_context))
return VNET_API_ERROR_SESSION_CONNECT;
return 0;
}
uword
unformat_vnet_uri (unformat_input_t * input, va_list * args)
{
- session_endpoint_extended_t *sep = va_arg (*args,
- session_endpoint_extended_t *);
+ session_endpoint_cfg_t *sep = va_arg (*args, session_endpoint_cfg_t *);
u32 transport_proto = 0, port;
if (unformat (input, "%U://%U/%d", unformat_transport_proto,
}
static u8 *cache_uri;
-static session_endpoint_extended_t *cache_sep;
+static session_endpoint_cfg_t *cache_sep;
int
-parse_uri (char *uri, session_endpoint_extended_t * sep)
+parse_uri (char *uri, session_endpoint_cfg_t * sep)
{
unformat_input_t _input, *input = &_input;
}
static int
-session_validate_namespace (u8 * namespace_id, u64 secret, u32 * app_ns_index)
+app_validate_namespace (u8 * namespace_id, u64 secret, u32 * app_ns_index)
{
app_namespace_t *app_ns;
if (vec_len (namespace_id) == 0)
return 0;
}
+static u8 *
+app_name_from_api_index (u32 api_client_index)
+{
+ vl_api_registration_t *regp;
+ regp = vl_api_client_index_to_registration (api_client_index);
+ if (regp)
+ return format (0, "%s%c", regp->name, 0);
+
+ clib_warning ("api client index %u does not have an api registration!",
+ api_client_index);
+ return format (0, "unknown%c", 0);
+}
+
/**
* Attach application to vpp
*
{
svm_fifo_segment_private_t *fs;
application_t *app = 0;
+ app_worker_t *app_wrk;
segment_manager_t *sm;
u32 app_ns_index = 0;
+ u8 *app_name = 0;
u64 secret;
int rv;
return clib_error_return_code (0, VNET_API_ERROR_APP_ALREADY_ATTACHED, 0,
"app already attached");
+ if (a->api_client_index != APP_INVALID_INDEX)
+ {
+ app_name = app_name_from_api_index (a->api_client_index);
+ a->name = app_name;
+ }
+
secret = a->options[APP_OPTIONS_NAMESPACE_SECRET];
- if ((rv = session_validate_namespace (a->namespace_id, secret,
- &app_ns_index)))
+ if ((rv = app_validate_namespace (a->namespace_id, secret, &app_ns_index)))
return clib_error_return_code (0, rv, 0, "namespace validation: %d", rv);
a->options[APP_OPTIONS_NAMESPACE] = app_ns_index;
- app = application_new ();
- if ((rv = application_init (app, a->api_client_index, a->name, a->options,
- a->session_cb_vft)))
+
+ if ((rv = application_alloc_and_init ((app_init_args_t *) a)))
return clib_error_return_code (0, rv, 0, "app init: %d", rv);
- a->app_evt_q = app->event_queue;
- sm = segment_manager_get (app->first_segment_manager);
+ app = application_get (a->app_index);
+ if ((rv = app_worker_alloc_and_init (app, &app_wrk)))
+ return clib_error_return_code (0, rv, 0, "app default wrk init: %d", rv);
+
+ a->app_evt_q = app_wrk->event_queue;
+ app_wrk->api_client_index = a->api_client_index;
+ sm = segment_manager_get (app_wrk->first_segment_manager);
fs = segment_manager_get_segment_w_lock (sm, 0);
if (application_is_proxy (app))
ASSERT (vec_len (fs->ssvm.name) <= 128);
a->segment = &fs->ssvm;
- a->app_index = app->index;
segment_manager_segment_reader_unlock (sm);
-
+ vec_free (app_name);
return 0;
}
vnet_application_detach (vnet_app_detach_args_t * a)
{
application_t *app;
- app = application_get_if_valid (a->app_index);
+ app = application_get_if_valid (a->app_index);
if (!app)
{
clib_warning ("app not attached");
return VNET_API_ERROR_APPLICATION_NOT_ATTACHED;
}
- application_del (app);
+ app_interface_check_thread_and_barrier (vnet_application_detach, a);
+ application_detach_process (app, a->api_client_index);
return 0;
}
int
vnet_bind_uri (vnet_bind_args_t * a)
{
- session_endpoint_extended_t sep = SESSION_ENDPOINT_EXT_NULL;
+ session_endpoint_cfg_t sep = SESSION_ENDPOINT_CFG_NULL;
int rv;
rv = parse_uri (a->uri, &sep);
if (rv)
return rv;
-
- return vnet_bind_i (a->app_index, (session_endpoint_t *) & sep, &a->handle);
+ sep.app_wrk_index = 0;
+ clib_memcpy (&a->sep_ext, &sep, sizeof (sep));
+ return vnet_bind_inline (a);
}
int
vnet_unbind_uri (vnet_unbind_args_t * a)
{
- session_endpoint_extended_t sep = SESSION_ENDPOINT_EXT_NULL;
+ session_endpoint_cfg_t sep = SESSION_ENDPOINT_CFG_NULL;
stream_session_t *listener;
u32 table_index;
int rv;
(session_endpoint_t *) & sep);
if (!listener)
return VNET_API_ERROR_ADDRESS_NOT_IN_USE;
-
- return vnet_unbind_i (a->app_index, listen_session_get_handle (listener));
+ a->handle = listen_session_get_handle (listener);
+ return vnet_unbind_inline (a);
}
clib_error_t *
vnet_connect_uri (vnet_connect_args_t * a)
{
- session_endpoint_extended_t sep = SESSION_ENDPOINT_EXT_NULL;
+ session_endpoint_cfg_t sep = SESSION_ENDPOINT_CFG_NULL;
int rv;
/* Parse uri */
if (rv)
return clib_error_return_code (0, rv, 0, "app init: %d", rv);
- if ((rv = application_connect (a->app_index, a->api_context,
- (session_endpoint_t *) & sep)))
+ clib_memcpy (&a->sep_ext, &sep, sizeof (sep));
+ if ((rv = application_connect (a)))
return clib_error_return_code (0, rv, 0, "connect failed");
return 0;
}
local_session_t *ls;
/* Disconnect reply came to worker 1 not main thread */
- if (vlib_get_thread_index () == 1)
- {
- vlib_rpc_call_main_thread (vnet_disconnect_session, (u8 *) a,
- sizeof (*a));
- return 0;
- }
+ app_interface_check_thread_and_barrier (vnet_disconnect_session, a);
if (!(ls = application_get_local_session_from_handle (a->handle)))
return 0;
- if (ls->app_index != a->app_index && ls->client_index != a->app_index)
- {
- clib_warning ("app %u is neither client nor server for session %u",
- a->app_index, a->app_index);
- return VNET_API_ERROR_INVALID_VALUE;
- }
return application_local_session_disconnect (a->app_index, ls);
}
else
{
+ app_worker_t *app_wrk;
stream_session_t *s;
+
s = session_get_from_handle_if_valid (a->handle);
- if (!s || s->app_index != a->app_index)
+ if (!s)
+ return VNET_API_ERROR_INVALID_VALUE;
+ app_wrk = app_worker_get (s->app_wrk_index);
+ if (app_wrk->app_index != a->app_index)
return VNET_API_ERROR_INVALID_VALUE;
/* We're peeking into another's thread pool. Make sure */
vnet_bind (vnet_bind_args_t * a)
{
int rv;
- if ((rv = vnet_bind_i (a->app_index, &a->sep, &a->handle)))
+ if ((rv = vnet_bind_inline (a)))
return clib_error_return_code (0, rv, 0, "bind failed: %d", rv);
return 0;
}
vnet_unbind (vnet_unbind_args_t * a)
{
int rv;
- if ((rv = vnet_unbind_i (a->app_index, a->handle)))
+ if ((rv = vnet_unbind_inline (a)))
return clib_error_return_code (0, rv, 0, "unbind failed: %d", rv);
return 0;
}
clib_error_t *
vnet_connect (vnet_connect_args_t * a)
{
- session_endpoint_t *sep = (session_endpoint_t *) & a->sep;
int rv;
- if ((rv = application_connect (a->app_index, a->api_context, sep)))
+ if ((rv = application_connect (a)))
return clib_error_return_code (0, rv, 0, "connect failed: %d", rv);
return 0;
}