tcp: reset fin-wait-2 timeout connections

Type: improvement

Signed-off-by: Florin Coras <fcoras@cisco.com>
Change-Id: Id931f3f308a01788d222d0d62f26f5c579321c6a

diff --git a/src/vnet/tcp/tcp.c b/src/vnet/tcp/tcp.c
index f83f00a..e34f773 100644 (file)
--- a/src/vnet/tcp/tcp.c
+++ b/src/vnet/tcp/tcp.c
@@ -1431,6 +1431,14 @@ tcp_timer_waitclose_handler (u32 conn_index, u32 thread_index)
       session_transport_closed_notify (&tc->connection);
       tcp_worker_stats_inc (thread_index, to_closing, 1);
       break;
+    case TCP_STATE_FIN_WAIT_2:
+      tcp_send_reset (tc);
+      tcp_connection_timers_reset (tc);
+      tcp_connection_set_state (tc, TCP_STATE_CLOSED);
+      session_transport_closed_notify (&tc->connection);
+      tcp_timer_set (tc, TCP_TIMER_WAITCLOSE, tcp_cfg.cleanup_time);
+      tcp_worker_stats_inc (thread_index, to_finwait2, 1);
+      break;
     default:
       tcp_connection_del (tc);
       break;

diff --git a/src/vnet/tcp/tcp.h b/src/vnet/tcp/tcp.h
index 1549efb..a60e105 100644 (file)
--- a/src/vnet/tcp/tcp.h
+++ b/src/vnet/tcp/tcp.h
@@ -508,6 +508,7 @@ typedef struct _tcp_lookup_dispatch
   _(tr_events, u32, "timer retransmit events")                 \
   _(to_closewait, u32, "timeout close-wait")                   \
   _(to_finwait1, u32, "timeout fin-wait-1")                    \
+  _(to_finwait2, u32, "timeout fin-wait-2")                    \
   _(to_lastack, u32, "timeout last-ack")                       \
   _(to_closing, u32, "timeout closing")                                \
   _(tr_abort, u32, "timer retransmit abort")                   \