summaryrefslogtreecommitdiffstats
path: root/src/vnet/session/session_api.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/vnet/session/session_api.c')
-rw-r--r--src/vnet/session/session_api.c173
1 files changed, 92 insertions, 81 deletions
diff --git a/src/vnet/session/session_api.c b/src/vnet/session/session_api.c
index a95faada9ae..eb5b2c36f99 100644
--- a/src/vnet/session/session_api.c
+++ b/src/vnet/session/session_api.c
@@ -22,6 +22,8 @@
#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 */
@@ -63,6 +65,50 @@ _(APP_ADD_CERT_KEY_PAIR, app_add_cert_key_pair) \
_(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)
{
@@ -680,18 +726,8 @@ vl_api_application_attach_t_handler (vl_api_application_attach_t * mp)
a->api_client_index = mp->client_index;
a->options = mp->options;
a->session_cb_vft = &session_mq_cb_vft_old;
- 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 =
+ (u8 *) vl_api_from_api_to_new_c_string (&mp->namespace_id);
if ((rv = vnet_application_attach (a)))
{
@@ -730,13 +766,8 @@ done:
{
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;
@@ -778,18 +809,8 @@ vl_api_app_attach_t_handler (vl_api_app_attach_t * mp)
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)))
{
@@ -836,8 +857,7 @@ done:
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);
@@ -1063,7 +1083,6 @@ vl_api_bind_sock_t_handler (vl_api_bind_sock_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)
@@ -1079,14 +1098,13 @@ vl_api_bind_sock_t_handler (vl_api_bind_sock_t * mp)
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;
@@ -1167,24 +1185,20 @@ vl_api_connect_sock_t_handler (vl_api_connect_sock_t * mp)
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;
@@ -1278,9 +1292,7 @@ done:
{
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;
@@ -1306,14 +1318,8 @@ vl_api_app_namespace_add_del_t_handler (vl_api_app_namespace_add_del_t * mp)
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),
@@ -1349,16 +1355,13 @@ vl_api_session_rule_add_del_t_handler (vl_api_session_rule_add_del_t * mp)
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);
@@ -1367,12 +1370,10 @@ vl_api_session_rule_add_del_t_handler (vl_api_session_rule_add_del_t * mp)
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);
@@ -1390,23 +1391,28 @@ send_session_rule_details4 (mma_rule_16_t * rule, u8 is_local,
(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)
{
@@ -1427,23 +1433,28 @@ send_session_rule_details6 (mma_rule_40_t * rule, u8 is_local,
(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)
{