summaryrefslogtreecommitdiffstats
path: root/src/vnet/sctp
diff options
context:
space:
mode:
authorFlorin Coras <fcoras@cisco.com>2018-01-15 01:08:33 -0800
committerDave Barach <openvpp@barachs.net>2018-01-25 23:53:35 +0000
commitb384b543313b6b47a277c903e9d4fcd4343054fa (patch)
tree1996e3a25eb3a32fe5bbc405d75f38dd041a5a40 /src/vnet/sctp
parent4e578068fc3fe8ba176d211123ddd88962dab315 (diff)
session: add support for memfd segments
- update segment manager and session api to work with both flavors of ssvm segments - added generic ssvm slave/master init and del functions - cleanup/refactor tcp_echo - fixed uses of svm fifo pool as vector Change-Id: Ieee8b163faa407da6e77e657a2322de213a9d2a0 Signed-off-by: Florin Coras <fcoras@cisco.com>
Diffstat (limited to 'src/vnet/sctp')
-rw-r--r--src/vnet/sctp/builtin_client.c7
-rw-r--r--src/vnet/sctp/builtin_server.c5
2 files changed, 2 insertions, 10 deletions
diff --git a/src/vnet/sctp/builtin_client.c b/src/vnet/sctp/builtin_client.c
index 4e50c0ae2ea..12f053297c2 100644
--- a/src/vnet/sctp/builtin_client.c
+++ b/src/vnet/sctp/builtin_client.c
@@ -438,21 +438,16 @@ static clib_error_t *
attach_builtin_test_clients_app (u8 * appns_id, u64 appns_flags,
u64 appns_secret)
{
- u32 segment_name_length, prealloc_fifos, segment_size = 2 << 20;
+ u32 prealloc_fifos, segment_size = 2 << 20;
tclient_main_t *tm = &tclient_main;
vnet_app_attach_args_t _a, *a = &_a;
- u8 segment_name[128];
u64 options[16];
clib_error_t *error = 0;
- segment_name_length = ARRAY_LEN (segment_name);
-
memset (a, 0, sizeof (*a));
memset (options, 0, sizeof (options));
a->api_client_index = tm->my_client_index;
- a->segment_name = segment_name;
- a->segment_name_length = segment_name_length;
a->session_cb_vft = &builtin_clients;
prealloc_fifos = tm->prealloc_fifos ? tm->expected_connections : 1;
diff --git a/src/vnet/sctp/builtin_server.c b/src/vnet/sctp/builtin_server.c
index 81267e78434..e67c4abad9b 100644
--- a/src/vnet/sctp/builtin_server.c
+++ b/src/vnet/sctp/builtin_server.c
@@ -95,7 +95,7 @@ builtin_sctp_session_connected_callback (u32 app_index, u32 api_context,
int
builtin_sctp_add_segment_callback (u32 client_index,
- const u8 * seg_name, u32 seg_size)
+ const ssvm_private_t * fs)
{
clib_warning ("called...");
return -1;
@@ -270,7 +270,6 @@ static int
server_attach (u8 * appns_id, u64 appns_flags, u64 appns_secret)
{
builtin_server_main_t *bsm = &builtin_server_main;
- u8 segment_name[128];
u64 options[APP_OPTIONS_N_OPTIONS];
vnet_app_attach_args_t _a, *a = &_a;
u32 segment_size = 512 << 20;
@@ -305,8 +304,6 @@ server_attach (u8 * appns_id, u64 appns_flags, u64 appns_secret)
a->options[APP_OPTIONS_FLAGS] |= appns_flags;
a->options[APP_OPTIONS_NAMESPACE_SECRET] = appns_secret;
}
- a->segment_name = segment_name;
- a->segment_name_length = ARRAY_LEN (segment_name);
if (vnet_application_attach (a))
{