aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSergey Kandaurov <pluknet@nginx.com>2021-02-15 14:54:28 +0300
committerSergey Kandaurov <pluknet@nginx.com>2021-02-15 14:54:28 +0300
commit407c47074da59f016f99cf04c823080cf7a0b00c (patch)
tree401f4b0ba7d2c3c52793dc96693fa6d0ca140ff8 /src
parentf86c1e1de1fed4e6e92ecee1ed1609d31e52224c (diff)
downloadnginx-407c47074da59f016f99cf04c823080cf7a0b00c.tar.gz
nginx-407c47074da59f016f99cf04c823080cf7a0b00c.zip
QUIC: fixed indentation.
Diffstat (limited to 'src')
-rw-r--r--src/event/quic/ngx_event_quic.c29
-rw-r--r--src/event/quic/ngx_event_quic_bpf.c4
-rw-r--r--src/event/quic/ngx_event_quic_protection.c8
-rw-r--r--src/event/quic/ngx_event_quic_protection.h4
-rw-r--r--src/event/quic/ngx_event_quic_transport.c12
5 files changed, 28 insertions, 29 deletions
diff --git a/src/event/quic/ngx_event_quic.c b/src/event/quic/ngx_event_quic.c
index 3501fa23a..61e48fe7b 100644
--- a/src/event/quic/ngx_event_quic.c
+++ b/src/event/quic/ngx_event_quic.c
@@ -542,7 +542,6 @@ ngx_quic_log_frame(ngx_log_t *log, ngx_quic_frame_t *f, ngx_uint_t tx)
p = ngx_slprintf(p, last, " ft:%ui", f->u.close.frame_type);
}
-
break;
case NGX_QUIC_FT_STREAM0:
@@ -589,7 +588,7 @@ ngx_quic_log_frame(ngx_log_t *log, ngx_quic_frame_t *f, ngx_uint_t tx)
break;
case NGX_QUIC_FT_RESET_STREAM:
- p = ngx_slprintf(p, last, "RESET_STREAM"
+ p = ngx_slprintf(p, last, "RESET_STREAM"
" 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);
@@ -1012,7 +1011,7 @@ ngx_quic_apply_transport_params(ngx_connection_t *c, ngx_quic_tp_t *ctp)
} else if (ctp->max_udp_payload_size > ngx_quic_max_udp_payload(c)) {
ctp->max_udp_payload_size = ngx_quic_max_udp_payload(c);
ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, 0,
- "quic client maximum packet size truncated");
+ "quic client maximum packet size truncated");
}
if (ctp->active_connection_id_limit < 2) {
@@ -1518,7 +1517,7 @@ ngx_quic_send_retry(ngx_connection_t *c, ngx_quic_conf_t *conf,
}
ngx_log_debug(NGX_LOG_DEBUG_EVENT, c->log, 0,
- "quic retry packet sent to %xV", &pkt.dcid);
+ "quic retry packet sent to %xV", &pkt.dcid);
/*
* quic-transport 17.2.5.1: A server MUST NOT send more than one Retry
@@ -1967,7 +1966,7 @@ ngx_quic_close_connection(ngx_connection_t *c, ngx_int_t rc)
if (qc == NULL) {
if (rc == NGX_ERROR) {
ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, 0,
- "quic close connection early error");
+ "quic close connection early error");
}
} else if (ngx_quic_close_quic(c, rc) == NGX_AGAIN) {
@@ -2040,9 +2039,9 @@ ngx_quic_close_quic(ngx_connection_t *c, ngx_int_t rc)
: ssl_encryption_initial;
if (rc == NGX_OK) {
- ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0,
- "quic immediate close drain:%d",
- qc->draining);
+ ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0,
+ "quic immediate close drain:%d",
+ qc->draining);
qc->close.log = c->log;
qc->close.data = c;
@@ -3477,7 +3476,7 @@ ngx_quic_handle_ack_frame(ngx_connection_t *c, ngx_quic_header_t *pkt,
if (gap + 2 > min) {
qc->error = NGX_QUIC_ERR_FRAME_ENCODING_ERROR;
ngx_log_error(NGX_LOG_INFO, c->log, 0,
- "quic invalid range:%ui in ack frame", i);
+ "quic invalid range:%ui in ack frame", i);
return NGX_ERROR;
}
@@ -3486,7 +3485,7 @@ ngx_quic_handle_ack_frame(ngx_connection_t *c, ngx_quic_header_t *pkt,
if (range > max) {
qc->error = NGX_QUIC_ERR_FRAME_ENCODING_ERROR;
ngx_log_error(NGX_LOG_INFO, c->log, 0,
- "quic invalid range:%ui in ack frame", i);
+ "quic invalid range:%ui in ack frame", i);
return NGX_ERROR;
}
@@ -3757,8 +3756,8 @@ ngx_quic_handle_ordered_frame(ngx_connection_t *c, ngx_quic_frames_stream_t *fs,
fs->total -= f->length;
ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0,
- "quic skipped buffered frame, total:%ui",
- fs->total);
+ "quic skipped buffered frame, total:%ui",
+ fs->total);
ngx_quic_free_frame(c, frame);
continue;
}
@@ -3784,7 +3783,7 @@ ngx_quic_handle_ordered_frame(ngx_connection_t *c, ngx_quic_frames_stream_t *fs,
ngx_queue_remove(q);
ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0,
- "quic consumed buffered frame, total:%ui", fs->total);
+ "quic consumed buffered frame, total:%ui", fs->total);
ngx_quic_free_frame(c, frame);
@@ -3872,8 +3871,8 @@ ngx_quic_buffer_frame(ngx_connection_t *c, ngx_quic_frames_stream_t *fs,
fs->total += f->length;
ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0,
- "quic ordered frame with unexpected offset:"
- " buffered total:%ui", fs->total);
+ "quic ordered frame with unexpected offset:"
+ " buffered total:%ui", fs->total);
if (ngx_queue_empty(&fs->frames)) {
ngx_queue_insert_after(&fs->frames, &dst->queue);
diff --git a/src/event/quic/ngx_event_quic_bpf.c b/src/event/quic/ngx_event_quic_bpf.c
index f449793ea..4d5c3adae 100644
--- a/src/event/quic/ngx_event_quic_bpf.c
+++ b/src/event/quic/ngx_event_quic_bpf.c
@@ -400,8 +400,8 @@ ngx_quic_bpf_get_group(ngx_cycle_t *cycle, ngx_listening_t *ls)
}
ngx_log_debug2(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
- "quic bpf sockmap fd duplicated old:%i new:%i",
- ogrp->map_fd, grp->map_fd);
+ "quic bpf sockmap fd duplicated old:%i new:%i",
+ ogrp->map_fd, grp->map_fd);
return grp;
}
diff --git a/src/event/quic/ngx_event_quic_protection.c b/src/event/quic/ngx_event_quic_protection.c
index 130637aaf..4617fe83c 100644
--- a/src/event/quic/ngx_event_quic_protection.c
+++ b/src/event/quic/ngx_event_quic_protection.c
@@ -184,7 +184,7 @@ ngx_quic_keys_set_initial_secret(ngx_pool_t *pool, ngx_quic_keys_t *keys,
};
ngx_log_debug0(NGX_LOG_DEBUG_EVENT, pool->log, 0,
- "quic ngx_quic_set_initial_secret");
+ "quic ngx_quic_set_initial_secret");
#ifdef NGX_QUIC_DEBUG_CRYPTO
ngx_log_debug3(NGX_LOG_DEBUG_EVENT, pool->log, 0,
"quic salt len:%uz %*xs", sizeof(salt), sizeof(salt), salt);
@@ -242,7 +242,7 @@ ngx_quic_keys_set_initial_secret(ngx_pool_t *pool, ngx_quic_keys_t *keys,
&server->secret,
},
{
- /* AEAD_AES_128_GCM prior to handshake, quic-tls-23#section-5.4.1 */
+ /* AEAD_AES_128_GCM prior to handshake, quic-tls-23#section-5.4.1 */
ngx_string("tls13 quic hp"),
&server->hp,
&server->secret,
@@ -724,7 +724,7 @@ ngx_quic_keys_available(ngx_quic_keys_t *keys,
void
ngx_quic_keys_discard(ngx_quic_keys_t *keys,
- enum ssl_encryption_level_t level)
+ enum ssl_encryption_level_t level)
{
keys->secrets[level].client.key.len = 0;
}
@@ -956,7 +956,7 @@ ngx_quic_derive_key(ngx_log_t *log, const char *label, ngx_str_t *secret,
if (ngx_hkdf_extract(is, &is_len, digest, secret->data, secret->len,
salt->data, salt->len)
- != NGX_OK)
+ != NGX_OK)
{
ngx_ssl_error(NGX_LOG_INFO, log, 0,
"ngx_hkdf_extract(%s) failed", label);
diff --git a/src/event/quic/ngx_event_quic_protection.h b/src/event/quic/ngx_event_quic_protection.h
index 60f9b6ae7..2eeb38d7f 100644
--- a/src/event/quic/ngx_event_quic_protection.h
+++ b/src/event/quic/ngx_event_quic_protection.h
@@ -24,9 +24,9 @@ int ngx_quic_keys_set_encryption_secret(ngx_pool_t *pool, ngx_uint_t is_write,
ngx_quic_keys_t *keys, enum ssl_encryption_level_t level,
const SSL_CIPHER *cipher, const uint8_t *secret, size_t secret_len);
ngx_uint_t ngx_quic_keys_available(ngx_quic_keys_t *keys,
- enum ssl_encryption_level_t level);
+ enum ssl_encryption_level_t level);
void ngx_quic_keys_discard(ngx_quic_keys_t *keys,
- enum ssl_encryption_level_t level);
+ enum ssl_encryption_level_t level);
void ngx_quic_keys_switch(ngx_connection_t *c, ngx_quic_keys_t *keys);
ngx_int_t ngx_quic_keys_update(ngx_connection_t *c, ngx_quic_keys_t *keys);
ngx_int_t ngx_quic_derive_key(ngx_log_t *log, const char *label,
diff --git a/src/event/quic/ngx_event_quic_transport.c b/src/event/quic/ngx_event_quic_transport.c
index a849a20dc..01fcc9582 100644
--- a/src/event/quic/ngx_event_quic_transport.c
+++ b/src/event/quic/ngx_event_quic_transport.c
@@ -492,9 +492,9 @@ ngx_quic_parse_long_header_v1(ngx_quic_header_t *pkt)
pkt->level = ssl_encryption_handshake;
} else {
- ngx_log_error(NGX_LOG_INFO, pkt->log, 0,
- "quic bad packet type");
- return NGX_DECLINED;
+ ngx_log_error(NGX_LOG_INFO, pkt->log, 0,
+ "quic bad packet type");
+ return NGX_DECLINED;
}
p = ngx_quic_parse_int(p, end, &varint);
@@ -738,7 +738,7 @@ ngx_quic_parse_frame(ngx_quic_header_t *pkt, u_char *start, u_char *end,
if (p == NULL) {
pkt->error = NGX_QUIC_ERR_FRAME_ENCODING_ERROR;
ngx_log_error(NGX_LOG_INFO, pkt->log, 0,
- "quic failed to obtain quic frame type");
+ "quic failed to obtain quic frame type");
return NGX_ERROR;
}
@@ -1636,8 +1636,8 @@ ngx_quic_parse_transport_params(u_char *p, u_char *end, ngx_quic_tp_t *tp,
p = ngx_quic_parse_int(p, end, &len);
if (p == NULL) {
ngx_log_error(NGX_LOG_INFO, log, 0,
- "quic failed to parse"
- " transport param id:0x%xL length", id);
+ "quic failed to parse"
+ " transport param id:0x%xL length", id);
return NGX_ERROR;
}