From c821f24d5bfeb66e286b05f8163a24fd5e38e326 Mon Sep 17 00:00:00 2001 From: Andrei Vagin Date: Sat, 7 Oct 2017 00:31:54 +0300 Subject: [PATCH] libsoccr: ignore data in a sent queue, if a connect is closed If a connection was reseted, it can have some data in a sent queue, a use can't read this data, so we can ignore them too. https://jira.sw.ru/browse/PSBM-67026 Signed-off-by: Andrei Vagin --- soccr/soccr.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/soccr/soccr.c b/soccr/soccr.c index 1a1aaa35d..394095f00 100644 --- a/soccr/soccr.c +++ b/soccr/soccr.c @@ -209,6 +209,18 @@ static int refresh_sk(struct libsoccr_sk *sk, data->unsq_len = size; + if (data->state == TCP_CLOSE) { + /* A connection could be reseted. In thise case a sent queue + * may contain some data. A user can't read this data, so let's + * ignore them. Otherwise we will need to add a logic whether + * the send queue contains a fin packet or not and decide whether + * a fin or reset packet has to be sent to restore a state + */ + + data->unsq_len = 0; + data->outq_len = 0; + } + /* Don't account the fin packet. It doesn't countain real data. */ if ((1 << data->state) & (SNDQ_FIRST_FIN | SNDQ_SECOND_FIN)) { if (data->outq_len)