From 378213974e2c361c45a325c22ec5a9ca6a0a13cd Mon Sep 17 00:00:00 2001 From: Florin Coras Date: Thu, 23 May 2019 22:28:16 -0700 Subject: tcp: handle fin+rst in same frame Change-Id: Ie7a6c7b92a6beeb356f01384216a4982fb3d420e Signed-off-by: Florin Coras --- src/vnet/session/session.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/vnet/session/session.c b/src/vnet/session/session.c index c56712bbf87..4374678348e 100644 --- a/src/vnet/session/session.c +++ b/src/vnet/session/session.c @@ -879,9 +879,16 @@ session_transport_closed_notify (transport_connection_t * tc) if (!(s = session_get_if_valid (tc->s_index, tc->thread_index))) return; + /* Transport thinks that app requested close but it actually didn't. + * Can happen for tcp if fin and rst are received in close succession. */ + if (s->session_state == SESSION_STATE_READY) + { + session_transport_closing_notify (tc); + svm_fifo_dequeue_drop_all (s->server_tx_fifo); + } /* If app close has not been received or has not yet resulted in * a transport close, only mark the session transport as closed */ - if (s->session_state <= SESSION_STATE_CLOSING) + else if (s->session_state <= SESSION_STATE_CLOSING) { session_lookup_del_session (s); s->session_state = SESSION_STATE_TRANSPORT_CLOSED; -- cgit 1.2.3-korg