tcp: fix close wait timeout with no fin

[vpp.git] / src / vnet / tcp / tcp.c

diff --git a/src/vnet/tcp/tcp.c b/src/vnet/tcp/tcp.c
index d00f4ab..1c8ce34 100644 (file)
--- a/src/vnet/tcp/tcp.c
+++ b/src/vnet/tcp/tcp.c
@@ -1017,8 +1017,8 @@ tcp_round_snd_space (tcp_connection_t * tc, u32 snd_space)
  * @param tc tcp connection
  * @return number of bytes session is allowed to write
  */
-static u32
-tcp_snd_space (tcp_connection_t * tc)
+static inline u32
+tcp_snd_space_inline (tcp_connection_t * tc)
 {
   int snd_space, snt_limited;
 
@@ -1066,11 +1066,17 @@ tcp_snd_space (tcp_connection_t * tc)
   return 0;
 }
 
+u32
+tcp_snd_space (tcp_connection_t * tc)
+{
+  return tcp_snd_space_inline (tc);
+}
+
 static u32
 tcp_session_send_space (transport_connection_t * trans_conn)
 {
   tcp_connection_t *tc = (tcp_connection_t *) trans_conn;
-  return clib_min (tcp_snd_space (tc),
+  return clib_min (tcp_snd_space_inline (tc),
                   tc->snd_wnd - (tc->snd_nxt - tc->snd_una));
 }
 
@@ -1186,6 +1192,10 @@ tcp_timer_waitclose_handler (u32 conn_index)
          clib_warning ("FIN was sent and still in CLOSE WAIT. Weird!");
        }
 
+      /* Make sure we don't try to send unsent data */
+      tcp_connection_timers_reset (tc);
+      tcp_cong_recovery_off (tc);
+      tc->snd_una_max = tc->snd_nxt = tc->snd_una;
       tcp_send_fin (tc);
       tc->state = TCP_STATE_LAST_ACK;