X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Ftls%2Ftls.h;h=d950fe8262979e9aaecc23ec9097801c1a8cc442;hb=6e8e10f79f8543ee60b5474932cda492abe48990;hp=6de6924d3902a64c725db2d0af17bcdf86d0549a;hpb=06a6a30f911383523931cd05c515f08aead7fbd0;p=vpp.git

diff --git a/src/vnet/tls/tls.h b/src/vnet/tls/tls.h
index 6de6924d390..d950fe82629 100644
--- a/src/vnet/tls/tls.h
+++ b/src/vnet/tls/tls.h
@@ -37,22 +37,23 @@
 #endif
 
 /* *INDENT-OFF* */
-typedef CLIB_PACKED (struct tls_cxt_id_
+typedef struct tls_cxt_id_
 {
-  u32 parent_app_wrk_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;
+} 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_
 {
@@ -75,7 +76,11 @@ typedef struct tls_ctx_
 
   u8 is_passive_close;
   u8 resume;
+  u8 app_closed;
+  u8 no_app_session;
   u8 *srv_hostname;
+  u32 evt_index;
+  u32 ckpair_index;
 } tls_ctx_t;
 
 typedef struct tls_main_
@@ -105,7 +110,8 @@ typedef struct tls_engine_vft_
   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);
@@ -115,13 +121,13 @@ typedef struct tls_engine_vft_
 
 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_ */