Commit 19fb74b0 authored by Tatsuhiro Tsujikawa's avatar Tatsuhiro Tsujikawa

Always call write_quic when timer expires

parent 5b788f52
...@@ -911,7 +911,6 @@ void quic_pkt_timeout_cb(struct ev_loop *loop, ev_timer *w, int revents) { ...@@ -911,7 +911,6 @@ void quic_pkt_timeout_cb(struct ev_loop *loop, ev_timer *w, int revents) {
int Client::quic_pkt_timeout() { int Client::quic_pkt_timeout() {
int rv; int rv;
auto now = timestamp(worker->loop); auto now = timestamp(worker->loop);
auto should_write = false;
if (ngtcp2_conn_loss_detection_expiry(quic.conn) <= now) { if (ngtcp2_conn_loss_detection_expiry(quic.conn) <= now) {
rv = ngtcp2_conn_on_loss_detection_timer(quic.conn, now); rv = ngtcp2_conn_on_loss_detection_timer(quic.conn, now);
...@@ -919,16 +918,12 @@ int Client::quic_pkt_timeout() { ...@@ -919,16 +918,12 @@ int Client::quic_pkt_timeout() {
quic.last_error = quic::err_transport(NGTCP2_ERR_INTERNAL); quic.last_error = quic::err_transport(NGTCP2_ERR_INTERNAL);
return -1; return -1;
} }
should_write = true;
} }
if (ngtcp2_conn_ack_delay_expiry(quic.conn) <= now) { if (ngtcp2_conn_ack_delay_expiry(quic.conn) <= now) {
ngtcp2_conn_cancel_expired_ack_delay_timer(quic.conn, now); ngtcp2_conn_cancel_expired_ack_delay_timer(quic.conn, now);
should_write = true;
} }
if (should_write) {
return write_quic(); return write_quic();
}
return 0;
} }
void Client::quic_restart_pkt_timer() { void Client::quic_restart_pkt_timer() {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment