session: add support for memfd segments

[vpp.git] / src / vnet / session / application_interface.c

diff --git a/src/vnet/session/application_interface.c b/src/vnet/session/application_interface.c
index a0dff90..f2a13be 100644 (file)
--- a/src/vnet/session/application_interface.c
+++ b/src/vnet/session/application_interface.c
@@ -92,7 +92,8 @@ static int
 vnet_bind_i (u32 app_index, session_endpoint_t * sep, u64 * handle)
 {
   application_t *app;
-  u32 table_index, listener_index;
+  u32 table_index;
+  u64 listener;
   int rv, have_local = 0;
 
   app = application_get_if_valid (app_index);
@@ -108,8 +109,8 @@ vnet_bind_i (u32 app_index, session_endpoint_t * sep, u64 * handle)
 
   table_index = application_session_table (app,
                                           session_endpoint_fib_proto (sep));
-  listener_index = session_lookup_session_endpoint (table_index, sep);
-  if (listener_index != SESSION_INVALID_INDEX)
+  listener = session_lookup_endpoint_listener (table_index, sep, 1);
+  if (listener != SESSION_INVALID_HANDLE)
     return VNET_API_ERROR_ADDRESS_IN_USE;
 
   /*
@@ -119,8 +120,8 @@ vnet_bind_i (u32 app_index, session_endpoint_t * sep, u64 * handle)
   if (application_has_local_scope (app) && session_endpoint_is_zero (sep))
     {
       table_index = application_local_session_table (app);
-      listener_index = session_lookup_session_endpoint (table_index, sep);
-      if (listener_index != SESSION_INVALID_INDEX)
+      listener = session_lookup_endpoint_listener (table_index, sep, 1);
+      if (listener != SESSION_INVALID_HANDLE)
        return VNET_API_ERROR_ADDRESS_IN_USE;
       session_lookup_add_session_endpoint (table_index, sep, app->index);
       *handle = session_lookup_local_listener_make_handle (sep);
@@ -205,7 +206,8 @@ vnet_connect_i (u32 app_index, u32 api_context, session_endpoint_t * sep,
                void *mp)
 {
   application_t *server, *app;
-  u32 table_index;
+  u32 table_index, server_index;
+  stream_session_t *listener;
 
   if (session_endpoint_is_zero (sep))
     return VNET_API_ERROR_INVALID_VALUE;
@@ -221,14 +223,25 @@ vnet_connect_i (u32 app_index, u32 api_context, session_endpoint_t * sep,
   if (application_has_local_scope (app))
     {
       table_index = application_local_session_table (app);
-      app_index = session_lookup_local_session_endpoint (table_index, sep);
-      server = application_get (app_index);
+      server_index = session_lookup_local_endpoint (table_index, sep);
+      if (server_index == APP_DROP_INDEX)
+       return VNET_API_ERROR_APP_CONNECT_FILTERED;
+
       /*
-       * Server is willing to have a direct fifo connection created
-       * instead of going through the state machine, etc.
+       * Break loop if rule in local table points to connecting app. This
+       * can happen if client is a generic proxy. Route connect through
+       * global table instead.
        */
-      if (server && (server->flags & APP_OPTIONS_FLAGS_ACCEPT_REDIRECT))
-       return app_connect_redirect (server, mp);
+      if (server_index != app_index)
+       {
+         server = application_get (server_index);
+         /*
+          * Server is willing to have a direct fifo connection created
+          * instead of going through the state machine, etc.
+          */
+         if (server && (server->flags & APP_OPTIONS_FLAGS_ACCEPT_REDIRECT))
+           return app_connect_redirect (server, mp);
+       }
     }
 
   /*
@@ -243,10 +256,13 @@ vnet_connect_i (u32 app_index, u32 api_context, session_endpoint_t * sep,
 
   table_index = application_session_table (app,
                                           session_endpoint_fib_proto (sep));
-  app_index = session_lookup_session_endpoint (table_index, sep);
-  server = application_get (app_index);
-  if (server && (server->flags & APP_OPTIONS_FLAGS_ACCEPT_REDIRECT))
-    return app_connect_redirect (server, mp);
+  listener = session_lookup_listener (table_index, sep);
+  if (listener)
+    {
+      server = application_get (listener->app_index);
+      if (server && (server->flags & APP_OPTIONS_FLAGS_ACCEPT_REDIRECT))
+       return app_connect_redirect (server, mp);
+    }
 
   /*
    * Not connecting to a local server, propagate to transport
@@ -310,7 +326,22 @@ unformat_vnet_uri (unformat_input_t * input, va_list * args)
       sep->is_ip4 = 0;
       return 1;
     }
-
+  if (unformat (input, "sctp://%U/%d", unformat_ip4_address, &sep->ip.ip4,
+               &sep->port))
+    {
+      sep->transport_proto = TRANSPORT_PROTO_SCTP;
+      sep->port = clib_host_to_net_u16 (sep->port);
+      sep->is_ip4 = 1;
+      return 1;
+    }
+  if (unformat (input, "sctp://%U/%d", unformat_ip6_address, &sep->ip.ip6,
+               &sep->port))
+    {
+      sep->transport_proto = TRANSPORT_PROTO_SCTP;
+      sep->port = clib_host_to_net_u16 (sep->port);
+      sep->is_ip4 = 0;
+      return 1;
+    }
   return 0;
 }
 
@@ -382,11 +413,11 @@ session_validate_namespace (u8 * namespace_id, u64 secret, u32 * app_ns_index)
 clib_error_t *
 vnet_application_attach (vnet_app_attach_args_t * a)
 {
+  svm_fifo_segment_private_t *fs;
   application_t *app = 0;
   segment_manager_t *sm;
-  u8 *seg_name;
-  u64 secret;
   u32 app_ns_index = 0;
+  u64 secret;
   int rv;
 
   app = application_lookup (a->api_client_index);
@@ -406,13 +437,15 @@ vnet_application_attach (vnet_app_attach_args_t * a)
 
   a->app_event_queue_address = pointer_to_uword (app->event_queue);
   sm = segment_manager_get (app->first_segment_manager);
-  segment_manager_get_segment_info (sm->segment_indices[0],
-                                   &seg_name, &a->segment_size);
+  fs = segment_manager_get_segment (sm->segment_indices[0]);
+
+  if (application_is_proxy (app))
+    application_setup_proxy (app);
 
-  a->segment_name_length = vec_len (seg_name);
-  a->segment_name = seg_name;
-  ASSERT (vec_len (a->segment_name) <= 128);
+  ASSERT (vec_len (fs->ssvm.name) <= 128);
+  a->segment = &fs->ssvm;
   a->app_index = app->index;
+
   return 0;
 }
 
@@ -470,14 +503,15 @@ vnet_unbind_uri (vnet_unbind_args_t * a)
 clib_error_t *
 vnet_connect_uri (vnet_connect_args_t * a)
 {
-  session_endpoint_t sep = SESSION_ENDPOINT_NULL;
+  session_endpoint_t sep_null = SESSION_ENDPOINT_NULL;
   int rv;
 
   /* Parse uri */
-  rv = parse_uri (a->uri, &sep);
+  a->sep = sep_null;
+  rv = parse_uri (a->uri, &a->sep);
   if (rv)
     return clib_error_return_code (0, rv, 0, "app init: %d", rv);
-  if ((rv = vnet_connect_i (a->app_index, a->api_context, &sep, a->mp)))
+  if ((rv = vnet_connect_i (a->app_index, a->api_context, &a->sep, a->mp)))
     return clib_error_return_code (0, rv, 0, "connect failed");
   return 0;
 }
@@ -489,7 +523,7 @@ vnet_disconnect_session (vnet_disconnect_args_t * a)
   stream_session_t *s;
 
   session_parse_handle (a->handle, &index, &thread_index);
-  s = stream_session_get_if_valid (index, thread_index);
+  s = session_get_if_valid (index, thread_index);
 
   if (!s || s->app_index != a->app_index)
     return VNET_API_ERROR_INVALID_VALUE;