X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Ftls%2Ftls.h;h=09f1bdc7b07551963c12b62d99ce394c8657828b;hb=a26373bda8aa66cebf03ac092c20fdf4b0a0f625;hp=0dfc48bd3360e06057181bf39345023940599585;hpb=d77eee64b17762bf21f8dbe0b9f955513f81f1a5;p=vpp.git

diff --git a/src/vnet/tls/tls.h b/src/vnet/tls/tls.h
index 0dfc48bd336..09f1bdc7b07 100644
--- a/src/vnet/tls/tls.h
+++ b/src/vnet/tls/tls.h
@@ -32,7 +32,7 @@
   if (_lvl <= TLS_DEBUG) 				\
     clib_warning (_fmt, ##_args)
 #else
-#define TLS_DBG(_fmt, _args...)
+#define TLS_DBG(_lvl, _fmt, _args...)
 #endif
 
 /* *INDENT-OFF* */
@@ -41,8 +41,10 @@ typedef CLIB_PACKED (struct tls_cxt_id_
   u32 parent_app_index;
   session_handle_t app_session_handle;
   session_handle_t tls_session_handle;
+  u32 ssl_ctx;
   u32 listener_ctx_index;
   u8 tcp_is_ip4;
+  u8 tls_engine_id;
 }) tls_ctx_id_t;
 /* *INDENT-ON* */
 
@@ -60,12 +62,15 @@ typedef struct tls_ctx_
 #define tls_session_handle c_tls_ctx_id.tls_session_handle
 #define listener_ctx_index c_tls_ctx_id.listener_ctx_index
 #define tcp_is_ip4 c_tls_ctx_id.tcp_is_ip4
-#define tls_ctx_idx c_c_index
+#define tls_ctx_engine c_tls_ctx_id.tls_engine_id
+#define tls_ssl_ctx c_tls_ctx_id.ssl_ctx
+#define tls_ctx_handle c_c_index
   /* Temporary storage for session open opaque. Overwritten once
    * underlying tcp connection is established */
 #define parent_app_api_context c_s_index
 
   u8 is_passive_close;
+  u8 resume;
   u8 *srv_hostname;
 } tls_ctx_t;
 
@@ -75,6 +80,8 @@ typedef struct tls_main_
   tls_ctx_t *listener_ctx_pool;
   tls_ctx_t *half_open_ctx_pool;
   clib_rwlock_t half_open_rwlock;
+  u8 **rx_bufs;
+  u8 **tx_bufs;
 
   /*
    * Config
@@ -91,22 +98,16 @@ typedef struct tls_engine_vft_
   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, u8 * buf, u32 len);
-  int (*ctx_write) (tls_ctx_t * ctx, u8 * buf, u32 len);
-  int (*ctx_handshake_rx) (tls_ctx_t * ctx);
+  int (*ctx_read) (tls_ctx_t * ctx, stream_session_t * tls_session);
+  int (*ctx_write) (tls_ctx_t * ctx, stream_session_t * app_session);
     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);
 } tls_engine_vft_t;
 
-enum tls_handshake_results_
-{
-  HANDSHAKE_NOT_OVER,
-  CLIENT_HANDSHAKE_OK,
-  CLIENT_HANDSHAKE_FAIL,
-  SERVER_HANDSHAKE_OK
-};
-
 typedef enum tls_engine_type_
 {
+  TLS_ENGINE_NONE,
   TLS_ENGINE_MBEDTLS,
   TLS_ENGINE_OPENSSL,
   TLS_N_ENGINES
@@ -115,8 +116,13 @@ typedef enum tls_engine_type_
 tls_main_t *vnet_tls_get_main (void);
 void tls_register_engine (const tls_engine_vft_t * vft,
 			  tls_engine_type_t type);
-int tls_add_vpp_q_evt (svm_fifo_t * f, u8 evt_type);
-
+int tls_add_vpp_q_rx_evt (stream_session_t * s);
+int tls_add_vpp_q_tx_evt (stream_session_t * s);
+int tls_add_vpp_q_builtin_tx_evt (stream_session_t * s);
+int tls_add_vpp_q_builtin_rx_evt (stream_session_t * s);
+int tls_notify_app_accept (tls_ctx_t * ctx);
+int tls_notify_app_connected (tls_ctx_t * ctx, u8 is_failed);
+void tls_notify_app_enqueue (tls_ctx_t * ctx, stream_session_t * app_session);
 #endif /* SRC_VNET_TLS_TLS_H_ */
 /*
  * fd.io coding-style-patch-verification: ON