Mercurial > hg > nginx

changeset 8361:336d527ca031 quic

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Error messages cleanup. + added "quic" prefix to all error messages + rephrased some messages + removed excessive error logging from frame parser + added ngx_quic_check_peer() function to check proper source/destination match and do it one place
author Vladimir Homutov <vl@nginx.com>
date Fri, 24 Apr 2020 14:38:49 +0300
parents f175006124d0
children 44cac24aaa44
files src/event/ngx_event_quic.c src/event/ngx_event_quic_transport.c
diffstat 2 files changed, 135 insertions(+), 187 deletions(-) [+]
line wrap: on
line diff
--- a/src/event/ngx_event_quic.c
+++ b/src/event/ngx_event_quic.c
@@ -158,6 +158,8 @@ static ngx_int_t ngx_quic_handshake_inpu
     ngx_quic_header_t *pkt);
 static ngx_int_t ngx_quic_early_input(ngx_connection_t *c,
     ngx_quic_header_t *pkt);
+static ngx_int_t ngx_quic_check_peer(ngx_quic_connection_t *qc,
+    ngx_quic_header_t *pkt);
 static ngx_int_t ngx_quic_app_input(ngx_connection_t *c,
     ngx_quic_header_t *pkt);
 static ngx_int_t ngx_quic_payload_handler(ngx_connection_t *c,
@@ -385,7 +387,7 @@ ngx_quic_add_handshake_data(ngx_ssl_conn
                 || qc->ctp.max_packet_size > NGX_QUIC_DEFAULT_MAX_PACKET_SIZE)
             {
                 ngx_log_error(NGX_LOG_INFO, c->log, 0,
-                              "maximum packet size is invalid");
+                              "quic maximum packet size is invalid");
                 return NGX_ERROR;
             }
 
