session: fix cleanup in closing states

Type: fix

Change-Id: Iccc283bb98d3bb459a711ec2b74d6a32ad12903b
Signed-off-by: Florin Coras <[email protected]>
(cherry picked from commit 54c93cfc2556d9c6d2cf472f51d4c2866a556ef6)

diff --git a/src/vnet/session/session.c b/src/vnet/session/session.c
index cc9f4a8..47f7326 100644 (file)
--- a/src/vnet/session/session.c
+++ b/src/vnet/session/session.c
@@ -1279,11 +1279,9 @@ session_transport_reset (session_t * s)
 void
 session_transport_cleanup (session_t * s)
 {
-  s->session_state = SESSION_STATE_CLOSED;
-
   /* Delete from main lookup table before we axe the the transport */
   session_lookup_del_session (s);
-  if (s->session_state != SESSION_STATE_TRANSPORT_DELETED)
+  if (s->session_state < SESSION_STATE_TRANSPORT_DELETED)
     transport_cleanup (session_get_transport_proto (s), s->connection_index,
                       s->thread_index);
   /* Since we called cleanup, no delete notification will come. So, make

diff --git a/src/vnet/tcp/tcp.c b/src/vnet/tcp/tcp.c
index f32a709..75a45a4 100644 (file)
--- a/src/vnet/tcp/tcp.c
+++ b/src/vnet/tcp/tcp.c
@@ -475,6 +475,8 @@ tcp_session_cleanup (u32 conn_index, u32 thread_index)
 {
   tcp_connection_t *tc;
   tc = tcp_connection_get (conn_index, thread_index);
+  if (!tc)
+    return;
   tcp_connection_set_state (tc, TCP_STATE_CLOSED);
   tcp_connection_cleanup (tc);
 }