Mercurial > hg > nginx
comparison src/event/ngx_event_quic.c @ 8360:f175006124d0 quic
Cleaned up hexdumps in debug output.
- the ngx_quic_hexdump0() macro is renamed to ngx_quic_hexdump();
the original ngx_quic_hexdump() macro with variable argument is
removed, extra information is logged normally, with ngx_log_debug()
- all labels in hex dumps are prefixed with "quic"
- the hexdump format is simplified, length is moved forward to avoid
situations when the dump is truncated, and length is not shown
- ngx_quic_flush_flight() function contents is debug-only, placed under
NGX_DEBUG macro to avoid "unused variable" warnings from compiler
- frame names in labels are capitalized, similar to other places
author | Vladimir Homutov <vl@nginx.com> |
---|---|
date | Fri, 24 Apr 2020 11:33:00 +0300 |
parents | 2f900ae486bc |
children | 336d527ca031 |
comparison
equal
deleted
inserted
replaced
8359:2f900ae486bc | 8360:f175006124d0 |
---|---|
250 ngx_quic_secrets_t *keys; | 250 ngx_quic_secrets_t *keys; |
251 | 251 |
252 c = ngx_ssl_get_connection((ngx_ssl_conn_t *) ssl_conn); | 252 c = ngx_ssl_get_connection((ngx_ssl_conn_t *) ssl_conn); |
253 | 253 |
254 #ifdef NGX_QUIC_DEBUG_CRYPTO | 254 #ifdef NGX_QUIC_DEBUG_CRYPTO |
255 ngx_quic_hexdump(c->log, "level:%d read secret", | 255 ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0, |
256 rsecret, secret_len, level); | 256 "quic ngx_quic_set_read_secret() level:%d", level); |
257 ngx_quic_hexdump(c->log, "quic read secret", rsecret, secret_len); | |
257 #endif | 258 #endif |
258 | 259 |
259 keys = &c->quic->keys[level]; | 260 keys = &c->quic->keys[level]; |
260 | 261 |
261 if (level == ssl_encryption_early_data) { | 262 if (level == ssl_encryption_early_data) { |
277 ngx_quic_secrets_t *keys; | 278 ngx_quic_secrets_t *keys; |
278 | 279 |
279 c = ngx_ssl_get_connection((ngx_ssl_conn_t *) ssl_conn); | 280 c = ngx_ssl_get_connection((ngx_ssl_conn_t *) ssl_conn); |
280 | 281 |
281 #ifdef NGX_QUIC_DEBUG_CRYPTO | 282 #ifdef NGX_QUIC_DEBUG_CRYPTO |
282 ngx_quic_hexdump(c->log, "level:%d write secret", | 283 ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0, |
283 wsecret, secret_len, level); | 284 "quic ngx_quic_set_write_secret() level:%d", level); |
285 ngx_quic_hexdump(c->log, "quic write secret", wsecret, secret_len); | |
284 #endif | 286 #endif |
285 | 287 |
286 keys = &c->quic->keys[level]; | 288 keys = &c->quic->keys[level]; |
287 | 289 |
288 return ngx_quic_set_encryption_secret(c->pool, ssl_conn, level, | 290 return ngx_quic_set_encryption_secret(c->pool, ssl_conn, level, |
302 ngx_quic_secrets_t *keys; | 304 ngx_quic_secrets_t *keys; |
303 | 305 |
304 c = ngx_ssl_get_connection((ngx_ssl_conn_t *) ssl_conn); | 306 c = ngx_ssl_get_connection((ngx_ssl_conn_t *) ssl_conn); |
305 | 307 |
306 #ifdef NGX_QUIC_DEBUG_CRYPTO | 308 #ifdef NGX_QUIC_DEBUG_CRYPTO |
307 ngx_quic_hexdump(c->log, "level:%d read", rsecret, secret_len, level); | 309 ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0, |
310 "quic ngx_quic_set_encryption_secrets() level:%d", level); | |
311 ngx_quic_hexdump(c->log, "quic read", rsecret, secret_len); | |
308 #endif | 312 #endif |
309 | 313 |
310 keys = &c->quic->keys[level]; | 314 keys = &c->quic->keys[level]; |
311 | 315 |
312 rc = ngx_quic_set_encryption_secret(c->pool, ssl_conn, level, | 316 rc = ngx_quic_set_encryption_secret(c->pool, ssl_conn, level, |
320 c->quic->state = NGX_QUIC_ST_EARLY_DATA; | 324 c->quic->state = NGX_QUIC_ST_EARLY_DATA; |
321 return 1; | 325 return 1; |
322 } | 326 } |
323 | 327 |
324 #ifdef NGX_QUIC_DEBUG_CRYPTO | 328 #ifdef NGX_QUIC_DEBUG_CRYPTO |
325 ngx_quic_hexdump(c->log, "level:%d write", wsecret, secret_len, level); | 329 ngx_quic_hexdump(c->log, "quic write", wsecret, secret_len); |
326 #endif | 330 #endif |
327 | 331 |
328 return ngx_quic_set_encryption_secret(c->pool, ssl_conn, level, | 332 return ngx_quic_set_encryption_secret(c->pool, ssl_conn, level, |
329 wsecret, secret_len, | 333 wsecret, secret_len, |
330 &keys->server); | 334 &keys->server); |
432 | 436 |
433 | 437 |
434 static int | 438 static int |
435 ngx_quic_flush_flight(ngx_ssl_conn_t *ssl_conn) | 439 ngx_quic_flush_flight(ngx_ssl_conn_t *ssl_conn) |
436 { | 440 { |
441 #if (NGX_DEBUG) | |
437 ngx_connection_t *c; | 442 ngx_connection_t *c; |
438 | 443 |
439 c = ngx_ssl_get_connection((ngx_ssl_conn_t *) ssl_conn); | 444 c = ngx_ssl_get_connection((ngx_ssl_conn_t *) ssl_conn); |
440 | 445 |
441 ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, 0, | 446 ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, 0, |
442 "quic ngx_quic_flush_flight()"); | 447 "quic ngx_quic_flush_flight()"); |
443 | 448 #endif |
444 return 1; | 449 return 1; |
445 } | 450 } |
446 | 451 |
447 | 452 |
448 static int | 453 static int |
674 if (len < 0) { | 679 if (len < 0) { |
675 return NGX_ERROR; | 680 return NGX_ERROR; |
676 } | 681 } |
677 | 682 |
678 #ifdef NGX_QUIC_DEBUG_PACKETS | 683 #ifdef NGX_QUIC_DEBUG_PACKETS |
679 ngx_quic_hexdump0(c->log, "quic transport parameters", p, len); | 684 ngx_quic_hexdump(c->log, "quic transport parameters", p, len); |
680 #endif | 685 #endif |
681 | 686 |
682 if (SSL_set_quic_transport_params(ssl_conn, p, len) == 0) { | 687 if (SSL_set_quic_transport_params(ssl_conn, p, len) == 0) { |
683 ngx_log_error(NGX_LOG_INFO, c->log, 0, | 688 ngx_log_error(NGX_LOG_INFO, c->log, 0, |
684 "SSL_set_quic_transport_params() failed"); | 689 "SSL_set_quic_transport_params() failed"); |
2454 if (ngx_quic_encrypt(&pkt, c->ssl->connection, &res) != NGX_OK) { | 2459 if (ngx_quic_encrypt(&pkt, c->ssl->connection, &res) != NGX_OK) { |
2455 return NGX_ERROR; | 2460 return NGX_ERROR; |
2456 } | 2461 } |
2457 | 2462 |
2458 #ifdef NGX_QUIC_DEBUG_PACKETS | 2463 #ifdef NGX_QUIC_DEBUG_PACKETS |
2459 ngx_quic_hexdump0(c->log, "packet to send", res.data, res.len); | 2464 ngx_quic_hexdump(c->log, "quic packet to send", res.data, res.len); |
2460 #endif | 2465 #endif |
2461 | 2466 |
2462 len = c->send(c, res.data, res.len); | 2467 len = c->send(c, res.data, res.len); |
2463 if (len == NGX_ERROR || (size_t) len != res.len) { | 2468 if (len == NGX_ERROR || (size_t) len != res.len) { |
2464 return NGX_ERROR; | 2469 return NGX_ERROR; |