commit cbbc4a2558eca8d78e0bd713ff58c54e294b1819
author Zeyu Zhang <zeyu.zhang@intel.com> Sat Oct 12 14:21:59 2019 +0800
committer Florin Coras <florin.coras@gmail.com> Wed Oct 30 15:47:00 2019 +0000
tree 6e88a0dd2f99ad7f0dae7fde97ce8e5e210f723d
parent 0c4def0e84e3f563d9b2729f16b159f18d382602

tls: fix on tcp connection reset

VPP would fail in tcp_connection_reset() if the tls
or app session was just created.

Type: fix

Change-Id: I45d107f57e4f3fc468c15ca3392d5e1c413bd690
Signed-off-by: Zeyu Zhang <zeyu.zhang@intel.com>

src/vnet/tls/tls.c

diff --git a/src/vnet/tls/tls.c b/src/vnet/tls/tls.c
index 28c1f58..7b61453 100644
--- a/src/vnet/tls/tls.c
+++ b/src/vnet/tls/tls.c
@@ -358,10 +358,18 @@
 tls_session_reset_callback (session_t * s)
 {
   tls_ctx_t *ctx;
+  transport_connection_t *tc;
+  session_t *app_session;
 
   ctx = tls_ctx_get (s->opaque);
-  session_transport_reset_notify (&ctx->connection);
-  session_transport_closed_notify (&ctx->connection);
+  tc = &ctx->connection;
+  if (tls_ctx_handshake_is_over (ctx))
+    {
+      session_transport_reset_notify (tc);
+      session_transport_closed_notify (tc);
+    }
+  else if ((app_session = session_get (tc->s_index, tc->thread_index)))
+    session_free (app_session);
   tls_disconnect_transport (ctx);
 }