Mercurial > hg > nginx
changeset 8630:279ad36f2f4b quic
QUIC: renamed c->qs to c->quic.
author | Roman Arutyunyan <arut@nginx.com> |
---|---|
date | Tue, 10 Nov 2020 19:40:00 +0000 |
parents | feec2cc762f6 |
children | e167c7b4cff4 |
files | src/core/ngx_connection.h src/event/ngx_event.c src/event/ngx_event_openssl.c src/event/ngx_event_quic.c src/http/modules/ngx_http_quic_module.c src/http/ngx_http_request.c src/http/ngx_http_request_body.c src/http/ngx_http_upstream.c src/http/v3/ngx_http_v3.h src/http/v3/ngx_http_v3_parse.c src/http/v3/ngx_http_v3_request.c src/http/v3/ngx_http_v3_streams.c src/http/v3/ngx_http_v3_tables.c src/stream/ngx_stream_core_module.c src/stream/ngx_stream_handler.c src/stream/ngx_stream_quic_module.c |
diffstat | 16 files changed, 46 insertions(+), 46 deletions(-) [+] |
line wrap: on
line diff
--- a/src/core/ngx_connection.h Tue Nov 10 18:38:42 2020 +0000 +++ b/src/core/ngx_connection.h Tue Nov 10 19:40:00 2020 +0000 @@ -151,7 +151,7 @@ ngx_proxy_protocol_t *proxy_protocol; #if (NGX_QUIC || NGX_COMPAT) - ngx_quic_stream_t *qs; + ngx_quic_stream_t *quic; #endif #if (NGX_SSL || NGX_COMPAT)
--- a/src/event/ngx_event.c Tue Nov 10 18:38:42 2020 +0000 +++ b/src/event/ngx_event.c Tue Nov 10 19:40:00 2020 +0000 @@ -274,7 +274,7 @@ c = rev->data; - if (c->qs) { + if (c->quic) { if (!rev->active && !rev->ready) { rev->active = 1; @@ -368,7 +368,7 @@ #if (NGX_QUIC) - if (c->qs) { + if (c->quic) { if (!wev->active && !wev->ready) { wev->active = 1; @@ -953,7 +953,7 @@ int sndlowat; #if (NGX_QUIC) - if (c->qs) { + if (c->quic) { return NGX_OK; } #endif
--- a/src/event/ngx_event_openssl.c Tue Nov 10 18:38:42 2020 +0000 +++ b/src/event/ngx_event_openssl.c Tue Nov 10 19:40:00 2020 +0000 @@ -2870,7 +2870,7 @@ ngx_uint_t tries; #if (NGX_QUIC) - if (c->qs) { + if (c->quic) { /* QUIC streams inherit SSL object */ return NGX_OK; }
--- a/src/event/ngx_event_quic.c Tue Nov 10 18:38:42 2020 +0000 +++ b/src/event/ngx_event_quic.c Tue Nov 10 19:40:00 2020 +0000 @@ -5231,7 +5231,7 @@ ngx_quic_stream_t *qs, *sn; ngx_quic_connection_t *qc; - qs = c->qs; + qs = c->quic; qc = ngx_quic_get_connection(qs->parent); if (bidi) { @@ -5482,7 +5482,7 @@ return NULL; } - sn->c->qs = sn; + sn->c->quic = sn; sn->c->type = SOCK_STREAM; sn->c->pool = pool; sn->c->ssl = c->ssl; @@ -5548,7 +5548,7 @@ ngx_quic_stream_t *qs; ngx_quic_connection_t *qc; - qs = c->qs; + qs = c->quic; b = qs->b; pc = qs->parent; qc = ngx_quic_get_connection(pc); @@ -5678,7 +5678,7 @@ ngx_quic_stream_t *qs; ngx_quic_connection_t *qc; - qs = c->qs; + qs = c->quic; pc = qs->parent; qc = ngx_quic_get_connection(pc); wev = c->write; @@ -5797,7 +5797,7 @@ ngx_quic_stream_t *qs; ngx_quic_connection_t *qc; - qs = c->qs; + qs = c->quic; qc = ngx_quic_get_connection(qs->parent); size = NGX_QUIC_STREAM_BUFSIZE; @@ -5855,7 +5855,7 @@ ngx_quic_stream_t *qs; ngx_quic_connection_t *qc; - qs = c->qs; + qs = c->quic; pc = qs->parent; qc = ngx_quic_get_connection(pc);
--- a/src/http/modules/ngx_http_quic_module.c Tue Nov 10 18:38:42 2020 +0000 +++ b/src/http/modules/ngx_http_quic_module.c Tue Nov 10 19:40:00 2020 +0000 @@ -179,7 +179,7 @@ ngx_http_variable_quic(ngx_http_request_t *r, ngx_http_variable_value_t *v, uintptr_t data) { - if (r->connection->qs) { + if (r->connection->quic) { v->len = 4; v->valid = 1;
--- a/src/http/ngx_http_request.c Tue Nov 10 18:38:42 2020 +0000 +++ b/src/http/ngx_http_request.c Tue Nov 10 19:40:00 2020 +0000 @@ -330,7 +330,7 @@ #endif - if (c->qs == NULL) { + if (c->quic == NULL) { c->log->connection = c->number; qcf = ngx_http_get_module_srv_conf(hc->conf_ctx, @@ -339,7 +339,7 @@ return; } - phc = c->qs->parent->data; + phc = c->quic->parent->data; if (phc->ssl_servername) { hc->ssl_servername = phc->ssl_servername; @@ -2847,7 +2847,7 @@ #endif #if (NGX_HTTP_QUIC) - if (r->connection->qs) { + if (r->connection->quic) { ngx_http_close_request(r, 0); return; } @@ -3064,7 +3064,7 @@ #if (NGX_HTTP_QUIC) - if (c->qs) { + if (c->quic) { if (c->read->error) { err = 0; goto closed;
--- a/src/http/ngx_http_request_body.c Tue Nov 10 18:38:42 2020 +0000 +++ b/src/http/ngx_http_request_body.c Tue Nov 10 19:40:00 2020 +0000 @@ -580,7 +580,7 @@ #endif #if (NGX_HTTP_QUIC) - if (r->connection->qs) { + if (r->connection->quic) { return NGX_OK; } #endif
--- a/src/http/ngx_http_upstream.c Tue Nov 10 18:38:42 2020 +0000 +++ b/src/http/ngx_http_upstream.c Tue Nov 10 19:40:00 2020 +0000 @@ -524,7 +524,7 @@ #endif #if (NGX_HTTP_QUIC) - if (c->qs) { + if (c->quic) { ngx_http_upstream_init_request(r); return; } @@ -1354,7 +1354,7 @@ #if (NGX_HTTP_QUIC) - if (c->qs) { + if (c->quic) { if (c->write->error) { ngx_http_upstream_finalize_request(r, u, NGX_HTTP_CLIENT_CLOSED_REQUEST);
--- a/src/http/v3/ngx_http_v3.h Tue Nov 10 18:38:42 2020 +0000 +++ b/src/http/v3/ngx_http_v3.h Tue Nov 10 19:40:00 2020 +0000 @@ -77,11 +77,11 @@ #define ngx_http_v3_get_module_srv_conf(c, module) \ ngx_http_get_module_srv_conf( \ - ((ngx_http_v3_connection_t *) c->qs->parent->data)->hc.conf_ctx, \ - module) + ((ngx_http_v3_connection_t *) c->quic->parent->data)->hc.conf_ctx, \ + module) #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 {
--- a/src/http/v3/ngx_http_v3_parse.c Tue Nov 10 18:38:42 2020 +0000 +++ b/src/http/v3/ngx_http_v3_parse.c Tue Nov 10 19:40:00 2020 +0000 @@ -279,7 +279,7 @@ ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "http3 parse headers done"); 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; } }
--- a/src/http/v3/ngx_http_v3_request.c Tue Nov 10 18:38:42 2020 +0000 +++ b/src/http/v3/ngx_http_v3_request.c Tue Nov 10 19:40:00 2020 +0000 @@ -469,7 +469,7 @@ out = NULL; 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) { if (ngx_http_v3_push_resources(r, &ll) != NGX_OK) { @@ -1123,7 +1123,7 @@ ngx_http_v3_connection_t *h3c; 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); ngx_log_debug5(NGX_LOG_DEBUG_HTTP, c->log, 0, @@ -1196,7 +1196,7 @@ goto failed; } - h3c = c->qs->parent->data; + h3c = c->quic->parent->data; ngx_memcpy(hc, h3c, sizeof(ngx_http_connection_t)); c->data = hc;
--- a/src/http/v3/ngx_http_v3_streams.c Tue Nov 10 18:38:42 2020 +0000 +++ b/src/http/v3/ngx_http_v3_streams.c Tue Nov 10 19:40:00 2020 +0000 @@ -50,7 +50,7 @@ hc = c->data; - if (c->qs == NULL) { + if (c->quic == NULL) { h3c = ngx_pcalloc(c->pool, sizeof(ngx_http_v3_connection_t)); if (h3c == NULL) { return NGX_ERROR; @@ -69,7 +69,7 @@ return NGX_ERROR; } - if ((c->qs->id & NGX_QUIC_STREAM_UNIDIRECTIONAL) == 0) { + if ((c->quic->id & NGX_QUIC_STREAM_UNIDIRECTIONAL) == 0) { return NGX_OK; } @@ -101,7 +101,7 @@ ngx_http_v3_uni_stream_t *us; 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"); @@ -131,7 +131,7 @@ c = rev->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"); @@ -363,7 +363,7 @@ goto failed; } - h3c = c->qs->parent->data; + h3c = c->quic->parent->data; h3c->npushing++; cln->handler = ngx_http_v3_push_cleanup; @@ -419,7 +419,7 @@ index = -1; } - h3c = c->qs->parent->data; + h3c = c->quic->parent->data; if (index >= 0) { if (h3c->known_streams[index]) { @@ -476,7 +476,7 @@ ngx_http_v3_srv_conf_t *h3scf; ngx_http_v3_connection_t *h3c; - h3c = c->qs->parent->data; + h3c = c->quic->parent->data; if (h3c->settings_sent) { return NGX_OK; @@ -763,7 +763,7 @@ { 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, "http3 MAX_PUSH_ID:%uL", max_push_id); @@ -786,7 +786,7 @@ ngx_http_v3_push_t *push; 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, "http3 CANCEL_PUSH:%uL", push_id);
--- a/src/http/v3/ngx_http_v3_tables.c Tue Nov 10 18:38:42 2020 +0000 +++ b/src/http/v3/ngx_http_v3_tables.c Tue Nov 10 19:40:00 2020 +0000 @@ -198,7 +198,7 @@ return NGX_HTTP_V3_ERR_ENCODER_STREAM_ERROR; } - h3c = c->qs->parent->data; + h3c = c->quic->parent->data; dt = &h3c->table; ngx_log_debug4(NGX_LOG_DEBUG_HTTP, c->log, 0, @@ -250,7 +250,7 @@ ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0, "http3 set capacity %ui", capacity); - pc = c->qs->parent; + pc = c->quic->parent; h3c = pc->data; h3scf = ngx_http_get_module_srv_conf(h3c->hc.conf_ctx, ngx_http_v3_module); @@ -324,7 +324,7 @@ ngx_http_v3_connection_t *h3c; ngx_http_v3_dynamic_table_t *dt; - h3c = c->qs->parent->data; + h3c = c->quic->parent->data; dt = &h3c->table; if (need > dt->capacity) { @@ -367,7 +367,7 @@ 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; if (dt->base + dt->nelts <= index) { @@ -463,7 +463,7 @@ ngx_http_v3_connection_t *h3c; ngx_http_v3_dynamic_table_t *dt; - h3c = c->qs->parent->data; + h3c = c->quic->parent->data; dt = &h3c->table; if (index < dt->base || index - dt->base >= dt->nelts) { @@ -506,7 +506,7 @@ return NGX_OK; } - h3c = c->qs->parent->data; + h3c = c->quic->parent->data; dt = &h3c->table; h3scf = ngx_http_get_module_srv_conf(h3c->hc.conf_ctx, ngx_http_v3_module); @@ -555,7 +555,7 @@ ngx_http_v3_connection_t *h3c; ngx_http_v3_dynamic_table_t *dt; - pc = c->qs->parent; + pc = c->quic->parent; h3c = pc->data; dt = &h3c->table; @@ -636,7 +636,7 @@ ngx_http_v3_block_t *block; 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, "http3 new dynamic header, blocked:%ui", h3c->nblocked);
--- a/src/stream/ngx_stream_core_module.c Tue Nov 10 18:38:42 2020 +0000 +++ b/src/stream/ngx_stream_core_module.c Tue Nov 10 19:40:00 2020 +0000 @@ -326,7 +326,7 @@ if (c->type == SOCK_STREAM #if (NGX_STREAM_QUIC) - && c->qs == NULL + && c->quic == NULL #endif && cscf->tcp_nodelay && ngx_tcp_nodelay(c) != NGX_OK)
--- a/src/stream/ngx_stream_handler.c Tue Nov 10 18:38:42 2020 +0000 +++ b/src/stream/ngx_stream_handler.c Tue Nov 10 19:40:00 2020 +0000 @@ -120,7 +120,7 @@ if (addr_conf->quic) { ngx_quic_conf_t *qcf; - if (c->qs == NULL) { + if (c->quic == NULL) { c->log->connection = c->number; qcf = ngx_stream_get_module_srv_conf(addr_conf->ctx,
--- a/src/stream/ngx_stream_quic_module.c Tue Nov 10 18:38:42 2020 +0000 +++ b/src/stream/ngx_stream_quic_module.c Tue Nov 10 19:40:00 2020 +0000 @@ -170,7 +170,7 @@ ngx_stream_variable_quic(ngx_stream_session_t *s, ngx_stream_variable_value_t *v, uintptr_t data) { - if (s->connection->qs) { + if (s->connection->quic) { v->len = 4; v->valid = 1;