Merge pull request #580 from h2o/kazuho/jumpstart-use-max-rate

for careful resume, use max(latest, smoothed) rather than smoothed
h2o · May 13, 2024 · 052eae2 · 052eae2
2 parents 696ff63 + 9369520
commit 052eae2
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/lib/quicly.c b/lib/quicly.c
@@ -4278,8 +4278,9 @@ static int send_resumption_token(quicly_conn_t *conn, quicly_send_context_t *s)
     { /* fill conn->super.stats.token_sent the information we are sending now */
         quicly_rate_t rate;
         conn->super.stats.token_sent.at = conn->stash.now - conn->created_at;
-        if (conn->egress.loss.rtt.minimum != 0 && (quicly_ratemeter_report(&conn->egress.ratemeter, &rate), rate.smoothed != 0)) {
-            conn->super.stats.token_sent.rate = rate.smoothed;
+        if (conn->egress.loss.rtt.minimum != 0 &&
+            (quicly_ratemeter_report(&conn->egress.ratemeter, &rate), rate.smoothed != 0 || rate.latest != 0)) {
+            conn->super.stats.token_sent.rate = rate.smoothed > rate.latest ? rate.smoothed : rate.latest;
             conn->super.stats.token_sent.rtt = conn->egress.loss.rtt.minimum;
         } else {
             conn->super.stats.token_sent.rate = 0;