@@ -519,7 +521,8 @@ ngx_quic_new_connection(ngx_connection_t
     static u_char           buf[NGX_QUIC_DEFAULT_MAX_PACKET_SIZE];
 
     if (ngx_buf_size(pkt->raw) < NGX_QUIC_MIN_INITIAL_SIZE) {
-        ngx_log_error(NGX_LOG_INFO, c->log, 0, "too small UDP datagram");
+        ngx_log_error(NGX_LOG_INFO, c->log, 0,
+                      "quic UDP datagram is too small for initial packet");
         return NGX_ERROR;
     }
 
@@ -529,7 +532,7 @@ ngx_quic_new_connection(ngx_connection_t
 
     if (!ngx_quic_pkt_in(pkt->flags)) {
         ngx_log_error(NGX_LOG_INFO, c->log, 0,
-                      "invalid initial packet: 0x%xi", pkt->flags);
+                      "quic invalid initial packet: 0x%xi", pkt->flags);
         return NGX_ERROR;
     }
 
@@ -657,7 +660,7 @@ ngx_quic_init_connection(ngx_connection_
 
     if (SSL_set_quic_method(ssl_conn, &quic_method) == 0) {
         ngx_log_error(NGX_LOG_INFO, c->log, 0,
-                      "SSL_set_quic_method() failed");
+                      "quic SSL_set_quic_method() failed");
         return NGX_ERROR;
     }
 
@@ -686,7 +689,7 @@ ngx_quic_init_connection(ngx_connection_
 
     if (SSL_set_quic_transport_params(ssl_conn, p, len) == 0) {
         ngx_log_error(NGX_LOG_INFO, c->log, 0,
-                      "SSL_set_quic_transport_params() failed");
+                      "quic SSL_set_quic_transport_params() failed");
         return NGX_ERROR;
     }
 
@@ -738,7 +741,8 @@ ngx_quic_input_handler(ngx_event_t *rev)
     ngx_log_debug0(NGX_LOG_DEBUG_EVENT, rev->log, 0, "quic input handler");
 
     if (rev->timedout) {
-        ngx_log_error(NGX_LOG_INFO, c->log, NGX_ETIMEDOUT, "client timed out");
+        ngx_log_error(NGX_LOG_INFO, c->log, NGX_ETIMEDOUT,
+                      "quic client timed out");
         ngx_quic_close_connection(c, NGX_DONE);
         return;
     }
@@ -1003,7 +1007,9 @@ ngx_quic_input(ngx_connection_t *c, ngx_
 
         if (pkt.flags == 0) {
             /* XXX: no idea WTF is this, just ignore */
-            ngx_log_error(NGX_LOG_ALERT, c->log, 0, "FIREFOX: ZEROES");
+            ngx_log_error(NGX_LOG_ALERT, c->log, 0,
+                          "quic packet with zero flags, presumably"
+                          " firefox padding, ignored");
             break;
         }
 
@@ -1021,7 +1027,7 @@ ngx_quic_input(ngx_connection_t *c, ngx_
 
             } else {
                 ngx_log_error(NGX_LOG_INFO, c->log, 0,
-                              "BUG: unknown quic state");
+                              "quic unknown long packet type");
                 return NGX_ERROR;
             }
 
@@ -1110,7 +1116,7 @@ ngx_quic_handshake_input(ngx_connection_
 
     if (keys->client.key.len == 0) {
         ngx_log_error(NGX_LOG_INFO, c->log, 0,
-                      "no read keys yet, packet ignored");
+                      "quic no read keys yet, packet ignored");
         return NGX_DECLINED;
     }
 
@@ -1119,29 +1125,13 @@ ngx_quic_handshake_input(ngx_connection_
         return NGX_ERROR;
     }
 
-    if (pkt->dcid.len != qc->dcid.len) {
-        ngx_log_error(NGX_LOG_INFO, c->log, 0, "unexpected quic dcidl");
-        return NGX_ERROR;
-    }
-
-    if (ngx_memcmp(pkt->dcid.data, qc->dcid.data, qc->dcid.len) != 0) {
-        ngx_log_error(NGX_LOG_INFO, c->log, 0, "unexpected quic dcid");
-        return NGX_ERROR;
-    }
-
-    if (pkt->scid.len != qc->scid.len) {
-        ngx_log_error(NGX_LOG_INFO, c->log, 0, "unexpected quic scidl");
-        return NGX_ERROR;
-    }
-
-    if (ngx_memcmp(pkt->scid.data, qc->scid.data, qc->scid.len) != 0) {
-        ngx_log_error(NGX_LOG_INFO, c->log, 0, "unexpected quic scid");
+    if (ngx_quic_check_peer(qc, pkt) != NGX_OK) {
         return NGX_ERROR;
     }
 
     if (!ngx_quic_pkt_hs(pkt->flags)) {
         ngx_log_error(NGX_LOG_INFO, c->log, 0,
-                      "invalid packet type: 0x%xi", pkt->flags);
+                      "quic invalid packet type: 0x%xi", pkt->flags);
         return NGX_ERROR;
     }
 
@@ -1180,29 +1170,13 @@ ngx_quic_early_input(ngx_connection_t *c
         return NGX_ERROR;
     }
 
-    if (pkt->dcid.len != qc->dcid.len) {
-        ngx_log_error(NGX_LOG_INFO, c->log, 0, "unexpected quic dcidl");
-        return NGX_ERROR;
-    }
-
-    if (ngx_memcmp(pkt->dcid.data, qc->dcid.data, qc->dcid.len) != 0) {
-        ngx_log_error(NGX_LOG_INFO, c->log, 0, "unexpected quic dcid");
-        return NGX_ERROR;
-    }
-
-    if (pkt->scid.len != qc->scid.len) {
-        ngx_log_error(NGX_LOG_INFO, c->log, 0, "unexpected quic scidl");
-        return NGX_ERROR;
-    }
-
-    if (ngx_memcmp(pkt->scid.data, qc->scid.data, qc->scid.len) != 0) {
-        ngx_log_error(NGX_LOG_INFO, c->log, 0, "unexpected quic scid");
+    if (ngx_quic_check_peer(qc, pkt) != NGX_OK) {
         return NGX_ERROR;
     }
 
     if (!ngx_quic_pkt_zrtt(pkt->flags)) {
         ngx_log_error(NGX_LOG_INFO, c->log, 0,
-                      "invalid packet type: 0x%xi", pkt->flags);
+                      "quic invalid packet type: 0x%xi", pkt->flags);
         return NGX_ERROR;
     }
 
@@ -1211,7 +1185,7 @@ ngx_quic_early_input(ngx_connection_t *c
     }
 
     if (c->quic->state != NGX_QUIC_ST_EARLY_DATA) {
-        ngx_log_error(NGX_LOG_INFO, c->log, 0, "unexpected 0-RTT packet");
+        ngx_log_error(NGX_LOG_INFO, c->log, 0, "quic unexpected 0-RTT packet");
         return NGX_OK;
     }
 
@@ -1232,6 +1206,33 @@ ngx_quic_early_input(ngx_connection_t *c
 
 
 static ngx_int_t
+ngx_quic_check_peer(ngx_quic_connection_t *qc, ngx_quic_header_t *pkt)
+{
+    if (pkt->dcid.len != qc->dcid.len) {
+        ngx_log_error(NGX_LOG_INFO, pkt->log, 0, "quic unexpected quic dcidl");
+        return NGX_ERROR;
+    }
+
+    if (ngx_memcmp(pkt->dcid.data, qc->dcid.data, qc->dcid.len) != 0) {
+        ngx_log_error(NGX_LOG_INFO, pkt->log, 0, "quic unexpected quic dcid");
+        return NGX_ERROR;
+    }
+
+    if (pkt->scid.len != qc->scid.len) {
+        ngx_log_error(NGX_LOG_INFO, pkt->log, 0, "quic unexpected quic scidl");
+        return NGX_ERROR;
+    }
+
+    if (ngx_memcmp(pkt->scid.data, qc->scid.data, qc->scid.len) != 0) {
+        ngx_log_error(NGX_LOG_INFO, pkt->log, 0, "quic unexpected quic scid");
+        return NGX_ERROR;
+    }
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
 ngx_quic_app_input(ngx_connection_t *c, ngx_quic_header_t *pkt)
 {
     ngx_int_t               rc;
@@ -1249,7 +1250,7 @@ ngx_quic_app_input(ngx_connection_t *c, 
 
     if (keys->client.key.len == 0) {
         ngx_log_error(NGX_LOG_INFO, c->log, 0,
-                      "no read keys yet, packet ignored");
+                      "quic no read keys yet, packet ignored");
         return NGX_DECLINED;
     }
 
@@ -1448,7 +1449,7 @@ ngx_quic_payload_handler(ngx_connection_
 
     if (p != end) {
         ngx_log_error(NGX_LOG_INFO, c->log, 0,
-                      "trailing garbage in payload: %ui bytes", end - p);
+                      "quic trailing garbage in payload: %ui bytes", end - p);
         return NGX_ERROR;
     }
 
@@ -1551,7 +1552,7 @@ ngx_quic_handle_ack_frame(ngx_connection
 
     if (ack->first_range > ack->largest) {
         ngx_log_error(NGX_LOG_INFO, c->log, 0,
-                      "invalid first range in ack frame");
+                      "quic invalid first range in ack frame");
         return NGX_ERROR;
     }
 
@@ -1582,7 +1583,7 @@ ngx_quic_handle_ack_frame(ngx_connection
 
         if (gap >= min) {
             ngx_log_error(NGX_LOG_INFO, c->log, 0,
-                         "invalid range %ui in ack frame", i);
+                         "quic invalid range %ui in ack frame", i);
             return NGX_ERROR;
         }
 
@@ -1590,7 +1591,7 @@ ngx_quic_handle_ack_frame(ngx_connection
 
         if (range > max + 1) {
             ngx_log_error(NGX_LOG_INFO, c->log, 0,
-                         "invalid range %ui in ack frame", i);
+                         "quic invalid range %ui in ack frame", i);
             return NGX_ERROR;
         }
 
@@ -1640,7 +1641,7 @@ ngx_quic_handle_ack_frame_range(ngx_conn
         }
 
         ngx_log_error(NGX_LOG_INFO, c->log, 0,
-                      "ACK for the packet not in sent queue ");
+                      "quic ACK for the packet not in sent queue ");
         // TODO: handle error properly: PROTOCOL VIOLATION?
         return NGX_ERROR;
     }
@@ -1811,7 +1812,7 @@ ngx_quic_buffer_frame(ngx_connection_t *
     /* check limit on total size used by all buffered frames, not actual data */
     if (NGX_QUIC_MAX_BUFFERED - fs->total < f->length) {
         ngx_log_error(NGX_LOG_INFO, c->log, 0,
-                      "ordered input buffer limit exceeded");
+                      "quic ordered input buffer limit exceeded");
         return NGX_ERROR;
     }
 
@@ -1987,7 +1988,8 @@ ngx_quic_handle_stream_frame(ngx_connect
         }
 
         if (n < f->length) {
-            ngx_log_error(NGX_LOG_INFO, c->log, 0, "no space in stream buffer");
+            ngx_log_error(NGX_LOG_INFO, c->log, 0,
+                          "quic no space in stream buffer");
             return NGX_ERROR;
         }
 
@@ -2069,7 +2071,8 @@ ngx_quic_stream_input(ngx_connection_t *
     b = sn->b;
 
     if ((size_t) ((b->pos - b->start) + (b->end - b->last)) < f->length) {
-        ngx_log_error(NGX_LOG_INFO, c->log, 0, "no space in stream buffer");
+        ngx_log_error(NGX_LOG_INFO, c->log, 0,
+                      "quic no space in stream buffer");
         return NGX_ERROR;
     }
 
@@ -2180,7 +2183,8 @@ ngx_quic_handle_stream_data_blocked_fram
     sn = ngx_quic_find_stream(&qc->streams.tree, f->id);
 
     if (sn == NULL) {
-        ngx_log_error(NGX_LOG_INFO, c->log, 0, "unknown stream id:%uL", f->id);
+        ngx_log_error(NGX_LOG_INFO, c->log, 0,
+                      "quic unknown stream id:%uL", f->id);
         return NGX_ERROR;
     }
 
@@ -2595,7 +2599,7 @@ ngx_quic_retransmit(ngx_connection_t *c,
 
             if (start->first + qc->tp.max_idle_timeout < now) {
                 ngx_log_error(NGX_LOG_ERR, c->log, 0,
-                              "retransmission timeout");
+                              "quic retransmission timeout");
                 return NGX_DECLINED;
             }
 
--- a/src/event/ngx_event_quic_transport.c
+++ b/src/event/ngx_event_quic_transport.c
@@ -241,19 +241,19 @@ ngx_quic_parse_long_header(ngx_quic_head
     p = ngx_quic_read_uint8(p, end, &pkt->flags);
     if (p == NULL) {
         ngx_log_error(NGX_LOG_INFO, pkt->log, 0,
-                      "packet is too small to read flags");
+                      "quic packet is too small to read flags");
         return NGX_ERROR;
     }
 
     if (!ngx_quic_long_pkt(pkt->flags)) {
-        ngx_log_error(NGX_LOG_INFO, pkt->log, 0, "not a long packet");
+        ngx_log_error(NGX_LOG_INFO, pkt->log, 0, "quic not a long packet");
         return NGX_ERROR;
     }
 
     p = ngx_quic_read_uint32(p, end, &pkt->version);
     if (p == NULL) {
         ngx_log_error(NGX_LOG_INFO, pkt->log, 0,
-                      "packet is too small to read version");
+                      "quic packet is too small to read version");
         return NGX_ERROR;
     }
 
@@ -263,14 +263,14 @@ ngx_quic_parse_long_header(ngx_quic_head
 
     if (pkt->version != NGX_QUIC_VERSION) {
         ngx_log_error(NGX_LOG_INFO, pkt->log, 0,
-                      "unsupported quic version: 0x%xi", pkt->version);
+                      "quic unsupported version: 0x%xi", pkt->version);
         return NGX_ERROR;
     }
 
     p = ngx_quic_read_uint8(p, end, &idlen);
     if (p == NULL) {
         ngx_log_error(NGX_LOG_INFO, pkt->log, 0,
-                      "packet is too small to read dcid len");
+                      "quic packet is too small to read dcid len");
         return NGX_ERROR;
     }
 
@@ -279,14 +279,14 @@ ngx_quic_parse_long_header(ngx_quic_head
     p = ngx_quic_read_bytes(p, end, idlen, &pkt->dcid.data);
     if (p == NULL) {
         ngx_log_error(NGX_LOG_INFO, pkt->log, 0,
-                      "packet is too small to read dcid");
+                      "quic packet is too small to read dcid");
         return NGX_ERROR;
     }
 
     p = ngx_quic_read_uint8(p, end, &idlen);
     if (p == NULL) {
         ngx_log_error(NGX_LOG_INFO, pkt->log, 0,
-                      "packet is too small to read scid len");
+                      "quic packet is too small to read scid len");
         return NGX_ERROR;
     }
 
