session: remove unused attach options

- ACCEPT_COOKIE
- PRIVATE_SEGMENT_COUNT

They are not handled by session layer even if configured by
applications.

Type: improvement

Change-Id: I673f8da6e83181be018489b85082dfd1b1dab87b
Signed-off-by: Florin Coras <[email protected]>

diff --git a/src/plugins/hs_apps/echo_client.c b/src/plugins/hs_apps/echo_client.c
index 4bc464b..2612e2a 100644 (file)
--- a/src/plugins/hs_apps/echo_client.c
+++ b/src/plugins/hs_apps/echo_client.c
@@ -1000,12 +1000,10 @@ ec_attach ()
 
   prealloc_fifos = ecm->prealloc_fifos ? ecm->expected_connections : 1;
 
-  options[APP_OPTIONS_ACCEPT_COOKIE] = 0x12345678;
   options[APP_OPTIONS_SEGMENT_SIZE] = ecm->private_segment_size;
   options[APP_OPTIONS_ADD_SEGMENT_SIZE] = ecm->private_segment_size;
   options[APP_OPTIONS_RX_FIFO_SIZE] = ecm->fifo_size;
   options[APP_OPTIONS_TX_FIFO_SIZE] = ecm->fifo_size;
-  options[APP_OPTIONS_PRIVATE_SEGMENT_COUNT] = ecm->private_segment_count;
   options[APP_OPTIONS_PREALLOC_FIFO_PAIRS] = prealloc_fifos;
   options[APP_OPTIONS_FLAGS] = APP_OPTIONS_FLAGS_IS_BUILTIN;
   options[APP_OPTIONS_TLS_ENGINE] = ecm->tls_engine;

diff --git a/src/plugins/hs_apps/echo_server.c b/src/plugins/hs_apps/echo_server.c
index 61b8676..0585132 100644 (file)
--- a/src/plugins/hs_apps/echo_server.c
+++ b/src/plugins/hs_apps/echo_server.c
@@ -512,7 +512,6 @@ echo_server_attach (u8 * appns_id, u64 appns_flags, u64 appns_secret)
   a->options[APP_OPTIONS_ADD_SEGMENT_SIZE] = esm->private_segment_size;
   a->options[APP_OPTIONS_RX_FIFO_SIZE] = esm->fifo_size;
   a->options[APP_OPTIONS_TX_FIFO_SIZE] = esm->fifo_size;
-  a->options[APP_OPTIONS_PRIVATE_SEGMENT_COUNT] = esm->private_segment_count;
   a->options[APP_OPTIONS_TLS_ENGINE] = esm->tls_engine;
   a->options[APP_OPTIONS_PCT_FIRST_ALLOC] = 100;
   a->options[APP_OPTIONS_PREALLOC_FIFO_PAIRS] =

diff --git a/src/plugins/hs_apps/proxy.c b/src/plugins/hs_apps/proxy.c
index 2c7535d..c26f469 100644 (file)
--- a/src/plugins/hs_apps/proxy.c
+++ b/src/plugins/hs_apps/proxy.c
@@ -1198,7 +1198,6 @@ proxy_server_attach ()
   a->options[APP_OPTIONS_MAX_FIFO_SIZE] = pm->max_fifo_size;
   a->options[APP_OPTIONS_HIGH_WATERMARK] = (u64) pm->high_watermark;
   a->options[APP_OPTIONS_LOW_WATERMARK] = (u64) pm->low_watermark;
-  a->options[APP_OPTIONS_PRIVATE_SEGMENT_COUNT] = pm->private_segment_count;
   a->options[APP_OPTIONS_PREALLOC_FIFO_PAIRS] =
     pm->prealloc_fifos ? pm->prealloc_fifos : 0;
 
@@ -1229,14 +1228,12 @@ active_open_attach (void)
   a->session_cb_vft = &active_open_clients;
   a->name = format (0, "proxy-active-open");
 
-  options[APP_OPTIONS_ACCEPT_COOKIE] = 0x12345678;
   options[APP_OPTIONS_SEGMENT_SIZE] = 512 << 20;
   options[APP_OPTIONS_RX_FIFO_SIZE] = pm->fifo_size;
   options[APP_OPTIONS_TX_FIFO_SIZE] = pm->fifo_size;
   options[APP_OPTIONS_MAX_FIFO_SIZE] = pm->max_fifo_size;
   options[APP_OPTIONS_HIGH_WATERMARK] = (u64) pm->high_watermark;
   options[APP_OPTIONS_LOW_WATERMARK] = (u64) pm->low_watermark;
-  options[APP_OPTIONS_PRIVATE_SEGMENT_COUNT] = pm->private_segment_count;
   options[APP_OPTIONS_PREALLOC_FIFO_PAIRS] =
     pm->prealloc_fifos ? pm->prealloc_fifos : 0;
 

diff --git a/src/vnet/session/application_interface.h b/src/vnet/session/application_interface.h
index e9284b9..342d9cf 100644 (file)
--- a/src/vnet/session/application_interface.h
+++ b/src/vnet/session/application_interface.h
@@ -181,7 +181,7 @@ typedef enum
   APP_OPTIONS_EVT_QUEUE_SIZE,
   APP_OPTIONS_SEGMENT_SIZE,
   APP_OPTIONS_ADD_SEGMENT_SIZE,
-  APP_OPTIONS_PRIVATE_SEGMENT_COUNT,
+  APP_OPTIONS_UNUSED1,
   APP_OPTIONS_RX_FIFO_SIZE,
   APP_OPTIONS_TX_FIFO_SIZE,
   APP_OPTIONS_PREALLOC_FIFO_PAIRS,
@@ -189,7 +189,7 @@ typedef enum
   APP_OPTIONS_NAMESPACE,
   APP_OPTIONS_NAMESPACE_SECRET,
   APP_OPTIONS_PROXY_TRANSPORT,
-  APP_OPTIONS_ACCEPT_COOKIE,
+  APP_OPTIONS_UNUSED2,
   APP_OPTIONS_TLS_ENGINE,
   APP_OPTIONS_MAX_FIFO_SIZE,
   APP_OPTIONS_HIGH_WATERMARK,