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

QUIC: renamed c->qs to c->quic.

Browse Source
This commit is contained in:
Roman Arutyunyan 2020-11-10 19:40:00 +00:00
parent 4b41b1478f
commit 2fd31c8959
16 changed files with 46 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/ngx_connection.h
View File

@ -151,7 +151,7 @@ struct ngx_connection_s {
ngx_proxy_protocol_t *proxy_protocol; ngx_proxy_protocol_t *proxy_protocol;
#if (NGX_QUIC || NGX_COMPAT) #if (NGX_QUIC || NGX_COMPAT)
ngx_quic_stream_t *qs; ngx_quic_stream_t *quic;
#endif #endif
#if (NGX_SSL || NGX_COMPAT) #if (NGX_SSL || NGX_COMPAT)

6
src/event/ngx_event.c
View File

@ -274,7 +274,7 @@ ngx_handle_read_event(ngx_event_t *rev, ngx_uint_t flags)
c = rev->data; c = rev->data;
if (c->qs) { if (c->quic) {
if (!rev->active && !rev->ready) { if (!rev->active && !rev->ready) {
rev->active = 1; rev->active = 1;
@ -368,7 +368,7 @@ ngx_handle_write_event(ngx_event_t *wev, size_t lowat)
#if (NGX_QUIC) #if (NGX_QUIC)
if (c->qs) { if (c->quic) {
if (!wev->active && !wev->ready) { if (!wev->active && !wev->ready) {
wev->active = 1; wev->active = 1;
@ -953,7 +953,7 @@ ngx_send_lowat(ngx_connection_t *c, size_t lowat)
int sndlowat; int sndlowat;
#if (NGX_QUIC) #if (NGX_QUIC)
if (c->qs) { if (c->quic) {
return NGX_OK; return NGX_OK;
} }
#endif #endif

2
src/event/ngx_event_openssl.c
View File

@ -2870,7 +2870,7 @@ ngx_ssl_shutdown(ngx_connection_t *c)
ngx_uint_t tries; ngx_uint_t tries;
#if (NGX_QUIC) #if (NGX_QUIC)
if (c->qs) { if (c->quic) {
/* QUIC streams inherit SSL object */ /* QUIC streams inherit SSL object */
return NGX_OK; return NGX_OK;
} }

12
src/event/ngx_event_quic.c
View File

@ -5231,7 +5231,7 @@ ngx_quic_open_stream(ngx_connection_t *c, ngx_uint_t bidi)
ngx_quic_stream_t *qs, *sn; ngx_quic_stream_t *qs, *sn;
ngx_quic_connection_t *qc; ngx_quic_connection_t *qc;
qs = c->qs; qs = c->quic;
qc = ngx_quic_get_connection(qs->parent); qc = ngx_quic_get_connection(qs->parent);
if (bidi) { if (bidi) {
@ -5482,7 +5482,7 @@ ngx_quic_create_stream(ngx_connection_t *c, uint64_t id, size_t rcvbuf_size)
return NULL; return NULL;
} }
sn->c->qs = sn; sn->c->quic = sn;
sn->c->type = SOCK_STREAM; sn->c->type = SOCK_STREAM;
sn->c->pool = pool; sn->c->pool = pool;
sn->c->ssl = c->ssl; sn->c->ssl = c->ssl;
@ -5548,7 +5548,7 @@ ngx_quic_stream_recv(ngx_connection_t *c, u_char *buf, size_t size)
ngx_quic_stream_t *qs; ngx_quic_stream_t *qs;
ngx_quic_connection_t *qc; ngx_quic_connection_t *qc;
qs = c->qs; qs = c->quic;
b = qs->b; b = qs->b;
pc = qs->parent; pc = qs->parent;
qc = ngx_quic_get_connection(pc); qc = ngx_quic_get_connection(pc);
@ -5678,7 +5678,7 @@ ngx_quic_stream_send_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit)
ngx_quic_stream_t *qs; ngx_quic_stream_t *qs;
ngx_quic_connection_t *qc; ngx_quic_connection_t *qc;
qs = c->qs; qs = c->quic;
pc = qs->parent; pc = qs->parent;
qc = ngx_quic_get_connection(pc); qc = ngx_quic_get_connection(pc);
wev = c->write; wev = c->write;
@ -5797,7 +5797,7 @@ ngx_quic_max_stream_flow(ngx_connection_t *c)
ngx_quic_stream_t *qs; ngx_quic_stream_t *qs;
ngx_quic_connection_t *qc; ngx_quic_connection_t *qc;
qs = c->qs; qs = c->quic;
qc = ngx_quic_get_connection(qs->parent); qc = ngx_quic_get_connection(qs->parent);
size = NGX_QUIC_STREAM_BUFSIZE; size = NGX_QUIC_STREAM_BUFSIZE;
@ -5855,7 +5855,7 @@ ngx_quic_stream_cleanup_handler(void *data)
ngx_quic_stream_t *qs; ngx_quic_stream_t *qs;
ngx_quic_connection_t *qc; ngx_quic_connection_t *qc;
qs = c->qs; qs = c->quic;
pc = qs->parent; pc = qs->parent;
qc = ngx_quic_get_connection(pc); qc = ngx_quic_get_connection(pc);

2
src/http/modules/ngx_http_quic_module.c
View File

@ -179,7 +179,7 @@ static ngx_int_t
ngx_http_variable_quic(ngx_http_request_t *r, ngx_http_variable_quic(ngx_http_request_t *r,
ngx_http_variable_value_t *v, uintptr_t data) ngx_http_variable_value_t *v, uintptr_t data)
{ {
if (r->connection->qs) { if (r->connection->quic) {
v->len = 4; v->len = 4;
v->valid = 1; v->valid = 1;

8
src/http/ngx_http_request.c
View File

@ -330,7 +330,7 @@ ngx_http_init_connection(ngx_connection_t *c)
#endif #endif
if (c->qs == NULL) { if (c->quic == NULL) {
c->log->connection = c->number; c->log->connection = c->number;
qcf = ngx_http_get_module_srv_conf(hc->conf_ctx, qcf = ngx_http_get_module_srv_conf(hc->conf_ctx,
@ -339,7 +339,7 @@ ngx_http_init_connection(ngx_connection_t *c)
return; return;
} }
phc = c->qs->parent->data; phc = c->quic->parent->data;
if (phc->ssl_servername) { if (phc->ssl_servername) {
hc->ssl_servername = phc->ssl_servername; hc->ssl_servername = phc->ssl_servername;
@ -2847,7 +2847,7 @@ ngx_http_finalize_connection(ngx_http_request_t *r)
#endif #endif
#if (NGX_HTTP_QUIC) #if (NGX_HTTP_QUIC)
if (r->connection->qs) { if (r->connection->quic) {
ngx_http_close_request(r, 0); ngx_http_close_request(r, 0);
return; return;
} }
@ -3064,7 +3064,7 @@ ngx_http_test_reading(ngx_http_request_t *r)
#if (NGX_HTTP_QUIC) #if (NGX_HTTP_QUIC)
if (c->qs) { if (c->quic) {
if (c->read->error) { if (c->read->error) {
err = 0; err = 0;
goto closed; goto closed;

2
src/http/ngx_http_request_body.c
View File

@ -580,7 +580,7 @@ ngx_http_discard_request_body(ngx_http_request_t *r)
#endif #endif
#if (NGX_HTTP_QUIC) #if (NGX_HTTP_QUIC)
if (r->connection->qs) { if (r->connection->quic) {
return NGX_OK; return NGX_OK;
} }
#endif #endif

4
src/http/ngx_http_upstream.c
View File

@ -524,7 +524,7 @@ ngx_http_upstream_init(ngx_http_request_t *r)
#endif #endif
#if (NGX_HTTP_QUIC) #if (NGX_HTTP_QUIC)
if (c->qs) { if (c->quic) {
ngx_http_upstream_init_request(r); ngx_http_upstream_init_request(r);
return; return;
} }
@ -1354,7 +1354,7 @@ ngx_http_upstream_check_broken_connection(ngx_http_request_t *r,
#if (NGX_HTTP_QUIC) #if (NGX_HTTP_QUIC)
if (c->qs) { if (c->quic) {
if (c->write->error) { if (c->write->error) {
ngx_http_upstream_finalize_request(r, u, ngx_http_upstream_finalize_request(r, u,
NGX_HTTP_CLIENT_CLOSED_REQUEST); NGX_HTTP_CLIENT_CLOSED_REQUEST);

6
src/http/v3/ngx_http_v3.h
View File

@ -77,11 +77,11 @@
#define ngx_http_v3_get_module_srv_conf(c, module) \ #define ngx_http_v3_get_module_srv_conf(c, module) \
ngx_http_get_module_srv_conf( \ ngx_http_get_module_srv_conf( \
((ngx_http_v3_connection_t *) c->qs->parent->data)->hc.conf_ctx, \ ((ngx_http_v3_connection_t *) c->quic->parent->data)->hc.conf_ctx, \
module) module)
#define ngx_http_v3_finalize_connection(c, code, reason) \ #define ngx_http_v3_finalize_connection(c, code, reason) \
ngx_quic_finalize_connection(c->qs->parent, code, reason) ngx_quic_finalize_connection(c->quic->parent, code, reason)
typedef struct { typedef struct {

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

@ -279,7 +279,7 @@ done:
ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "http3 parse headers done"); ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "http3 parse headers done");
if (st->prefix.insert_count > 0) { if (st->prefix.insert_count > 0) {
if (ngx_http_v3_client_ack_header(c, c->qs->id) != NGX_OK) { if (ngx_http_v3_client_ack_header(c, c->quic->id) != NGX_OK) {
return NGX_ERROR; return NGX_ERROR;
} }
} }

6
src/http/v3/ngx_http_v3_request.c
View File

@ -469,7 +469,7 @@ ngx_http_v3_create_header(ngx_http_request_t *r)
out = NULL; out = NULL;
ll = &out; ll = &out;
if ((c->qs->id & NGX_QUIC_STREAM_UNIDIRECTIONAL) == 0 if ((c->quic->id & NGX_QUIC_STREAM_UNIDIRECTIONAL) == 0
&& r->method != NGX_HTTP_HEAD) && r->method != NGX_HTTP_HEAD)
{ {
if (ngx_http_v3_push_resources(r, &ll) != NGX_OK) { if (ngx_http_v3_push_resources(r, &ll) != NGX_OK) {
@ -1123,7 +1123,7 @@ ngx_http_v3_push_resource(ngx_http_request_t *r, ngx_str_t *path,
ngx_http_v3_connection_t *h3c; ngx_http_v3_connection_t *h3c;
c = r->connection; c = r->connection;
h3c = c->qs->parent->data; h3c = c->quic->parent->data;
h3scf = ngx_http_get_module_srv_conf(r, ngx_http_v3_module); h3scf = ngx_http_get_module_srv_conf(r, ngx_http_v3_module);
ngx_log_debug5(NGX_LOG_DEBUG_HTTP, c->log, 0, ngx_log_debug5(NGX_LOG_DEBUG_HTTP, c->log, 0,
@ -1196,7 +1196,7 @@ ngx_http_v3_create_push_request(ngx_http_request_t *pr, ngx_str_t *path,
goto failed; goto failed;
} }
h3c = c->qs->parent->data; h3c = c->quic->parent->data;
ngx_memcpy(hc, h3c, sizeof(ngx_http_connection_t)); ngx_memcpy(hc, h3c, sizeof(ngx_http_connection_t));
c->data = hc; c->data = hc;

18
src/http/v3/ngx_http_v3_streams.c
View File

@ -50,7 +50,7 @@ ngx_http_v3_init_connection(ngx_connection_t *c)
hc = c->data; hc = c->data;
if (c->qs == NULL) { if (c->quic == NULL) {
h3c = ngx_pcalloc(c->pool, sizeof(ngx_http_v3_connection_t)); h3c = ngx_pcalloc(c->pool, sizeof(ngx_http_v3_connection_t));
if (h3c == NULL) { if (h3c == NULL) {
return NGX_ERROR; return NGX_ERROR;
@ -69,7 +69,7 @@ ngx_http_v3_init_connection(ngx_connection_t *c)
return NGX_ERROR; return NGX_ERROR;
} }
if ((c->qs->id & NGX_QUIC_STREAM_UNIDIRECTIONAL) == 0) { if ((c->quic->id & NGX_QUIC_STREAM_UNIDIRECTIONAL) == 0) {
return NGX_OK; return NGX_OK;
} }
@ -101,7 +101,7 @@ ngx_http_v3_close_uni_stream(ngx_connection_t *c)
ngx_http_v3_uni_stream_t *us; ngx_http_v3_uni_stream_t *us;
us = c->data; us = c->data;
h3c = c->qs->parent->data; h3c = c->quic->parent->data;
ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "http3 close stream"); ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "http3 close stream");
@ -131,7 +131,7 @@ ngx_http_v3_read_uni_stream_type(ngx_event_t *rev)
c = rev->data; c = rev->data;
us = c->data; us = c->data;
h3c = c->qs->parent->data; h3c = c->quic->parent->data;
ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "http3 read stream type"); ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "http3 read stream type");
@ -363,7 +363,7 @@ ngx_http_v3_create_push_stream(ngx_connection_t *c, uint64_t push_id)
goto failed; goto failed;
} }
h3c = c->qs->parent->data; h3c = c->quic->parent->data;
h3c->npushing++; h3c->npushing++;
cln->handler = ngx_http_v3_push_cleanup; cln->handler = ngx_http_v3_push_cleanup;
@ -419,7 +419,7 @@ ngx_http_v3_get_uni_stream(ngx_connection_t *c, ngx_uint_t type)
index = -1; index = -1;
} }
h3c = c->qs->parent->data; h3c = c->quic->parent->data;
if (index >= 0) { if (index >= 0) {
if (h3c->known_streams[index]) { if (h3c->known_streams[index]) {
@ -476,7 +476,7 @@ ngx_http_v3_send_settings(ngx_connection_t *c)
ngx_http_v3_srv_conf_t *h3scf; ngx_http_v3_srv_conf_t *h3scf;
ngx_http_v3_connection_t *h3c; ngx_http_v3_connection_t *h3c;
h3c = c->qs->parent->data; h3c = c->quic->parent->data;
if (h3c->settings_sent) { if (h3c->settings_sent) {
return NGX_OK; return NGX_OK;
@ -763,7 +763,7 @@ ngx_http_v3_set_max_push_id(ngx_connection_t *c, uint64_t max_push_id)
{ {
ngx_http_v3_connection_t *h3c; ngx_http_v3_connection_t *h3c;
h3c = c->qs->parent->data; h3c = c->quic->parent->data;
ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0, ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
"http3 MAX_PUSH_ID:%uL", max_push_id); "http3 MAX_PUSH_ID:%uL", max_push_id);
@ -786,7 +786,7 @@ ngx_http_v3_cancel_push(ngx_connection_t *c, uint64_t push_id)
ngx_http_v3_push_t *push; ngx_http_v3_push_t *push;
ngx_http_v3_connection_t *h3c; ngx_http_v3_connection_t *h3c;
h3c = c->qs->parent->data; h3c = c->quic->parent->data;
ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0, ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
"http3 CANCEL_PUSH:%uL", push_id); "http3 CANCEL_PUSH:%uL", push_id);

16
src/http/v3/ngx_http_v3_tables.c
View File

@ -198,7 +198,7 @@ ngx_http_v3_insert(ngx_connection_t *c, ngx_str_t *name, ngx_str_t *value)
return NGX_HTTP_V3_ERR_ENCODER_STREAM_ERROR; return NGX_HTTP_V3_ERR_ENCODER_STREAM_ERROR;
} }
h3c = c->qs->parent->data; h3c = c->quic->parent->data;
dt = &h3c->table; dt = &h3c->table;
ngx_log_debug4(NGX_LOG_DEBUG_HTTP, c->log, 0, ngx_log_debug4(NGX_LOG_DEBUG_HTTP, c->log, 0,
@ -250,7 +250,7 @@ ngx_http_v3_set_capacity(ngx_connection_t *c, ngx_uint_t capacity)
ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0, ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
"http3 set capacity %ui", capacity); "http3 set capacity %ui", capacity);
pc = c->qs->parent; pc = c->quic->parent;
h3c = pc->data; h3c = pc->data;
h3scf = ngx_http_get_module_srv_conf(h3c->hc.conf_ctx, ngx_http_v3_module); h3scf = ngx_http_get_module_srv_conf(h3c->hc.conf_ctx, ngx_http_v3_module);
@ -324,7 +324,7 @@ ngx_http_v3_evict(ngx_connection_t *c, size_t need)
ngx_http_v3_connection_t *h3c; ngx_http_v3_connection_t *h3c;
ngx_http_v3_dynamic_table_t *dt; ngx_http_v3_dynamic_table_t *dt;
h3c = c->qs->parent->data; h3c = c->quic->parent->data;
dt = &h3c->table; dt = &h3c->table;
if (need > dt->capacity) { if (need > dt->capacity) {
@ -367,7 +367,7 @@ ngx_http_v3_duplicate(ngx_connection_t *c, ngx_uint_t index)
ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0, "http3 duplicate %ui", index); ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0, "http3 duplicate %ui", index);
h3c = c->qs->parent->data; h3c = c->quic->parent->data;
dt = &h3c->table; dt = &h3c->table;
if (dt->base + dt->nelts <= index) { if (dt->base + dt->nelts <= index) {
@ -463,7 +463,7 @@ ngx_http_v3_lookup(ngx_connection_t *c, ngx_uint_t index, ngx_str_t *name,
ngx_http_v3_connection_t *h3c; ngx_http_v3_connection_t *h3c;
ngx_http_v3_dynamic_table_t *dt; ngx_http_v3_dynamic_table_t *dt;
h3c = c->qs->parent->data; h3c = c->quic->parent->data;
dt = &h3c->table; dt = &h3c->table;
if (index < dt->base || index - dt->base >= dt->nelts) { if (index < dt->base || index - dt->base >= dt->nelts) {
@ -506,7 +506,7 @@ ngx_http_v3_decode_insert_count(ngx_connection_t *c, ngx_uint_t *insert_count)
return NGX_OK; return NGX_OK;
} }
h3c = c->qs->parent->data; h3c = c->quic->parent->data;
dt = &h3c->table; dt = &h3c->table;
h3scf = ngx_http_get_module_srv_conf(h3c->hc.conf_ctx, ngx_http_v3_module); h3scf = ngx_http_get_module_srv_conf(h3c->hc.conf_ctx, ngx_http_v3_module);
@ -555,7 +555,7 @@ ngx_http_v3_check_insert_count(ngx_connection_t *c, ngx_uint_t insert_count)
ngx_http_v3_connection_t *h3c; ngx_http_v3_connection_t *h3c;
ngx_http_v3_dynamic_table_t *dt; ngx_http_v3_dynamic_table_t *dt;
pc = c->qs->parent; pc = c->quic->parent;
h3c = pc->data; h3c = pc->data;
dt = &h3c->table; dt = &h3c->table;
@ -636,7 +636,7 @@ ngx_http_v3_new_header(ngx_connection_t *c)
ngx_http_v3_block_t *block; ngx_http_v3_block_t *block;
ngx_http_v3_connection_t *h3c; ngx_http_v3_connection_t *h3c;
h3c = c->qs->parent->data; h3c = c->quic->parent->data;
ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0, ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
"http3 new dynamic header, blocked:%ui", h3c->nblocked); "http3 new dynamic header, blocked:%ui", h3c->nblocked);

2
src/stream/ngx_stream_core_module.c
View File

@ -326,7 +326,7 @@ ngx_stream_core_content_phase(ngx_stream_session_t *s,
if (c->type == SOCK_STREAM if (c->type == SOCK_STREAM
#if (NGX_STREAM_QUIC) #if (NGX_STREAM_QUIC)
&& c->qs == NULL && c->quic == NULL
#endif #endif
&& cscf->tcp_nodelay && cscf->tcp_nodelay
&& ngx_tcp_nodelay(c) != NGX_OK) && ngx_tcp_nodelay(c) != NGX_OK)

2
src/stream/ngx_stream_handler.c
View File

@ -120,7 +120,7 @@ ngx_stream_init_connection(ngx_connection_t *c)
if (addr_conf->quic) { if (addr_conf->quic) {
ngx_quic_conf_t *qcf; ngx_quic_conf_t *qcf;
if (c->qs == NULL) { if (c->quic == NULL) {
c->log->connection = c->number; c->log->connection = c->number;
qcf = ngx_stream_get_module_srv_conf(addr_conf->ctx, qcf = ngx_stream_get_module_srv_conf(addr_conf->ctx,

2
src/stream/ngx_stream_quic_module.c
View File

@ -170,7 +170,7 @@ static ngx_int_t
ngx_stream_variable_quic(ngx_stream_session_t *s, ngx_stream_variable_quic(ngx_stream_session_t *s,
ngx_stream_variable_value_t *v, uintptr_t data) ngx_stream_variable_value_t *v, uintptr_t data)
{ {
if (s->connection->qs) { if (s->connection->quic) {
v->len = 4; v->len = 4;
v->valid = 1; v->valid = 1;