@@ -295,7 +295,7 @@ ngx_quic_parse_long_header(ngx_quic_head
     p = ngx_quic_read_bytes(p, end, idlen, &pkt->scid.data);
     if (p == NULL) {
         ngx_log_error(NGX_LOG_INFO, pkt->log, 0,
-                      "packet is too small to read scid");
+                      "quic packet is too small to read scid");
         return NGX_ERROR;
     }
 
@@ -398,12 +398,12 @@ ngx_quic_parse_short_header(ngx_quic_hea
     p = ngx_quic_read_uint8(p, end, &pkt->flags);
     if (p == NULL) {
         ngx_log_error(NGX_LOG_INFO, pkt->log, 0,
-                      "packet is too small to read flags");
+                      "quic packet is too small to read flags");
         return NGX_ERROR;
     }
 
     if (!ngx_quic_short_pkt(pkt->flags)) {
-        ngx_log_error(NGX_LOG_INFO, pkt->log, 0, "not a short packet");
+        ngx_log_error(NGX_LOG_INFO, pkt->log, 0, "quic not a short packet");
         return NGX_ERROR;
     }
 
@@ -420,7 +420,7 @@ ngx_quic_parse_short_header(ngx_quic_hea
     p = ngx_quic_read_bytes(p, end, dcid->len, &pkt->dcid.data);
     if (p == NULL) {
         ngx_log_error(NGX_LOG_INFO, pkt->log, 0,
-                      "packet is too small to read dcid");
+                      "quic packet is too small to read dcid");
         return NGX_ERROR;
     }
 
