_(SESSION_RULES_DUMP, session_rules_dump) \
_(APPLICATION_TLS_CERT_ADD, application_tls_cert_add) \
_(APPLICATION_TLS_KEY_ADD, application_tls_key_add) \
+_(APP_WORKER_ADD_DEL, app_worker_add_del) \
static int
-session_send_memfd_fd (vl_api_registration_t * reg, const ssvm_private_t * sp)
+session_send_fds (vl_api_registration_t * reg, int fds[], int n_fds)
{
clib_error_t *error;
if (vl_api_registration_file_index (reg) == VL_API_INVALID_FI)
clib_warning ("can't send memfd fd");
return -1;
}
- error = vl_api_send_fd_msg (reg, sp->fd);
+ error = vl_api_send_fd_msg (reg, fds, n_fds);
if (error)
{
clib_error_report (error);
static int
send_add_segment_callback (u32 api_client_index, const ssvm_private_t * sp)
{
+ int fds[SESSION_N_FD_TYPE], n_fds = 0;
vl_api_map_another_segment_t *mp;
vl_api_registration_t *reg;
+ u8 fd_flags = 0;
reg = vl_mem_api_client_index_to_registration (api_client_index);
if (!reg)
return -1;
}
- if (ssvm_type (sp) == SSVM_SEGMENT_MEMFD
- && vl_api_registration_file_index (reg) == VL_API_INVALID_FI)
+ if (ssvm_type (sp) == SSVM_SEGMENT_MEMFD)
{
- clib_warning ("can't send memfd fd");
- return -1;
+ if (vl_api_registration_file_index (reg) == VL_API_INVALID_FI)
+ {
+ clib_warning ("can't send memfd fd");
+ return -1;
+ }
+
+ fd_flags |= SESSION_FD_F_MEMFD_SEGMENT;
+ fds[n_fds] = sp->fd;
+ n_fds += 1;
}
- mp = vl_msg_api_alloc_as_if_client (sizeof (*mp));
+ mp = vl_mem_api_alloc_as_if_client_w_reg (reg, sizeof (*mp));
memset (mp, 0, sizeof (*mp));
mp->_vl_msg_id = clib_host_to_net_u16 (VL_API_MAP_ANOTHER_SEGMENT);
mp->segment_size = sp->ssvm_size;
+ mp->fd_flags = fd_flags;
strncpy ((char *) mp->segment_name, (char *) sp->name,
sizeof (mp->segment_name) - 1);
vl_msg_api_send_shmem (reg->vl_input_queue, (u8 *) & mp);
- if (ssvm_type (sp) == SSVM_SEGMENT_MEMFD)
- return session_send_memfd_fd (reg, sp);
+ if (n_fds)
+ return session_send_fds (reg, fds, n_fds);
return 0;
}
return -1;
}
- if (ssvm_type (fs) == SSVM_SEGMENT_MEMFD
- && vl_api_registration_file_index (reg) == VL_API_INVALID_FI)
+ mp = vl_mem_api_alloc_as_if_client_w_reg (reg, sizeof (*mp));
+ memset (mp, 0, sizeof (*mp));
+ mp->_vl_msg_id = clib_host_to_net_u16 (VL_API_UNMAP_SEGMENT);
+ strncpy ((char *) mp->segment_name, (char *) fs->name,
+ sizeof (mp->segment_name) - 1);
+
+ vl_msg_api_send_shmem (reg->vl_input_queue, (u8 *) & mp);
+
+ return 0;
+}
+
+static int
+send_app_cut_through_registration_add (u32 api_client_index,
+ u32 wrk_map_index, u64 mq_addr,
+ u64 peer_mq_addr)
+{
+ vl_api_app_cut_through_registration_add_t *mp;
+ vl_api_registration_t *reg;
+ svm_msg_q_t *mq, *peer_mq;
+ int fds[2];
+
+ reg = vl_mem_api_client_index_to_registration (api_client_index);
+ if (!reg)
{
- clib_warning ("can't send memfd fd");
+ clib_warning ("no registration: %u", api_client_index);
return -1;
}
- mp = vl_msg_api_alloc_as_if_client (sizeof (*mp));
+ mp = vl_mem_api_alloc_as_if_client_w_reg (reg, sizeof (*mp));
memset (mp, 0, sizeof (*mp));
- mp->_vl_msg_id = clib_host_to_net_u16 (VL_API_UNMAP_SEGMENT);
- strncpy ((char *) mp->segment_name, (char *) fs->name,
- sizeof (mp->segment_name) - 1);
+ mp->_vl_msg_id =
+ clib_host_to_net_u16 (VL_API_APP_CUT_THROUGH_REGISTRATION_ADD);
+
+ mp->evt_q_address = mq_addr;
+ mp->peer_evt_q_address = peer_mq_addr;
+ mp->wrk_index = wrk_map_index;
+
+ mq = uword_to_pointer (mq_addr, svm_msg_q_t *);
+ peer_mq = uword_to_pointer (peer_mq_addr, svm_msg_q_t *);
+
+ if (svm_msg_q_get_producer_eventfd (mq) != -1)
+ {
+ mp->fd_flags |= SESSION_FD_F_MQ_EVENTFD;
+ mp->n_fds = 2;
+ /* app will overwrite exactly the fds we pass here. So
+ * when we swap mq with peer_mq (accept vs connect) the
+ * fds will still be valid */
+ fds[0] = svm_msg_q_get_consumer_eventfd (mq);
+ fds[1] = svm_msg_q_get_producer_eventfd (peer_mq);
+ }
vl_msg_api_send_shmem (reg->vl_input_queue, (u8 *) & mp);
- if (ssvm_type (fs) == SSVM_SEGMENT_MEMFD)
- return session_send_memfd_fd (reg, fs);
+ if (mp->n_fds != 0)
+ session_send_fds (reg, fds, mp->n_fds);
return 0;
}
static int
send_session_accept_callback (stream_session_t * s)
{
- application_t *server = application_get (s->app_index);
+ app_worker_t *server_wrk = app_worker_get (s->app_wrk_index);
transport_proto_vft_t *tp_vft;
vl_api_accept_session_t *mp;
vl_api_registration_t *reg;
transport_connection_t *tc;
stream_session_t *listener;
svm_msg_q_t *vpp_queue;
+ application_t *server;
+ server = application_get (server_wrk->app_index);
reg = vl_mem_api_client_index_to_registration (server->api_client_index);
if (!reg)
{
memset (mp, 0, sizeof (*mp));
mp->_vl_msg_id = clib_host_to_net_u16 (VL_API_ACCEPT_SESSION);
- mp->context = server->index;
+ mp->context = server_wrk->wrk_index;
mp->server_rx_fifo = pointer_to_uword (s->server_rx_fifo);
mp->server_tx_fifo = pointer_to_uword (s->server_tx_fifo);
if (application_is_proxy (server))
{
listener =
- application_first_listener (server, session_get_fib_proto (s),
- session_get_transport_proto (s));
+ app_worker_first_listener (server_wrk, session_get_fib_proto (s),
+ session_get_transport_proto (s));
if (listener)
mp->listener_handle = listen_session_get_handle (listener);
}
}
void
-send_local_session_disconnect_callback (u32 app_index, local_session_t * ls)
+mq_send_local_session_disconnected_cb (u32 app_wrk_index,
+ local_session_t * ls)
{
- application_t *app = application_get (app_index);
- vl_api_disconnect_session_t *mp;
- vl_api_registration_t *reg;
-
- reg = vl_mem_api_client_index_to_registration (app->api_client_index);
- if (!reg)
- {
- clib_warning ("no registration: %u", app->api_client_index);
- return;
- }
+ app_worker_t *app_wrk = app_worker_get (app_wrk_index);
+ svm_msg_q_msg_t _msg, *msg = &_msg;
+ session_disconnected_msg_t *mp;
+ svm_msg_q_t *app_mq;
+ session_event_t *evt;
+ application_t *app;
- mp = vl_mem_api_alloc_as_if_client_w_reg (reg, sizeof (*mp));
- memset (mp, 0, sizeof (*mp));
- mp->_vl_msg_id = clib_host_to_net_u16 (VL_API_DISCONNECT_SESSION);
+ app = application_get (app_wrk->app_index);
+ app_mq = app_wrk->event_queue;
+ svm_msg_q_lock_and_alloc_msg_w_ring (app_mq, SESSION_MQ_CTRL_EVT_RING,
+ SVM_Q_WAIT, msg);
+ svm_msg_q_unlock (app_mq);
+ evt = svm_msg_q_msg_data (app_mq, msg);
+ memset (evt, 0, sizeof (*evt));
+ evt->event_type = SESSION_CTRL_EVT_DISCONNECTED;
+ mp = (session_disconnected_msg_t *) evt->data;
mp->handle = application_local_session_handle (ls);
mp->context = app->api_client_index;
- vl_msg_api_send_shmem (reg->vl_input_queue, (u8 *) & mp);
+ svm_msg_q_add (app_mq, msg, SVM_Q_WAIT);
}
static void
send_session_disconnect_callback (stream_session_t * s)
{
- application_t *app = application_get (s->app_index);
+ app_worker_t *app_wrk = app_worker_get (s->app_wrk_index);
vl_api_disconnect_session_t *mp;
vl_api_registration_t *reg;
+ application_t *app;
+ app = application_get (app_wrk->app_index);
reg = vl_mem_api_client_index_to_registration (app->api_client_index);
if (!reg)
{
static void
send_session_reset_callback (stream_session_t * s)
{
- application_t *app = application_get (s->app_index);
+ app_worker_t *app_wrk = app_worker_get (s->app_wrk_index);
vl_api_registration_t *reg;
vl_api_reset_session_t *mp;
+ application_t *app;
+ app = application_get (app_wrk->app_index);
reg = vl_mem_api_client_index_to_registration (app->api_client_index);
if (!reg)
{
}
int
-send_session_connected_callback (u32 app_index, u32 api_context,
+send_session_connected_callback (u32 app_wrk_index, u32 api_context,
stream_session_t * s, u8 is_fail)
{
vl_api_connect_session_reply_t *mp;
transport_connection_t *tc;
vl_api_registration_t *reg;
svm_msg_q_t *vpp_queue;
+ app_worker_t *app_wrk;
application_t *app;
- app = application_get (app_index);
+ app_wrk = app_worker_get (app_wrk_index);
+ app = application_get (app_wrk->app_index);
reg = vl_mem_api_client_index_to_registration (app->api_client_index);
if (!reg)
{
static int
mq_send_session_accepted_cb (stream_session_t * s)
{
- application_t *app = application_get (s->app_index);
+ app_worker_t *app_wrk = app_worker_get (s->app_wrk_index);
svm_msg_q_msg_t _msg, *msg = &_msg;
svm_msg_q_t *vpp_queue, *app_mq;
transport_proto_vft_t *tp_vft;
stream_session_t *listener;
session_accepted_msg_t *mp;
session_event_t *evt;
+ application_t *app;
- app_mq = app->event_queue;
+ app = application_get (app_wrk->app_index);
+ app_mq = app_wrk->event_queue;
svm_msg_q_lock_and_alloc_msg_w_ring (app_mq, SESSION_MQ_CTRL_EVT_RING,
SVM_Q_WAIT, msg);
svm_msg_q_unlock (app_mq);
memset (evt, 0, sizeof (*evt));
evt->event_type = SESSION_CTRL_EVT_ACCEPTED;
mp = (session_accepted_msg_t *) evt->data;
- mp->context = app->index;
+ mp->context = app->app_index;
mp->server_rx_fifo = pointer_to_uword (s->server_rx_fifo);
mp->server_tx_fifo = pointer_to_uword (s->server_tx_fifo);
if (application_is_proxy (app))
{
listener =
- application_first_listener (app, session_get_fib_proto (s),
- session_get_transport_proto (s));
+ app_worker_first_listener (app_wrk, session_get_fib_proto (s),
+ session_get_transport_proto (s));
if (listener)
mp->listener_handle = listen_session_get_handle (listener);
}
{
local_session_t *ls = (local_session_t *) s;
local_session_t *ll;
+ u8 main_thread = vlib_num_workers ()? 1 : 0;
+
+ send_app_cut_through_registration_add (app->api_client_index,
+ app_wrk->wrk_map_index,
+ ls->server_evt_q,
+ ls->client_evt_q);
+
if (application_local_session_listener_has_transport (ls))
{
listener = listen_session_get (ls->listener_index);
}
mp->handle = application_local_session_handle (ls);
mp->port = ls->port;
- vpp_queue = session_manager_get_vpp_event_queue (0);
+ vpp_queue = session_manager_get_vpp_event_queue (main_thread);
mp->vpp_event_queue_address = pointer_to_uword (vpp_queue);
mp->client_event_queue_address = ls->client_evt_q;
mp->server_event_queue_address = ls->server_evt_q;
static void
mq_send_session_disconnected_cb (stream_session_t * s)
{
- application_t *app = application_get (s->app_index);
+ app_worker_t *app_wrk = app_worker_get (s->app_wrk_index);
svm_msg_q_msg_t _msg, *msg = &_msg;
session_disconnected_msg_t *mp;
svm_msg_q_t *app_mq;
session_event_t *evt;
+ application_t *app;
- app_mq = app->event_queue;
+ app = application_get (app_wrk->app_index);
+ app_mq = app_wrk->event_queue;
svm_msg_q_lock_and_alloc_msg_w_ring (app_mq, SESSION_MQ_CTRL_EVT_RING,
SVM_Q_WAIT, msg);
svm_msg_q_unlock (app_mq);
static void
mq_send_session_reset_cb (stream_session_t * s)
{
- application_t *app = application_get (s->app_index);
+ app_worker_t *app = app_worker_get (s->app_wrk_index);
svm_msg_q_msg_t _msg, *msg = &_msg;
session_reset_msg_t *mp;
svm_msg_q_t *app_mq;
}
static int
-mq_send_session_connected_cb (u32 app_index, u32 api_context,
+mq_send_session_connected_cb (u32 app_wrk_index, u32 api_context,
stream_session_t * s, u8 is_fail)
{
svm_msg_q_msg_t _msg, *msg = &_msg;
session_connected_msg_t *mp;
svm_msg_q_t *vpp_mq, *app_mq;
transport_connection_t *tc;
+ app_worker_t *app_wrk;
session_event_t *evt;
application_t *app;
- app = application_get (app_index);
- app_mq = app->event_queue;
+ app_wrk = app_worker_get (app_wrk_index);
+ app = application_get (app_wrk->app_index);
+ app_mq = app_wrk->event_queue;
if (!app_mq)
{
- clib_warning ("app %u with api index: %u not attached", app->index,
+ clib_warning ("app %u with api index: %u not attached", app->app_index,
app->api_client_index);
return -1;
}
else
{
local_session_t *ls = (local_session_t *) s;
+ u8 main_thread = vlib_num_workers ()? 1 : 0;
+
+ send_app_cut_through_registration_add (app->api_client_index,
+ app_wrk->wrk_map_index,
+ ls->client_evt_q,
+ ls->server_evt_q);
+
mp->handle = application_local_session_handle (ls);
mp->lcl_port = ls->port;
- vpp_mq = session_manager_get_vpp_event_queue (0);
+ vpp_mq = session_manager_get_vpp_event_queue (main_thread);
mp->vpp_event_queue_address = pointer_to_uword (vpp_mq);
mp->client_event_queue_address = ls->client_evt_q;
mp->server_event_queue_address = ls->server_evt_q;
return 0;
}
+static int
+mq_send_session_bound_cb (u32 app_wrk_index, u32 api_context,
+ session_handle_t handle, int rv)
+{
+ svm_msg_q_msg_t _msg, *msg = &_msg;
+ svm_msg_q_t *app_mq, *vpp_evt_q;
+ transport_connection_t *tc;
+ stream_session_t *ls = 0;
+ session_bound_msg_t *mp;
+ app_worker_t *app_wrk;
+ session_event_t *evt;
+ application_t *app;
+
+ app_wrk = app_worker_get (app_wrk_index);
+ app = application_get (app_wrk->app_index);
+ app_mq = app_wrk->event_queue;
+ if (!app_mq)
+ {
+ clib_warning ("app %u with api index: %u not attached", app->app_index,
+ app->api_client_index);
+ return -1;
+ }
+
+ svm_msg_q_lock_and_alloc_msg_w_ring (app_mq, SESSION_MQ_CTRL_EVT_RING,
+ SVM_Q_WAIT, msg);
+ svm_msg_q_unlock (app_mq);
+ evt = svm_msg_q_msg_data (app_mq, msg);
+ memset (evt, 0, sizeof (*evt));
+ evt->event_type = SESSION_CTRL_EVT_BOUND;
+ mp = (session_bound_msg_t *) evt->data;
+ mp->context = api_context;
+
+ if (rv)
+ goto done;
+
+ mp->handle = handle;
+ if (application_has_global_scope (app))
+ {
+ ls = listen_session_get_from_handle (handle);
+ tc = listen_session_get_transport (ls);
+ mp->lcl_port = tc->lcl_port;
+ mp->lcl_is_ip4 = tc->is_ip4;
+ clib_memcpy (mp->lcl_ip, &tc->lcl_ip, sizeof (tc->lcl_ip));
+ }
+ else
+ {
+ local_session_t *local;
+ local = application_get_local_listener_w_handle (handle);
+ mp->lcl_port = local->port;
+ mp->lcl_is_ip4 = session_type_is_ip4 (local->session_type);
+ }
+
+ if (ls && session_transport_service_type (ls) == TRANSPORT_SERVICE_CL)
+ {
+ mp->rx_fifo = pointer_to_uword (ls->server_rx_fifo);
+ mp->tx_fifo = pointer_to_uword (ls->server_tx_fifo);
+ vpp_evt_q = session_manager_get_vpp_event_queue (0);
+ mp->vpp_evt_q = pointer_to_uword (vpp_evt_q);
+ }
+
+done:
+ mp->retval = rv;
+ svm_msg_q_add (app_mq, msg, SVM_Q_WAIT);
+ return 0;
+}
+
static session_cb_vft_t session_mq_cb_vft = {
.session_accept_callback = mq_send_session_accepted_cb,
.session_disconnect_callback = mq_send_session_disconnected_cb,
static void
vl_api_application_attach_t_handler (vl_api_application_attach_t * mp)
{
+ int rv = 0, fds[SESSION_N_FD_TYPE], n_fds = 0;
vl_api_application_attach_reply_t *rmp;
ssvm_private_t *segp, *evt_q_segment;
vnet_app_attach_args_t _a, *a = &_a;
vl_api_registration_t *reg;
clib_error_t *error = 0;
- int rv = 0;
+ u8 fd_flags = 0;
reg = vl_api_client_index_to_registration (mp->client_index);
if (!reg)
{
rv = clib_error_get_code (error);
clib_error_report (error);
+ vec_free (a->namespace_id);
+ goto done;
}
vec_free (a->namespace_id);
+ /* Send event queues segment */
+ if ((evt_q_segment = session_manager_get_evt_q_segment ()))
+ {
+ fd_flags |= SESSION_FD_F_VPP_MQ_SEGMENT;
+ fds[n_fds] = evt_q_segment->fd;
+ n_fds += 1;
+ }
+ /* Send fifo segment fd if needed */
+ if (ssvm_type (a->segment) == SSVM_SEGMENT_MEMFD)
+ {
+ fd_flags |= SESSION_FD_F_MEMFD_SEGMENT;
+ fds[n_fds] = a->segment->fd;
+ n_fds += 1;
+ }
+ if (a->options[APP_OPTIONS_FLAGS] & APP_OPTIONS_FLAGS_EVT_MQ_USE_EVENTFD)
+ {
+ fd_flags |= SESSION_FD_F_MQ_EVENTFD;
+ fds[n_fds] = svm_msg_q_get_producer_eventfd (a->app_evt_q);
+ n_fds += 1;
+ }
+
done:
/* *INDENT-OFF* */
memcpy (rmp->segment_name, segp->name, vec_len (segp->name));
rmp->segment_name_length = vec_len (segp->name);
}
- rmp->app_event_queue_address = a->app_event_queue_address;
+ rmp->app_event_queue_address = pointer_to_uword (a->app_evt_q);
+ rmp->n_fds = n_fds;
+ rmp->fd_flags = fd_flags;
}
}));
/* *INDENT-ON* */
- if (rv)
- return;
-
- /* Send fifo segment fd if needed */
- if (ssvm_type (a->segment) == SSVM_SEGMENT_MEMFD)
- session_send_memfd_fd (reg, a->segment);
- /* Send event queues segment */
- if ((evt_q_segment = session_manager_get_evt_q_segment ()))
- session_send_memfd_fd (reg, evt_q_segment);
+ if (n_fds)
+ session_send_fds (reg, fds, n_fds);
}
static void
app = application_lookup (mp->client_index);
if (app)
{
- a->app_index = app->index;
+ a->app_index = app->app_index;
rv = vnet_application_detach (a);
}
stream_session_t *s;
application_t *app = 0;
svm_msg_q_t *vpp_evt_q;
+ app_worker_t *app_wrk;
int rv;
if (session_manager_is_enabled () == 0)
{
memset (a, 0, sizeof (*a));
a->uri = (char *) mp->uri;
- a->app_index = app->index;
+ a->app_index = app->app_index;
rv = vnet_bind_uri (a);
}
else
}
}));
/* *INDENT-ON* */
+
+ /* If app uses mq for control messages, send an mq message as well */
+ if (app && application_use_mq_for_ctrl (app))
+ {
+ app_wrk = application_get_worker (app, 0);
+ mq_send_session_bound_cb (app_wrk->wrk_index, mp->context, a->handle,
+ rv);
+ }
}
static void
if (app)
{
a->uri = (char *) mp->uri;
- a->app_index = app->index;
+ a->app_index = app->app_index;
rv = vnet_unbind_uri (a);
}
else
app = application_lookup (mp->client_index);
if (app)
{
+ memset (a, 0, sizeof (*a));
a->uri = (char *) mp->uri;
a->api_context = mp->context;
- a->app_index = app->index;
+ a->app_index = app->app_index;
if ((error = vnet_connect_uri (a)))
{
rv = clib_error_get_code (error);
if (app)
{
a->handle = mp->handle;
- a->app_index = app->index;
+ a->app_index = app->app_index;
rv = vnet_disconnect_session (a);
}
else
if (app)
{
a->handle = mp->handle;
- a->app_index = app->index;
+ a->app_index = app->app_index;
vnet_disconnect_session (a);
}
}
static void
vl_api_reset_session_reply_t_handler (vl_api_reset_session_reply_t * mp)
{
+ app_worker_t *app_wrk;
application_t *app;
stream_session_t *s;
u32 index, thread_index;
- app = application_lookup (mp->client_index);
+ app = application_lookup (mp->context);
if (!app)
return;
session_parse_handle (mp->handle, &index, &thread_index);
s = session_get_if_valid (index, thread_index);
- if (s == 0 || app->index != s->app_index)
+ if (!s)
{
clib_warning ("Invalid session!");
return;
}
+ app_wrk = app_worker_get (s->app_wrk_index);
+ if (app_wrk->app_index != app->app_index)
+ {
+ clib_warning ("app %u does not own handle 0x%lx", app->app_index,
+ mp->handle);
+ return;
+ }
+
/* Client objected to resetting the session, log and continue */
if (mp->retval)
{
if (session_handle_is_local (mp->handle))
{
ls = application_get_local_session_from_handle (mp->handle);
- if (!ls || ls->app_index != mp->context)
+ if (!ls || ls->app_wrk_index != mp->context)
{
clib_warning ("server %u doesn't own local handle %llu",
mp->context, mp->handle);
clib_warning ("session doesn't exist");
return;
}
- if (s->app_index != mp->context)
+ if (s->app_wrk_index != mp->context)
{
clib_warning ("app doesn't own session");
return;
int rv = 0;
clib_error_t *error;
application_t *app = 0;
+ app_worker_t *app_wrk;
stream_session_t *s;
transport_connection_t *tc = 0;
ip46_address_t *ip46;
a->sep.fib_index = mp->vrf;
a->sep.sw_if_index = ENDPOINT_INVALID_INDEX;
a->sep.transport_proto = mp->proto;
- a->app_index = app->index;
+ a->app_index = app->app_index;
+ a->wrk_map_index = mp->wrk_index;
if ((error = vnet_bind (a)))
{
}
}));
/* *INDENT-ON* */
+
+ /* If app uses mq for control messages, send an mq message as well */
+ if (app && application_use_mq_for_ctrl (app))
+ {
+ app_wrk = application_get_worker (app, mp->wrk_index);
+ mq_send_session_bound_cb (app_wrk->wrk_index, mp->context, a->handle,
+ rv);
+ }
}
static void
app = application_lookup (mp->client_index);
if (app)
{
- a->app_index = app->index;
+ a->app_index = app->app_index;
a->handle = mp->handle;
+ a->wrk_map_index = mp->wrk_index;
if ((error = vnet_unbind (a)))
{
rv = clib_error_get_code (error);
{
vl_api_connect_session_reply_t *rmp;
vnet_connect_args_t _a, *a = &_a;
- application_t *app;
+ application_t *app = 0;
clib_error_t *error = 0;
int rv = 0;
a->sep.sw_if_index = ENDPOINT_INVALID_INDEX;
if (mp->hostname_len)
{
- vec_validate (a->sep.hostname, mp->hostname_len - 1);
- clib_memcpy (a->sep.hostname, mp->hostname, mp->hostname_len);
+ vec_validate (a->sep_ext.hostname, mp->hostname_len - 1);
+ clib_memcpy (a->sep_ext.hostname, mp->hostname, mp->hostname_len);
}
a->api_context = mp->context;
- a->app_index = app->index;
+ a->app_index = app->app_index;
+ a->wrk_map_index = mp->wrk_index;
if ((error = vnet_connect (a)))
{
rv = clib_error_get_code (error);
clib_error_report (error);
}
- vec_free (a->sep.hostname);
+ vec_free (a->sep_ext.hostname);
}
else
{
done:
REPLY_MACRO (VL_API_CONNECT_SESSION_REPLY);
+
+ if (app && application_use_mq_for_ctrl (app))
+ {
+ app_worker_t *app_wrk = application_get_worker (app, mp->wrk_index);
+ mq_send_session_connected_cb (app_wrk->wrk_index, mp->context, 0, 1);
+ }
+}
+
+static void
+vl_api_app_worker_add_del_t_handler (vl_api_app_worker_add_del_t * mp)
+{
+ int rv = 0, fds[SESSION_N_FD_TYPE], n_fds = 0;
+ vl_api_app_worker_add_del_reply_t *rmp;
+ vl_api_registration_t *reg;
+ clib_error_t *error = 0;
+ application_t *app;
+ u8 fd_flags = 0;
+
+ if (!session_manager_is_enabled ())
+ {
+ rv = VNET_API_ERROR_FEATURE_DISABLED;
+ goto done;
+ }
+
+ reg = vl_api_client_index_to_registration (mp->client_index);
+ if (!reg)
+ return;
+
+ app = application_lookup (clib_net_to_host_u32 (mp->app_api_index));
+ if (!app)
+ {
+ rv = VNET_API_ERROR_INVALID_VALUE;
+ goto done;
+ }
+
+ vnet_app_worker_add_del_args_t args = {
+ .app_index = app->app_index,
+ .wrk_index = clib_net_to_host_u32 (mp->wrk_index),
+ .is_add = mp->is_add
+ };
+ error = vnet_app_worker_add_del (&args);
+ if (error)
+ {
+ rv = clib_error_get_code (error);
+ clib_error_report (error);
+ goto done;
+ }
+
+ if (!mp->is_add)
+ goto done;
+
+ /* Send fifo segment fd if needed */
+ if (ssvm_type (args.segment) == SSVM_SEGMENT_MEMFD)
+ {
+ fd_flags |= SESSION_FD_F_MEMFD_SEGMENT;
+ fds[n_fds] = args.segment->fd;
+ n_fds += 1;
+ }
+ if (application_segment_manager_properties (app)->use_mq_eventfd)
+ {
+ fd_flags |= SESSION_FD_F_MQ_EVENTFD;
+ fds[n_fds] = svm_msg_q_get_producer_eventfd (args.evt_q);
+ n_fds += 1;
+ }
+
+ /* *INDENT-OFF* */
+done:
+ REPLY_MACRO2 (VL_API_APP_WORKER_ADD_DEL_REPLY, ({
+ rmp->is_add = mp->is_add;
+ rmp->wrk_index = clib_host_to_net_u32 (args.wrk_index);
+ if (!rv && mp->is_add)
+ {
+ if (vec_len (args.segment->name))
+ {
+ memcpy (rmp->segment_name, args.segment->name,
+ vec_len (args.segment->name));
+ rmp->segment_name_length = vec_len (args.segment->name);
+ }
+ rmp->app_event_queue_address = pointer_to_uword (args.evt_q);
+ rmp->n_fds = n_fds;
+ rmp->fd_flags = fd_flags;
+ }
+ }));
+ /* *INDENT-ON* */
+
+ if (n_fds)
+ session_send_fds (reg, fds, n_fds);
}
static void
goto done;
}
memset (a, 0, sizeof (*a));
- a->app_index = app->index;
+ a->app_index = app->app_index;
cert_len = clib_net_to_host_u16 (mp->cert_len);
if (cert_len > 10000)
{
goto done;
}
memset (a, 0, sizeof (*a));
- a->app_index = app->index;
+ a->app_index = app->app_index;
key_len = clib_net_to_host_u16 (mp->key_len);
if (key_len > 10000)
{
vnet_app_detach_args_t _a, *a = &_a;
if (app)
{
- a->app_index = app->index;
+ a->app_index = app->app_index;
vnet_application_detach (a);
}
return 0;