X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fsession%2Fapplication.c;h=8090e75a6dc33dc09e6ebbe5e262cbf31e0e08bd;hb=e86a8edd3c14fb41ace2a12efd17bc7772bf623f;hp=9a519c763fe0d52d2e6360cf91751690e3451b50;hpb=c97a7398fc465c480a3ac66cf4b0f91a034ed564;p=vpp.git

diff --git a/src/vnet/session/application.c b/src/vnet/session/application.c
index 9a519c763fe..8090e75a6dc 100644
--- a/src/vnet/session/application.c
+++ b/src/vnet/session/application.c
@@ -76,7 +76,7 @@ application_local_session_table (application_t * app)
 int
 application_api_queue_is_full (application_t * app)
 {
-  unix_shared_memory_queue_t *q;
+  svm_queue_t *q;
 
   /* builtin servers are always OK */
   if (app->api_client_index == ~0)
@@ -146,11 +146,12 @@ application_new ()
 void
 application_del (application_t * app)
 {
+  segment_manager_properties_t *props;
+  vnet_unbind_args_t _a, *a = &_a;
   segment_manager_t *sm;
   u64 handle, *handles = 0;
   u32 index;
   int i;
-  vnet_unbind_args_t _a, *a = &_a;
 
   /*
    * The app event queue allocated in first segment is cleared with
@@ -207,7 +208,8 @@ application_del (application_t * app)
 	  segment_manager_del (sm);
 	}
     }
-
+  props = segment_manager_properties_get (app->sm_properties);
+  segment_manager_properties_free (props);
   application_table_del (app);
   pool_put (app_pool, app);
 }
@@ -235,20 +237,21 @@ application_init (application_t * app, u32 api_client_index, u64 * options,
   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
    */
   sm = segment_manager_new ();
   sm->app_index = app->index;
-  props = &app->sm_properties;
-  props->add_segment_size = options[SESSION_OPTIONS_ADD_SEGMENT_SIZE];
-  props->rx_fifo_size = options[SESSION_OPTIONS_RX_FIFO_SIZE];
+  props = segment_manager_properties_alloc ();
+  app->sm_properties = segment_manager_properties_index (props);
+  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;
@@ -256,10 +259,9 @@ application_init (application_t * app, u32 api_client_index, u64 * options,
   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];
-  if ((rv = segment_manager_init (sm, props, first_seg_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;
 
@@ -329,7 +331,7 @@ application_alloc_segment_manager (application_t * app)
     }
 
   sm = segment_manager_new ();
-  sm->properties = &app->sm_properties;
+  sm->properties_index = app->sm_properties;
 
   return sm;
 }
@@ -520,7 +522,32 @@ application_first_listener (application_t * app, u8 fib_proto,
   /* *INDENT-OFF* */
    hash_foreach (handle, sm_index, app->listeners_table, ({
      listener = listen_session_get_from_handle (handle);
-     if (listener->session_type == sst)
+     if (listener->session_type == sst
+	 && listener->listener_index != SESSION_PROXY_LISTENER_INDEX)
+       return listener;
+   }));
+  /* *INDENT-ON* */
+
+  return 0;
+}
+
+stream_session_t *
+application_proxy_listener (application_t * app, u8 fib_proto,
+			    u8 transport_proto)
+{
+  stream_session_t *listener;
+  u64 handle;
+  u32 sm_index;
+  u8 sst;
+
+  sst = session_type_from_proto_and_ip (transport_proto,
+					fib_proto == FIB_PROTOCOL_IP4);
+
+  /* *INDENT-OFF* */
+   hash_foreach (handle, sm_index, app->listeners_table, ({
+     listener = listen_session_get_from_handle (handle);
+     if (listener->session_type == sst
+	 && listener->listener_index == SESSION_PROXY_LISTENER_INDEX)
        return listener;
    }));
   /* *INDENT-ON* */
@@ -532,8 +559,6 @@ static clib_error_t *
 application_start_stop_proxy_fib_proto (application_t * app, u8 fib_proto,
 					u8 transport_proto, u8 is_start)
 {
-  session_rule_add_del_args_t args;
-  fib_prefix_t lcl_pref, rmt_pref;
   app_namespace_t *app_ns = app_namespace_get (app->ns_index);
   u8 is_ip4 = (fib_proto == FIB_PROTOCOL_IP4);
   session_endpoint_t sep = SESSION_ENDPOINT_NULL;
@@ -543,68 +568,76 @@ application_start_stop_proxy_fib_proto (application_t * app, u8 fib_proto,
 
   if (is_start)
     {
-      sep.is_ip4 = is_ip4;
-      sep.fib_index = app_namespace_get_fib_index (app_ns, fib_proto);
-      sep.sw_if_index = app_ns->sw_if_index;
-      sep.transport_proto = transport_proto;
-      application_start_listen (app, &sep, &handle);
-      s = listen_session_get_from_handle (handle);
+      s = application_first_listener (app, fib_proto, transport_proto);
+      if (!s)
+	{
+	  sep.is_ip4 = is_ip4;
+	  sep.fib_index = app_namespace_get_fib_index (app_ns, fib_proto);
+	  sep.sw_if_index = app_ns->sw_if_index;
+	  sep.transport_proto = transport_proto;
+	  application_start_listen (app, &sep, &handle);
+	  s = listen_session_get_from_handle (handle);
+	  s->listener_index = SESSION_PROXY_LISTENER_INDEX;
+	}
     }
   else
     {
-      s = application_first_listener (app, fib_proto, transport_proto);
+      s = application_proxy_listener (app, fib_proto, transport_proto);
+      ASSERT (s);
     }
+
   tc = listen_session_get_transport (s);
 
   if (!ip_is_zero (&tc->lcl_ip, 1))
     {
-      memset (&args, 0, sizeof (args));
-      memset (&lcl_pref, 0, sizeof (lcl_pref));
-      ip_copy (&lcl_pref.fp_addr, &tc->lcl_ip, is_ip4);
-      lcl_pref.fp_len = is_ip4 ? 32 : 128;
-      lcl_pref.fp_proto = fib_proto;
-      memset (&rmt_pref, 0, sizeof (rmt_pref));
-      rmt_pref.fp_len = 0;
-      rmt_pref.fp_proto = fib_proto;
-
-      args.table_args.lcl = lcl_pref;
-      args.table_args.rmt = rmt_pref;
-      args.table_args.lcl_port = 0;
-      args.table_args.rmt_port = 0;
-      args.table_args.action_index = app->index;
-      args.table_args.is_add = is_start;
-      args.transport_proto = transport_proto;
-      args.appns_index = app->ns_index;
-      args.scope = SESSION_RULE_SCOPE_GLOBAL;
-      return vnet_session_rule_add_del (&args);
+      u32 sti;
+      sep.is_ip4 = is_ip4;
+      sep.fib_index = app_namespace_get_fib_index (app_ns, fib_proto);
+      sep.transport_proto = transport_proto;
+      sep.port = 0;
+      sti = session_lookup_get_index_for_fib (fib_proto, sep.fib_index);
+      if (is_start)
+	session_lookup_add_session_endpoint (sti, &sep, s->session_index);
+      else
+	session_lookup_del_session_endpoint (sti, &sep);
     }
+
   return 0;
 }
 
-void
-application_start_stop_proxy (application_t * app, u8 transport_proto,
-			      u8 is_start)
+static void
+application_start_stop_proxy_local_scope (application_t * app,
+					  u8 transport_proto, u8 is_start)
 {
-  session_rule_add_del_args_t args;
+  session_endpoint_t sep = SESSION_ENDPOINT_NULL;
+  app_namespace_t *app_ns;
+  app_ns = app_namespace_get (app->ns_index);
+  sep.is_ip4 = 1;
+  sep.transport_proto = transport_proto;
+  sep.port = 0;
 
-  if (application_has_local_scope (app))
+  if (is_start)
+    {
+      session_lookup_add_session_endpoint (app_ns->local_table_index, &sep,
+					   app->index);
+      sep.is_ip4 = 0;
+      session_lookup_add_session_endpoint (app_ns->local_table_index, &sep,
+					   app->index);
+    }
+  else
     {
-      memset (&args, 0, sizeof (args));
-      args.table_args.lcl.fp_proto = FIB_PROTOCOL_IP4;
-      args.table_args.rmt.fp_proto = FIB_PROTOCOL_IP4;
-      args.table_args.lcl_port = 0;
-      args.table_args.rmt_port = 0;
-      args.table_args.action_index = app->index;
-      args.table_args.is_add = is_start;
-      args.transport_proto = transport_proto;
-      args.appns_index = app->ns_index;
-      args.scope = SESSION_RULE_SCOPE_LOCAL;
-      vnet_session_rule_add_del (&args);
-
-      args.table_args.lcl.fp_proto = FIB_PROTOCOL_IP6;
-      args.table_args.rmt.fp_proto = FIB_PROTOCOL_IP6;
-      vnet_session_rule_add_del (&args);
+      session_lookup_del_session_endpoint (app_ns->local_table_index, &sep);
+      sep.is_ip4 = 0;
+      session_lookup_del_session_endpoint (app_ns->local_table_index, &sep);
     }
+}
+
+void
+application_start_stop_proxy (application_t * app,
+			      transport_proto_t transport_proto, u8 is_start)
+{
+  if (application_has_local_scope (app))
+    application_start_stop_proxy_local_scope (app, transport_proto, is_start);
 
   if (application_has_global_scope (app))
     {
@@ -619,24 +652,34 @@ void
 application_setup_proxy (application_t * app)
 {
   u16 transports = app->proxied_transports;
+  transport_proto_t tp;
+
   ASSERT (application_is_proxy (app));
   if (application_is_builtin (app))
     return;
-  if (transports & (1 << TRANSPORT_PROTO_TCP))
-    application_start_stop_proxy (app, TRANSPORT_PROTO_TCP, 1);
-  if (transports & (1 << TRANSPORT_PROTO_UDP))
-    application_start_stop_proxy (app, TRANSPORT_PROTO_UDP, 1);
+
+  /* *INDENT-OFF* */
+  transport_proto_foreach (tp, ({
+    if (transports & (1 << tp))
+      application_start_stop_proxy (app, tp, 1);
+  }));
+  /* *INDENT-ON* */
 }
 
 void
 application_remove_proxy (application_t * app)
 {
   u16 transports = app->proxied_transports;
+  transport_proto_t tp;
+
   ASSERT (application_is_proxy (app));
-  if (transports & (1 << TRANSPORT_PROTO_TCP))
-    application_start_stop_proxy (app, TRANSPORT_PROTO_TCP, 0);
-  if (transports & (1 << TRANSPORT_PROTO_UDP))
-    application_start_stop_proxy (app, TRANSPORT_PROTO_UDP, 0);
+
+  /* *INDENT-OFF* */
+  transport_proto_foreach (tp, ({
+    if (transports & (1 << tp))
+      application_start_stop_proxy (app, tp, 0);
+  }));
+  /* *INDENT-ON* */
 }
 
 u8 *
@@ -745,6 +788,7 @@ format_application (u8 * s, va_list * args)
 {
   application_t *app = va_arg (*args, application_t *);
   CLIB_UNUSED (int verbose) = va_arg (*args, int);
+  segment_manager_properties_t *props;
   const u8 *app_ns_name;
   u8 *app_name;
 
@@ -752,27 +796,27 @@ format_application (u8 * s, va_list * args)
     {
       if (verbose)
 	s = format (s, "%-10s%-20s%-15s%-15s%-15s%-15s%-15s", "Index", "Name",
-		    "Namespace", "API Client", "Add seg size", "Rx fifo size",
+		    "API Client", "Namespace", "Add seg size", "Rx fifo size",
 		    "Tx fifo size");
       else
 	s =
-	  format (s, "%-10s%-20s%-15s%-20s", "Index", "Name", "Namespace",
-		  "API Client");
+	  format (s, "%-10s%-20s%-15s%-40s", "Index", "Name", "API Client",
+		  "Namespace");
       return s;
     }
 
   app_name = app_get_name_from_reg_index (app);
   app_ns_name = app_namespace_id_from_index (app->ns_index);
+  props = segment_manager_properties_get (app->sm_properties);
   if (verbose)
     s =
-      format (s, "%-10d%-20s%-15s%-15d%-15d%-15d%-15d", app->index, app_name,
-	      app_ns_name, app->api_client_index,
-	      app->sm_properties.add_segment_size,
-	      app->sm_properties.rx_fifo_size,
-	      app->sm_properties.tx_fifo_size);
+      format (s, "%-10d%-20s%-15d%-15d%-15d%-15d%-15d", app->index, app_name,
+	      app->api_client_index, app->ns_index,
+	      props->add_segment_size,
+	      props->rx_fifo_size, props->tx_fifo_size);
   else
-    s = format (s, "%-10d%-20s%-15s%-20d", app->index, app_name, app_ns_name,
-		app->api_client_index);
+    s = format (s, "%-10d%-20s%-15d%-40s", app->index, app_name,
+		app->api_client_index, app_ns_name);
   return s;
 }