commit ff6e7699a5e9921d73818970ecf3571080922ecc
author Florin Coras <fcoras@cisco.com> Mon Dec 11 04:59:01 2017 -0800
committer Dave Barach <openvpp@barachs.net> Thu Dec 14 00:45:51 2017 +0000
tree f22a28b2024833ae0128b7249ff7f9e71ec29bc7
parent cf3561bde53173a7be9aa02ed4897c7f2d55bd0a

session: cleanup attach flags

Change-Id: I39d21d15677f57e10b69b8842f2cbca277abddf0
Signed-off-by: Florin Coras <fcoras@cisco.com>

src/vnet/session/application.c

diff --git a/src/vnet/session/application.c b/src/vnet/session/application.c
index 3e6ac98..f6151b6 100644
--- a/src/vnet/session/application.c
+++ b/src/vnet/session/application.c
@@ -237,8 +237,8 @@
   u32 default_rx_fifo_size = 16 << 10, default_tx_fifo_size = 16 << 10;
   int rv;
 
-  app_evt_queue_size = options[APP_EVT_QUEUE_SIZE] > 0 ?
-    options[APP_EVT_QUEUE_SIZE] : default_app_evt_queue_size;
+  app_evt_queue_size = options[APP_OPTIONS_EVT_QUEUE_SIZE] > 0 ?
+    options[APP_OPTIONS_EVT_QUEUE_SIZE] : default_app_evt_queue_size;
 
   /*
    * Setup segment manager
@@ -247,11 +247,11 @@
   sm->app_index = app->index;
   props = segment_manager_properties_alloc ();
   app->sm_properties = segment_manager_properties_index (props);
-  props->add_segment_size = options[SESSION_OPTIONS_ADD_SEGMENT_SIZE];
-  props->rx_fifo_size = options[SESSION_OPTIONS_RX_FIFO_SIZE];
+  props->add_segment_size = options[APP_OPTIONS_ADD_SEGMENT_SIZE];
+  props->rx_fifo_size = options[APP_OPTIONS_RX_FIFO_SIZE];
   props->rx_fifo_size =
     props->rx_fifo_size ? props->rx_fifo_size : default_rx_fifo_size;
-  props->tx_fifo_size = options[SESSION_OPTIONS_TX_FIFO_SIZE];
+  props->tx_fifo_size = options[APP_OPTIONS_TX_FIFO_SIZE];
   props->tx_fifo_size =
     props->tx_fifo_size ? props->tx_fifo_size : default_tx_fifo_size;
   props->add_segment = props->add_segment_size != 0;
@@ -259,9 +259,8 @@
   props->use_private_segment = options[APP_OPTIONS_FLAGS]
     & APP_OPTIONS_FLAGS_IS_BUILTIN;
   props->private_segment_count = options[APP_OPTIONS_PRIVATE_SEGMENT_COUNT];
-  props->private_segment_size = options[APP_OPTIONS_PRIVATE_SEGMENT_SIZE];
 
-  first_seg_size = options[SESSION_OPTIONS_SEGMENT_SIZE];
+  first_seg_size = options[APP_OPTIONS_SEGMENT_SIZE];
   if ((rv = segment_manager_init (sm, app->sm_properties, first_seg_size)))
     return rv;
   sm->first_is_protected = 1;