@@ -445,7 +445,7 @@ ngx_quic_parse_initial_header(ngx_quic_h
     p = ngx_quic_parse_int(p, end, &varint);
     if (p == NULL) {
         ngx_log_error(NGX_LOG_INFO, pkt->log, 0,
-                      "failed to parse token length");
+                      "quic failed to parse token length");
         return NGX_ERROR;
     }
 
@@ -454,13 +454,13 @@ ngx_quic_parse_initial_header(ngx_quic_h
     p = ngx_quic_read_bytes(p, end, pkt->token.len, &pkt->token.data);
     if (p == NULL) {
         ngx_log_error(NGX_LOG_INFO, pkt->log, 0,
-                      "packet too small to read token data");
+                      "quic packet too small to read token data");
         return NGX_ERROR;
     }
 
     p = ngx_quic_parse_int(p, end, &varint);
     if (p == NULL) {
-        ngx_log_error(NGX_LOG_INFO, pkt->log, 0, "bad packet length");
+        ngx_log_error(NGX_LOG_INFO, pkt->log, 0, "quic bad packet length");
         return NGX_ERROR;
     }
 
@@ -468,7 +468,8 @@ ngx_quic_parse_initial_header(ngx_quic_h
                    "quic initial packet length: %uL", varint);
 
     if (varint > (uint64_t) ((pkt->data + pkt->len) - p)) {
-        ngx_log_error(NGX_LOG_INFO, pkt->log, 0, "truncated initial packet");
+        ngx_log_error(NGX_LOG_INFO, pkt->log, 0,
+                      "quic truncated initial packet");
         return NGX_ERROR;
     }
 
