Mercurial > hg > nginx
changeset 8651:dbad2d6d1898 quic
QUIC: removed ngx_quic_hexdump() macro.
Instead, appropriate format specifier for hexadecimal is used
in ngx_log_debug().
The STREAM frame "data" debug is moved into ngx_quic_log_frame(), similar
to all other frame fields debug.
| author | Vladimir Homutov <vl@nginx.com> |
|---|---|
| date | Fri, 27 Nov 2020 18:43:36 +0300 |
| parents | 9dce2978e4fd |
| children | e9bd4305e68b |
| files | src/event/ngx_event_quic.c src/event/ngx_event_quic.h src/event/ngx_event_quic_protection.c src/event/ngx_event_quic_transport.c |
| diffstat | 4 files changed, 65 insertions(+), 66 deletions(-) [+] |
line wrap: on
line diff
--- a/src/event/ngx_event_quic.c +++ b/src/event/ngx_event_quic.c @@ -505,6 +505,11 @@ ngx_quic_log_frame(ngx_log_t *log, ngx_q p = ngx_slprintf(p, last, " fin:1"); } +#ifdef NGX_QUIC_DEBUG_FRAMES + p = ngx_slprintf(p, last, " data len:%uL %*xs", f->u.stream.length, + (size_t) f->u.stream.length, f->u.stream.data); +#endif + break; case NGX_QUIC_FT_MAX_DATA: @@ -669,7 +674,9 @@ ngx_quic_set_read_secret(ngx_ssl_conn_t ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0, "quic ngx_quic_set_read_secret() level:%d", level); #ifdef NGX_QUIC_DEBUG_CRYPTO - ngx_quic_hexdump(c->log, "quic read secret", rsecret, secret_len); + ngx_log_debug3(NGX_LOG_DEBUG_EVENT, c->log, 0, + "quic read secret len:%uz %*xs", secret_len, + secret_len, rsecret); #endif return ngx_quic_keys_set_encryption_secret(c->pool, 0, qc->keys, level, @@ -691,7 +698,9 @@ ngx_quic_set_write_secret(ngx_ssl_conn_t ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0, "quic ngx_quic_set_write_secret() level:%d", level); #ifdef NGX_QUIC_DEBUG_CRYPTO - ngx_quic_hexdump(c->log, "quic write secret", wsecret, secret_len); + ngx_log_debug3(NGX_LOG_DEBUG_EVENT, c->log, 0, + "quic write secret len:%uz %*xs", secret_len, + secret_len, wsecret); #endif return ngx_quic_keys_set_encryption_secret(c->pool, 1, qc->keys, level, @@ -715,7 +724,9 @@ ngx_quic_set_encryption_secrets(ngx_ssl_ ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0, "quic ngx_quic_set_encryption_secrets() level:%d", level); #ifdef NGX_QUIC_DEBUG_CRYPTO - ngx_quic_hexdump(c->log, "quic read secret", rsecret, secret_len); + ngx_log_debug3(NGX_LOG_DEBUG_EVENT, c->log, 0, + "quic read secret len:%uz %*xs", secret_len, + secret_len, rsecret); #endif cipher = SSL_get_current_cipher(ssl_conn); @@ -732,7 +743,9 @@ ngx_quic_set_encryption_secrets(ngx_ssl_ } #ifdef NGX_QUIC_DEBUG_CRYPTO - ngx_quic_hexdump(c->log, "quic write secret", wsecret, secret_len); + ngx_log_debug3(NGX_LOG_DEBUG_EVENT, c->log, 0, + "quic write secret len:%uz %*xs", secret_len, + secret_len, wsecret); #endif return ngx_quic_keys_set_encryption_secret(c->pool, 1, qc->keys, level, @@ -1226,7 +1239,8 @@ ngx_quic_negotiate_version(ngx_connectio len = ngx_quic_create_version_negotiation(&pkt, buf); #ifdef NGX_QUIC_DEBUG_PACKETS - ngx_quic_hexdump(c->log, "quic vnego packet to send", buf, len); + ngx_log_debug3(NGX_LOG_DEBUG_EVENT, c->log, 0, + "quic vnego packet to send len:%uz %*xs", len, len, buf); #endif (void) c->send(c, buf, len); @@ -1242,9 +1256,9 @@ ngx_quic_create_server_id(ngx_connection return NGX_ERROR; } - ngx_quic_hexdump(c->log, "quic create server id", - id, NGX_QUIC_SERVER_CID_LEN); - + ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0, + "quic create server id %*xs", + (size_t) NGX_QUIC_SERVER_CID_LEN, id); return NGX_OK; } @@ -1280,7 +1294,8 @@ ngx_quic_send_retry(ngx_connection_t *c) } #ifdef NGX_QUIC_DEBUG_PACKETS - ngx_quic_hexdump(c->log, "quic packet to send", res.data, res.len); + ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0, + "quic packet to send len:%uz %xV", res.len, &res); #endif len = c->send(c, res.data, res.len); @@ -1398,7 +1413,8 @@ ngx_quic_new_token(ngx_connection_t *c, EVP_CIPHER_CTX_free(ctx); #ifdef NGX_QUIC_DEBUG_PACKETS - ngx_quic_hexdump(c->log, "quic new token", token->data, token->len); + ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0, + "quic new token len:%uz %xV", token->len, token); #endif return NGX_OK; @@ -1568,8 +1584,9 @@ ngx_quic_init_connection(ngx_connection_ return NGX_ERROR; } - ngx_quic_hexdump(c->log, "quic stateless reset token", - qc->tp.sr_token, (size_t) NGX_QUIC_SR_TOKEN_LEN); + ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0, + "quic stateless reset token %*xs", + (size_t) NGX_QUIC_SR_TOKEN_LEN, qc->tp.sr_token); len = ngx_quic_create_transport_params(NULL, NULL, &qc->tp, &clen); /* always succeeds */ @@ -1585,7 +1602,8 @@ ngx_quic_init_connection(ngx_connection_ } #ifdef NGX_QUIC_DEBUG_PACKETS - ngx_quic_hexdump(c->log, "quic transport parameters", p, len); + ngx_log_debug3(NGX_LOG_DEBUG_EVENT, c->log, 0, + "quic transport parameters len:%uz %*xs", len, len, p); #endif if (SSL_set_quic_transport_params(ssl_conn, p, len) == 0) { @@ -2073,17 +2091,21 @@ ngx_quic_process_packet(ngx_connection_t qc = ngx_quic_get_connection(c); + ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0, + "quic packet rx dcid len:%uz %xV", + pkt->dcid.len, &pkt->dcid); + #if (NGX_DEBUG) - ngx_quic_hexdump(c->log, "quic packet rx dcid", - pkt->dcid.data, pkt->dcid.len); - if (pkt->level != ssl_encryption_application) { - ngx_quic_hexdump(c->log, "quic packet rx scid", pkt->scid.data, - pkt->scid.len); + ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0, + "quic packet rx scid len:%uz %xV", + pkt->scid.len, &pkt->scid); } if (pkt->level == ssl_encryption_initial) { - ngx_quic_hexdump(c->log, "quic token", pkt->token.data, pkt->token.len); + ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0, + "quic token len:%uz %xV", + pkt->token.len, &pkt->token); } #endif @@ -4520,10 +4542,9 @@ ngx_quic_insert_server_id(ngx_connection ngx_insert_udp_connection(c, &sid->udp, &dcid); - ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0, - "quic insert server id seqnum:%uL", sid->seqnum); - - ngx_quic_hexdump(c->log, "quic server id", id->data, id->len); + ngx_log_debug3(NGX_LOG_DEBUG_EVENT, c->log, 0, + "quic insert server id seqnum:%uL id len:%uz %xV", + sid->seqnum, id->len, id); return sid; }
--- a/src/event/ngx_event_quic.h +++ b/src/event/ngx_event_quic.h @@ -138,30 +138,4 @@ ngx_int_t ngx_quic_get_packet_dcid(ngx_l /* #define NGX_QUIC_DEBUG_FRAMES_ALLOC */ /* log frames alloc/reuse/free */ /* #define NGX_QUIC_DEBUG_CRYPTO */ -#if (NGX_DEBUG) - -#define ngx_quic_hexdump(log, fmt, data, len) \ - ngx_quic_hexdump_real(log, fmt, (u_char *) data, (size_t) len) - -static ngx_inline -void ngx_quic_hexdump_real(ngx_log_t *log, const char *label, u_char *data, - size_t len) -{ - ngx_int_t m; - u_char buf[2048]; - - if (log->log_level & NGX_LOG_DEBUG_EVENT) { - m = ngx_hex_dump(buf, data, (len > 1024) ? 1024 : len) - buf; - ngx_log_debug5(NGX_LOG_DEBUG_EVENT, log, 0, - "%s len:%uz data:%*s%s", - label, len, m, buf, len < 2048 ? "" : "..."); - } -} - -#else - -#define ngx_quic_hexdump(log, fmt, data, len) - -#endif - #endif /* _NGX_EVENT_QUIC_H_INCLUDED_ */
--- a/src/event/ngx_event_quic_protection.c +++ b/src/event/ngx_event_quic_protection.c @@ -183,8 +183,10 @@ ngx_quic_keys_set_initial_secret(ngx_poo ngx_log_debug0(NGX_LOG_DEBUG_EVENT, pool->log, 0, "quic ngx_quic_set_initial_secret"); #ifdef NGX_QUIC_DEBUG_CRYPTO - ngx_quic_hexdump(pool->log, "quic salt", salt, sizeof(salt)); - ngx_quic_hexdump(pool->log, "quic initial secret", is, is_len); + ngx_log_debug3(NGX_LOG_DEBUG_EVENT, pool->log, 0, + "quic salt len:%uz %*xs", sizeof(salt), sizeof(salt), salt); + ngx_log_debug3(NGX_LOG_DEBUG_EVENT, pool->log, 0, + "quic initial secret len:%uz %*xs", is_len, is_len, is); #endif /* draft-ietf-quic-tls-23#section-5.2 */ @@ -292,8 +294,8 @@ 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 expand %V", label); - ngx_quic_hexdump(pool->log, "quic key", out->data, out->len); + ngx_log_debug3(NGX_LOG_DEBUG_EVENT, pool->log, 0, + "quic expand %V key len:%uz %xV", label, out->len, out); #endif return NGX_OK; @@ -840,7 +842,8 @@ ngx_quic_create_packet(ngx_quic_header_t out.data = res->data + ad.len; #ifdef NGX_QUIC_DEBUG_CRYPTO - ngx_quic_hexdump(pkt->log, "quic ad", ad.data, ad.len); + ngx_log_debug2(NGX_LOG_DEBUG_EVENT, pkt->log, 0, + "quic ad len:%uz %xV", ad.len, &ad); #endif if (ngx_quic_ciphers(pkt->keys->cipher, &ciphers, pkt->level) == NGX_ERROR) @@ -910,7 +913,8 @@ ngx_quic_create_retry_packet(ngx_quic_he itag.len = EVP_GCM_TLS_TAG_LEN; #ifdef NGX_QUIC_DEBUG_CRYPTO - ngx_quic_hexdump(pkt->log, "quic retry itag", ad.data, ad.len); + ngx_log_debug2(NGX_LOG_DEBUG_EVENT, pkt->log, 0, + "quic retry itag len:%uz %xV", ad.len, &ad); #endif if (ngx_quic_ciphers(0, &ciphers, pkt->level) == NGX_ERROR) { @@ -982,8 +986,9 @@ ngx_quic_new_sr_token(ngx_connection_t * ngx_memcpy(token, key, NGX_QUIC_SR_TOKEN_LEN); #if (NGX_DEBUG) - ngx_quic_hexdump(c->log, "quic stateless reset token", token, - (size_t) NGX_QUIC_SR_TOKEN_LEN); + ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0, + "quic stateless reset token %*xs", + (size_t) NGX_QUIC_SR_TOKEN_LEN, token); #endif return NGX_OK; @@ -1138,7 +1143,8 @@ 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 ad", ad.data, ad.len); + ngx_log_debug2(NGX_LOG_DEBUG_EVENT, pkt->log, 0, + "quic ad len:%uz %xV", ad.len, &ad); #endif pkt->payload.len = in.len - EVP_GCM_TLS_TAG_LEN; @@ -1174,8 +1180,9 @@ ngx_quic_decrypt(ngx_quic_header_t *pkt, } #if defined(NGX_QUIC_DEBUG_CRYPTO) && defined(NGX_QUIC_DEBUG_PACKETS) - ngx_quic_hexdump(pkt->log, "quic packet payload", - pkt->payload.data, pkt->payload.len); + ngx_log_debug2(NGX_LOG_DEBUG_EVENT, pkt->log, 0, + "quic packet payload len:%uz %xV", + pkt->payload.len, &pkt->payload); #endif *largest_pn = lpn;
--- a/src/event/ngx_event_quic_transport.c +++ b/src/event/ngx_event_quic_transport.c @@ -920,10 +920,6 @@ ngx_quic_parse_frame(ngx_quic_header_t * goto error; } -#ifdef NGX_QUIC_DEBUG_FRAMES - ngx_quic_hexdump(pkt->log, "quic STREAM frame", - f->u.stream.data, f->u.stream.length); -#endif break; case NGX_QUIC_FT_MAX_DATA: @@ -1649,8 +1645,9 @@ ngx_quic_parse_transport_params(u_char * tp->active_connection_id_limit); #if (NGX_QUIC_DRAFT_VERSION >= 28) - ngx_quic_hexdump(log, "quic tp initial_source_connection_id:", - tp->initial_scid.data, tp->initial_scid.len); + ngx_log_debug2(NGX_LOG_DEBUG_EVENT, log, 0, + "quic tp initial source_connection_id len:%uz %xV", + tp->initial_scid.len, &tp->initial_scid); #endif return NGX_OK;