#include <vnet/session/session_table.h>
#include <vnet/session/session.h>
+#include <vnet/ip/ip_types_api.h>
+
#include <vnet/vnet_msg_enum.h>
#define vl_typedefs /* define message structures */
_(APP_DEL_CERT_KEY_PAIR, app_del_cert_key_pair) \
_(APP_WORKER_ADD_DEL, app_worker_add_del) \
+static transport_proto_t
+api_session_transport_proto_decode (const vl_api_transport_proto_t * api_tp)
+{
+ switch (*api_tp)
+ {
+ case TRANSPORT_PROTO_API_TCP:
+ return TRANSPORT_PROTO_TCP;
+ case TRANSPORT_PROTO_API_UDP:
+ return TRANSPORT_PROTO_UDP;
+ case TRANSPORT_PROTO_API_SCTP:
+ return TRANSPORT_PROTO_SCTP;
+ case TRANSPORT_PROTO_API_TLS:
+ return TRANSPORT_PROTO_TLS;
+ case TRANSPORT_PROTO_API_UDPC:
+ return TRANSPORT_PROTO_UDPC;
+ case TRANSPORT_PROTO_API_QUIC:
+ return TRANSPORT_PROTO_QUIC;
+ default:
+ return TRANSPORT_PROTO_NONE;
+ }
+}
+
+static vl_api_transport_proto_t
+api_session_transport_proto_encode (const transport_proto_t tp)
+{
+ switch (tp)
+ {
+ case TRANSPORT_PROTO_TCP:
+ return TRANSPORT_PROTO_API_TCP;
+ case TRANSPORT_PROTO_UDP:
+ return TRANSPORT_PROTO_API_UDP;
+ case TRANSPORT_PROTO_SCTP:
+ return TRANSPORT_PROTO_API_SCTP;
+ case TRANSPORT_PROTO_TLS:
+ return TRANSPORT_PROTO_API_TLS;
+ case TRANSPORT_PROTO_UDPC:
+ return TRANSPORT_PROTO_API_UDPC;
+ case TRANSPORT_PROTO_QUIC:
+ return TRANSPORT_PROTO_API_QUIC;
+ default:
+ return TRANSPORT_PROTO_API_NONE;
+ }
+}
+
static int
session_send_fds (vl_api_registration_t * reg, int fds[], int n_fds)
{
return 0;
}
+/* ### WILL BE DEPRECATED POST 20.01 ### */
static int
send_add_segment_callback (u32 api_client_index, u64 segment_handle)
{
return 0;
}
+/* ### WILL BE DEPRECATED POST 20.01 ### */
static int
send_del_segment_callback (u32 api_client_index, u64 segment_handle)
{
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);
+ mp->flags = s->flags;
if (session_has_transport (s))
{
static void
mq_send_session_migrate_cb (session_t * s, session_handle_t new_sh)
{
- clib_warning ("not supported");
+ svm_msg_q_msg_t _msg, *msg = &_msg;
+ session_migrated_msg_t *mp;
+ svm_msg_q_t *vpp_evt_q;
+ app_worker_t *app_wrk;
+ session_event_t *evt;
+ svm_msg_q_t *app_mq;
+
+ app_wrk = app_worker_get (s->app_wrk_index);
+ 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_MIGRATED;
+ mp = (session_migrated_msg_t *) evt->data;
+ mp->handle = session_handle (s);
+ mp->new_handle = new_sh;
+ mp->vpp_thread_index = session_thread_from_handle (new_sh);
+ vpp_evt_q = session_main_get_vpp_event_queue (mp->vpp_thread_index);
+ mp->vpp_evt_q = pointer_to_uword (vpp_evt_q);
+ svm_msg_q_add_and_unlock (app_mq, msg);
}
-static session_cb_vft_t session_mq_cb_vft = {
+static int
+mq_send_add_segment_cb (u32 app_wrk_index, u64 segment_handle)
+{
+ int fds[SESSION_N_FD_TYPE], n_fds = 0;
+ svm_msg_q_msg_t _msg, *msg = &_msg;
+ session_app_add_segment_msg_t *mp;
+ vl_api_registration_t *reg;
+ app_worker_t *app_wrk;
+ session_event_t *evt;
+ svm_msg_q_t *app_mq;
+ fifo_segment_t *fs;
+ ssvm_private_t *sp;
+ u8 fd_flags = 0;
+
+ app_wrk = app_worker_get (app_wrk_index);
+
+ reg = vl_mem_api_client_index_to_registration (app_wrk->api_client_index);
+ if (!reg)
+ {
+ clib_warning ("no api registration for client: %u",
+ app_wrk->api_client_index);
+ return -1;
+ }
+
+ fs = segment_manager_get_segment_w_handle (segment_handle);
+ sp = &fs->ssvm;
+ if (ssvm_type (sp) == SSVM_SEGMENT_MEMFD)
+ {
+ 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;
+ }
+
+ app_mq = app_wrk->event_queue;
+ if (mq_try_lock_and_alloc_msg (app_mq, msg))
+ return -1;
+
+ if (n_fds)
+ session_send_fds (reg, fds, n_fds);
+
+ evt = svm_msg_q_msg_data (app_mq, msg);
+ clib_memset (evt, 0, sizeof (*evt));
+ evt->event_type = SESSION_CTRL_EVT_APP_ADD_SEGMENT;
+ mp = (session_app_add_segment_msg_t *) evt->data;
+ clib_memset (mp, 0, sizeof (*mp));
+ mp->segment_size = sp->ssvm_size;
+ mp->fd_flags = fd_flags;
+ mp->segment_handle = segment_handle;
+ strncpy ((char *) mp->segment_name, (char *) sp->name,
+ sizeof (mp->segment_name) - 1);
+
+ svm_msg_q_add_and_unlock (app_mq, msg);
+
+ return 0;
+}
+
+static int
+mq_send_del_segment_cb (u32 app_wrk_index, u64 segment_handle)
+{
+ svm_msg_q_msg_t _msg, *msg = &_msg;
+ session_app_del_segment_msg_t *mp;
+ vl_api_registration_t *reg;
+ app_worker_t *app_wrk;
+ session_event_t *evt;
+ svm_msg_q_t *app_mq;
+
+ app_wrk = app_worker_get (app_wrk_index);
+ reg = vl_mem_api_client_index_to_registration (app_wrk->api_client_index);
+ if (!reg)
+ {
+ clib_warning ("no registration: %u", app_wrk->api_client_index);
+ return -1;
+ }
+
+ 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_APP_DEL_SEGMENT;
+ mp = (session_app_del_segment_msg_t *) evt->data;
+ clib_memset (mp, 0, sizeof (*mp));
+ mp->segment_handle = segment_handle;
+ svm_msg_q_add_and_unlock (app_mq, msg);
+
+ return 0;
+}
+
+static void
+mq_send_session_cleanup_cb (session_t * s, session_cleanup_ntf_t ntf)
+{
+ svm_msg_q_msg_t _msg, *msg = &_msg;
+ session_cleanup_msg_t *mp;
+ svm_msg_q_t *app_mq;
+ session_event_t *evt;
+ app_worker_t *app_wrk;
+
+ /* Only propagate session cleanup notification */
+ if (ntf == SESSION_CLEANUP_TRANSPORT)
+ return;
+
+ app_wrk = app_worker_get_if_valid (s->app_wrk_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_CLEANUP;
+ mp = (session_cleanup_msg_t *) evt->data;
+ mp->handle = session_handle (s);
+ svm_msg_q_add_and_unlock (app_mq, msg);
+}
+
+/* ### WILL BE DEPRECATED POST 20.01 ### */
+static session_cb_vft_t session_mq_cb_vft_old = {
.session_accept_callback = mq_send_session_accepted_cb,
.session_disconnect_callback = mq_send_session_disconnected_cb,
.session_connected_callback = mq_send_session_connected_cb,
.del_segment_callback = send_del_segment_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,
+ .session_migrate_callback = mq_send_session_migrate_cb,
+ .session_cleanup_callback = mq_send_session_cleanup_cb,
+ .add_segment_callback = mq_send_add_segment_cb,
+ .del_segment_callback = mq_send_del_segment_cb,
+};
+
static void
vl_api_session_enable_disable_t_handler (vl_api_session_enable_disable_t * mp)
{
clib_memset (a, 0, sizeof (*a));
a->api_client_index = mp->client_index;
a->options = mp->options;
- a->session_cb_vft = &session_mq_cb_vft;
- if (mp->namespace_id_len > 64)
- {
- rv = VNET_API_ERROR_INVALID_VALUE;
- goto done;
- }
-
- if (mp->namespace_id_len)
- {
- vec_validate (a->namespace_id, mp->namespace_id_len - 1);
- clib_memcpy_fast (a->namespace_id, mp->namespace_id,
- mp->namespace_id_len);
- }
+ a->session_cb_vft = &session_mq_cb_vft_old;
+ a->namespace_id =
+ (u8 *) vl_api_from_api_to_new_c_string (&mp->namespace_id);
if ((rv = vnet_application_attach (a)))
{
{
segp = a->segment;
rmp->app_index = clib_host_to_net_u32 (a->app_index);
- rmp->segment_name_length = 0;
+ vl_api_vec_to_api_string (segp->name, &rmp->segment_name);
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 = pointer_to_uword (a->app_evt_q);
rmp->n_fds = n_fds;
rmp->fd_flags = fd_flags;
a->api_client_index = mp->client_index;
a->options = mp->options;
a->session_cb_vft = &session_mq_cb_vft;
- if (mp->namespace_id_len > 64)
- {
- rv = VNET_API_ERROR_INVALID_VALUE;
- goto done;
- }
- if (mp->namespace_id_len)
- {
- vec_validate (a->namespace_id, mp->namespace_id_len - 1);
- clib_memcpy_fast (a->namespace_id, mp->namespace_id,
- mp->namespace_id_len);
- }
+ a->namespace_id = vl_api_from_api_to_new_vec (&mp->namespace_id);
if ((rv = vnet_application_attach (a)))
{
rmp->fd_flags = fd_flags;
if (vec_len (segp->name))
{
- memcpy (rmp->segment_name, segp->name, vec_len (segp->name));
- rmp->segment_name_length = vec_len (segp->name);
+ vl_api_vec_to_api_string (segp->name, &rmp->segment_name);
}
rmp->segment_size = segp->ssvm_size;
rmp->segment_handle = clib_host_to_net_u64 (a->segment_handle);
}
}
+/* ### WILL BE DEPRECATED POST 20.01 ### */
static void
vl_api_map_another_segment_reply_t_handler (vl_api_map_another_segment_reply_t
* mp)
vl_api_bind_sock_reply_t *rmp;
application_t *app = 0;
app_worker_t *app_wrk;
- ip46_address_t *ip46;
int rv = 0;
if (session_main_is_enabled () == 0)
goto done;
}
- ip46 = (ip46_address_t *) mp->ip;
clib_memset (a, 0, sizeof (*a));
- a->sep.is_ip4 = mp->is_ip4;
- a->sep.ip = *ip46;
+ ip_address_decode (&mp->ip, &a->sep.ip);
+ a->sep.is_ip4 = ip46_address_is_ip4 (&a->sep.ip);
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->sep.transport_proto = api_session_transport_proto_decode (&mp->proto);
a->app_index = app->app_index;
a->wrk_map_index = mp->wrk_index;
if (app)
{
svm_queue_t *client_q;
- ip46_address_t *ip46 = (ip46_address_t *) mp->ip;
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;
+ ip_address_decode (&mp->ip, &a->sep.ip);
+ a->sep.is_ip4 = ip46_address_is_ip4 (&a->sep.ip);
a->sep.port = mp->port;
- a->sep.transport_proto = mp->proto;
+ a->sep.transport_proto =
+ api_session_transport_proto_decode (&mp->proto);
a->sep.peer.fib_index = mp->vrf;
a->sep.peer.sw_if_index = ENDPOINT_INVALID_INDEX;
a->sep_ext.parent_handle = mp->parent_handle;
- if (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->sep_ext.hostname =
+ (u8 *) vl_api_from_api_to_new_c_string (&mp->hostname);
a->api_context = mp->context;
a->app_index = app->app_index;
a->wrk_map_index = mp->wrk_index;
{
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);
+ vl_api_vec_to_api_string (args.segment->name, &rmp->segment_name);
}
rmp->app_event_queue_address = pointer_to_uword (args.evt_q);
rmp->n_fds = n_fds;
goto done;
}
- if (mp->namespace_id_len > ARRAY_LEN (mp->namespace_id))
- {
- rv = VNET_API_ERROR_INVALID_VALUE;
- goto done;
- }
+ ns_id = vl_api_from_api_to_new_vec (&mp->namespace_id);
- vec_validate (ns_id, mp->namespace_id_len - 1);
- 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),
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;
- u8 fib_proto;
int rv = 0;
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;
- table_args->lcl.fp_proto = fib_proto;
- table_args->rmt.fp_len = mp->rmt_plen;
- table_args->rmt.fp_proto = fib_proto;
+ ip_prefix_decode (&mp->lcl, &table_args->lcl);
+ ip_prefix_decode (&mp->rmt, &table_args->rmt);
+
table_args->lcl_port = mp->lcl_port;
table_args->rmt_port = mp->rmt_port;
table_args->action_index = clib_net_to_host_u32 (mp->action_index);
table_args->tag = format (0, "%s", mp->tag);
args.appns_index = clib_net_to_host_u32 (mp->appns_index);
args.scope = mp->scope;
- args.transport_proto = mp->transport_proto;
+ args.transport_proto =
+ api_session_transport_proto_decode (&mp->transport_proto) ==
+ TRANSPORT_PROTO_UDP ? 1 : 0;
- 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);
rv = vnet_session_rule_add_del (&args);
if (rv)
clib_warning ("rule add del returned: %d", rv);
(session_mask_or_match_4_t *) & rule->match;
session_mask_or_match_4_t *mask =
(session_mask_or_match_4_t *) & rule->mask;
+ fib_prefix_t lcl, rmt;
rmp = vl_msg_api_alloc (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_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);
+ clib_memset (&lcl, 0, sizeof (lcl));
+ clib_memset (&rmt, 0, sizeof (rmt));
+ ip_set (&lcl.fp_addr, &match->lcl_ip, 1);
+ ip_set (&rmt.fp_addr, &match->rmt_ip, 1);
+ lcl.fp_len = ip4_mask_to_preflen (&mask->lcl_ip);
+ rmt.fp_len = ip4_mask_to_preflen (&mask->rmt_ip);
+
+ ip_prefix_encode (&lcl, &rmp->lcl);
+ ip_prefix_encode (&rmt, &rmp->rmt);
rmp->lcl_port = match->lcl_port;
rmp->rmt_port = match->rmt_port;
rmp->action_index = clib_host_to_net_u32 (rule->action_index);
rmp->scope =
- is_local ? SESSION_RULE_SCOPE_LOCAL : SESSION_RULE_SCOPE_GLOBAL;
- rmp->transport_proto = transport_proto;
+ is_local ? SESSION_RULE_SCOPE_API_LOCAL : SESSION_RULE_SCOPE_API_GLOBAL;
+ rmp->transport_proto = api_session_transport_proto_encode (transport_proto);
rmp->appns_index = clib_host_to_net_u32 (appns_index);
if (tag)
{
(session_mask_or_match_6_t *) & rule->match;
session_mask_or_match_6_t *mask =
(session_mask_or_match_6_t *) & rule->mask;
+ fib_prefix_t lcl, rmt;
rmp = vl_msg_api_alloc (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_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);
+ clib_memset (&lcl, 0, sizeof (lcl));
+ clib_memset (&rmt, 0, sizeof (rmt));
+ ip_set (&lcl.fp_addr, &match->lcl_ip, 0);
+ ip_set (&rmt.fp_addr, &match->rmt_ip, 0);
+ lcl.fp_len = ip6_mask_to_preflen (&mask->lcl_ip);
+ rmt.fp_len = ip6_mask_to_preflen (&mask->rmt_ip);
+
+ ip_prefix_encode (&lcl, &rmp->lcl);
+ ip_prefix_encode (&rmt, &rmp->rmt);
rmp->lcl_port = match->lcl_port;
rmp->rmt_port = match->rmt_port;
rmp->action_index = clib_host_to_net_u32 (rule->action_index);
rmp->scope =
- is_local ? SESSION_RULE_SCOPE_LOCAL : SESSION_RULE_SCOPE_GLOBAL;
- rmp->transport_proto = transport_proto;
+ is_local ? SESSION_RULE_SCOPE_API_LOCAL : SESSION_RULE_SCOPE_API_GLOBAL;
+ rmp->transport_proto = api_session_transport_proto_encode (transport_proto);
rmp->appns_index = clib_host_to_net_u32 (appns_index);
if (tag)
{
Code Review / vpp.git / blobdiff