@@ -498,7 +499,7 @@ ngx_quic_parse_handshake_header(ngx_quic
 
     p = ngx_quic_parse_int(p, end, &plen);
     if (p == NULL) {
-        ngx_log_error(NGX_LOG_INFO, pkt->log, 0, "bad packet length");
+        ngx_log_error(NGX_LOG_INFO, pkt->log, 0, "quic bad packet length");
         return NGX_ERROR;
     }
 
@@ -506,7 +507,8 @@ ngx_quic_parse_handshake_header(ngx_quic
                    "quic handshake packet length: %uL", plen);
 
     if (plen > (uint64_t)((pkt->data + pkt->len) - p)) {
-        ngx_log_error(NGX_LOG_INFO, pkt->log, 0, "truncated handshake packet");
+        ngx_log_error(NGX_LOG_INFO, pkt->log, 0,
+                      "quic truncated handshake packet");
         return NGX_ERROR;
     }
 
@@ -536,7 +538,7 @@ ngx_quic_parse_frame(ngx_quic_header_t *
     p = ngx_quic_parse_int(p, end, &varint);
     if (p == NULL) {
         ngx_log_error(NGX_LOG_INFO, pkt->log, 0,
-                     "failed to obtain quic frame type");
+                     "quic failed to obtain quic frame type");
         return NGX_ERROR;
     }
 
@@ -552,23 +554,17 @@ ngx_quic_parse_frame(ngx_quic_header_t *
 
         p = ngx_quic_parse_int(p, end, &f->u.crypto.offset);
         if (p == NULL) {
-            ngx_log_error(NGX_LOG_INFO, pkt->log, 0,
-                          "failed to parse crypto frame offset");
-            return NGX_ERROR;
+            goto error;
         }
 
         p = ngx_quic_parse_int(p, end, &f->u.crypto.length);
         if (p == NULL) {
-            ngx_log_error(NGX_LOG_INFO, pkt->log, 0,
-                          "failed to parse crypto frame len");
-            return NGX_ERROR;
+            goto error;
         }
 
         p = ngx_quic_read_bytes(p, end, f->u.crypto.length, &f->u.crypto.data);
         if (p == NULL) {
-            ngx_log_error(NGX_LOG_INFO, pkt->log, 0,
-                          "failed to parse crypto frame data");
-            return NGX_ERROR;
+            goto error;
         }
 
         ngx_log_debug3(NGX_LOG_DEBUG_EVENT, pkt->log, 0,
@@ -604,9 +600,7 @@ ngx_quic_parse_frame(ngx_quic_header_t *
               && (p = ngx_quic_parse_int(p, end, &f->u.ack.range_count))
               && (p = ngx_quic_parse_int(p, end, &f->u.ack.first_range))))
         {
-            ngx_log_error(NGX_LOG_INFO, pkt->log, 0,
-                          "failed to parse ack frame");
-            return NGX_ERROR;
+            goto error;
         }
 
         f->u.ack.ranges_start = p;
@@ -620,9 +614,7 @@ ngx_quic_parse_frame(ngx_quic_header_t *
             }
 
             if (p == NULL) {
-                ngx_log_error(NGX_LOG_INFO, pkt->log, 0,
-                              "failed to parse ack frame range %ui", i);
-                return NGX_ERROR;
+                goto error;
             }
         }
 
@@ -641,9 +633,7 @@ ngx_quic_parse_frame(ngx_quic_header_t *
                   && (p = ngx_quic_parse_int(p, end, &f->u.ack.ect1))
                   && (p = ngx_quic_parse_int(p, end, &f->u.ack.ce))))
             {
-                ngx_log_error(NGX_LOG_INFO, pkt->log, 0,
-                              "failed to parse ack frame ECT counts", i);
-                return NGX_ERROR;
+                goto error;
             }
 
             ngx_log_debug3(NGX_LOG_DEBUG_EVENT, pkt->log, 0,
@@ -667,37 +657,27 @@ ngx_quic_parse_frame(ngx_quic_header_t *
 
         p = ngx_quic_parse_int(p, end, &f->u.ncid.seqnum);
         if (p == NULL) {
-            ngx_log_error(NGX_LOG_INFO, pkt->log, 0,
-                          "failed to parse new connection id frame seqnum");
-            return NGX_ERROR;
+            goto error;
         }
 
         p = ngx_quic_parse_int(p, end, &f->u.ncid.retire);
         if (p == NULL) {
-            ngx_log_error(NGX_LOG_INFO, pkt->log, 0,
-                          "failed to parse new connection id frame retire");
-            return NGX_ERROR;
+            goto error;
         }
 
         p = ngx_quic_read_uint8(p, end, &f->u.ncid.len);
         if (p == NULL) {
-            ngx_log_error(NGX_LOG_INFO, pkt->log, 0,
-                          "failed to parse new connection id length");
-            return NGX_ERROR;
+            goto error;
         }
 
         p = ngx_quic_copy_bytes(p, end, f->u.ncid.len, f->u.ncid.cid);
         if (p == NULL) {
-            ngx_log_error(NGX_LOG_INFO, pkt->log, 0,
-                          "failed to parse new connection id cid");
-            return NGX_ERROR;
+            goto error;
         }
 
         p = ngx_quic_copy_bytes(p, end, 16, f->u.ncid.srt);
         if (p == NULL) {
-            ngx_log_error(NGX_LOG_INFO, pkt->log, 0,
-                          "failed to parse new connection id srt");
-            return NGX_ERROR;
+            goto error;
         }
 
         ngx_log_debug3(NGX_LOG_DEBUG_EVENT, pkt->log, 0,
@@ -721,25 +701,19 @@ ngx_quic_parse_frame(ngx_quic_header_t *
 
         p = ngx_quic_parse_int(p, end, &f->u.close.error_code);
         if (p == NULL) {
-            ngx_log_error(NGX_LOG_INFO, pkt->log, 0,
-                          "failed to parse close connection frame error code");
-            return NGX_ERROR;
+            goto error;
         }
 
         if (f->type == NGX_QUIC_FT_CONNECTION_CLOSE) {
             p = ngx_quic_parse_int(p, end, &f->u.close.frame_type);
             if (p == NULL) {
-                ngx_log_error(NGX_LOG_INFO, pkt->log, 0,
-                              "failed to parse close connection frame type");
-                return NGX_ERROR;
+                goto error;
             }
         }
 
         p = ngx_quic_parse_int(p, end, &varint);
         if (p == NULL) {
-            ngx_log_error(NGX_LOG_INFO, pkt->log, 0,
-                          "failed to parse close reason length");
-            return NGX_ERROR;
+            goto error;
         }
 
         f->u.close.reason.len = varint;
@@ -747,9 +721,7 @@ ngx_quic_parse_frame(ngx_quic_header_t *
         p = ngx_quic_read_bytes(p, end, f->u.close.reason.len,
                                 &f->u.close.reason.data);
         if (p == NULL) {
-            ngx_log_error(NGX_LOG_INFO, pkt->log, 0,
-                          "failed to parse close reason");
-            return NGX_ERROR;
+            goto error;
         }
 
         if (f->type == NGX_QUIC_FT_CONNECTION_CLOSE) {
@@ -791,17 +763,13 @@ ngx_quic_parse_frame(ngx_quic_header_t *
 
         p = ngx_quic_parse_int(p, end, &f->u.stream.stream_id);
         if (p == NULL) {
-            ngx_log_error(NGX_LOG_INFO, pkt->log, 0,
-                          "failed to parse stream frame id");
-            return NGX_ERROR;
+            goto error;
         }
 
         if (f->type & 0x04) {
             p = ngx_quic_parse_int(p, end, &f->u.stream.offset);
             if (p == NULL) {
-                 ngx_log_error(NGX_LOG_INFO, pkt->log, 0,
-                               "failed to parse stream frame offset");
-                return NGX_ERROR;
+                goto error;
             }
 
         } else {
@@ -811,9 +779,7 @@ ngx_quic_parse_frame(ngx_quic_header_t *
         if (f->type & 0x02) {
             p = ngx_quic_parse_int(p, end, &f->u.stream.length);
             if (p == NULL) {
-                ngx_log_error(NGX_LOG_INFO, pkt->log, 0,
-                              "failed to parse stream frame length");
-                return NGX_ERROR;
+                goto error;
             }
 
         } else {
@@ -823,10 +789,7 @@ ngx_quic_parse_frame(ngx_quic_header_t *
         p = ngx_quic_read_bytes(p, end, f->u.stream.length,
                                 &f->u.stream.data);
         if (p == NULL) {
-            ngx_log_error(NGX_LOG_INFO, pkt->log, 0,
-                          "failed to parse stream frame data len=%ui "
-                          "offset=%ui", f->u.stream.length, f->u.stream.offset);
-            return NGX_ERROR;
+            goto error;
         }
 
         ngx_log_debug7(NGX_LOG_DEBUG_EVENT, pkt->log, 0,
@@ -850,9 +813,7 @@ ngx_quic_parse_frame(ngx_quic_header_t *
 
         p = ngx_quic_parse_int(p, end, &f->u.max_data.max_data);
         if (p == NULL) {
-            ngx_log_error(NGX_LOG_INFO, pkt->log, 0,
-                          "failed to parse max data frame");
-            return NGX_ERROR;
+            goto error;
         }
 
         ngx_log_debug1(NGX_LOG_DEBUG_EVENT, pkt->log, 0,
@@ -871,9 +832,7 @@ ngx_quic_parse_frame(ngx_quic_header_t *
               && (p = ngx_quic_parse_int(p, end,
                                          &f->u.reset_stream.final_size))))
         {
-            ngx_log_error(NGX_LOG_INFO, pkt->log, 0,
-                          "failed to parse reset stream frame");
-            return NGX_ERROR;
+            goto error;
         }
 
         ngx_log_debug3(NGX_LOG_DEBUG_EVENT, pkt->log, 0,
@@ -891,16 +850,12 @@ ngx_quic_parse_frame(ngx_quic_header_t *
 
         p = ngx_quic_parse_int(p, end, &f->u.stop_sending.id);
         if (p == NULL) {
-            ngx_log_error(NGX_LOG_INFO, pkt->log, 0,
-                          "failed to parse stop sending frame id");
-            return NGX_ERROR;
+            goto error;
         }
 
         p = ngx_quic_parse_int(p, end, &f->u.stop_sending.error_code);
         if (p == NULL) {
-            ngx_log_error(NGX_LOG_INFO, pkt->log, 0,
-                          "failed to parse stop sending frame error code");
-            return NGX_ERROR;
+            goto error;
         }
 
         ngx_log_debug2(NGX_LOG_DEBUG_EVENT, pkt->log, 0,
@@ -918,9 +873,7 @@ ngx_quic_parse_frame(ngx_quic_header_t *
 
         p = ngx_quic_parse_int(p, end, &f->u.streams_blocked.limit);
         if (p == NULL) {
-            ngx_log_error(NGX_LOG_INFO, pkt->log, 0,
-                          "failed to parse streams blocked frame limit");
-            return NGX_ERROR;
+            goto error;
         }
 
         f->u.streams_blocked.bidi =
@@ -946,7 +899,7 @@ ngx_quic_parse_frame(ngx_quic_header_t *
         /* TODO: implement */
 
         ngx_log_error(NGX_LOG_ALERT, pkt->log, 0,
-                      "unimplemented frame type 0x%xi in packet", f->type);
+                      "quic unimplemented frame type 0x%xi in packet", f->type);
 
         break;
 
@@ -959,9 +912,7 @@ ngx_quic_parse_frame(ngx_quic_header_t *
 
         p = ngx_quic_parse_int(p, end, &f->u.max_streams.limit);
         if (p == NULL) {
-            ngx_log_error(NGX_LOG_INFO, pkt->log, 0,
-                          "failed to parse max streams frame limit");
-            return NGX_ERROR;
+            goto error;
         }
 
         f->u.max_streams.bidi = (f->type == NGX_QUIC_FT_MAX_STREAMS) ? 1 : 0;
@@ -980,16 +931,12 @@ ngx_quic_parse_frame(ngx_quic_header_t *
 
         p = ngx_quic_parse_int(p, end, &f->u.max_stream_data.id);
         if (p == NULL) {
-            ngx_log_error(NGX_LOG_INFO, pkt->log, 0,
-                          "failed to parse max stream data frame data id");
-            return NGX_ERROR;
+            goto error;
         }
 
         p = ngx_quic_parse_int(p, end,  &f->u.max_stream_data.limit);
         if (p == NULL) {
-            ngx_log_error(NGX_LOG_INFO, pkt->log, 0,
-                          "failed to parse max stream data frame data limit");
-            return NGX_ERROR;
+            goto error;
         }
 
         ngx_log_debug2(NGX_LOG_DEBUG_EVENT, pkt->log, 0,
@@ -1006,9 +953,7 @@ ngx_quic_parse_frame(ngx_quic_header_t *
 
         p = ngx_quic_parse_int(p, end, &f->u.data_blocked.limit);
         if (p == NULL) {
-            ngx_log_error(NGX_LOG_INFO, pkt->log, 0,
-                          "failed to parse data blocked frame limit");
-            return NGX_ERROR;
+            goto error;
         }
 
         ngx_log_debug1(NGX_LOG_DEBUG_EVENT, pkt->log, 0,
@@ -1024,16 +969,12 @@ ngx_quic_parse_frame(ngx_quic_header_t *
 
         p = ngx_quic_parse_int(p, end, &f->u.stream_data_blocked.id);
         if (p == NULL) {
-            ngx_log_error(NGX_LOG_INFO, pkt->log, 0,
-                          "failed to parse tream data blocked frame id");
-            return NGX_ERROR;
+            goto error;
         }
 
         p = ngx_quic_parse_int(p, end, &f->u.stream_data_blocked.limit);
         if (p == NULL) {
-            ngx_log_error(NGX_LOG_INFO, pkt->log, 0,
-                          "failed to parse tream data blocked frame limit");
-            return NGX_ERROR;
+            goto error;
         }
 
         ngx_log_debug2(NGX_LOG_DEBUG_EVENT, pkt->log, 0,
@@ -1051,10 +992,7 @@ ngx_quic_parse_frame(ngx_quic_header_t *
 
         p = ngx_quic_parse_int(p, end, &f->u.retire_cid.sequence_number);
         if (p == NULL) {
-            ngx_log_error(NGX_LOG_INFO, pkt->log, 0,
-                          "failed to parse retire connection id"
-                          " frame sequence number");
-            return NGX_ERROR;
+            goto error;
         }
 
         ngx_log_debug1(NGX_LOG_DEBUG_EVENT, pkt->log, 0,
@@ -1071,9 +1009,7 @@ ngx_quic_parse_frame(ngx_quic_header_t *
 
         p = ngx_quic_copy_bytes(p, end, 8, f->u.path_challenge.data);
         if (p == NULL) {
-            ngx_log_error(NGX_LOG_INFO, pkt->log, 0,
-                          "failed to get path challenge frame data");
-            return NGX_ERROR;
+            goto error;
         }
 
         ngx_log_debug0(NGX_LOG_DEBUG_EVENT, pkt->log, 0,
@@ -1093,9 +1029,7 @@ ngx_quic_parse_frame(ngx_quic_header_t *
 
         p = ngx_quic_copy_bytes(p, end, 8, f->u.path_response.data);
         if (p == NULL) {
-            ngx_log_error(NGX_LOG_INFO, pkt->log, 0,
-                          "failed to get path response frame data");
-            return NGX_ERROR;
+            goto error;
         }
 
         ngx_log_debug0(NGX_LOG_DEBUG_EVENT, pkt->log, 0,
@@ -1109,8 +1043,7 @@ ngx_quic_parse_frame(ngx_quic_header_t *
 
     default:
         ngx_log_error(NGX_LOG_INFO, pkt->log, 0,
-                      "unknown frame type 0x%xi in packet", f->type);
-
+                      "quic unknown frame type 0x%xi", f->type);
         return NGX_ERROR;
     }
 
@@ -1119,10 +1052,18 @@ ngx_quic_parse_frame(ngx_quic_header_t *
 not_allowed:
 
     ngx_log_error(NGX_LOG_INFO, pkt->log, 0,
-                  "frame type 0x%xi is not allowed in packet with flags 0x%xi",
+                  "quic frame type 0x%xi is not "
+                  "allowed in packet with flags 0x%xi",
                   f->type, pkt->flags);
 
     return NGX_DECLINED;
+
+error:
+
+    ngx_log_error(NGX_LOG_INFO, pkt->log, 0,
+                  "quic failed to parse frame type 0x%xi", f->type);
+
+    return NGX_ERROR;
 }
 
 
@@ -1137,14 +1078,14 @@ ngx_quic_parse_ack_range(ngx_quic_header
     p = ngx_quic_parse_int(p, end, gap);
     if (p == NULL) {
         ngx_log_error(NGX_LOG_INFO, pkt->log, 0,
-                      "failed to parse ack frame gap");
+                      "quic failed to parse ack frame gap");
         return NGX_ERROR;
     }
 
     p = ngx_quic_parse_int(p, end, range);
     if (p == NULL) {
         ngx_log_error(NGX_LOG_INFO, pkt->log, 0,
-                      "failed to parse ack frame range");
+                      "quic failed to parse ack frame range");
         return NGX_ERROR;
     }
 
@@ -1456,14 +1397,15 @@ ngx_quic_parse_transport_params(u_char *
         p = ngx_quic_parse_int(p, end, &id);
         if (p == NULL) {
             ngx_log_error(NGX_LOG_INFO, log, 0,
-                          "failed to parse transport param id");
+                          "quic failed to parse transport param id");
             return NGX_ERROR;
         }
 
         p = ngx_quic_parse_int(p, end, &len);
         if (p == NULL) {
             ngx_log_error(NGX_LOG_INFO, log, 0,
-                         "failed to parse transport param id 0x%xi length", id);
+                         "quic failed to parse"
+                         " transport param id 0x%xi length", id);
             return NGX_ERROR;
         }
 
@@ -1471,13 +1413,14 @@ ngx_quic_parse_transport_params(u_char *
 
         if (rc == NGX_ERROR) {
             ngx_log_error(NGX_LOG_INFO, log, 0,
-                          "failed to parse transport param id 0x%xi data", id);
+                          "quic failed to parse"
+                          " transport param id 0x%xi data", id);
             return NGX_ERROR;
         }
 
         if (rc == NGX_DECLINED) {
             ngx_log_error(NGX_LOG_INFO, log, 0,
-                          "unknown transport param id 0x%xi,skipped", id);
+                          "quic unknown transport param id 0x%xi,skipped", id);
         }
 
         p += len;
@@ -1485,7 +1428,8 @@ ngx_quic_parse_transport_params(u_char *
 
     if (p != end) {
         ngx_log_error(NGX_LOG_INFO, log, 0,
-                      "trailing garbage in transport parameters: %ui bytes",
+                      "quic trailing garbage in"
+                      " transport parameters: %ui bytes",
                       end - p);
         return NGX_ERROR;
     }