X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fsession%2Fapplication_interface.h;h=f72a4619974515fcec446f46497f4f9c2357e625;hb=58d36f02b45c5af38b7df81fb7976129cad3e05b;hp=4d6f9def026db360f86bfb385154734b3ffe1835;hpb=10d8cc6bf92851fcaec4a6b4c6d3554dc1eb2386;p=vpp.git

diff --git a/src/vnet/session/application_interface.h b/src/vnet/session/application_interface.h
index 4d6f9def026..f72a4619974 100644
--- a/src/vnet/session/application_interface.h
+++ b/src/vnet/session/application_interface.h
@@ -21,12 +21,7 @@
 #include <vnet/session/session.h>
 #include <vnet/session/application.h>
 #include <vnet/session/transport.h>
-
-typedef enum _session_api_proto
-{
-  SESSION_PROTO_TCP,
-  SESSION_PROTO_UDP
-} session_api_proto_t;
+#include <vnet/tls/tls.h>
 
 typedef struct _vnet_app_attach_args_t
 {
@@ -36,18 +31,16 @@ typedef struct _vnet_app_attach_args_t
   /** Application and segment manager options */
   u64 *options;
 
+  /** ID of the namespace the app has access to */
+  u8 *namespace_id;
+
   /** Session to application callback functions */
   session_cb_vft_t *session_cb_vft;
 
-  /** Flag that indicates if app is builtin */
-  u8 builtin;
-
   /*
    * Results
    */
-  u8 *segment_name;
-  u32 segment_name_length;
-  u32 segment_size;
+  ssvm_private_t *segment;
   u64 app_event_queue_address;
   u32 app_index;
 } vnet_app_attach_args_t;
@@ -62,11 +55,7 @@ typedef struct _vnet_bind_args_t
   union
   {
     char *uri;
-    struct
-    {
-      transport_endpoint_t tep;
-      session_api_proto_t proto;
-    };
+    session_endpoint_t sep;
   };
 
   u32 app_index;
@@ -95,44 +84,58 @@ typedef struct _vnet_connect_args
   union
   {
     char *uri;
-    struct
-    {
-      transport_endpoint_t tep;
-      session_api_proto_t proto;
-    };
+    session_endpoint_extended_t sep;
   };
   u32 app_index;
   u32 api_context;
 
-  /* Used for redirects */
-  void *mp;
+  session_handle_t session_handle;
 } vnet_connect_args_t;
 
 typedef struct _vnet_disconnect_args_t
 {
-  u64 handle;
+  session_handle_t handle;
   u32 app_index;
 } vnet_disconnect_args_t;
 
+typedef struct _vnet_application_add_tls_cert_args_t
+{
+  u32 app_index;
+  u8 *cert;
+} vnet_app_add_tls_cert_args_t;
+
+typedef struct _vnet_application_add_tls_key_args_t
+{
+  u32 app_index;
+  u8 *key;
+} vnet_app_add_tls_key_args_t;
+
 /* Application attach options */
 typedef enum
 {
-  APP_EVT_QUEUE_SIZE,
   APP_OPTIONS_FLAGS,
+  APP_OPTIONS_EVT_QUEUE_SIZE,
+  APP_OPTIONS_SEGMENT_SIZE,
+  APP_OPTIONS_ADD_SEGMENT_SIZE,
+  APP_OPTIONS_PRIVATE_SEGMENT_COUNT,
+  APP_OPTIONS_RX_FIFO_SIZE,
+  APP_OPTIONS_TX_FIFO_SIZE,
   APP_OPTIONS_PREALLOC_FIFO_PAIRS,
-  SESSION_OPTIONS_SEGMENT_SIZE,
-  SESSION_OPTIONS_ADD_SEGMENT_SIZE,
-  SESSION_OPTIONS_RX_FIFO_SIZE,
-  SESSION_OPTIONS_TX_FIFO_SIZE,
-  SESSION_OPTIONS_PREALLOCATED_FIFO_PAIRS,
-  SESSION_OPTIONS_ACCEPT_COOKIE,
-  SESSION_OPTIONS_N_OPTIONS
+  APP_OPTIONS_NAMESPACE,
+  APP_OPTIONS_NAMESPACE_SECRET,
+  APP_OPTIONS_PROXY_TRANSPORT,
+  APP_OPTIONS_ACCEPT_COOKIE,
+  APP_OPTIONS_TLS_ENGINE,
+  APP_OPTIONS_N_OPTIONS
 } app_attach_options_index_t;
 
 #define foreach_app_options_flags				\
-  _(USE_FIFO, "Use FIFO with redirects")			\
+  _(ACCEPT_REDIRECT, "Use FIFO with redirects")			\
   _(ADD_SEGMENT, "Add segment and signal app if needed")	\
-  _(BUILTIN_APP, "Application is builtin")			\
+  _(IS_BUILTIN, "Application is builtin")			\
+  _(IS_PROXY, "Application is proxying")				\
+  _(USE_GLOBAL_SCOPE, "App can use global session scope")	\
+  _(USE_LOCAL_SCOPE, "App can use local session scope")
 
 typedef enum _app_options
 {
@@ -148,29 +151,24 @@ typedef enum _app_options_flags
 #undef _
 } app_options_flags_t;
 
-///** Server can handle delegated connect requests from local clients */
-//#define APP_OPTIONS_FLAGS_USE_FIFO    (1<<0)
-//
-///** Server wants vpp to add segments when out of memory for fifos */
-//#define APP_OPTIONS_FLAGS_ADD_SEGMENT   (1<<1)
-
-#define VNET_CONNECT_REDIRECTED	123
-
-int vnet_application_attach (vnet_app_attach_args_t * a);
-int vnet_application_detach (vnet_app_detach_args_t * a);
-
 int vnet_bind_uri (vnet_bind_args_t *);
 int vnet_unbind_uri (vnet_unbind_args_t * a);
-int vnet_connect_uri (vnet_connect_args_t * a);
+clib_error_t *vnet_connect_uri (vnet_connect_args_t * a);
+
+clib_error_t *vnet_application_attach (vnet_app_attach_args_t * a);
+clib_error_t *vnet_bind (vnet_bind_args_t * a);
+clib_error_t *vnet_connect (vnet_connect_args_t * a);
+clib_error_t *vnet_unbind (vnet_unbind_args_t * a);
+int vnet_application_detach (vnet_app_detach_args_t * a);
 int vnet_disconnect_session (vnet_disconnect_args_t * a);
 
-int vnet_bind (vnet_bind_args_t * a);
-int vnet_connect (vnet_connect_args_t * a);
-int vnet_unbind (vnet_unbind_args_t * a);
+clib_error_t *vnet_app_add_tls_cert (vnet_app_add_tls_cert_args_t * a);
+clib_error_t *vnet_app_add_tls_key (vnet_app_add_tls_key_args_t * a);
 
-int
-api_parse_session_handle (u64 handle, u32 * session_index,
-			  u32 * thread_index);
+extern const char test_srv_crt_rsa[];
+extern const u32 test_srv_crt_rsa_len;
+extern const char test_srv_key_rsa[];
+extern const u32 test_srv_key_rsa_len;
 
 #endif /* __included_uri_h__ */