Mercurial > hg > nginx

changeset 8363:d3395396ce51 quic

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed packet retransmission. Previously frames in ctx->sent queue could be lost.
author Roman Arutyunyan <arut@nginx.com>
date Fri, 24 Apr 2020 17:20:37 +0300
parents 44cac24aaa44
children eee307399229
files src/event/ngx_event_quic.c
diffstat 1 files changed, 10 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/src/event/ngx_event_quic.c
+++ b/src/event/ngx_event_quic.c
@@ -2586,11 +2586,18 @@ ngx_quic_retransmit(ngx_connection_t *c,
     }
 
     q = ngx_queue_head(&ctx->sent);
-    start = ngx_queue_data(q, ngx_quic_frame_t, queue);
-    pn = start->pnum;
-    f = start;
 
     do {
+        start = ngx_queue_data(q, ngx_quic_frame_t, queue);
+
+        wait = start->last + qc->tp.max_ack_delay - now;
+
+        if ((ngx_msec_int_t) wait > 0) {
+            break;
+        }
+
+        pn = start->pnum;
+
         ngx_queue_init(&range);
 
         /* send frames with same packet number to the wire */
@@ -2614,12 +2621,6 @@ ngx_quic_retransmit(ngx_connection_t *c,
 
         } while (q != ngx_queue_sentinel(&ctx->sent));
 
-        wait = start->last + qc->tp.max_ack_delay - now;
-
-        if ((ngx_msec_int_t) wait > 0) {
-            break;
-        }
-
         /* NGX_DONE is impossible here, such frames don't get into this queue */
         if (ngx_quic_send_frames(c, &range) != NGX_OK) {
             return NGX_ERROR;