X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Ftls%2Ftls.c;fp=src%2Fvnet%2Ftls%2Ftls.c;h=3c06498e6e0b430079444b432d08cb58f7c5479d;hb=ea158d64a0aa0673807c74ce00fc854519ba589c;hp=60a819571cf3e54a8126dbf086ef77594de7981c;hpb=7c90be5e2963e7852754e963cc92fca0b64c3bb7;p=vpp.git diff --git a/src/vnet/tls/tls.c b/src/vnet/tls/tls.c index 60a819571cf..3c06498e6e0 100644 --- a/src/vnet/tls/tls.c +++ b/src/vnet/tls/tls.c @@ -405,6 +405,12 @@ tls_ctx_transport_close (tls_ctx_t * ctx) return tls_vfts[ctx->tls_ctx_engine].ctx_transport_close (ctx); } +static inline int +tls_ctx_transport_reset (tls_ctx_t *ctx) +{ + return tls_vfts[ctx->tls_ctx_engine].ctx_transport_reset (ctx); +} + static inline int tls_ctx_app_close (tls_ctx_t * ctx) { @@ -440,32 +446,13 @@ tls_notify_app_io_error (tls_ctx_t *ctx) } void -tls_session_reset_callback (session_t * s) +tls_session_reset_callback (session_t *ts) { tls_ctx_t *ctx; - transport_connection_t *tc; - session_t *app_session; - ctx = tls_ctx_get (s->opaque); + ctx = tls_ctx_get_w_thread (ts->opaque, ts->thread_index); ctx->flags |= TLS_CONN_F_PASSIVE_CLOSE; - tc = &ctx->connection; - if (tls_ctx_handshake_is_over (ctx)) - { - session_transport_reset_notify (tc); - session_transport_closed_notify (tc); - tls_disconnect_transport (ctx); - } - else - { - app_session = session_get_if_valid (ctx->c_s_index, ctx->c_thread_index); - if (app_session) - { - session_free (app_session); - ctx->c_s_index = SESSION_INVALID_INDEX; - ctx->flags |= TLS_CONN_F_NO_APP_SESSION; - tls_disconnect_transport (ctx); - } - } + tls_ctx_transport_reset (ctx); } static void