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

Fixed format specifiers.

Browse Source
This commit is contained in:
Sergey Kandaurov 2020-07-20 15:19:03 +03:00
parent 91b6487d8d
commit 8d2d2c5f8f
4 changed files with 44 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/event/ngx_event_quic.c
View File

@ -645,7 +645,7 @@ ngx_quic_new_connection(ngx_connection_t *c, ngx_ssl_t *ssl, ngx_quic_tp_t *tp,
if (!ngx_quic_pkt_in(pkt->flags)) {
ngx_log_error(NGX_LOG_INFO, c->log, 0,
"quic invalid initial packet: 0x%xi", pkt->flags);
"quic invalid initial packet: 0x%xd", pkt->flags);
return NGX_ERROR;
}
@ -1614,7 +1614,7 @@ ngx_quic_retry_input(ngx_connection_t *c, ngx_quic_header_t *pkt)
if (!ngx_quic_pkt_in(pkt->flags)) {
ngx_log_error(NGX_LOG_INFO, c->log, 0,
"quic invalid initial packet: 0x%xi", pkt->flags);
"quic invalid initial packet: 0x%xd", pkt->flags);
return NGX_ERROR;
}
@ -2157,7 +2157,7 @@ ngx_quic_send_ack(ngx_connection_t *c, ngx_quic_header_t *pkt)
frame->u.ack.largest = pkt->pn;
frame->u.ack.delay = ngx_quic_ack_delay(c, &pkt->received, frame->level);
ngx_sprintf(frame->info, "ACK for PN=%d from frame handler level=%d",
ngx_sprintf(frame->info, "ACK for PN=%uL from frame handler level=%d",
pkt->pn, frame->level);
ngx_quic_queue_frame(c->quic, frame);
@ -2552,7 +2552,7 @@ ngx_quic_handle_ordered_frame(ngx_connection_t *c, ngx_quic_frames_stream_t *fs,
if (f->offset > fs->received) {
ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0,
"quic out-of-order frame: expecting %ui got %ui",
"quic out-of-order frame: expecting %uL got %uL",
fs->received, f->offset);
return ngx_quic_buffer_frame(c, fs, frame);
@ -2769,8 +2769,7 @@ ngx_quic_handle_crypto_frame(ngx_connection_t *c, ngx_quic_header_t *pkt,
static ngx_int_t
ngx_quic_crypto_input(ngx_connection_t *c, ngx_quic_frame_t *frame, void *data)
{
int sslerr;
ssize_t n;
int n, sslerr;
ngx_ssl_conn_t *ssl_conn;
ngx_quic_send_ctx_t *ctx;
ngx_quic_crypto_frame_t *f;
@ -2889,7 +2888,7 @@ ngx_quic_handle_stream_frame(ngx_connection_t *c, ngx_quic_header_t *pkt,
if (sn == NULL) {
ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0,
"quic stream id 0x%xi is new", f->stream_id);
"quic stream id 0x%xL is new", f->stream_id);
if (f->stream_id & NGX_QUIC_STREAM_SERVER_INITIATED) {
qc->error = NGX_QUIC_ERR_STREAM_STATE_ERROR;
@ -3263,7 +3262,7 @@ ngx_quic_handle_stop_sending_frame(ngx_connection_t *c,
if (sn == NULL) {
ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0,
"quic stream id 0x%xi is new", f->id);
"quic stream id 0x%xL is new", f->id);
if (f->id & NGX_QUIC_STREAM_SERVER_INITIATED) {
qc->error = NGX_QUIC_ERR_STREAM_STATE_ERROR;
@ -3951,7 +3950,7 @@ ngx_quic_stream_recv(ngx_connection_t *c, u_char *buf, size_t size)
rev = c->read;
ngx_log_debug3(NGX_LOG_DEBUG_EVENT, c->log, 0,
"quic stream id 0x%xi recv: eof:%d, avail:%z",
"quic stream id 0x%xL recv: eof:%d, avail:%z",
qs->id, rev->pending_eof, b->last - b->pos);
if (b->pos == b->last) {
@ -3963,7 +3962,7 @@ ngx_quic_stream_recv(ngx_connection_t *c, u_char *buf, size_t size)
}
ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0,
"quic stream id 0x%xi recv() not ready", qs->id);
"quic stream id 0x%xL recv() not ready", qs->id);
return NGX_AGAIN;
}
@ -3981,7 +3980,7 @@ ngx_quic_stream_recv(ngx_connection_t *c, u_char *buf, size_t size)
}
ngx_log_debug3(NGX_LOG_DEBUG_EVENT, c->log, 0,
"quic stream id 0x%xi recv: %z of %uz", qs->id, len, size);
"quic stream id 0x%xL recv: %z of %uz", qs->id, len, size);
if (!rev->pending_eof) {
frame = ngx_quic_alloc_frame(pc, 0);
@ -4023,7 +4022,7 @@ ngx_quic_stream_recv(ngx_connection_t *c, u_char *buf, size_t size)
ngx_quic_queue_frame(pc->quic, frame);
ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0,
"quic stream id 0x%xi recv: increased max data: %ui",
"quic stream id 0x%xL recv: increased max data: %uL",
qs->id, qc->streams.recv_max_data);
}
@ -4051,7 +4050,7 @@ ngx_quic_stream_send(ngx_connection_t *c, u_char *buf, size_t size)
}
ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0,
"quic stream id 0x%xi send: %uz", qs->id, size);
"quic stream id 0x%xL send: %uz", qs->id, size);
/*
* we need to fit at least 1 frame into a packet, thus account head/tail;
@ -4127,7 +4126,7 @@ ngx_quic_stream_send(ngx_connection_t *c, u_char *buf, size_t size)
p += fsize;
n += fsize;
ngx_sprintf(frame->info, "stream 0x%xi len=%ui level=%d",
ngx_sprintf(frame->info, "stream 0x%xL len=%ui level=%d",
qs->id, fsize, frame->level);
ngx_quic_queue_frame(qc, frame);
@ -4164,7 +4163,7 @@ ngx_quic_stream_cleanup_handler(void *data)
qc = pc->quic;
ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0,
"quic stream id 0x%xi cleanup", qs->id);
"quic stream id 0x%xL cleanup", qs->id);
ngx_rbtree_delete(&qc->streams.tree, &qs->node);
ngx_quic_free_frames(pc, &qs->fs.frames);
@ -4181,7 +4180,7 @@ ngx_quic_stream_cleanup_handler(void *data)
}
ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0,
"quic stream id 0x%xi send fin", qs->id);
"quic stream id 0x%xL send fin", qs->id);
frame = ngx_quic_alloc_frame(pc, 0);
if (frame == NULL) {
@ -4200,7 +4199,7 @@ ngx_quic_stream_cleanup_handler(void *data)
frame->u.stream.length = 0;
frame->u.stream.data = NULL;
ngx_sprintf(frame->info, "stream 0x%xi fin=1 level=%d",
ngx_sprintf(frame->info, "stream 0x%xL fin=1 level=%d",
qs->id, frame->level);
ngx_quic_queue_frame(qc, frame);

2
src/event/ngx_event_quic_protection.c
View File

@ -1089,7 +1089,7 @@ ngx_quic_decrypt(ngx_quic_header_t *pkt, ngx_ssl_conn_t *ssl_conn,
#endif
ngx_log_debug1(NGX_LOG_DEBUG_EVENT, pkt->log, 0,
"quic clear flags: %xi", clearflags);
"quic clear flags: %xd", clearflags);
ngx_log_debug2(NGX_LOG_DEBUG_EVENT, pkt->log, 0,
"quic packet number: %uL, len: %xi", pn, pnl);

52
src/event/ngx_event_quic_transport.c
View File

@ -261,7 +261,7 @@ ngx_quic_parse_long_header(ngx_quic_header_t *pkt)
}
ngx_log_debug2(NGX_LOG_DEBUG_EVENT, pkt->log, 0,
"quic long packet flags:%xi version:%xD",
"quic long packet flags:%xd version:%xD",
pkt->flags, pkt->version);
if (!(pkt->flags & NGX_QUIC_PKT_FIXED_BIT)) {
@ -271,7 +271,7 @@ ngx_quic_parse_long_header(ngx_quic_header_t *pkt)
if (pkt->version != NGX_QUIC_VERSION) {
ngx_log_error(NGX_LOG_INFO, pkt->log, 0,
"quic unsupported version: 0x%xi", pkt->version);
"quic unsupported version: 0x%xD", pkt->version);
return NGX_ERROR;
}
@ -457,7 +457,7 @@ ngx_quic_parse_short_header(ngx_quic_header_t *pkt, ngx_str_t *dcid)
}
ngx_log_debug1(NGX_LOG_DEBUG_EVENT, pkt->log, 0,
"quic short packet flags:%xi", pkt->flags);
"quic short packet flags:%xd", pkt->flags);
if (!(pkt->flags & NGX_QUIC_PKT_FIXED_BIT)) {
ngx_log_error(NGX_LOG_INFO, pkt->log, 0, "quic fixed bit is not set");
@ -669,8 +669,8 @@ ngx_quic_parse_frame(ngx_quic_header_t *pkt, u_char *start, u_char *end,
f->u.ack.ranges_end = p;
ngx_log_debug4(NGX_LOG_DEBUG_EVENT, pkt->log, 0,
"quic frame in ACK largest:%ui delay:%ui"
" count:%ui first:%ui", f->u.ack.largest,
"quic frame in ACK largest:%uL delay:%uL"
" count:%uL first:%uL", f->u.ack.largest,
f->u.ack.delay,
f->u.ack.range_count,
f->u.ack.first_range);
@ -685,7 +685,7 @@ ngx_quic_parse_frame(ngx_quic_header_t *pkt, u_char *start, u_char *end,
}
ngx_log_debug3(NGX_LOG_DEBUG_EVENT, pkt->log, 0,
"quic ACK ECN counters: %ui %ui %ui",
"quic ACK ECN counters: %uL %uL %uL",
f->u.ack.ect0, f->u.ack.ect1, f->u.ack.ce);
}
@ -722,7 +722,7 @@ ngx_quic_parse_frame(ngx_quic_header_t *pkt, u_char *start, u_char *end,
}
ngx_log_debug3(NGX_LOG_DEBUG_EVENT, pkt->log, 0,
"quic frame in: NCID seq:%ui retire:%ui len:%ui",
"quic frame in: NCID seq:%uL retire:%uL len:%ud",
f->u.ncid.seqnum, f->u.ncid.retire, f->u.ncid.len);
break;
@ -758,7 +758,7 @@ ngx_quic_parse_frame(ngx_quic_header_t *pkt, u_char *start, u_char *end,
ngx_log_debug4(NGX_LOG_DEBUG_EVENT, pkt->log, 0,
"quic frame in CONNECTION_CLOSE"
" err:%s code:0x%xi type:0x%xi reason:'%V'",
" err:%s code:0x%xL type:0x%xL reason:'%V'",
ngx_quic_error_text(f->u.close.error_code),
f->u.close.error_code, f->u.close.frame_type,
&f->u.close.reason);
@ -766,7 +766,7 @@ ngx_quic_parse_frame(ngx_quic_header_t *pkt, u_char *start, u_char *end,
ngx_log_debug2(NGX_LOG_DEBUG_EVENT, pkt->log, 0,
"quic frame in: CONNECTION_CLOSE_APP:"
" code:0x%xi reason:'%V'",
" code:0x%xL reason:'%V'",
f->u.close.error_code, &f->u.close.reason);
}
@ -819,8 +819,8 @@ ngx_quic_parse_frame(ngx_quic_header_t *pkt, u_char *start, u_char *end,
}
ngx_log_debug7(NGX_LOG_DEBUG_EVENT, pkt->log, 0,
"quic frame in: STREAM type:0x%xi id:0x%xi offset:0x%xi "
"len:0x%xi bits off:%d len:%d fin:%d",
"quic frame in: STREAM type:0x%xi id:0x%xL offset:0x%xL "
"len:0x%xL bits off:%d len:%d fin:%d",
f->type, f->u.stream.stream_id, f->u.stream.offset,
f->u.stream.length, f->u.stream.off, f->u.stream.len,
f->u.stream.fin);
@ -839,7 +839,7 @@ ngx_quic_parse_frame(ngx_quic_header_t *pkt, u_char *start, u_char *end,
}
ngx_log_debug1(NGX_LOG_DEBUG_EVENT, pkt->log, 0,
"quic frame in: MAX_DATA max_data:%ui",
"quic frame in: MAX_DATA max_data:%uL",
f->u.max_data.max_data);
break;
@ -855,7 +855,7 @@ ngx_quic_parse_frame(ngx_quic_header_t *pkt, u_char *start, u_char *end,
ngx_log_debug3(NGX_LOG_DEBUG_EVENT, pkt->log, 0,
"quic frame in: RESET_STREAM"
" id:0x%xi error_code:0x%xi final_size:0x%xi",
" id:0x%xL error_code:0x%xL final_size:0x%xL",
f->u.reset_stream.id, f->u.reset_stream.error_code,
f->u.reset_stream.final_size);
break;
@ -873,7 +873,7 @@ ngx_quic_parse_frame(ngx_quic_header_t *pkt, u_char *start, u_char *end,
}
ngx_log_debug2(NGX_LOG_DEBUG_EVENT, pkt->log, 0,
"quic frame in: STOP_SENDING id:0x%xi error_code:0x%xi",
"quic frame in: STOP_SENDING id:0x%xL error_code:0x%xL",
f->u.stop_sending.id, f->u.stop_sending.error_code);
break;
@ -890,7 +890,7 @@ ngx_quic_parse_frame(ngx_quic_header_t *pkt, u_char *start, u_char *end,
(f->type == NGX_QUIC_FT_STREAMS_BLOCKED) ? 1 : 0;
ngx_log_debug2(NGX_LOG_DEBUG_EVENT, pkt->log, 0,
"quic frame in: STREAMS_BLOCKED limit:%ui bidi:%d",
"quic frame in: STREAMS_BLOCKED limit:%uL bidi:%ui",
f->u.streams_blocked.limit,
f->u.streams_blocked.bidi);
@ -915,7 +915,7 @@ ngx_quic_parse_frame(ngx_quic_header_t *pkt, u_char *start, u_char *end,
f->u.max_streams.bidi = (f->type == NGX_QUIC_FT_MAX_STREAMS) ? 1 : 0;
ngx_log_debug2(NGX_LOG_DEBUG_EVENT, pkt->log, 0,
"quic frame in: MAX_STREAMS limit:%ui bidi:%d",
"quic frame in: MAX_STREAMS limit:%uL bidi:%ui",
f->u.max_streams.limit,
f->u.max_streams.bidi);
break;
@ -933,7 +933,7 @@ ngx_quic_parse_frame(ngx_quic_header_t *pkt, u_char *start, u_char *end,
}
ngx_log_debug2(NGX_LOG_DEBUG_EVENT, pkt->log, 0,
"quic frame in: MAX_STREAM_DATA id:%ui limit:%ui",
"quic frame in: MAX_STREAM_DATA id:%uL limit:%uL",
f->u.max_stream_data.id,
f->u.max_stream_data.limit);
break;
@ -946,7 +946,7 @@ ngx_quic_parse_frame(ngx_quic_header_t *pkt, u_char *start, u_char *end,
}
ngx_log_debug1(NGX_LOG_DEBUG_EVENT, pkt->log, 0,
"quic frame in: DATA_BLOCKED limit:%ui",
"quic frame in: DATA_BLOCKED limit:%uL",
f->u.data_blocked.limit);
break;
@ -964,7 +964,7 @@ ngx_quic_parse_frame(ngx_quic_header_t *pkt, u_char *start, u_char *end,
ngx_log_debug2(NGX_LOG_DEBUG_EVENT, pkt->log, 0,
"quic frame in: STREAM_DATA_BLOCKED"
" id:%ui limit:%ui",
" id:%uL limit:%uL",
f->u.stream_data_blocked.id,
f->u.stream_data_blocked.limit);
break;
@ -978,7 +978,7 @@ ngx_quic_parse_frame(ngx_quic_header_t *pkt, u_char *start, u_char *end,
ngx_log_debug1(NGX_LOG_DEBUG_EVENT, pkt->log, 0,
"quic frame in: RETIRE_CONNECTION_ID"
" sequence_number:%ui",
" sequence_number:%uL",
f->u.retire_cid.sequence_number);
break;
@ -1100,7 +1100,7 @@ ngx_quic_frame_allowed(ngx_quic_header_t *pkt, ngx_uint_t frame_type)
ngx_log_error(NGX_LOG_INFO, pkt->log, 0,
"quic frame type 0x%xi is not "
"allowed in packet with flags 0x%xi",
"allowed in packet with flags 0x%xd",
frame_type, pkt->flags);
return NGX_DECLINED;
@ -1130,7 +1130,7 @@ ngx_quic_parse_ack_range(ngx_quic_header_t *pkt, u_char *start, u_char *end,
}
ngx_log_debug2(NGX_LOG_DEBUG_EVENT, pkt->log, 0,
"quic ACK range: gap %ui range %ui", *gap, *range);
"quic ACK range: gap %uL range %uL", *gap, *range);
return p - start;
}
@ -1482,7 +1482,7 @@ ngx_quic_parse_transport_params(u_char *p, u_char *end, ngx_quic_tp_t *tp,
case NGX_QUIC_TP_STATELESS_RESET_TOKEN:
ngx_log_error(NGX_LOG_INFO, log, 0,
"quic client sent forbidden transport param"
" id 0x%xi", id);
" id 0x%xL", id);
return NGX_ERROR;
}
@ -1490,7 +1490,7 @@ ngx_quic_parse_transport_params(u_char *p, u_char *end, ngx_quic_tp_t *tp,
if (p == NULL) {
ngx_log_error(NGX_LOG_INFO, log, 0,
"quic failed to parse"
" transport param id 0x%xi length", id);
" transport param id 0x%xL length", id);
return NGX_ERROR;
}
@ -1499,13 +1499,13 @@ ngx_quic_parse_transport_params(u_char *p, u_char *end, ngx_quic_tp_t *tp,
if (rc == NGX_ERROR) {
ngx_log_error(NGX_LOG_INFO, log, 0,
"quic failed to parse"
" transport param id 0x%xi data", id);
" transport param id 0x%xL data", id);
return NGX_ERROR;
}
if (rc == NGX_DECLINED) {
ngx_log_error(NGX_LOG_INFO, log, 0,
"quic unknown transport param id 0x%xi,skipped", id);
"quic unknown transport param id 0x%xL, skipped", id);
}
p += len;

2
src/http/v3/ngx_http_v3_parse.c
View File

@ -325,7 +325,7 @@ done:
ngx_log_debug4(NGX_LOG_DEBUG_HTTP, c->log, 0,
"http3 parse header block prefix done "
"insert_count:%ui, sign:%ui, delta_base:%ui, base:%uL",
"insert_count:%ui, sign:%ui, delta_base:%ui, base:%ui",
st->insert_count, st->sign, st->delta_base, st->base);
st->state = sw_start;