iv-org-mirror
/
litespeed-quic
mirror of https://gitea.invidious.io/iv-org/litespeed-quic.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Only force TICK_CLOSE flag when CONNECTION_CLOSE frame received.

This commit is contained in:
George Wang 2021-06-11 22:18:01 -04:00
parent d1628a5677
commit 47440e4eaf
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/liblsquic/lsquic_full_conn.c
View File

@ -3597,15 +3597,18 @@ full_conn_ci_tick (lsquic_conn_t *lconn, lsquic_time_t now)
* packets scheduled to send, or silent close flag is not set.
*/
conn->fc_flags |= FC_TICK_CLOSE;
tick |= TICK_CLOSE;
if (conn->fc_flags & FC_RECV_CLOSE)
tick |= TICK_CLOSE;
if ((conn->fc_flags & FC_RECV_CLOSE) ||
0 != lsquic_send_ctl_n_scheduled(&conn->fc_send_ctl) ||
!conn->fc_settings->es_silent_close)
{
RETURN_IF_OUT_OF_PACKETS();
generate_connection_close_packet(conn);
tick |= TICK_SEND;
tick |= TICK_SEND|TICK_CLOSE;
}
else
tick |= TICK_CLOSE;
goto end;
}

7
src/liblsquic/lsquic_full_conn_ietf.c
View File

@ -8354,7 +8354,8 @@ ietf_full_conn_ci_tick (struct lsquic_conn *lconn, lsquic_time_t now)
{
LSQ_DEBUG("connection is OK to close");
conn->ifc_flags |= IFC_TICK_CLOSE;
tick |= TICK_CLOSE;
if (conn->ifc_flags & IFC_RECV_CLOSE)
tick |= TICK_CLOSE;
if (!(conn->ifc_mflags & MF_CONN_CLOSE_PACK)
/* Generate CONNECTION_CLOSE frame if:
* ... this is a client and handshake was successful;
@ -8379,8 +8380,10 @@ ietf_full_conn_ci_tick (struct lsquic_conn *lconn, lsquic_time_t now)
{
RETURN_IF_OUT_OF_PACKETS();
generate_connection_close_packet(conn);
tick |= TICK_SEND;
tick |= TICK_SEND|TICK_CLOSE;
}
else
tick |= TICK_CLOSE;
goto end;
}