/*
- * Copyright (c) 2015-2016 Cisco and/or its affiliates.
+ * Copyright (c) 2015-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:
#include <vlibmemory/api.h>
#include <vnet/session/application.h>
#include <vnet/session/application_interface.h>
+#include <vnet/session/application_local.h>
#include <vnet/session/session_rules_table.h>
#include <vnet/session/session_table.h>
+#include <vnet/session/session.h>
#include <vnet/vnet_msg_enum.h>
_(CONNECT_URI, connect_uri) \
_(DISCONNECT_SESSION, disconnect_session) \
_(DISCONNECT_SESSION_REPLY, disconnect_session_reply) \
-_(ACCEPT_SESSION_REPLY, accept_session_reply) \
-_(RESET_SESSION_REPLY, reset_session_reply) \
_(BIND_SOCK, bind_sock) \
_(UNBIND_SOCK, unbind_sock) \
_(CONNECT_SOCK, connect_sock) \
_(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)
+send_add_segment_callback (u32 api_client_index, u64 segment_handle)
{
+ int fds[SESSION_N_FD_TYPE], n_fds = 0;
vl_api_map_another_segment_t *mp;
+ svm_fifo_segment_private_t *fs;
vl_api_registration_t *reg;
+ ssvm_private_t *sp;
+ u8 fd_flags = 0;
reg = vl_mem_api_client_index_to_registration (api_client_index);
if (!reg)
{
- clib_warning ("no registration: %u", api_client_index);
+ clib_warning ("no api registration for client: %u", api_client_index);
return -1;
}
- if (ssvm_type (sp) == SSVM_SEGMENT_MEMFD
- && vl_api_registration_file_index (reg) == VL_API_INVALID_FI)
+ fs = segment_manager_get_segment_w_handle (segment_handle);
+ sp = &fs->ssvm;
+ 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));
- memset (mp, 0, sizeof (*mp));
+ mp = vl_mem_api_alloc_as_if_client_w_reg (reg, sizeof (*mp));
+ clib_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;
+ mp->segment_handle = clib_host_to_net_u64 (segment_handle);
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;
}
static int
-send_del_segment_callback (u32 api_client_index, const ssvm_private_t * fs)
+send_del_segment_callback (u32 api_client_index, u64 segment_handle)
{
vl_api_unmap_segment_t *mp;
vl_api_registration_t *reg;
return -1;
}
- if (ssvm_type (fs) == SSVM_SEGMENT_MEMFD
- && vl_api_registration_file_index (reg) == VL_API_INVALID_FI)
- {
- clib_warning ("can't send memfd fd");
- return -1;
- }
-
- mp = vl_msg_api_alloc_as_if_client (sizeof (*mp));
- memset (mp, 0, sizeof (*mp));
+ mp = vl_mem_api_alloc_as_if_client_w_reg (reg, sizeof (*mp));
+ clib_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->segment_handle = clib_host_to_net_u64 (segment_handle);
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);
-
return 0;
}
static int
-send_session_accept_callback (stream_session_t * s)
+send_app_cut_through_registration_add (u32 api_client_index,
+ u32 wrk_map_index, u64 mq_addr,
+ u64 peer_mq_addr)
{
- application_t *server = application_get (s->app_index);
- transport_proto_vft_t *tp_vft;
- vl_api_accept_session_t *mp;
+ vl_api_app_cut_through_registration_add_t *mp;
vl_api_registration_t *reg;
- transport_connection_t *tc;
- stream_session_t *listener;
- svm_msg_q_t *vpp_queue;
+ svm_msg_q_t *mq, *peer_mq;
+ int fds[2];
- reg = vl_mem_api_client_index_to_registration (server->api_client_index);
+ reg = vl_mem_api_client_index_to_registration (api_client_index);
if (!reg)
{
- clib_warning ("no registration: %u", server->api_client_index);
+ clib_warning ("no registration: %u", api_client_index);
return -1;
}
mp = vl_mem_api_alloc_as_if_client_w_reg (reg, sizeof (*mp));
- memset (mp, 0, sizeof (*mp));
+ clib_memset (mp, 0, sizeof (*mp));
+ 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 (mp->n_fds != 0)
+ session_send_fds (reg, fds, mp->n_fds);
+
+ return 0;
+}
+
+static int
+mq_try_lock_and_alloc_msg (svm_msg_q_t * app_mq, svm_msg_q_msg_t * msg)
+{
+ int rv;
+ u8 try = 0;
+ while (try < 100)
+ {
+ rv = svm_msg_q_lock_and_alloc_msg_w_ring (app_mq,
+ SESSION_MQ_CTRL_EVT_RING,
+ SVM_Q_NOWAIT, msg);
+ if (!rv)
+ return 0;
+ try++;
+ usleep (1);
+ }
+ clib_warning ("failed to alloc msg");
+ return -1;
+}
- mp->_vl_msg_id = clib_host_to_net_u16 (VL_API_ACCEPT_SESSION);
- mp->context = server->index;
- mp->server_rx_fifo = pointer_to_uword (s->server_rx_fifo);
- mp->server_tx_fifo = pointer_to_uword (s->server_tx_fifo);
+static int
+mq_send_session_accepted_cb (session_t * s)
+{
+ 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_connection_t *tc;
+ session_t *listener;
+ session_accepted_msg_t *mp;
+ session_event_t *evt;
+ application_t *app;
+ app_listener_t *al;
+
+ app = application_get (app_wrk->app_index);
+ app_mq = app_wrk->event_queue;
+ if (mq_try_lock_and_alloc_msg (app_mq, msg))
+ return -1;
+
+ evt = svm_msg_q_msg_data (app_mq, msg);
+ clib_memset (evt, 0, sizeof (*evt));
+ evt->event_type = SESSION_CTRL_EVT_ACCEPTED;
+ mp = (session_accepted_msg_t *) evt->data;
+ clib_memset (mp, 0, sizeof (*mp));
+ mp->context = app->app_index;
+ mp->server_rx_fifo = pointer_to_uword (s->rx_fifo);
+ mp->server_tx_fifo = pointer_to_uword (s->tx_fifo);
+ mp->segment_handle = session_segment_handle (s);
if (session_has_transport (s))
{
listener = listen_session_get (s->listener_index);
- mp->listener_handle = listen_session_get_handle (listener);
- if (application_is_proxy (server))
+ al = app_listener_get (app, listener->al_index);
+ mp->listener_handle = app_listener_handle (al);
+ if (application_is_proxy (app))
{
listener =
- application_first_listener (server, 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);
}
- vpp_queue = session_manager_get_vpp_event_queue (s->thread_index);
+ vpp_queue = session_main_get_vpp_event_queue (s->thread_index);
mp->vpp_event_queue_address = pointer_to_uword (vpp_queue);
mp->handle = session_handle (s);
- tp_vft = transport_protocol_get_vft (session_get_transport_proto (s));
- tc = tp_vft->get_connection (s->connection_index, s->thread_index);
+ tc = transport_get_connection (session_get_transport_proto (s),
+ s->connection_index, s->thread_index);
mp->port = tc->rmt_port;
mp->is_ip4 = tc->is_ip4;
- clib_memcpy (&mp->ip, &tc->rmt_ip, sizeof (tc->rmt_ip));
+ clib_memcpy_fast (&mp->ip, &tc->rmt_ip, sizeof (tc->rmt_ip));
}
else
{
- local_session_t *ls = (local_session_t *) s;
- local_session_t *ll;
- if (application_local_session_listener_has_transport (ls))
- {
- listener = listen_session_get (ls->listener_index);
- mp->listener_handle = listen_session_get_handle (listener);
- mp->is_ip4 = session_type_is_ip4 (listener->session_type);
- }
- else
- {
- ll = application_get_local_listen_session (server,
- ls->listener_index);
- if (ll->transport_listener_index != ~0)
- {
- listener = listen_session_get (ll->transport_listener_index);
- mp->listener_handle = listen_session_get_handle (listener);
- }
- else
- {
- mp->listener_handle = application_local_session_handle (ll);
- }
- mp->is_ip4 = session_type_is_ip4 (ll->listener_session_type);
- }
- mp->handle = application_local_session_handle (ls);
- mp->port = ls->port;
- mp->vpp_event_queue_address = ls->client_evt_q;
- mp->server_event_queue_address = ls->server_evt_q;
+ u8 main_thread = vlib_num_workers ()? 1 : 0;
+ ct_connection_t *ct;
+
+ ct = (ct_connection_t *) session_get_transport (s);
+ send_app_cut_through_registration_add (app_wrk->api_client_index,
+ app_wrk->wrk_map_index,
+ ct->server_evt_q,
+ ct->client_evt_q);
+
+ listener = listen_session_get (s->listener_index);
+ al = app_listener_get (app, listener->al_index);
+ mp->listener_handle = app_listener_handle (al);
+ mp->is_ip4 = session_type_is_ip4 (listener->session_type);
+ mp->handle = session_handle (s);
+ mp->port = ct->c_rmt_port;
+ vpp_queue = session_main_get_vpp_event_queue (main_thread);
+ mp->vpp_event_queue_address = pointer_to_uword (vpp_queue);
+ mp->client_event_queue_address = ct->client_evt_q;
+ mp->server_event_queue_address = ct->server_evt_q;
}
- vl_msg_api_send_shmem (reg->vl_input_queue, (u8 *) & mp);
+ svm_msg_q_add_and_unlock (app_mq, msg);
return 0;
}
-void
-send_local_session_disconnect_callback (u32 app_index, local_session_t * ls)
+static inline void
+mq_send_session_close_evt (app_worker_t * app_wrk, session_handle_t sh,
+ session_evt_type_t evt_type)
{
- application_t *app = application_get (app_index);
- vl_api_disconnect_session_t *mp;
- vl_api_registration_t *reg;
+ svm_msg_q_msg_t _msg, *msg = &_msg;
+ session_disconnected_msg_t *mp;
+ svm_msg_q_t *app_mq;
+ session_event_t *evt;
- reg = vl_mem_api_client_index_to_registration (app->api_client_index);
- if (!reg)
+ app_mq = app_wrk->event_queue;
+ if (mq_try_lock_and_alloc_msg (app_mq, msg))
+ return;
+ evt = svm_msg_q_msg_data (app_mq, msg);
+ clib_memset (evt, 0, sizeof (*evt));
+ evt->event_type = evt_type;
+ mp = (session_disconnected_msg_t *) evt->data;
+ mp->handle = sh;
+ mp->context = app_wrk->api_client_index;
+ svm_msg_q_add_and_unlock (app_mq, msg);
+}
+
+static inline void
+mq_notify_close_subscribers (u32 app_index, session_handle_t sh,
+ svm_fifo_t * f, session_evt_type_t evt_type)
+{
+ app_worker_t *app_wrk;
+ application_t *app;
+ int i;
+
+ app = application_get (app_index);
+ if (!app)
+ return;
+
+ for (i = 0; i < f->n_subscribers; i++)
{
- clib_warning ("no registration: %u", app->api_client_index);
- return;
+ if (!(app_wrk = application_get_worker (app, f->subscribers[i])))
+ continue;
+ mq_send_session_close_evt (app_wrk, sh, SESSION_CTRL_EVT_DISCONNECTED);
}
-
- 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);
- mp->handle = application_local_session_handle (ls);
- mp->context = app->api_client_index;
- vl_msg_api_send_shmem (reg->vl_input_queue, (u8 *) & mp);
}
static void
-send_session_disconnect_callback (stream_session_t * s)
+mq_send_session_disconnected_cb (session_t * s)
{
- application_t *app = application_get (s->app_index);
- vl_api_disconnect_session_t *mp;
- vl_api_registration_t *reg;
+ app_worker_t *app_wrk = app_worker_get (s->app_wrk_index);
+ session_handle_t sh = session_handle (s);
- reg = vl_mem_api_client_index_to_registration (app->api_client_index);
- if (!reg)
- {
- clib_warning ("no registration: %u", app->api_client_index);
- return;
- }
+ mq_send_session_close_evt (app_wrk, session_handle (s),
+ SESSION_CTRL_EVT_DISCONNECTED);
- 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);
- mp->handle = session_handle (s);
- mp->context = app->api_client_index;
- vl_msg_api_send_shmem (reg->vl_input_queue, (u8 *) & mp);
+ if (svm_fifo_n_subscribers (s->rx_fifo))
+ mq_notify_close_subscribers (app_wrk->app_index, sh, s->rx_fifo,
+ SESSION_CTRL_EVT_DISCONNECTED);
}
static void
-send_session_reset_callback (stream_session_t * s)
+mq_send_session_reset_cb (session_t * s)
{
- application_t *app = application_get (s->app_index);
- vl_api_registration_t *reg;
- vl_api_reset_session_t *mp;
+ app_worker_t *app_wrk = app_worker_get (s->app_wrk_index);
+ session_handle_t sh = session_handle (s);
- reg = vl_mem_api_client_index_to_registration (app->api_client_index);
- if (!reg)
- {
- clib_warning ("no registration: %u", app->api_client_index);
- return;
- }
+ mq_send_session_close_evt (app_wrk, sh, SESSION_CTRL_EVT_RESET);
- 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_RESET_SESSION);
- mp->handle = session_handle (s);
- vl_msg_api_send_shmem (reg->vl_input_queue, (u8 *) & mp);
+ if (svm_fifo_n_subscribers (s->rx_fifo))
+ mq_notify_close_subscribers (app_wrk->app_index, sh, s->rx_fifo,
+ SESSION_CTRL_EVT_RESET);
}
-int
-send_session_connected_callback (u32 app_index, u32 api_context,
- stream_session_t * s, u8 is_fail)
+static int
+mq_send_session_connected_cb (u32 app_wrk_index, u32 api_context,
+ session_t * s, u8 is_fail)
{
- vl_api_connect_session_reply_t *mp;
+ 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;
- vl_api_registration_t *reg;
- svm_msg_q_t *vpp_queue;
- application_t *app;
+ app_worker_t *app_wrk;
+ session_event_t *evt;
- app = application_get (app_index);
- reg = vl_mem_api_client_index_to_registration (app->api_client_index);
- if (!reg)
+ app_wrk = app_worker_get (app_wrk_index);
+ app_mq = app_wrk->event_queue;
+ if (!app_mq)
{
- clib_warning ("no registration: %u", app->api_client_index);
+ clib_warning ("app %u with api index: %u not attached",
+ app_wrk->app_index, app_wrk->api_client_index);
return -1;
}
- mp = vl_mem_api_alloc_as_if_client_w_reg (reg, sizeof (*mp));
- mp->_vl_msg_id = clib_host_to_net_u16 (VL_API_CONNECT_SESSION_REPLY);
+ if (mq_try_lock_and_alloc_msg (app_mq, msg))
+ return -1;
+
+ evt = svm_msg_q_msg_data (app_mq, msg);
+ clib_memset (evt, 0, sizeof (*evt));
+ evt->event_type = SESSION_CTRL_EVT_CONNECTED;
+ mp = (session_connected_msg_t *) evt->data;
+ clib_memset (mp, 0, sizeof (*mp));
mp->context = api_context;
if (is_fail)
goto done;
}
- vpp_queue = session_manager_get_vpp_event_queue (s->thread_index);
+ vpp_mq = session_main_get_vpp_event_queue (s->thread_index);
mp->handle = session_handle (s);
- mp->vpp_event_queue_address = pointer_to_uword (vpp_queue);
- clib_memcpy (mp->lcl_ip, &tc->lcl_ip, sizeof (tc->lcl_ip));
+ mp->vpp_event_queue_address = pointer_to_uword (vpp_mq);
+ clib_memcpy_fast (mp->lcl_ip, &tc->lcl_ip, sizeof (tc->lcl_ip));
mp->is_ip4 = tc->is_ip4;
mp->lcl_port = tc->lcl_port;
- mp->server_rx_fifo = pointer_to_uword (s->server_rx_fifo);
- mp->server_tx_fifo = pointer_to_uword (s->server_tx_fifo);
+ mp->server_rx_fifo = pointer_to_uword (s->rx_fifo);
+ mp->server_tx_fifo = pointer_to_uword (s->tx_fifo);
+ mp->segment_handle = session_segment_handle (s);
}
else
{
- local_session_t *ls = (local_session_t *) s;
- mp->handle = application_local_session_handle (ls);
- mp->lcl_port = ls->port;
- mp->vpp_event_queue_address = ls->server_evt_q;
- mp->client_event_queue_address = ls->client_evt_q;
- mp->server_rx_fifo = pointer_to_uword (s->server_tx_fifo);
- mp->server_tx_fifo = pointer_to_uword (s->server_rx_fifo);
+ u8 main_thread = vlib_num_workers ()? 1 : 0;
+ ct_connection_t *cct;
+ session_t *ss;
+
+ cct = (ct_connection_t *) session_get_transport (s);
+ send_app_cut_through_registration_add (app_wrk->api_client_index,
+ app_wrk->wrk_map_index,
+ cct->client_evt_q,
+ cct->server_evt_q);
+
+ mp->handle = session_handle (s);
+ mp->lcl_port = cct->c_lcl_port;
+ vpp_mq = session_main_get_vpp_event_queue (main_thread);
+ mp->vpp_event_queue_address = pointer_to_uword (vpp_mq);
+ mp->client_event_queue_address = cct->client_evt_q;
+ mp->server_event_queue_address = cct->server_evt_q;
+ ss = ct_session_get_peer (s);
+ mp->server_rx_fifo = pointer_to_uword (ss->tx_fifo);
+ mp->server_tx_fifo = pointer_to_uword (ss->rx_fifo);
+ mp->segment_handle = session_segment_handle (ss);
}
done:
mp->retval = is_fail ?
clib_host_to_net_u32 (VNET_API_ERROR_SESSION_CONNECT) : 0;
- vl_msg_api_send_shmem (reg->vl_input_queue, (u8 *) & mp);
+
+ svm_msg_q_add_and_unlock (app_mq, msg);
+ 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;
+ session_bound_msg_t *mp;
+ app_worker_t *app_wrk;
+ session_event_t *evt;
+ app_listener_t *al;
+ session_t *ls = 0;
+
+ app_wrk = app_worker_get (app_wrk_index);
+ app_mq = app_wrk->event_queue;
+ if (!app_mq)
+ {
+ clib_warning ("app %u with api index: %u not attached",
+ app_wrk->app_index, app_wrk->api_client_index);
+ return -1;
+ }
+
+ if (mq_try_lock_and_alloc_msg (app_mq, msg))
+ return -1;
+
+ evt = svm_msg_q_msg_data (app_mq, msg);
+ clib_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;
+ al = app_listener_get_w_handle (handle);
+ if (al->session_index != SESSION_INVALID_INDEX)
+ ls = app_listener_get_session (al);
+ else
+ ls = app_listener_get_local_session (al);
+ tc = listen_session_get_transport (ls);
+ mp->lcl_port = tc->lcl_port;
+ mp->lcl_is_ip4 = tc->is_ip4;
+ clib_memcpy_fast (mp->lcl_ip, &tc->lcl_ip, sizeof (tc->lcl_ip));
+
+ vpp_evt_q = session_main_get_vpp_event_queue (0);
+ mp->vpp_evt_q = pointer_to_uword (vpp_evt_q);
+
+ if (session_transport_service_type (ls) == TRANSPORT_SERVICE_CL)
+ {
+ mp->rx_fifo = pointer_to_uword (ls->rx_fifo);
+ mp->tx_fifo = pointer_to_uword (ls->tx_fifo);
+ }
+
+done:
+ mp->retval = rv;
+ svm_msg_q_add_and_unlock (app_mq, msg);
return 0;
}
-static session_cb_vft_t session_cb_vft = {
- .session_accept_callback = send_session_accept_callback,
- .session_disconnect_callback = send_session_disconnect_callback,
- .session_connected_callback = send_session_connected_callback,
- .session_reset_callback = send_session_reset_callback,
+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,
+ .session_connected_callback = mq_send_session_connected_cb,
+ .session_reset_callback = mq_send_session_reset_cb,
.add_segment_callback = send_add_segment_callback,
.del_segment_callback = send_del_segment_callback,
};
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)
return;
- if (session_manager_is_enabled () == 0)
+ if (session_main_is_enabled () == 0)
{
rv = VNET_API_ERROR_FEATURE_DISABLED;
goto done;
sizeof (mp->options),
"Out of options, fix api message definition");
- memset (a, 0, sizeof (*a));
+ clib_memset (a, 0, sizeof (*a));
a->api_client_index = mp->client_index;
a->options = mp->options;
- a->session_cb_vft = &session_cb_vft;
-
+ a->session_cb_vft = &session_mq_cb_vft;
if (mp->namespace_id_len > 64)
{
rv = VNET_API_ERROR_INVALID_VALUE;
if (mp->namespace_id_len)
{
vec_validate (a->namespace_id, mp->namespace_id_len - 1);
- clib_memcpy (a->namespace_id, mp->namespace_id, mp->namespace_id_len);
+ clib_memcpy_fast (a->namespace_id, mp->namespace_id,
+ mp->namespace_id_len);
}
- if ((error = vnet_application_attach (a)))
+ if ((rv = vnet_application_attach (a)))
{
- rv = clib_error_get_code (error);
- clib_error_report (error);
+ clib_warning ("attach returned: %d", rv);
+ vec_free (a->namespace_id);
+ goto done;
}
vec_free (a->namespace_id);
+ /* Send event queues segment */
+ if ((evt_q_segment = session_main_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* */
if (!rv)
{
segp = a->segment;
+ rmp->app_index = clib_host_to_net_u32 (a->app_index);
rmp->segment_name_length = 0;
rmp->segment_size = segp->ssvm_size;
if (vec_len (segp->name))
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;
+ rmp->segment_handle = clib_host_to_net_u64 (a->segment_handle);
}
}));
/* *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
vnet_app_detach_args_t _a, *a = &_a;
application_t *app;
- if (session_manager_is_enabled () == 0)
+ if (session_main_is_enabled () == 0)
{
rv = VNET_API_ERROR_FEATURE_DISABLED;
goto done;
app = application_lookup (mp->client_index);
if (app)
{
- a->app_index = app->index;
+ a->app_index = app->app_index;
+ a->api_client_index = mp->client_index;
rv = vnet_application_detach (a);
}
static void
vl_api_bind_uri_t_handler (vl_api_bind_uri_t * mp)
{
- transport_connection_t *tc = 0;
- vnet_bind_args_t _a, *a = &_a;
vl_api_bind_uri_reply_t *rmp;
- stream_session_t *s;
+ vnet_listen_args_t _a, *a = &_a;
application_t *app = 0;
- svm_msg_q_t *vpp_evt_q;
+ app_worker_t *app_wrk;
int rv;
- if (session_manager_is_enabled () == 0)
+ if (session_main_is_enabled () == 0)
{
rv = VNET_API_ERROR_FEATURE_DISABLED;
goto done;
app = application_lookup (mp->client_index);
if (app)
{
- memset (a, 0, sizeof (*a));
+ clib_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
done:
- /* *INDENT-OFF* */
- REPLY_MACRO2 (VL_API_BIND_URI_REPLY, ({
- if (!rv)
- {
- rmp->handle = a->handle;
- if (app && application_has_global_scope (app))
- {
- s = listen_session_get_from_handle (a->handle);
- tc = listen_session_get_transport (s);
- rmp->lcl_is_ip4 = tc->is_ip4;
- rmp->lcl_port = tc->lcl_port;
- clib_memcpy (rmp->lcl_ip, &tc->lcl_ip, sizeof(tc->lcl_ip));
- if (session_transport_service_type (s) == TRANSPORT_SERVICE_CL)
- {
- rmp->rx_fifo = pointer_to_uword (s->server_rx_fifo);
- rmp->tx_fifo = pointer_to_uword (s->server_tx_fifo);
- vpp_evt_q = session_manager_get_vpp_event_queue (0);
- rmp->vpp_evt_q = pointer_to_uword (vpp_evt_q);
- }
- }
- }
- }));
- /* *INDENT-ON* */
+ REPLY_MACRO (VL_API_BIND_URI_REPLY);
+
+ if (app)
+ {
+ app_wrk = application_get_worker (app, 0);
+ mq_send_session_bound_cb (app_wrk->wrk_index, mp->context, a->handle,
+ rv);
+ }
}
static void
{
vl_api_unbind_uri_reply_t *rmp;
application_t *app;
- vnet_unbind_args_t _a, *a = &_a;
+ vnet_unlisten_args_t _a, *a = &_a;
int rv;
- if (session_manager_is_enabled () == 0)
+ if (session_main_is_enabled () == 0)
{
rv = VNET_API_ERROR_FEATURE_DISABLED;
goto done;
if (app)
{
a->uri = (char *) mp->uri;
- a->app_index = app->index;
+ a->app_index = app->app_index;
rv = vnet_unbind_uri (a);
}
else
static void
vl_api_connect_uri_t_handler (vl_api_connect_uri_t * mp)
{
- vl_api_connect_session_reply_t *rmp;
+ vl_api_connect_uri_reply_t *rmp;
vnet_connect_args_t _a, *a = &_a;
application_t *app;
- clib_error_t *error = 0;
int rv = 0;
- if (session_manager_is_enabled () == 0)
+ if (session_main_is_enabled () == 0)
{
rv = VNET_API_ERROR_FEATURE_DISABLED;
goto done;
app = application_lookup (mp->client_index);
if (app)
{
+ clib_memset (a, 0, sizeof (*a));
a->uri = (char *) mp->uri;
a->api_context = mp->context;
- a->app_index = app->index;
- if ((error = vnet_connect_uri (a)))
- {
- rv = clib_error_get_code (error);
- clib_error_report (error);
- }
+ a->app_index = app->app_index;
+ if ((rv = vnet_connect_uri (a)))
+ clib_warning ("connect_uri returned: %d", rv);
}
else
{
return;
done:
- /* *INDENT-OFF* */
- REPLY_MACRO (VL_API_CONNECT_SESSION_REPLY);
- /* *INDENT-ON* */
+ REPLY_MACRO (VL_API_CONNECT_URI_REPLY);
}
static void
application_t *app;
int rv = 0;
- if (session_manager_is_enabled () == 0)
+ if (session_main_is_enabled () == 0)
{
rv = VNET_API_ERROR_FEATURE_DISABLED;
goto done;
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)
-{
- application_t *app;
- stream_session_t *s;
- u32 index, thread_index;
-
- app = application_lookup (mp->client_index);
- 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)
- {
- clib_warning ("Invalid session!");
- return;
- }
-
- /* Client objected to resetting the session, log and continue */
- if (mp->retval)
- {
- clib_warning ("client retval %d", mp->retval);
- return;
- }
-
- /* This comes as a response to a reset, transport only waiting for
- * confirmation to remove connection state, no need to disconnect */
- stream_session_cleanup (s);
-}
-
-static void
-vl_api_accept_session_reply_t_handler (vl_api_accept_session_reply_t * mp)
-{
- vnet_disconnect_args_t _a = { 0 }, *a = &_a;
- local_session_t *ls;
- stream_session_t *s;
-
- /* Server isn't interested, kill the session */
- if (mp->retval)
- {
- a->app_index = mp->context;
- a->handle = mp->handle;
- vnet_disconnect_session (a);
- return;
- }
-
- if (session_handle_is_local (mp->handle))
- {
- ls = application_get_local_session_from_handle (mp->handle);
- if (!ls || ls->app_index != mp->context)
- {
- clib_warning ("server %u doesn't own local handle %llu",
- mp->context, mp->handle);
- return;
- }
- if (application_local_session_connect_notify (ls))
- return;
- ls->session_state = SESSION_STATE_READY;
- }
- else
- {
- s = session_get_from_handle_if_valid (mp->handle);
- if (!s)
- {
- clib_warning ("session doesn't exist");
- return;
- }
- if (s->app_index != mp->context)
- {
- clib_warning ("app doesn't own session");
- return;
- }
- s->session_state = SESSION_STATE_READY;
- }
-}
-
static void
vl_api_map_another_segment_reply_t_handler (vl_api_map_another_segment_reply_t
* mp)
static void
vl_api_bind_sock_t_handler (vl_api_bind_sock_t * mp)
{
+ vnet_listen_args_t _a, *a = &_a;
vl_api_bind_sock_reply_t *rmp;
- vnet_bind_args_t _a, *a = &_a;
- int rv = 0;
- clib_error_t *error;
application_t *app = 0;
- stream_session_t *s;
- transport_connection_t *tc = 0;
+ app_worker_t *app_wrk;
ip46_address_t *ip46;
- svm_msg_q_t *vpp_evt_q;
+ int rv = 0;
- if (session_manager_is_enabled () == 0)
+ if (session_main_is_enabled () == 0)
{
rv = VNET_API_ERROR_FEATURE_DISABLED;
goto done;
}
ip46 = (ip46_address_t *) mp->ip;
- memset (a, 0, sizeof (*a));
+ clib_memset (a, 0, sizeof (*a));
a->sep.is_ip4 = mp->is_ip4;
a->sep.ip = *ip46;
a->sep.port = mp->port;
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)))
- {
- rv = clib_error_get_code (error);
- clib_error_report (error);
- }
+ if ((rv = vnet_listen (a)))
+ clib_warning ("listen returned: %d", rv);
done:
- /* *INDENT-OFF* */
- REPLY_MACRO2 (VL_API_BIND_SOCK_REPLY,({
- if (!rv)
- {
- rmp->handle = a->handle;
- rmp->lcl_port = mp->port;
- rmp->lcl_is_ip4 = mp->is_ip4;
- if (app && application_has_global_scope (app))
- {
- s = listen_session_get_from_handle (a->handle);
- tc = listen_session_get_transport (s);
- clib_memcpy (rmp->lcl_ip, &tc->lcl_ip, sizeof (tc->lcl_ip));
- if (session_transport_service_type (s) == TRANSPORT_SERVICE_CL)
- {
- rmp->rx_fifo = pointer_to_uword (s->server_rx_fifo);
- rmp->tx_fifo = pointer_to_uword (s->server_tx_fifo);
- vpp_evt_q = session_manager_get_vpp_event_queue (0);
- rmp->vpp_evt_q = pointer_to_uword (vpp_evt_q);
- }
- }
- }
- }));
- /* *INDENT-ON* */
+ /* Actual reply sent only over mq */
+ REPLY_MACRO (VL_API_BIND_SOCK_REPLY);
+
+ if (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
vl_api_unbind_sock_t_handler (vl_api_unbind_sock_t * mp)
{
vl_api_unbind_sock_reply_t *rmp;
- vnet_unbind_args_t _a, *a = &_a;
- application_t *app;
- clib_error_t *error;
+ vnet_unlisten_args_t _a, *a = &_a;
+ app_worker_t *app_wrk;
+ application_t *app = 0;
int rv = 0;
- if (session_manager_is_enabled () == 0)
+ if (session_main_is_enabled () == 0)
{
rv = VNET_API_ERROR_FEATURE_DISABLED;
goto done;
app = application_lookup (mp->client_index);
if (app)
{
- a->app_index = app->index;
+ a->app_index = app->app_index;
a->handle = mp->handle;
- if ((error = vnet_unbind (a)))
- {
- rv = clib_error_get_code (error);
- clib_error_report (error);
- }
+ a->wrk_map_index = mp->wrk_index;
+ if ((rv = vnet_unlisten (a)))
+ clib_warning ("unlisten returned: %d", rv);
}
done:
REPLY_MACRO (VL_API_UNBIND_SOCK_REPLY);
+
+ /*
+ * Send reply over msg queue
+ */
+ svm_msg_q_msg_t _msg, *msg = &_msg;
+ session_unlisten_reply_msg_t *ump;
+ svm_msg_q_t *app_mq;
+ session_event_t *evt;
+
+ if (!app)
+ return;
+
+ app_wrk = application_get_worker (app, a->wrk_map_index);
+ if (!app_wrk)
+ return;
+
+ app_mq = app_wrk->event_queue;
+ if (mq_try_lock_and_alloc_msg (app_mq, msg))
+ return;
+
+ evt = svm_msg_q_msg_data (app_mq, msg);
+ clib_memset (evt, 0, sizeof (*evt));
+ evt->event_type = SESSION_CTRL_EVT_UNLISTEN_REPLY;
+ ump = (session_unlisten_reply_msg_t *) evt->data;
+ ump->context = mp->context;
+ ump->handle = mp->handle;
+ ump->retval = rv;
+ svm_msg_q_add_and_unlock (app_mq, msg);
}
static void
vl_api_connect_sock_t_handler (vl_api_connect_sock_t * mp)
{
- vl_api_connect_session_reply_t *rmp;
+ vl_api_connect_sock_reply_t *rmp;
vnet_connect_args_t _a, *a = &_a;
- application_t *app;
- clib_error_t *error = 0;
+ application_t *app = 0;
int rv = 0;
- if (session_manager_is_enabled () == 0)
+ if (session_main_is_enabled () == 0)
{
rv = VNET_API_ERROR_FEATURE_DISABLED;
goto done;
svm_queue_t *client_q;
ip46_address_t *ip46 = (ip46_address_t *) mp->ip;
- memset (a, 0, sizeof (*a));
+ clib_memset (a, 0, sizeof (*a));
client_q = vl_api_client_index_to_input_queue (mp->client_index);
mp->client_queue_address = pointer_to_uword (client_q);
a->sep.is_ip4 = mp->is_ip4;
a->sep.ip = *ip46;
a->sep.port = mp->port;
a->sep.transport_proto = mp->proto;
- a->sep.fib_index = mp->vrf;
- a->sep.sw_if_index = ENDPOINT_INVALID_INDEX;
+ a->sep.peer.fib_index = mp->vrf;
+ a->sep.peer.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_fast (a->sep_ext.hostname, mp->hostname,
+ mp->hostname_len);
}
a->api_context = mp->context;
- a->app_index = app->index;
- if ((error = vnet_connect (a)))
- {
- rv = clib_error_get_code (error);
- clib_error_report (error);
- }
- vec_free (a->sep.hostname);
+ a->app_index = app->app_index;
+ a->wrk_map_index = mp->wrk_index;
+ if ((rv = vnet_connect (a)))
+ clib_warning ("connect returned: %u", rv);
+ vec_free (a->sep_ext.hostname);
}
else
{
/* Got some error, relay it */
done:
- REPLY_MACRO (VL_API_CONNECT_SESSION_REPLY);
+ REPLY_MACRO (VL_API_CONNECT_SOCK_REPLY);
+
+ if (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;
+ application_t *app;
+ u8 fd_flags = 0;
+
+ if (!session_main_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_get_if_valid (clib_net_to_host_u32 (mp->app_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_map_index = clib_net_to_host_u32 (mp->wrk_index),
+ .api_client_index = mp->client_index,
+ .is_add = mp->is_add
+ };
+ rv = vnet_app_worker_add_del (&args);
+ if (rv)
+ {
+ clib_warning ("app worker add/del returned: %d", rv);
+ 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_map_index);
+ rmp->segment_handle = clib_host_to_net_u64 (args.segment_handle);
+ 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
vl_api_app_namespace_add_del_t_handler (vl_api_app_namespace_add_del_t * mp)
{
vl_api_app_namespace_add_del_reply_t *rmp;
- clib_error_t *error = 0;
u32 appns_index = 0;
u8 *ns_id = 0;
int rv = 0;
- if (!session_manager_is_enabled ())
+ if (!session_main_is_enabled ())
{
rv = VNET_API_ERROR_FEATURE_DISABLED;
goto done;
}
vec_validate (ns_id, mp->namespace_id_len - 1);
- clib_memcpy (ns_id, mp->namespace_id, mp->namespace_id_len);
+ clib_memcpy_fast (ns_id, mp->namespace_id, mp->namespace_id_len);
vnet_app_namespace_add_del_args_t args = {
.ns_id = ns_id,
.secret = clib_net_to_host_u64 (mp->secret),
.ip6_fib_id = clib_net_to_host_u32 (mp->ip6_fib_id),
.is_add = 1
};
- error = vnet_app_namespace_add_del (&args);
- if (error)
- {
- rv = clib_error_get_code (error);
- clib_error_report (error);
- }
- else
+ rv = vnet_app_namespace_add_del (&args);
+ if (!rv)
{
appns_index = app_namespace_index_from_id (ns_id);
if (appns_index == APP_NAMESPACE_INVALID_INDEX)
vl_api_session_rule_add_del_reply_t *rmp;
session_rule_add_del_args_t args;
session_rule_table_add_del_args_t *table_args = &args.table_args;
- clib_error_t *error;
u8 fib_proto;
int rv = 0;
- memset (&args, 0, sizeof (args));
+ clib_memset (&args, 0, sizeof (args));
fib_proto = mp->is_ip4 ? FIB_PROTOCOL_IP4 : FIB_PROTOCOL_IP6;
table_args->lcl.fp_len = mp->lcl_plen;
args.scope = mp->scope;
args.transport_proto = mp->transport_proto;
- memset (&table_args->lcl.fp_addr, 0, sizeof (table_args->lcl.fp_addr));
- memset (&table_args->rmt.fp_addr, 0, sizeof (table_args->rmt.fp_addr));
+ clib_memset (&table_args->lcl.fp_addr, 0, sizeof (table_args->lcl.fp_addr));
+ clib_memset (&table_args->rmt.fp_addr, 0, sizeof (table_args->rmt.fp_addr));
ip_set (&table_args->lcl.fp_addr, mp->lcl_ip, mp->is_ip4);
ip_set (&table_args->rmt.fp_addr, mp->rmt_ip, mp->is_ip4);
- error = vnet_session_rule_add_del (&args);
- if (error)
- {
- rv = clib_error_get_code (error);
- clib_error_report (error);
- }
+ rv = vnet_session_rule_add_del (&args);
+ if (rv)
+ clib_warning ("rule add del returned: %d", rv);
vec_free (table_args->tag);
REPLY_MACRO (VL_API_SESSION_RULE_ADD_DEL_REPLY);
}
(session_mask_or_match_4_t *) & rule->mask;
rmp = vl_msg_api_alloc (sizeof (*rmp));
- memset (rmp, 0, sizeof (*rmp));
+ clib_memset (rmp, 0, sizeof (*rmp));
rmp->_vl_msg_id = ntohs (VL_API_SESSION_RULES_DETAILS);
rmp->context = context;
rmp->is_ip4 = 1;
- clib_memcpy (rmp->lcl_ip, &match->lcl_ip, sizeof (match->lcl_ip));
- clib_memcpy (rmp->rmt_ip, &match->rmt_ip, sizeof (match->rmt_ip));
+ clib_memcpy_fast (rmp->lcl_ip, &match->lcl_ip, sizeof (match->lcl_ip));
+ clib_memcpy_fast (rmp->rmt_ip, &match->rmt_ip, sizeof (match->rmt_ip));
rmp->lcl_plen = ip4_mask_to_preflen (&mask->lcl_ip);
rmp->rmt_plen = ip4_mask_to_preflen (&mask->rmt_ip);
rmp->lcl_port = match->lcl_port;
rmp->appns_index = clib_host_to_net_u32 (appns_index);
if (tag)
{
- clib_memcpy (rmp->tag, tag, vec_len (tag));
+ clib_memcpy_fast (rmp->tag, tag, vec_len (tag));
rmp->tag[vec_len (tag)] = 0;
}
(session_mask_or_match_6_t *) & rule->mask;
rmp = vl_msg_api_alloc (sizeof (*rmp));
- memset (rmp, 0, sizeof (*rmp));
+ clib_memset (rmp, 0, sizeof (*rmp));
rmp->_vl_msg_id = ntohs (VL_API_SESSION_RULES_DETAILS);
rmp->context = context;
rmp->is_ip4 = 0;
- clib_memcpy (rmp->lcl_ip, &match->lcl_ip, sizeof (match->lcl_ip));
- clib_memcpy (rmp->rmt_ip, &match->rmt_ip, sizeof (match->rmt_ip));
+ clib_memcpy_fast (rmp->lcl_ip, &match->lcl_ip, sizeof (match->lcl_ip));
+ clib_memcpy_fast (rmp->rmt_ip, &match->rmt_ip, sizeof (match->rmt_ip));
rmp->lcl_plen = ip6_mask_to_preflen (&mask->lcl_ip);
rmp->rmt_plen = ip6_mask_to_preflen (&mask->rmt_ip);
rmp->lcl_port = match->lcl_port;
rmp->appns_index = clib_host_to_net_u32 (appns_index);
if (tag)
{
- clib_memcpy (rmp->tag, tag, vec_len (tag));
+ clib_memcpy_fast (rmp->tag, tag, vec_len (tag));
rmp->tag[vec_len (tag)] = 0;
}
application_t *app;
u32 cert_len;
int rv = 0;
- if (!session_manager_is_enabled ())
+ if (!session_main_is_enabled ())
{
rv = VNET_API_ERROR_FEATURE_DISABLED;
goto done;
rv = VNET_API_ERROR_APPLICATION_NOT_ATTACHED;
goto done;
}
- memset (a, 0, sizeof (*a));
- a->app_index = app->index;
+ clib_memset (a, 0, sizeof (*a));
+ a->app_index = app->app_index;
cert_len = clib_net_to_host_u16 (mp->cert_len);
if (cert_len > 10000)
{
goto done;
}
vec_validate (a->cert, cert_len);
- clib_memcpy (a->cert, mp->cert, cert_len);
+ clib_memcpy_fast (a->cert, mp->cert, cert_len);
if ((error = vnet_app_add_tls_cert (a)))
{
rv = clib_error_get_code (error);
application_t *app;
u32 key_len;
int rv = 0;
- if (!session_manager_is_enabled ())
+ if (!session_main_is_enabled ())
{
rv = VNET_API_ERROR_FEATURE_DISABLED;
goto done;
rv = VNET_API_ERROR_APPLICATION_NOT_ATTACHED;
goto done;
}
- memset (a, 0, sizeof (*a));
- a->app_index = app->index;
+ clib_memset (a, 0, sizeof (*a));
+ a->app_index = app->app_index;
key_len = clib_net_to_host_u16 (mp->key_len);
if (key_len > 10000)
{
goto done;
}
vec_validate (a->key, key_len);
- clib_memcpy (a->key, mp->key, key_len);
+ clib_memcpy_fast (a->key, mp->key, key_len);
if ((error = vnet_app_add_tls_key (a)))
{
rv = clib_error_get_code (error);
vnet_app_detach_args_t _a, *a = &_a;
if (app)
{
- a->app_index = app->index;
+ a->app_index = app->app_index;
+ a->api_client_index = client_index;
vnet_application_detach (a);
}
return 0;
Code Review / vpp.git / blobdiff