Mercurial > hg > nginx

diff src/event/quic/ngx_event_quic.c @ 8692:0697294f79a4 quic

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
QUIC: removed redundant "app" flag from ngx_quic_close_frame_t. The flag was introduced to create type-aware CONNECTION_CLOSE frames, and now is replaced with frame type information, directly accessible. Notably, this fixes type logging for received frames in b3d9e57d0f62.
author Sergey Kandaurov <pluknet@nginx.com>
date Wed, 03 Feb 2021 12:39:41 +0300
parents a346905c359f
children 3956bbf91002
line wrap: on
line diff
--- a/src/event/quic/ngx_event_quic.c
+++ b/src/event/quic/ngx_event_quic.c
@@ -522,7 +522,8 @@ ngx_quic_log_frame(ngx_log_t *log, ngx_q
     case NGX_QUIC_FT_CONNECTION_CLOSE:
     case NGX_QUIC_FT_CONNECTION_CLOSE_APP:
         p = ngx_slprintf(p, last, "CONNECTION_CLOSE%s err:%ui",
-                         f->u.close.app ? "_APP" : "", f->u.close.error_code);
+                         f->type == NGX_QUIC_FT_CONNECTION_CLOSE ? "" : "_APP",
+                         f->u.close.error_code);
 
         if (f->u.close.reason.len) {
             p = ngx_slprintf(p, last, " %V", &f->u.close.reason);
@@ -3251,10 +3252,10 @@ ngx_quic_send_cc(ngx_connection_t *c)
     }
 
     frame->level = qc->error_level;
-    frame->type = NGX_QUIC_FT_CONNECTION_CLOSE;
+    frame->type = qc->error_app ? NGX_QUIC_FT_CONNECTION_CLOSE_APP
+                                : NGX_QUIC_FT_CONNECTION_CLOSE;
     frame->u.close.error_code = qc->error;
     frame->u.close.frame_type = qc->error_ftype;
-    frame->u.close.app = qc->error_app;
 
     if (qc->error_reason) {
         frame->u.close.reason.len = ngx_strlen(qc->error_reason);