summaryrefslogtreecommitdiffstats
path: root/src/vnet/tcp/builtin_http_server.c
diff options
context:
space:
mode:
authorFlorin Coras <fcoras@cisco.com>2017-12-11 04:59:01 -0800
committerDave Barach <openvpp@barachs.net>2017-12-14 00:45:51 +0000
commitff6e7699a5e9921d73818970ecf3571080922ecc (patch)
treef22a28b2024833ae0128b7249ff7f9e71ec29bc7 /src/vnet/tcp/builtin_http_server.c
parentcf3561bde53173a7be9aa02ed4897c7f2d55bd0a (diff)
session: cleanup attach flags
Change-Id: I39d21d15677f57e10b69b8842f2cbca277abddf0 Signed-off-by: Florin Coras <fcoras@cisco.com>
Diffstat (limited to 'src/vnet/tcp/builtin_http_server.c')
-rw-r--r--src/vnet/tcp/builtin_http_server.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/src/vnet/tcp/builtin_http_server.c b/src/vnet/tcp/builtin_http_server.c
index 6d58aab6f38..6e1cd8e770e 100644
--- a/src/vnet/tcp/builtin_http_server.c
+++ b/src/vnet/tcp/builtin_http_server.c
@@ -511,23 +511,26 @@ server_attach ()
{
http_server_main_t *hsm = &http_server_main;
u8 segment_name[128];
- u64 options[SESSION_OPTIONS_N_OPTIONS];
+ u64 options[APP_OPTIONS_N_OPTIONS];
vnet_app_attach_args_t _a, *a = &_a;
+ u32 segment_size = 128 << 20;
memset (a, 0, sizeof (*a));
memset (options, 0, sizeof (options));
+ if (hsm->private_segment_size)
+ segment_size = hsm->private_segment_size;
+
a->api_client_index = hsm->my_client_index;
a->session_cb_vft = &builtin_session_cb_vft;
a->options = options;
- a->options[SESSION_OPTIONS_SEGMENT_SIZE] = 128 << 20;
- a->options[SESSION_OPTIONS_RX_FIFO_SIZE] =
+ a->options[APP_OPTIONS_SEGMENT_SIZE] = segment_size;
+ a->options[APP_OPTIONS_RX_FIFO_SIZE] =
hsm->fifo_size ? hsm->fifo_size : 8 << 10;
- a->options[SESSION_OPTIONS_TX_FIFO_SIZE] =
+ a->options[APP_OPTIONS_TX_FIFO_SIZE] =
hsm->fifo_size ? hsm->fifo_size : 32 << 10;
a->options[APP_OPTIONS_FLAGS] = APP_OPTIONS_FLAGS_IS_BUILTIN;
a->options[APP_OPTIONS_PREALLOC_FIFO_PAIRS] = hsm->prealloc_fifos;
- a->options[APP_OPTIONS_PRIVATE_SEGMENT_SIZE] = hsm->private_segment_size;
a->segment_name = segment_name;
a->segment_name_length = ARRAY_LEN (segment_name);