summaryrefslogtreecommitdiffstats
path: root/src/vnet
diff options
context:
space:
mode:
authorZeyu Zhang <zeyu.zhang@intel.com>2019-10-12 14:21:59 +0800
committerFlorin Coras <florin.coras@gmail.com>2019-10-30 15:47:00 +0000
commitcbbc4a2558eca8d78e0bd713ff58c54e294b1819 (patch)
tree6e88a0dd2f99ad7f0dae7fde97ce8e5e210f723d /src/vnet
parent0c4def0e84e3f563d9b2729f16b159f18d382602 (diff)
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>
Diffstat (limited to 'src/vnet')
-rw-r--r--src/vnet/session/session.c3
-rw-r--r--src/vnet/tls/tls.c12
2 files changed, 12 insertions, 3 deletions
diff --git a/src/vnet/session/session.c b/src/vnet/session/session.c
index 1189d53b3cc..d9a733d356e 100644
--- a/src/vnet/session/session.c
+++ b/src/vnet/session/session.c
@@ -864,7 +864,8 @@ session_transport_delete_notify (transport_connection_t * tc)
/* Session was created but accept notification was not yet sent to the
* app. Cleanup everything. */
session_lookup_del_session (s);
- session_free_w_fifos (s);
+ segment_manager_dealloc_fifos (s->rx_fifo, s->tx_fifo);
+ session_free (s);
break;
case SESSION_STATE_ACCEPTING:
case SESSION_STATE_TRANSPORT_CLOSING:
diff --git a/src/vnet/tls/tls.c b/src/vnet/tls/tls.c
index 28c1f5855ea..7b61453a9f7 100644
--- a/src/vnet/tls/tls.c
+++ b/src/vnet/tls/tls.c
@@ -358,10 +358,18 @@ void
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);
}