IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

QUIC: stripped down debug traces that have served its purpose.

Browse Source 
The most observable remainers are incoming packet and stream payload
that could still be useful to debug various QUIC and HTTP/3 frames.
This commit is contained in:
Sergey Kandaurov 2020-08-21 14:41:41 +03:00
parent fb21151ff8
commit 6c089cda29
3 changed files with 4 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/event/ngx_event_quic.c
View File

@ -3651,10 +3651,6 @@ ngx_quic_send_frames(ngx_connection_t *c, ngx_quic_send_ctx_t *ctx,
return NGX_ERROR; 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); len = c->send(c, res.data, res.len);
if (len == NGX_ERROR || (size_t) len != res.len) { if (len == NGX_ERROR || (size_t) len != res.len) {
return NGX_ERROR; return NGX_ERROR;

44
src/event/ngx_event_quic_protection.c
View File

@ -277,9 +277,7 @@ ngx_quic_hkdf_expand(ngx_pool_t *pool, const EVP_MD *digest, ngx_str_t *out,
} }
#ifdef NGX_QUIC_DEBUG_CRYPTO #ifdef NGX_QUIC_DEBUG_CRYPTO
ngx_log_debug1(NGX_LOG_DEBUG_EVENT, pool->log, 0, ngx_log_debug1(NGX_LOG_DEBUG_EVENT, pool->log, 0, "quic expand %V", label);
"quic ngx_quic_hkdf_expand %V keys", label);
ngx_quic_hexdump(pool->log, "quic info", info, info_len);
ngx_quic_hexdump(pool->log, "quic key", out->data, out->len); ngx_quic_hexdump(pool->log, "quic key", out->data, out->len);
#endif #endif
@ -779,8 +777,6 @@ ngx_quic_create_long_packet(ngx_quic_header_t *pkt, ngx_ssl_conn_t *ssl_conn,
out.data = res->data + ad.len; out.data = res->data + ad.len;
#ifdef NGX_QUIC_DEBUG_CRYPTO #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); ngx_quic_hexdump(pkt->log, "quic ad", ad.data, ad.len);
#endif #endif
@ -791,11 +787,6 @@ ngx_quic_create_long_packet(ngx_quic_header_t *pkt, ngx_ssl_conn_t *ssl_conn,
ngx_memcpy(nonce, pkt->secret->iv.data, pkt->secret->iv.len); ngx_memcpy(nonce, pkt->secret->iv.data, pkt->secret->iv.len);
ngx_quic_compute_nonce(nonce, sizeof(nonce), pkt->number); 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, if (ngx_quic_tls_seal(ciphers.c, pkt->secret, &out,
nonce, &pkt->payload, &ad, pkt->log) nonce, &pkt->payload, &ad, pkt->log)
!= NGX_OK) != NGX_OK)
@ -810,11 +801,6 @@ ngx_quic_create_long_packet(ngx_quic_header_t *pkt, ngx_ssl_conn_t *ssl_conn,
return NGX_ERROR; 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 */ /* quic-tls: 5.4.1. Header Protection Application */
ad.data[0] ^= mask[0] & 0x0f; ad.data[0] ^= mask[0] & 0x0f;
@ -846,8 +832,6 @@ ngx_quic_create_short_packet(ngx_quic_header_t *pkt, ngx_ssl_conn_t *ssl_conn,
out.data = res->data + ad.len; out.data = res->data + ad.len;
#ifdef NGX_QUIC_DEBUG_CRYPTO #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); ngx_quic_hexdump(pkt->log, "quic ad", ad.data, ad.len);
#endif #endif
@ -855,19 +839,9 @@ ngx_quic_create_short_packet(ngx_quic_header_t *pkt, ngx_ssl_conn_t *ssl_conn,
return NGX_ERROR; 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_memcpy(nonce, pkt->secret->iv.data, pkt->secret->iv.len);
ngx_quic_compute_nonce(nonce, sizeof(nonce), pkt->number); 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, if (ngx_quic_tls_seal(ciphers.c, pkt->secret, &out,
nonce, &pkt->payload, &ad, pkt->log) nonce, &pkt->payload, &ad, pkt->log)
!= NGX_OK) != NGX_OK)
@ -882,11 +856,6 @@ ngx_quic_create_short_packet(ngx_quic_header_t *pkt, ngx_ssl_conn_t *ssl_conn,
return NGX_ERROR; 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 */ /* quic-tls: 5.4.1. Header Protection Application */
ad.data[0] ^= mask[0] & 0x1f; ad.data[0] ^= mask[0] & 0x1f;
@ -1052,12 +1021,6 @@ ngx_quic_decrypt(ngx_quic_header_t *pkt, ngx_ssl_conn_t *ssl_conn,
sample = p + 4; 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 */ /* header protection */
if (ngx_quic_tls_hp(pkt->log, ciphers.hp, secret, mask, sample) if (ngx_quic_tls_hp(pkt->log, ciphers.hp, secret, mask, sample)
@ -1086,10 +1049,6 @@ ngx_quic_decrypt(ngx_quic_header_t *pkt, ngx_ssl_conn_t *ssl_conn,
pkt->pn = pn; pkt->pn = pn;
pkt->flags = clearflags; 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, ngx_log_debug1(NGX_LOG_DEBUG_EVENT, pkt->log, 0,
"quic clear flags: %xd", clearflags); "quic clear flags: %xd", clearflags);
ngx_log_debug2(NGX_LOG_DEBUG_EVENT, pkt->log, 0, ngx_log_debug2(NGX_LOG_DEBUG_EVENT, pkt->log, 0,
@ -1122,7 +1081,6 @@ ngx_quic_decrypt(ngx_quic_header_t *pkt, ngx_ssl_conn_t *ssl_conn,
ngx_quic_compute_nonce(nonce, sizeof(nonce), pn); ngx_quic_compute_nonce(nonce, sizeof(nonce), pn);
#ifdef NGX_QUIC_DEBUG_CRYPTO #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); ngx_quic_hexdump(pkt->log, "quic ad", ad.data, ad.len);
#endif #endif

19
src/event/ngx_event_quic_transport.c
View File

@ -247,10 +247,6 @@ ngx_quic_parse_long_header(ngx_quic_header_t *pkt)
p = pkt->data; p = pkt->data;
end = pkt->data + pkt->len; 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); p = ngx_quic_read_uint8(p, end, &pkt->flags);
if (p == NULL) { if (p == NULL) {
ngx_log_error(NGX_LOG_INFO, pkt->log, 0, ngx_log_error(NGX_LOG_INFO, pkt->log, 0,
@ -474,10 +470,6 @@ ngx_quic_parse_short_header(ngx_quic_header_t *pkt, ngx_str_t *dcid)
p = pkt->data; p = pkt->data;
end = pkt->data + pkt->len; 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); p = ngx_quic_read_uint8(p, end, &pkt->flags);
if (p == NULL) { if (p == NULL) {
ngx_log_error(NGX_LOG_INFO, pkt->log, 0, ngx_log_error(NGX_LOG_INFO, pkt->log, 0,
@ -655,15 +647,10 @@ ngx_quic_parse_frame(ngx_quic_header_t *pkt, u_char *start, u_char *end,
goto error; goto error;
} }
ngx_log_debug3(NGX_LOG_DEBUG_EVENT, pkt->log, 0, ngx_log_debug2(NGX_LOG_DEBUG_EVENT, pkt->log, 0,
"quic frame in: CRYPTO length: %uL off:%uL pp:%p", "quic frame in: CRYPTO length: %uL off:%uL",
f->u.crypto.length, f->u.crypto.offset, f->u.crypto.length, f->u.crypto.offset);
f->u.crypto.data);
#ifdef NGX_QUIC_DEBUG_FRAMES
ngx_quic_hexdump(pkt->log, "quic CRYPTO frame",
f->u.crypto.data, f->u.crypto.length);
#endif
break; break;
case NGX_QUIC_FT_PADDING: case NGX_QUIC_FT_PADDING: