From 23ccaa6191dddcd901ee1e82248b97859e27b510 Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Wed, 24 Jul 2019 23:13:25 +0900 Subject: [PATCH] Always call write_quic when timer expires --- src/h2load_quic.cc | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/h2load_quic.cc b/src/h2load_quic.cc index a51b1d55..e59e5550 100644 --- a/src/h2load_quic.cc +++ b/src/h2load_quic.cc @@ -911,7 +911,6 @@ void quic_pkt_timeout_cb(struct ev_loop *loop, ev_timer *w, int revents) { int Client::quic_pkt_timeout() { int rv; auto now = timestamp(worker->loop); - auto should_write = false; if (ngtcp2_conn_loss_detection_expiry(quic.conn) <= now) { rv = ngtcp2_conn_on_loss_detection_timer(quic.conn, now); @@ -919,16 +918,12 @@ int Client::quic_pkt_timeout() { quic.last_error = quic::err_transport(NGTCP2_ERR_INTERNAL); return -1; } - should_write = true; } if (ngtcp2_conn_ack_delay_expiry(quic.conn) <= now) { ngtcp2_conn_cancel_expired_ack_delay_timer(quic.conn, now); - should_write = true; } - if (should_write) { - return write_quic(); - } - return 0; + + return write_quic(); } void Client::quic_restart_pkt_timer() {