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

diff --git a/src/core/ngx_connection.h b/src/core/ngx_connection.h
index a075d84a38f644bdbe865582054bf1810dfccc08..3ac6205e26b24b4d4b1b240aee89a047906af875 100644 (file)
--- a/src/core/ngx_connection.h
+++ b/src/core/ngx_connection.h
@@ -151,7 +151,7 @@ struct ngx_connection_s {
     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)

diff --git a/src/event/ngx_event.c b/src/event/ngx_event.c
index de32630fd0b334483105b5db74a20214409878d5..bbb75dea8da5598bdf4e2b4a795e29f91df6c809 100644 (file)
--- a/src/event/ngx_event.c
+++ b/src/event/ngx_event.c
@@ -274,7 +274,7 @@ ngx_handle_read_event(ngx_event_t *rev, ngx_uint_t flags)
 
     c = rev->data;
 
-    if (c->qs) {
+    if (c->quic) {
 
         if (!rev->active && !rev->ready) {
             rev->active = 1;
@@ -368,7 +368,7 @@ ngx_handle_write_event(ngx_event_t *wev, size_t lowat)
 
 #if (NGX_QUIC)
 
-    if (c->qs) {
+    if (c->quic) {
 
         if (!wev->active && !wev->ready) {
             wev->active = 1;
@@ -953,7 +953,7 @@ ngx_send_lowat(ngx_connection_t *c, size_t lowat)
     int  sndlowat;
 
 #if (NGX_QUIC)
-    if (c->qs) {
+    if (c->quic) {
         return NGX_OK;
     }
 #endif

diff --git a/src/event/ngx_event_openssl.c b/src/event/ngx_event_openssl.c
index d404bbe244ad788d96d4d34eeb219ec821275436..00260e3b7bfa354c87e8e6671f76f3670396b9bf 100644 (file)
--- a/src/event/ngx_event_openssl.c
+++ b/src/event/ngx_event_openssl.c
@@ -2870,7 +2870,7 @@ ngx_ssl_shutdown(ngx_connection_t *c)
     ngx_uint_t  tries;
 
 #if (NGX_QUIC)
-    if (c->qs) {
+    if (c->quic) {
         /* QUIC streams inherit SSL object */
         return NGX_OK;
     }

diff --git a/src/event/ngx_event_quic.c b/src/event/ngx_event_quic.c
index c9ea2de1e0fdbbd01f80146a59debe66a1247211..7643cecfb0ca217fe2632d86b18c6be280a72fb3 100644 (file)
--- a/src/event/ngx_event_quic.c
+++ b/src/event/ngx_event_quic.c
@@ -5231,7 +5231,7 @@ ngx_quic_open_stream(ngx_connection_t *c, ngx_uint_t bidi)
     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 @@ ngx_quic_create_stream(ngx_connection_t *c, uint64_t id, size_t rcvbuf_size)
         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_recv(ngx_connection_t *c, u_char *buf, size_t size)
     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_send_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit)
     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_max_stream_flow(ngx_connection_t *c)
     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_cleanup_handler(void *data)
     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);
 

diff --git a/src/http/modules/ngx_http_quic_module.c b/src/http/modules/ngx_http_quic_module.c
index 3993d4692f0d4310669cd038c7abfc4c51e32a58..515d6c9532438568c28640169d0d5eb48741b656 100644 (file)
--- a/src/http/modules/ngx_http_quic_module.c
+++ b/src/http/modules/ngx_http_quic_module.c
@@ -179,7 +179,7 @@ static ngx_int_t
 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;

diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c
index f33555687ed5e6c43d09dd45249352ea4c2ea212..8df43891a69603e499edd3d6b76c47bdf8b3a3a1 100644 (file)
--- a/src/http/ngx_http_request.c
+++ b/src/http/ngx_http_request.c
@@ -330,7 +330,7 @@ ngx_http_init_connection(ngx_connection_t *c)
 
 #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 @@ ngx_http_init_connection(ngx_connection_t *c)
             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 @@ ngx_http_finalize_connection(ngx_http_request_t *r)
 #endif
 
 #if (NGX_HTTP_QUIC)
-    if (r->connection->qs) {
+    if (r->connection->quic) {
         ngx_http_close_request(r, 0);
         return;
     }
@@ -3064,7 +3064,7 @@ ngx_http_test_reading(ngx_http_request_t *r)
 
 #if (NGX_HTTP_QUIC)
 
-    if (c->qs) {
+    if (c->quic) {
         if (c->read->error) {
             err = 0;
             goto closed;

diff --git a/src/http/ngx_http_request_body.c b/src/http/ngx_http_request_body.c
index 760a3cd05bb020e4b5d4f5849fd81b869e59e4e7..c8ed658cd6e8bb26e8d8d53a41d2f3f4f1108921 100644 (file)
--- a/src/http/ngx_http_request_body.c
+++ b/src/http/ngx_http_request_body.c
@@ -580,7 +580,7 @@ ngx_http_discard_request_body(ngx_http_request_t *r)
 #endif
 
 #if (NGX_HTTP_QUIC)
-    if (r->connection->qs) {
+    if (r->connection->quic) {
         return NGX_OK;
     }
 #endif

diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
index 419d936b830050aa9743dc7e0166a9eceb530628..ceb98f140846b03755b16dfeef188ffad5ce95d5 100644 (file)
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -524,7 +524,7 @@ ngx_http_upstream_init(ngx_http_request_t *r)
 #endif
 
 #if (NGX_HTTP_QUIC)
-    if (c->qs) {
+    if (c->quic) {
         ngx_http_upstream_init_request(r);
         return;
     }
@@ -1354,7 +1354,7 @@ ngx_http_upstream_check_broken_connection(ngx_http_request_t *r,
 
 #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);

diff --git a/src/http/v3/ngx_http_v3.h b/src/http/v3/ngx_http_v3.h
index c244ab8614ae1dd80d98d313d488ddc0904a9db4..949fc2206af0e84080a646c39f59bd36874a34db 100644 (file)
--- a/src/http/v3/ngx_http_v3.h
+++ b/src/http/v3/ngx_http_v3.h
@@ -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 {

diff --git a/src/http/v3/ngx_http_v3_parse.c b/src/http/v3/ngx_http_v3_parse.c
index 6ce5f10a71e6b28569ae1f20e016366930153963..d5ff3cb8f2b969095ea8257a9003da0fc982782d 100644 (file)
--- a/src/http/v3/ngx_http_v3_parse.c
+++ b/src/http/v3/ngx_http_v3_parse.c
@@ -279,7 +279,7 @@ done:
     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;
         }
     }

diff --git a/src/http/v3/ngx_http_v3_request.c b/src/http/v3/ngx_http_v3_request.c
index d9f4c9d553ac898daacf71fa75ee4803e54c745a..5511e30316224854ffa52f9cc9ada4cbc1d54ffb 100644 (file)
--- a/src/http/v3/ngx_http_v3_request.c
+++ b/src/http/v3/ngx_http_v3_request.c
@@ -469,7 +469,7 @@ ngx_http_v3_create_header(ngx_http_request_t *r)
     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_push_resource(ngx_http_request_t *r, ngx_str_t *path,
     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 @@ ngx_http_v3_create_push_request(ngx_http_request_t *pr, ngx_str_t *path,
         goto failed;
     }
 
-    h3c = c->qs->parent->data;
+    h3c = c->quic->parent->data;
     ngx_memcpy(hc, h3c, sizeof(ngx_http_connection_t));
     c->data = hc;
 

diff --git a/src/http/v3/ngx_http_v3_streams.c b/src/http/v3/ngx_http_v3_streams.c
index 8d5147f4d7c20fa930f2ec958794188be3e2dbe6..8ac0487151f097735e462818578cc37e7f9fdc87 100644 (file)
--- a/src/http/v3/ngx_http_v3_streams.c
+++ b/src/http/v3/ngx_http_v3_streams.c
@@ -50,7 +50,7 @@ ngx_http_v3_init_connection(ngx_connection_t *c)
 
     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 @@ ngx_http_v3_init_connection(ngx_connection_t *c)
         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_close_uni_stream(ngx_connection_t *c)
     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 @@ ngx_http_v3_read_uni_stream_type(ngx_event_t *rev)
 
     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 @@ ngx_http_v3_create_push_stream(ngx_connection_t *c, uint64_t push_id)
         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 @@ ngx_http_v3_get_uni_stream(ngx_connection_t *c, ngx_uint_t type)
         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_send_settings(ngx_connection_t *c)
     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_set_max_push_id(ngx_connection_t *c, uint64_t max_push_id)
 {
     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_cancel_push(ngx_connection_t *c, uint64_t push_id)
     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);

diff --git a/src/http/v3/ngx_http_v3_tables.c b/src/http/v3/ngx_http_v3_tables.c
index bf4f1449c6c8bd30b2b70fa563b6e4074cbed29e..5389d0e2f4000a9283cc1620e15ae8e8755537c2 100644 (file)
--- a/src/http/v3/ngx_http_v3_tables.c
+++ b/src/http/v3/ngx_http_v3_tables.c
@@ -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;
     }
 
-    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_http_v3_set_capacity(ngx_connection_t *c, ngx_uint_t capacity)
     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_evict(ngx_connection_t *c, size_t need)
     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_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);
 
-    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_lookup(ngx_connection_t *c, ngx_uint_t index, ngx_str_t *name,
     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 @@ ngx_http_v3_decode_insert_count(ngx_connection_t *c, ngx_uint_t *insert_count)
         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_check_insert_count(ngx_connection_t *c, ngx_uint_t insert_count)
     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_new_header(ngx_connection_t *c)
     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);

diff --git a/src/stream/ngx_stream_core_module.c b/src/stream/ngx_stream_core_module.c
index 6990ae3f676ba379b18d9833e206a8a22addb36b..5f4fe13a06ccbabe99e1f9ff7e2092ffca2938cd 100644 (file)
--- a/src/stream/ngx_stream_core_module.c
+++ b/src/stream/ngx_stream_core_module.c
@@ -326,7 +326,7 @@ ngx_stream_core_content_phase(ngx_stream_session_t *s,
 
     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)

diff --git a/src/stream/ngx_stream_handler.c b/src/stream/ngx_stream_handler.c
index 33f7bc191c3e98261aa4c8e6cba3d34f4c7faada..c5b2e54a24d8a3ad0de592069c46186381eea06b 100644 (file)
--- a/src/stream/ngx_stream_handler.c
+++ b/src/stream/ngx_stream_handler.c
@@ -120,7 +120,7 @@ ngx_stream_init_connection(ngx_connection_t *c)
     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,

diff --git a/src/stream/ngx_stream_quic_module.c b/src/stream/ngx_stream_quic_module.c
index edf5ac70474cb80903cce9e0b4af3e414d03b757..49b1a6f855e7df868471c603a503921c665ae927 100644 (file)
--- a/src/stream/ngx_stream_quic_module.c
+++ b/src/stream/ngx_stream_quic_module.c
@@ -170,7 +170,7 @@ static ngx_int_t
 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;