Mercurial > hg > nginx

changeset 8578:52ad697f9d1c quic

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
QUIC: enabled more key-related debug by default.
author Vladimir Homutov <vl@nginx.com>
date Fri, 02 Oct 2020 12:40:49 +0300
parents b38b41127489
children d57cfdebe301
files src/event/ngx_event_quic.c src/event/ngx_event_quic_protection.c
diffstat 2 files changed, 13 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/event/ngx_event_quic.c
+++ b/src/event/ngx_event_quic.c
@@ -353,9 +353,9 @@ ngx_quic_set_read_secret(ngx_ssl_conn_t 
 
     c = ngx_ssl_get_connection((ngx_ssl_conn_t *) ssl_conn);
 
-#ifdef NGX_QUIC_DEBUG_CRYPTO
     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);
 #endif
 
@@ -377,9 +377,9 @@ ngx_quic_set_write_secret(ngx_ssl_conn_t
 
     c = ngx_ssl_get_connection((ngx_ssl_conn_t *) ssl_conn);
 
-#ifdef NGX_QUIC_DEBUG_CRYPTO
     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);
 #endif
 
@@ -403,9 +403,9 @@ ngx_quic_set_encryption_secrets(ngx_ssl_
 
     c = ngx_ssl_get_connection((ngx_ssl_conn_t *) ssl_conn);
 
-#ifdef NGX_QUIC_DEBUG_CRYPTO
     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", rsecret, secret_len);
 #endif
 
@@ -1691,6 +1691,15 @@ ngx_quic_process_packet(ngx_connection_t
 
     qc = c->quic;
 
+#if (NGX_DEBUG)
+    ngx_quic_hexdump(c->log, "quic pkt dcid", pkt->dcid.data, pkt->dcid.len);
+
+    if (pkt->level != ssl_encryption_application) {
+        ngx_quic_hexdump(c->log, "quic pkt scid", pkt->scid.data,
+                         pkt->scid.len);
+    }
+#endif
+
     if (qc) {
 
         if (rc == NGX_ABORT) {
--- a/src/event/ngx_event_quic_protection.c
+++ b/src/event/ngx_event_quic_protection.c
@@ -165,9 +165,9 @@ ngx_quic_set_initial_secret(ngx_pool_t *
         .len = is_len
     };
 
-#ifdef NGX_QUIC_DEBUG_CRYPTO
     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);
 #endif