walkero
/
nghttp2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Always call write_quic when timer expires

This commit is contained in:
Tatsuhiro Tsujikawa 2019-07-24 23:13:25 +09:00
parent d0cdea3f5d
commit 25b9ec522a
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/h2load_quic.cc
View File

@ -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,17 +918,13 @@ 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() {
auto expiry = ngtcp2_conn_get_expiry(quic.conn); auto expiry = ngtcp2_conn_get_expiry(quic.conn);