iv-org-mirror/litespeed-quic
1
0
Fork 0
mirror of https://gitea.invidious.io/iv-org/litespeed-quic.git synced 2024-08-15 00:53:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'litespeedtech:master' into master

Browse source
This commit is contained in:
M-BELLAHCENE 2022-09-27 10:12:05 +02:00 • committed by GitHub
commit f86548d7c9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/liblsquic/lsquic_full_conn.c
View file

@ -3411,6 +3411,8 @@ full_conn_ci_tick (lsquic_conn_t *lconn, lsquic_time_t now)
++conn->fc_stats.n_ticks; ++conn->fc_stats.n_ticks;
#endif #endif
CLOSE_IF_NECESSARY();
if (LSQ_LOG_ENABLED(LSQ_LOG_DEBUG) if (LSQ_LOG_ENABLED(LSQ_LOG_DEBUG)
&& conn->fc_mem_logged_last + 1000000 <= now) && conn->fc_mem_logged_last + 1000000 <= now)
{ {

4
src/liblsquic/lsquic_full_conn_ietf.c
View file

@ -1886,7 +1886,7 @@ generate_ack_frame_for_pns (struct ietf_full_conn *conn,
&conn->ifc_rechist[pns], now, &has_missing, &packet_out->po_ack2ed, &conn->ifc_rechist[pns], now, &has_missing, &packet_out->po_ack2ed,
ecn_counts); ecn_counts);
if (w < 0) { if (w < 0) {
ABORT_ERROR("generating ACK frame failed: %d", errno); ABORT_ERROR("%s generating ACK frame failed: %d", lsquic_pns2str[pns], errno);
return -1; return -1;
} }
CONN_STATS(out.acks, 1); CONN_STATS(out.acks, 1);
@ -8201,6 +8201,8 @@ ietf_full_conn_ci_tick (struct lsquic_conn *lconn, lsquic_time_t now)
CONN_STATS(n_ticks, 1); CONN_STATS(n_ticks, 1);
CLOSE_IF_NECESSARY();
if (conn->ifc_flags & IFC_HAVE_SAVED_ACK) if (conn->ifc_flags & IFC_HAVE_SAVED_ACK)
{ {
(void) /* If there is an error, we'll fail shortly */ (void) /* If there is an error, we'll fail shortly */

2
src/liblsquic/lsquic_send_ctl.c
View file

@ -3424,6 +3424,8 @@ lsquic_send_ctl_empty_pns (struct lsquic_send_ctl *ctl, enum packnum_space pns)
lsquic_alarmset_unset(ctl->sc_alset, AL_RETX_INIT + pns); lsquic_alarmset_unset(ctl->sc_alset, AL_RETX_INIT + pns);
ctl->sc_flags &= ~(SC_LOST_ACK_INIT << pns);
LSQ_DEBUG("emptied %s, destroyed %u packet%.*s", lsquic_pns2str[pns], LSQ_DEBUG("emptied %s, destroyed %u packet%.*s", lsquic_pns2str[pns],
count, count != 1, "s"); count, count != 1, "s");
} }