Mercurial > hg > nginx

diff src/event/ngx_event_quic_transport.c @ 8458:e0f92f68e018 quic

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
QUIC: Introduced ngx_quic_finalize_connection(). The function finalizes QUIC connection with an application protocol error code and sends a CONNECTION_CLOSE frame with type=0x1d. Also, renamed NGX_QUIC_FT_CONNECTION_CLOSE2 to NGX_QUIC_FT_CONNECTION_CLOSE_APP.
author Roman Arutyunyan <arut@nginx.com>
date Thu, 02 Jul 2020 16:33:59 +0300
parents 97adb87f149b
children 0d1ad81dd65c
line wrap: on
line diff
--- a/src/event/ngx_event_quic_transport.c
+++ b/src/event/ngx_event_quic_transport.c
@@ -726,10 +726,8 @@ ngx_quic_parse_frame(ngx_quic_header_t *
                        f->u.ncid.seqnum, f->u.ncid.retire, f->u.ncid.len);
         break;
 
-    case NGX_QUIC_FT_CONNECTION_CLOSE2:
-        /* fall through */
-
     case NGX_QUIC_FT_CONNECTION_CLOSE:
+    case NGX_QUIC_FT_CONNECTION_CLOSE_APP:
 
         p = ngx_quic_parse_int(p, end, &f->u.close.error_code);
         if (p == NULL) {
@@ -767,7 +765,7 @@ ngx_quic_parse_frame(ngx_quic_header_t *
         } else {
 
             ngx_log_debug2(NGX_LOG_DEBUG_EVENT, pkt->log, 0,
-                          "quic frame in: CONNECTION_CLOSE2:"
+                          "quic frame in: CONNECTION_CLOSE_APP:"
                           " code:0x%xi reason:'%V'",
                            f->u.close.error_code, &f->u.close.reason);
         }
@@ -1174,6 +1172,7 @@ ngx_quic_create_frame(u_char *p, ngx_qui
         return ngx_quic_create_stream(p, &f->u.stream);
 
     case NGX_QUIC_FT_CONNECTION_CLOSE:
+    case NGX_QUIC_FT_CONNECTION_CLOSE_APP:
         f->need_ack = 0;
         return ngx_quic_create_close(p, &f->u.close);
 
@@ -1742,13 +1741,21 @@ ngx_quic_create_transport_params(u_char 
 static size_t
 ngx_quic_create_close(u_char *p, ngx_quic_close_frame_t *cl)
 {
-    size_t   len;
-    u_char  *start;
+    size_t       len;
+    u_char      *start;
+    ngx_uint_t   type;
+
+    type = cl->app ? NGX_QUIC_FT_CONNECTION_CLOSE_APP
+                   : NGX_QUIC_FT_CONNECTION_CLOSE;
 
     if (p == NULL) {
-        len = ngx_quic_varint_len(NGX_QUIC_FT_CONNECTION_CLOSE);
+        len = ngx_quic_varint_len(type);
         len += ngx_quic_varint_len(cl->error_code);
-        len += ngx_quic_varint_len(cl->frame_type);
+
+        if (!cl->app) {
+            len += ngx_quic_varint_len(cl->frame_type);
+        }
+
         len += ngx_quic_varint_len(cl->reason.len);
         len += cl->reason.len;
 
@@ -1757,9 +1764,13 @@ ngx_quic_create_close(u_char *p, ngx_qui
 
     start = p;
 
-    ngx_quic_build_int(&p, NGX_QUIC_FT_CONNECTION_CLOSE);
+    ngx_quic_build_int(&p, type);
     ngx_quic_build_int(&p, cl->error_code);
-    ngx_quic_build_int(&p, cl->frame_type);
+
+    if (!cl->app) {
+        ngx_quic_build_int(&p, cl->frame_type);
+    }
+
     ngx_quic_build_int(&p, cl->reason.len);
     p = ngx_cpymem(p, cl->reason.data, cl->reason.len);