Skip to content

Fix: no_progress timeout too early. #532

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix: no_progress timeout too early. #532

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/liblsquic/lsquic_conn_public.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ struct lsquic_conn_public {
unsigned bytes_in; /* successfully processed */
unsigned bytes_out;
/* Used for no-progress timeout */
lsquic_time_t last_tick, last_prog;
lsquic_time_t last_prog;
unsigned max_peer_ack_usec;
uint8_t n_special_streams;
};
Expand Down
4 changes: 1 addition & 3 deletions src/liblsquic/lsquic_full_conn.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3355,17 +3355,15 @@ maybe_set_noprogress_alarm (struct full_conn *conn, lsquic_time_t now)

if (conn->fc_flags & FC_NOPROG_TIMEOUT)
{
if (conn->fc_pub.last_tick)
if (conn->fc_pub.last_prog)
{
exp = conn->fc_pub.last_prog + conn->fc_enpub->enp_noprog_timeout;
if (!lsquic_alarmset_is_set(&conn->fc_alset, AL_IDLE)
|| exp < conn->fc_alset.as_expiry[AL_IDLE])
lsquic_alarmset_set(&conn->fc_alset, AL_IDLE, exp);
conn->fc_pub.last_tick = now;
}
else
{
conn->fc_pub.last_tick = now;
conn->fc_pub.last_prog = now;
}
}
Expand Down
12 changes: 6 additions & 6 deletions src/liblsquic/lsquic_full_conn_ietf.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6055,9 +6055,11 @@ process_ping_frame (struct ietf_full_conn *conn,
if (conn->ifc_flags & IFC_SERVER)
log_conn_flow_control(conn);

LSQ_DEBUG("received PING frame, update last progress to %"PRIu64,
conn->ifc_pub.last_tick);
conn->ifc_pub.last_prog = conn->ifc_pub.last_tick;
if (conn->ifc_pub.last_prog) {
conn->ifc_pub.last_prog = lsquic_time_now();
LSQ_DEBUG("received PING frame, update last progress to %"PRIu64,
conn->ifc_pub.last_prog);
}

return 1;
}
Expand Down Expand Up @@ -8083,17 +8085,15 @@ maybe_set_noprogress_alarm (struct ietf_full_conn *conn, lsquic_time_t now)

if (conn->ifc_mflags & MF_NOPROG_TIMEOUT)
{
if (conn->ifc_pub.last_tick)
if (conn->ifc_pub.last_prog)
{
exp = conn->ifc_pub.last_prog + conn->ifc_enpub->enp_noprog_timeout;
if (!lsquic_alarmset_is_set(&conn->ifc_alset, AL_IDLE)
|| exp < conn->ifc_alset.as_expiry[AL_IDLE])
lsquic_alarmset_set(&conn->ifc_alset, AL_IDLE, exp);
conn->ifc_pub.last_tick = now;
}
else
{
conn->ifc_pub.last_tick = now;
conn->ifc_pub.last_prog = now;
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/liblsquic/lsquic_send_ctl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1299,9 +1299,9 @@ lsquic_send_ctl_got_ack (lsquic_send_ctl_t *ctl,
if (packet_out && (packet_out->po_frame_types & QUIC_FTBIT_PING)
&& ctl->sc_conn_pub->last_prog)
{
ctl->sc_conn_pub->last_prog = lsquic_time_now();
LSQ_DEBUG("ACK to PING frame, update last progress to %"PRIu64,
ctl->sc_conn_pub->last_tick);
ctl->sc_conn_pub->last_prog = ctl->sc_conn_pub->last_tick;
ctl->sc_conn_pub->last_prog);
}
}

Expand Down
11 changes: 5 additions & 6 deletions src/liblsquic/lsquic_stream.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,14 +268,13 @@ stream_inside_callback (const lsquic_stream_t *stream)
static void
maybe_update_last_progress (struct lsquic_stream *stream)
{
if (stream->conn_pub && !lsquic_stream_is_critical(stream))
if (stream->conn_pub && !lsquic_stream_is_critical(stream) && stream->conn_pub->last_prog)
{
if (stream->conn_pub->last_prog != stream->conn_pub->last_tick)
LSQ_DEBUG("update last progress to %"PRIu64,
stream->conn_pub->last_tick);
stream->conn_pub->last_prog = stream->conn_pub->last_tick;
stream->conn_pub->last_prog = lsquic_time_now();
LSQ_DEBUG("update last progress to %"PRIu64,
stream->conn_pub->last_prog);
#ifndef NDEBUG
stream->sm_last_prog = stream->conn_pub->last_tick;
stream->sm_last_prog = stream->conn_pub->last_prog;
#endif
}
}
Expand Down