X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Ftls%2Ftls.h;h=2038fdff133659b00de66f3d8ca6d2f606eac63e;hb=4b47ee26c;hp=ac0b39b8295656bec574625fbcfe6082a13c7e2f;hpb=c1a4265b4b76bf7874b53e866549371c8daf70f4;p=vpp.git

diff --git a/src/vnet/tls/tls.h b/src/vnet/tls/tls.h
index ac0b39b8295..2038fdff133 100644
--- a/src/vnet/tls/tls.h
+++ b/src/vnet/tls/tls.h
@@ -21,7 +21,7 @@
 #ifndef SRC_VNET_TLS_TLS_H_
 #define SRC_VNET_TLS_TLS_H_
 
-#define TLS_DEBUG 		0
+#define TLS_DEBUG		0
 #define TLS_DEBUG_LEVEL_CLIENT 	0
 #define TLS_DEBUG_LEVEL_SERVER 	0
 
@@ -37,22 +37,24 @@
 #endif
 
 /* *INDENT-OFF* */
-typedef CLIB_PACKED (struct tls_cxt_id_
+typedef struct tls_cxt_id_
 {
-  u32 parent_app_index;
   union {
     session_handle_t app_session_handle;
     u32 parent_app_api_ctx;
   };
   session_handle_t tls_session_handle;
+  u32 parent_app_wrk_index;
   u32 ssl_ctx;
   u32 listener_ctx_index;
   u8 tcp_is_ip4;
   u8 tls_engine_id;
-}) tls_ctx_id_t;
+  void *migrate_ctx;
+} tls_ctx_id_t;
 /* *INDENT-ON* */
 
-STATIC_ASSERT (sizeof (tls_ctx_id_t) <= 42, "ctx id must be less than 42");
+STATIC_ASSERT (sizeof (tls_ctx_id_t) <= TRANSPORT_CONN_ID_LEN,
+	       "ctx id must be less than TRANSPORT_CONN_ID_LEN");
 
 typedef struct tls_ctx_
 {
@@ -61,7 +63,7 @@ typedef struct tls_ctx_
     transport_connection_t connection;
     tls_ctx_id_t c_tls_ctx_id;
   };
-#define parent_app_index c_tls_ctx_id.parent_app_index
+#define parent_app_wrk_index c_tls_ctx_id.parent_app_wrk_index
 #define app_session_handle c_tls_ctx_id.app_session_handle
 #define tls_session_handle c_tls_ctx_id.tls_session_handle
 #define listener_ctx_index c_tls_ctx_id.listener_ctx_index
@@ -72,10 +74,17 @@ typedef struct tls_ctx_
   /* Temporary storage for session open opaque. Overwritten once
    * underlying tcp connection is established */
 #define parent_app_api_context c_tls_ctx_id.parent_app_api_ctx
+#define migration_ctx	       c_tls_ctx_id.migrate_ctx
 
   u8 is_passive_close;
   u8 resume;
+  u8 app_closed;
+  u8 no_app_session;
+  u8 is_migrated;
   u8 *srv_hostname;
+  u32 evt_index;
+  u32 ckpair_index;
+  transport_proto_t tls_type;
 } tls_ctx_t;
 
 typedef struct tls_main_
@@ -92,33 +101,42 @@ typedef struct tls_main_
    */
   u8 use_test_cert_in_ca;
   char *ca_cert_path;
+  u64 first_seg_size;
+  u32 fifo_size;
 } tls_main_t;
 
 typedef struct tls_engine_vft_
 {
   u32 (*ctx_alloc) (void);
+  u32 (*ctx_alloc_w_thread) (u32 thread_index);
   void (*ctx_free) (tls_ctx_t * ctx);
+  void *(*ctx_detach) (tls_ctx_t *ctx);
+  u32 (*ctx_attach) (u32 thread_index, void *ctx);
   tls_ctx_t *(*ctx_get) (u32 ctx_index);
   tls_ctx_t *(*ctx_get_w_thread) (u32 ctx_index, u8 thread_index);
   int (*ctx_init_client) (tls_ctx_t * ctx);
   int (*ctx_init_server) (tls_ctx_t * ctx);
   int (*ctx_read) (tls_ctx_t * ctx, session_t * tls_session);
-  int (*ctx_write) (tls_ctx_t * ctx, session_t * app_session);
+  int (*ctx_write) (tls_ctx_t * ctx, session_t * app_session,
+		    transport_send_params_t * sp);
     u8 (*ctx_handshake_is_over) (tls_ctx_t * ctx);
   int (*ctx_start_listen) (tls_ctx_t * ctx);
   int (*ctx_stop_listen) (tls_ctx_t * ctx);
+  int (*ctx_transport_close) (tls_ctx_t * ctx);
+  int (*ctx_app_close) (tls_ctx_t * ctx);
 } tls_engine_vft_t;
 
 tls_main_t *vnet_tls_get_main (void);
 void tls_register_engine (const tls_engine_vft_t * vft,
-			  tls_engine_type_t type);
+			  crypto_engine_type_t type);
 int tls_add_vpp_q_rx_evt (session_t * s);
 int tls_add_vpp_q_tx_evt (session_t * s);
 int tls_add_vpp_q_builtin_tx_evt (session_t * s);
 int tls_add_vpp_q_builtin_rx_evt (session_t * s);
 int tls_notify_app_accept (tls_ctx_t * ctx);
-int tls_notify_app_connected (tls_ctx_t * ctx, u8 is_failed);
+int tls_notify_app_connected (tls_ctx_t * ctx, session_error_t err);
 void tls_notify_app_enqueue (tls_ctx_t * ctx, session_t * app_session);
+void tls_disconnect_transport (tls_ctx_t * ctx);
 #endif /* SRC_VNET_TLS_TLS_H_ */
 
 /*