# HG changeset patch # User Sergey Kandaurov # Date 1598010101 -10800 # Node ID 64a484fd40a931cf372ff776ebe743154ba7a8a7 # Parent c5a894bd4f53328ef265eaab49a7dfa2d75e7a26 QUIC: stripped down debug traces that have served its purpose. The most observable remainers are incoming packet and stream payload that could still be useful to debug various QUIC and HTTP/3 frames. diff --git a/src/event/ngx_event_quic.c b/src/event/ngx_event_quic.c --- a/src/event/ngx_event_quic.c +++ b/src/event/ngx_event_quic.c @@ -3651,10 +3651,6 @@ ngx_quic_send_frames(ngx_connection_t *c return NGX_ERROR; } -#ifdef NGX_QUIC_DEBUG_PACKETS - ngx_quic_hexdump(c->log, "quic packet to send", res.data, res.len); -#endif - len = c->send(c, res.data, res.len); if (len == NGX_ERROR || (size_t) len != res.len) { return NGX_ERROR; diff --git a/src/event/ngx_event_quic_protection.c b/src/event/ngx_event_quic_protection.c --- a/src/event/ngx_event_quic_protection.c +++ b/src/event/ngx_event_quic_protection.c @@ -277,9 +277,7 @@ ngx_quic_hkdf_expand(ngx_pool_t *pool, c } #ifdef NGX_QUIC_DEBUG_CRYPTO - ngx_log_debug1(NGX_LOG_DEBUG_EVENT, pool->log, 0, - "quic ngx_quic_hkdf_expand %V keys", label); - ngx_quic_hexdump(pool->log, "quic info", info, info_len); + ngx_log_debug1(NGX_LOG_DEBUG_EVENT, pool->log, 0, "quic expand %V", label); ngx_quic_hexdump(pool->log, "quic key", out->data, out->len); #endif @@ -779,8 +777,6 @@ ngx_quic_create_long_packet(ngx_quic_hea out.data = res->data + ad.len; #ifdef NGX_QUIC_DEBUG_CRYPTO - ngx_log_debug0(NGX_LOG_DEBUG_EVENT, pkt->log, 0, - "quic ngx_quic_create_long_packet"); ngx_quic_hexdump(pkt->log, "quic ad", ad.data, ad.len); #endif @@ -791,11 +787,6 @@ ngx_quic_create_long_packet(ngx_quic_hea ngx_memcpy(nonce, pkt->secret->iv.data, pkt->secret->iv.len); ngx_quic_compute_nonce(nonce, sizeof(nonce), pkt->number); -#ifdef NGX_QUIC_DEBUG_CRYPTO - ngx_quic_hexdump(pkt->log, "quic server_iv", pkt->secret->iv.data, 12); - ngx_quic_hexdump(pkt->log, "quic nonce", nonce, 12); -#endif - if (ngx_quic_tls_seal(ciphers.c, pkt->secret, &out, nonce, &pkt->payload, &ad, pkt->log) != NGX_OK) @@ -810,11 +801,6 @@ ngx_quic_create_long_packet(ngx_quic_hea return NGX_ERROR; } -#ifdef NGX_QUIC_DEBUG_CRYPTO - ngx_quic_hexdump(pkt->log, "quic sample", sample, 16); - ngx_quic_hexdump(pkt->log, "quic mask", mask, 5); -#endif - /* quic-tls: 5.4.1. Header Protection Application */ ad.data[0] ^= mask[0] & 0x0f; @@ -846,8 +832,6 @@ ngx_quic_create_short_packet(ngx_quic_he out.data = res->data + ad.len; #ifdef NGX_QUIC_DEBUG_CRYPTO - ngx_log_debug0(NGX_LOG_DEBUG_EVENT, pkt->log, 0, - "quic ngx_quic_create_short_packet"); ngx_quic_hexdump(pkt->log, "quic ad", ad.data, ad.len); #endif @@ -855,19 +839,9 @@ ngx_quic_create_short_packet(ngx_quic_he return NGX_ERROR; } - ngx_log_debug3(NGX_LOG_DEBUG_EVENT, pkt->log, 0, - "quic ngx_quic_create_short_packet: number %L," - " encoded %d:0x%xD", pkt->number, (int) pkt->num_len, - pkt->trunc); - ngx_memcpy(nonce, pkt->secret->iv.data, pkt->secret->iv.len); ngx_quic_compute_nonce(nonce, sizeof(nonce), pkt->number); -#ifdef NGX_QUIC_DEBUG_CRYPTO - ngx_quic_hexdump(pkt->log, "quic server_iv", pkt->secret->iv.data, 12); - ngx_quic_hexdump(pkt->log, "quic nonce", nonce, 12); -#endif - if (ngx_quic_tls_seal(ciphers.c, pkt->secret, &out, nonce, &pkt->payload, &ad, pkt->log) != NGX_OK) @@ -882,11 +856,6 @@ ngx_quic_create_short_packet(ngx_quic_he return NGX_ERROR; } -#ifdef NGX_QUIC_DEBUG_CRYPTO - ngx_quic_hexdump(pkt->log, "quic sample", sample, 16); - ngx_quic_hexdump(pkt->log, "quic mask", mask, 5); -#endif - /* quic-tls: 5.4.1. Header Protection Application */ ad.data[0] ^= mask[0] & 0x1f; @@ -1052,12 +1021,6 @@ ngx_quic_decrypt(ngx_quic_header_t *pkt, sample = p + 4; -#ifdef NGX_QUIC_DEBUG_CRYPTO - ngx_log_debug0(NGX_LOG_DEBUG_EVENT, pkt->log, 0, - "quic ngx_quic_decrypt()"); - ngx_quic_hexdump(pkt->log, "quic sample", sample, 16); -#endif - /* header protection */ if (ngx_quic_tls_hp(pkt->log, ciphers.hp, secret, mask, sample) @@ -1086,10 +1049,6 @@ ngx_quic_decrypt(ngx_quic_header_t *pkt, pkt->pn = pn; pkt->flags = clearflags; -#ifdef NGX_QUIC_DEBUG_CRYPTO - ngx_quic_hexdump(pkt->log, "quic mask", mask, 5); -#endif - ngx_log_debug1(NGX_LOG_DEBUG_EVENT, pkt->log, 0, "quic clear flags: %xd", clearflags); ngx_log_debug2(NGX_LOG_DEBUG_EVENT, pkt->log, 0, @@ -1122,7 +1081,6 @@ ngx_quic_decrypt(ngx_quic_header_t *pkt, ngx_quic_compute_nonce(nonce, sizeof(nonce), pn); #ifdef NGX_QUIC_DEBUG_CRYPTO - ngx_quic_hexdump(pkt->log, "quic nonce", nonce, 12); ngx_quic_hexdump(pkt->log, "quic ad", ad.data, ad.len); #endif diff --git a/src/event/ngx_event_quic_transport.c b/src/event/ngx_event_quic_transport.c --- a/src/event/ngx_event_quic_transport.c +++ b/src/event/ngx_event_quic_transport.c @@ -247,10 +247,6 @@ ngx_quic_parse_long_header(ngx_quic_head p = pkt->data; end = pkt->data + pkt->len; -#ifdef NGX_QUIC_DEBUG_PACKETS - ngx_quic_hexdump(pkt->log, "quic long packet in", pkt->data, pkt->len); -#endif - p = ngx_quic_read_uint8(p, end, &pkt->flags); if (p == NULL) { ngx_log_error(NGX_LOG_INFO, pkt->log, 0, @@ -474,10 +470,6 @@ ngx_quic_parse_short_header(ngx_quic_hea p = pkt->data; end = pkt->data + pkt->len; -#ifdef NGX_QUIC_DEBUG_PACKETS - ngx_quic_hexdump(pkt->log, "quic short packet in", pkt->data, pkt->len); -#endif - p = ngx_quic_read_uint8(p, end, &pkt->flags); if (p == NULL) { ngx_log_error(NGX_LOG_INFO, pkt->log, 0, @@ -655,15 +647,10 @@ ngx_quic_parse_frame(ngx_quic_header_t * goto error; } - ngx_log_debug3(NGX_LOG_DEBUG_EVENT, pkt->log, 0, - "quic frame in: CRYPTO length: %uL off:%uL pp:%p", - f->u.crypto.length, f->u.crypto.offset, - f->u.crypto.data); + ngx_log_debug2(NGX_LOG_DEBUG_EVENT, pkt->log, 0, + "quic frame in: CRYPTO length: %uL off:%uL", + f->u.crypto.length, f->u.crypto.offset); -#ifdef NGX_QUIC_DEBUG_FRAMES - ngx_quic_hexdump(pkt->log, "quic CRYPTO frame", - f->u.crypto.data, f->u.crypto.length); -#endif break; case NGX_QUIC_FT_PADDING: