mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-12-04 22:09:01 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

QUIC: added "rx" and "tx" prefixes to packet debug.

Browse Source
This commit is contained in:
Vladimir Homutov 2020-10-26 23:47:16 +03:00
parent d35db4b3eb
commit 37b7360893
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/event/ngx_event_quic.c
View File

@ -1921,7 +1921,7 @@ ngx_quic_input(ngx_connection_t *c, ngx_buf_t *b, ngx_quic_conf_t *conf)
#if (NGX_DEBUG) #if (NGX_DEBUG)
if (pkt.parsed) { if (pkt.parsed) {
ngx_log_debug5(NGX_LOG_DEBUG_EVENT, c->log, 0, ngx_log_debug5(NGX_LOG_DEBUG_EVENT, c->log, 0,
"quic %s pkt done decr:%d pn:%L perr:%ui rc:%i", "quic pkt %s done decr:%d pn:%L perr:%ui rc:%i",
ngx_quic_level_name(pkt.level), pkt.decrypted, ngx_quic_level_name(pkt.level), pkt.decrypted,
pkt.pn, pkt.error, rc); pkt.pn, pkt.error, rc);
} else { } else {
@ -1999,10 +1999,10 @@ ngx_quic_process_packet(ngx_connection_t *c, ngx_quic_conf_t *conf,
qc = c->quic; qc = c->quic;
#if (NGX_DEBUG) #if (NGX_DEBUG)
ngx_quic_hexdump(c->log, "quic pkt dcid", pkt->dcid.data, pkt->dcid.len); ngx_quic_hexdump(c->log, "quic pkt rx dcid", pkt->dcid.data, pkt->dcid.len);
if (pkt->level != ssl_encryption_application) { if (pkt->level != ssl_encryption_application) {
ngx_quic_hexdump(c->log, "quic pkt scid", pkt->scid.data, ngx_quic_hexdump(c->log, "quic pkt rx scid", pkt->scid.data,
pkt->scid.len); pkt->scid.len);
} }
#endif #endif
@ -4551,10 +4551,10 @@ ngx_quic_send_frames(ngx_connection_t *c, ngx_quic_send_ctx_t *ctx,
res.data = dst; res.data = dst;
ngx_log_debug6(NGX_LOG_DEBUG_EVENT, c->log, 0, ngx_log_debug6(NGX_LOG_DEBUG_EVENT, c->log, 0,
"quic packet ready bytes:%ui level:%d" "quic pkt tx %s bytes:%ui"
" need_ack:%d number:%L encoded nl:%d trunc:0x%xD", " need_ack:%d number:%L encoded nl:%d trunc:0x%xD",
out.len, start->level, pkt.need_ack, pkt.number, ngx_quic_level_name(start->level), out.len, pkt.need_ack,
pkt.num_len, pkt.trunc); pkt.number, pkt.num_len, pkt.trunc);
if (ngx_quic_encrypt(&pkt, ssl_conn, &res) != NGX_OK) { if (ngx_quic_encrypt(&pkt, ssl_conn, &res) != NGX_OK) {
ngx_quic_free_frames(c, frames); ngx_quic_free_frames(c, frames);

4
src/event/ngx_event_quic_protection.c
View File

@ -1113,9 +1113,9 @@ ngx_quic_decrypt(ngx_quic_header_t *pkt, ngx_ssl_conn_t *ssl_conn,
pkt->flags = clearflags; pkt->flags = clearflags;
ngx_log_debug1(NGX_LOG_DEBUG_EVENT, pkt->log, 0, ngx_log_debug1(NGX_LOG_DEBUG_EVENT, pkt->log, 0,
"quic clearflags:%xd", clearflags); "quic pkt rx clearflags:%xd", clearflags);
ngx_log_debug2(NGX_LOG_DEBUG_EVENT, pkt->log, 0, ngx_log_debug2(NGX_LOG_DEBUG_EVENT, pkt->log, 0,
"quic packet number:%uL len:%xi", pn, pnl); "quic pkt rx number:%uL len:%xi", pn, pnl);
/* packet protection */ /* packet protection */

8
src/event/ngx_event_quic_transport.c
View File

@ -326,7 +326,7 @@ ngx_quic_parse_long_header(ngx_quic_header_t *pkt)
} }
ngx_log_debug2(NGX_LOG_DEBUG_EVENT, pkt->log, 0, ngx_log_debug2(NGX_LOG_DEBUG_EVENT, pkt->log, 0,
"quic long packet flags:%xd version:%xD", "quic pkt rx long flags:%xd version:%xD",
pkt->flags, pkt->version); pkt->flags, pkt->version);
if (!(pkt->flags & NGX_QUIC_PKT_FIXED_BIT)) { if (!(pkt->flags & NGX_QUIC_PKT_FIXED_BIT)) {
@ -540,7 +540,7 @@ ngx_quic_parse_short_header(ngx_quic_header_t *pkt, size_t dcid_len)
end = pkt->data + pkt->len; end = pkt->data + pkt->len;
ngx_log_debug1(NGX_LOG_DEBUG_EVENT, pkt->log, 0, ngx_log_debug1(NGX_LOG_DEBUG_EVENT, pkt->log, 0,
"quic short packet flags:%xd", pkt->flags); "quic pkt rx short flags:%xd", pkt->flags);
if (!(pkt->flags & NGX_QUIC_PKT_FIXED_BIT)) { if (!(pkt->flags & NGX_QUIC_PKT_FIXED_BIT)) {
ngx_log_error(NGX_LOG_INFO, pkt->log, 0, "quic fixed bit is not set"); ngx_log_error(NGX_LOG_INFO, pkt->log, 0, "quic fixed bit is not set");
@ -597,7 +597,7 @@ ngx_quic_parse_initial_header(ngx_quic_header_t *pkt)
} }
ngx_log_debug1(NGX_LOG_DEBUG_EVENT, pkt->log, 0, ngx_log_debug1(NGX_LOG_DEBUG_EVENT, pkt->log, 0,
"quic initial packet len:%uL", varint); "quic pkt rx initial len:%uL", varint);
if (varint > (uint64_t) ((pkt->data + pkt->len) - p)) { if (varint > (uint64_t) ((pkt->data + pkt->len) - p)) {
ngx_log_error(NGX_LOG_INFO, pkt->log, 0, ngx_log_error(NGX_LOG_INFO, pkt->log, 0,
@ -636,7 +636,7 @@ ngx_quic_parse_handshake_header(ngx_quic_header_t *pkt)
} }
ngx_log_debug1(NGX_LOG_DEBUG_EVENT, pkt->log, 0, ngx_log_debug1(NGX_LOG_DEBUG_EVENT, pkt->log, 0,
"quic handshake packet len:%uL", plen); "quic pkt rx handshake len:%uL", plen);
if (plen > (uint64_t)((pkt->data + pkt->len) - p)) { if (plen > (uint64_t)((pkt->data + pkt->len) - p)) {
ngx_log_error(NGX_LOG_INFO, pkt->log, 0, ngx_log_error(NGX_LOG_INFO, pkt->log, 0,