Mercurial > hg > nginx
annotate src/http/v3/ngx_http_v3_tables.c @ 8775:6e2c23481abb quic
HTTP/3: clean up table from session cleanup handler.
Previously table had a separate cleanup handler.
author | Roman Arutyunyan <arut@nginx.com> |
---|---|
date | Wed, 28 Apr 2021 11:30:27 +0300 |
parents | 0981329169ea |
children | e6c26cb4d38b |
rev | line source |
---|---|
8215 | 1 |
2 /* | |
3 * Copyright (C) Roman Arutyunyan | |
4 * Copyright (C) Nginx, Inc. | |
5 */ | |
6 | |
7 | |
8 #include <ngx_config.h> | |
9 #include <ngx_core.h> | |
10 #include <ngx_http.h> | |
11 | |
12 | |
8456
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
13 #define ngx_http_v3_table_entry_size(n, v) ((n)->len + (v)->len + 32) |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
14 |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
15 |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
16 static ngx_int_t ngx_http_v3_evict(ngx_connection_t *c, size_t need); |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
17 static void ngx_http_v3_unblock(void *data); |
8215 | 18 static ngx_int_t ngx_http_v3_new_header(ngx_connection_t *c); |
19 | |
20 | |
8456
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
21 typedef struct { |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
22 ngx_queue_t queue; |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
23 ngx_connection_t *connection; |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
24 ngx_uint_t *nblocked; |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
25 } ngx_http_v3_block_t; |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
26 |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
27 |
8215 | 28 static ngx_http_v3_header_t ngx_http_v3_static_table[] = { |
29 | |
30 { ngx_string(":authority"), ngx_string("") }, | |
8296
f11b7981a03d
HTTP/3: static table cleanup.
Sergey Kandaurov <pluknet@nginx.com>
parents:
8226
diff
changeset
|
31 { ngx_string(":path"), ngx_string("/") }, |
8215 | 32 { ngx_string("age"), ngx_string("0") }, |
33 { ngx_string("content-disposition"), ngx_string("") }, | |
34 { ngx_string("content-length"), ngx_string("0") }, | |
35 { ngx_string("cookie"), ngx_string("") }, | |
36 { ngx_string("date"), ngx_string("") }, | |
37 { ngx_string("etag"), ngx_string("") }, | |
38 { ngx_string("if-modified-since"), ngx_string("") }, | |
39 { ngx_string("if-none-match"), ngx_string("") }, | |
40 { ngx_string("last-modified"), ngx_string("") }, | |
41 { ngx_string("link"), ngx_string("") }, | |
42 { ngx_string("location"), ngx_string("") }, | |
43 { ngx_string("referer"), ngx_string("") }, | |
44 { ngx_string("set-cookie"), ngx_string("") }, | |
45 { ngx_string(":method"), ngx_string("CONNECT") }, | |
46 { ngx_string(":method"), ngx_string("DELETE") }, | |
47 { ngx_string(":method"), ngx_string("GET") }, | |
48 { ngx_string(":method"), ngx_string("HEAD") }, | |
49 { ngx_string(":method"), ngx_string("OPTIONS") }, | |
50 { ngx_string(":method"), ngx_string("POST") }, | |
51 { ngx_string(":method"), ngx_string("PUT") }, | |
52 { ngx_string(":scheme"), ngx_string("http") }, | |
53 { ngx_string(":scheme"), ngx_string("https") }, | |
54 { ngx_string(":status"), ngx_string("103") }, | |
55 { ngx_string(":status"), ngx_string("200") }, | |
56 { ngx_string(":status"), ngx_string("304") }, | |
57 { ngx_string(":status"), ngx_string("404") }, | |
58 { ngx_string(":status"), ngx_string("503") }, | |
59 { ngx_string("accept"), ngx_string("*/*") }, | |
60 { ngx_string("accept"), | |
8296
f11b7981a03d
HTTP/3: static table cleanup.
Sergey Kandaurov <pluknet@nginx.com>
parents:
8226
diff
changeset
|
61 ngx_string("application/dns-message") }, |
f11b7981a03d
HTTP/3: static table cleanup.
Sergey Kandaurov <pluknet@nginx.com>
parents:
8226
diff
changeset
|
62 { ngx_string("accept-encoding"), ngx_string("gzip, deflate, br") }, |
8215 | 63 { ngx_string("accept-ranges"), ngx_string("bytes") }, |
64 { ngx_string("access-control-allow-headers"), | |
65 ngx_string("cache-control") }, | |
66 { ngx_string("access-control-allow-headers"), | |
67 ngx_string("content-type") }, | |
68 { ngx_string("access-control-allow-origin"), | |
69 ngx_string("*") }, | |
70 { ngx_string("cache-control"), ngx_string("max-age=0") }, | |
71 { ngx_string("cache-control"), ngx_string("max-age=2592000") }, | |
72 { ngx_string("cache-control"), ngx_string("max-age=604800") }, | |
73 { ngx_string("cache-control"), ngx_string("no-cache") }, | |
74 { ngx_string("cache-control"), ngx_string("no-store") }, | |
75 { ngx_string("cache-control"), | |
8296
f11b7981a03d
HTTP/3: static table cleanup.
Sergey Kandaurov <pluknet@nginx.com>
parents:
8226
diff
changeset
|
76 ngx_string("public, max-age=31536000") }, |
8215 | 77 { ngx_string("content-encoding"), ngx_string("br") }, |
78 { ngx_string("content-encoding"), ngx_string("gzip") }, | |
79 { ngx_string("content-type"), | |
80 ngx_string("application/dns-message") }, | |
81 { ngx_string("content-type"), | |
82 ngx_string("application/javascript") }, | |
83 { ngx_string("content-type"), ngx_string("application/json") }, | |
84 { ngx_string("content-type"), | |
85 ngx_string("application/x-www-form-urlencoded") }, | |
86 { ngx_string("content-type"), ngx_string("image/gif") }, | |
87 { ngx_string("content-type"), ngx_string("image/jpeg") }, | |
88 { ngx_string("content-type"), ngx_string("image/png") }, | |
89 { ngx_string("content-type"), ngx_string("text/css") }, | |
90 { ngx_string("content-type"), | |
91 ngx_string("text/html;charset=utf-8") }, | |
92 { ngx_string("content-type"), ngx_string("text/plain") }, | |
93 { ngx_string("content-type"), | |
94 ngx_string("text/plain;charset=utf-8") }, | |
95 { ngx_string("range"), ngx_string("bytes=0-") }, | |
96 { ngx_string("strict-transport-security"), | |
97 ngx_string("max-age=31536000") }, | |
98 { ngx_string("strict-transport-security"), | |
99 ngx_string("max-age=31536000;includesubdomains") }, | |
100 { ngx_string("strict-transport-security"), | |
101 ngx_string("max-age=31536000;includesubdomains;preload") }, | |
102 { ngx_string("vary"), ngx_string("accept-encoding") }, | |
103 { ngx_string("vary"), ngx_string("origin") }, | |
8296
f11b7981a03d
HTTP/3: static table cleanup.
Sergey Kandaurov <pluknet@nginx.com>
parents:
8226
diff
changeset
|
104 { ngx_string("x-content-type-options"), |
f11b7981a03d
HTTP/3: static table cleanup.
Sergey Kandaurov <pluknet@nginx.com>
parents:
8226
diff
changeset
|
105 ngx_string("nosniff") }, |
8215 | 106 { ngx_string("x-xss-protection"), ngx_string("1;mode=block") }, |
107 { ngx_string(":status"), ngx_string("100") }, | |
108 { ngx_string(":status"), ngx_string("204") }, | |
109 { ngx_string(":status"), ngx_string("206") }, | |
110 { ngx_string(":status"), ngx_string("302") }, | |
111 { ngx_string(":status"), ngx_string("400") }, | |
112 { ngx_string(":status"), ngx_string("403") }, | |
113 { ngx_string(":status"), ngx_string("421") }, | |
114 { ngx_string(":status"), ngx_string("425") }, | |
115 { ngx_string(":status"), ngx_string("500") }, | |
116 { ngx_string("accept-language"), ngx_string("") }, | |
117 { ngx_string("access-control-allow-credentials"), | |
118 ngx_string("FALSE") }, | |
119 { ngx_string("access-control-allow-credentials"), | |
120 ngx_string("TRUE") }, | |
121 { ngx_string("access-control-allow-headers"), | |
122 ngx_string("*") }, | |
123 { ngx_string("access-control-allow-methods"), | |
124 ngx_string("get") }, | |
125 { ngx_string("access-control-allow-methods"), | |
126 ngx_string("get, post, options") }, | |
127 { ngx_string("access-control-allow-methods"), | |
128 ngx_string("options") }, | |
129 { ngx_string("access-control-expose-headers"), | |
130 ngx_string("content-length") }, | |
131 { ngx_string("access-control-request-headers"), | |
132 ngx_string("content-type") }, | |
133 { ngx_string("access-control-request-method"), | |
134 ngx_string("get") }, | |
135 { ngx_string("access-control-request-method"), | |
136 ngx_string("post") }, | |
137 { ngx_string("alt-svc"), ngx_string("clear") }, | |
8296
f11b7981a03d
HTTP/3: static table cleanup.
Sergey Kandaurov <pluknet@nginx.com>
parents:
8226
diff
changeset
|
138 { ngx_string("authorization"), ngx_string("") }, |
8215 | 139 { ngx_string("content-security-policy"), |
8296
f11b7981a03d
HTTP/3: static table cleanup.
Sergey Kandaurov <pluknet@nginx.com>
parents:
8226
diff
changeset
|
140 ngx_string("script-src 'none';object-src 'none';base-uri 'none'") }, |
8215 | 141 { ngx_string("early-data"), ngx_string("1") }, |
142 { ngx_string("expect-ct"), ngx_string("") }, | |
143 { ngx_string("forwarded"), ngx_string("") }, | |
144 { ngx_string("if-range"), ngx_string("") }, | |
145 { ngx_string("origin"), ngx_string("") }, | |
146 { ngx_string("purpose"), ngx_string("prefetch") }, | |
147 { ngx_string("server"), ngx_string("") }, | |
148 { ngx_string("timing-allow-origin"), ngx_string("*") }, | |
149 { ngx_string("upgrade-insecure-requests"), | |
150 ngx_string("1") }, | |
151 { ngx_string("user-agent"), ngx_string("") }, | |
152 { ngx_string("x-forwarded-for"), ngx_string("") }, | |
153 { ngx_string("x-frame-options"), ngx_string("deny") }, | |
154 { ngx_string("x-frame-options"), ngx_string("sameorigin") } | |
155 }; | |
156 | |
157 | |
158 ngx_int_t | |
159 ngx_http_v3_ref_insert(ngx_connection_t *c, ngx_uint_t dynamic, | |
160 ngx_uint_t index, ngx_str_t *value) | |
161 { | |
8456
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
162 ngx_str_t name; |
8215 | 163 |
8456
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
164 if (dynamic) { |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
165 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0, |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
166 "http3 ref insert dynamic[%ui] \"%V\"", index, value); |
8215 | 167 |
8456
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
168 if (ngx_http_v3_lookup(c, index, &name, NULL) != NGX_OK) { |
8460
72f9ff4e0a88
HTTP/3: close QUIC connection with HTTP/QPACK errors when needed.
Roman Arutyunyan <arut@nginx.com>
parents:
8456
diff
changeset
|
169 return NGX_HTTP_V3_ERR_ENCODER_STREAM_ERROR; |
8456
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
170 } |
8409
26cb2f3259b1
HTTP/3: reallocate strings inserted into the dynamic table.
Roman Arutyunyan <arut@nginx.com>
parents:
8296
diff
changeset
|
171 |
8456
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
172 } else { |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
173 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0, |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
174 "http3 ref insert static[%ui] \"%V\"", index, value); |
8215 | 175 |
8456
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
176 if (ngx_http_v3_lookup_static(c, index, &name, NULL) != NGX_OK) { |
8460
72f9ff4e0a88
HTTP/3: close QUIC connection with HTTP/QPACK errors when needed.
Roman Arutyunyan <arut@nginx.com>
parents:
8456
diff
changeset
|
177 return NGX_HTTP_V3_ERR_ENCODER_STREAM_ERROR; |
8456
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
178 } |
8215 | 179 } |
180 | |
8456
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
181 return ngx_http_v3_insert(c, &name, value); |
8215 | 182 } |
183 | |
184 | |
185 ngx_int_t | |
8456
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
186 ngx_http_v3_insert(ngx_connection_t *c, ngx_str_t *name, ngx_str_t *value) |
8215 | 187 { |
8456
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
188 u_char *p; |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
189 size_t size; |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
190 ngx_http_v3_header_t *h; |
8770
67f0eb150047
HTTP/3: renamed ngx_http_v3_connection_t to ngx_http_v3_session_t.
Roman Arutyunyan <arut@nginx.com>
parents:
8769
diff
changeset
|
191 ngx_http_v3_session_t *h3c; |
8456
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
192 ngx_http_v3_dynamic_table_t *dt; |
8215 | 193 |
8456
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
194 size = ngx_http_v3_table_entry_size(name, value); |
8215 | 195 |
8456
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
196 if (ngx_http_v3_evict(c, size) != NGX_OK) { |
8460
72f9ff4e0a88
HTTP/3: close QUIC connection with HTTP/QPACK errors when needed.
Roman Arutyunyan <arut@nginx.com>
parents:
8456
diff
changeset
|
197 return NGX_HTTP_V3_ERR_ENCODER_STREAM_ERROR; |
8215 | 198 } |
199 | |
8768
40d710a66aef
HTTP/3: ngx_http_v3_get_session() macro.
Roman Arutyunyan <arut@nginx.com>
parents:
8767
diff
changeset
|
200 h3c = ngx_http_v3_get_session(c); |
8456
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
201 dt = &h3c->table; |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
202 |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
203 ngx_log_debug4(NGX_LOG_DEBUG_HTTP, c->log, 0, |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
204 "http3 insert [%ui] \"%V\":\"%V\", size:%uz", |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
205 dt->base + dt->nelts, name, value, size); |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
206 |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
207 p = ngx_alloc(sizeof(ngx_http_v3_header_t) + name->len + value->len, |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
208 c->log); |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
209 if (p == NULL) { |
8215 | 210 return NGX_ERROR; |
211 } | |
212 | |
8456
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
213 h = (ngx_http_v3_header_t *) p; |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
214 |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
215 h->name.data = p + sizeof(ngx_http_v3_header_t); |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
216 h->name.len = name->len; |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
217 h->value.data = ngx_cpymem(h->name.data, name->data, name->len); |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
218 h->value.len = value->len; |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
219 ngx_memcpy(h->value.data, value->data, value->len); |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
220 |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
221 dt->elts[dt->nelts++] = h; |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
222 dt->size += size; |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
223 |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
224 /* TODO increment can be sent less often */ |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
225 |
8771
0981329169ea
HTTP/3: renamed ngx_http_v3_client_XXX() functions.
Roman Arutyunyan <arut@nginx.com>
parents:
8770
diff
changeset
|
226 if (ngx_http_v3_send_inc_insert_count(c, 1) != NGX_OK) { |
8409
26cb2f3259b1
HTTP/3: reallocate strings inserted into the dynamic table.
Roman Arutyunyan <arut@nginx.com>
parents:
8296
diff
changeset
|
227 return NGX_ERROR; |
26cb2f3259b1
HTTP/3: reallocate strings inserted into the dynamic table.
Roman Arutyunyan <arut@nginx.com>
parents:
8296
diff
changeset
|
228 } |
26cb2f3259b1
HTTP/3: reallocate strings inserted into the dynamic table.
Roman Arutyunyan <arut@nginx.com>
parents:
8296
diff
changeset
|
229 |
8215 | 230 if (ngx_http_v3_new_header(c) != NGX_OK) { |
231 return NGX_ERROR; | |
232 } | |
233 | |
234 return NGX_OK; | |
235 } | |
236 | |
237 | |
238 ngx_int_t | |
239 ngx_http_v3_set_capacity(ngx_connection_t *c, ngx_uint_t capacity) | |
240 { | |
8456
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
241 ngx_uint_t max, prev_max; |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
242 ngx_http_v3_header_t **elts; |
8770
67f0eb150047
HTTP/3: renamed ngx_http_v3_connection_t to ngx_http_v3_session_t.
Roman Arutyunyan <arut@nginx.com>
parents:
8769
diff
changeset
|
243 ngx_http_v3_session_t *h3c; |
8492
65c1fc5fae15
HTTP/3: renamed server configuration variables from v3cf to h3scf.
Roman Arutyunyan <arut@nginx.com>
parents:
8460
diff
changeset
|
244 ngx_http_v3_srv_conf_t *h3scf; |
8456
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
245 ngx_http_v3_dynamic_table_t *dt; |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
246 |
8215 | 247 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0, |
248 "http3 set capacity %ui", capacity); | |
249 | |
8768
40d710a66aef
HTTP/3: ngx_http_v3_get_session() macro.
Roman Arutyunyan <arut@nginx.com>
parents:
8767
diff
changeset
|
250 h3c = ngx_http_v3_get_session(c); |
8769
9ec3e71f8a61
HTTP/3: reference h3c directly from ngx_http_connection_t.
Roman Arutyunyan <arut@nginx.com>
parents:
8768
diff
changeset
|
251 h3scf = ngx_http_v3_get_module_srv_conf(c, ngx_http_v3_module); |
8456
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
252 |
8492
65c1fc5fae15
HTTP/3: renamed server configuration variables from v3cf to h3scf.
Roman Arutyunyan <arut@nginx.com>
parents:
8460
diff
changeset
|
253 if (capacity > h3scf->max_table_capacity) { |
8456
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
254 ngx_log_error(NGX_LOG_INFO, c->log, 0, |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
255 "client exceeded http3_max_table_capacity limit"); |
8460
72f9ff4e0a88
HTTP/3: close QUIC connection with HTTP/QPACK errors when needed.
Roman Arutyunyan <arut@nginx.com>
parents:
8456
diff
changeset
|
256 return NGX_HTTP_V3_ERR_ENCODER_STREAM_ERROR; |
8456
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
257 } |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
258 |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
259 dt = &h3c->table; |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
260 |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
261 if (dt->size > capacity) { |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
262 if (ngx_http_v3_evict(c, dt->size - capacity) != NGX_OK) { |
8460
72f9ff4e0a88
HTTP/3: close QUIC connection with HTTP/QPACK errors when needed.
Roman Arutyunyan <arut@nginx.com>
parents:
8456
diff
changeset
|
263 return NGX_HTTP_V3_ERR_ENCODER_STREAM_ERROR; |
8456
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
264 } |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
265 } |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
266 |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
267 max = capacity / 32; |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
268 prev_max = dt->capacity / 32; |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
269 |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
270 if (max > prev_max) { |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
271 elts = ngx_alloc(max * sizeof(void *), c->log); |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
272 if (elts == NULL) { |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
273 return NGX_ERROR; |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
274 } |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
275 |
8775
6e2c23481abb
HTTP/3: clean up table from session cleanup handler.
Roman Arutyunyan <arut@nginx.com>
parents:
8771
diff
changeset
|
276 if (dt->elts) { |
8456
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
277 ngx_memcpy(elts, dt->elts, dt->nelts * sizeof(void *)); |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
278 ngx_free(dt->elts); |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
279 } |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
280 |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
281 dt->elts = elts; |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
282 } |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
283 |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
284 dt->capacity = capacity; |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
285 |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
286 return NGX_OK; |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
287 } |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
288 |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
289 |
8775
6e2c23481abb
HTTP/3: clean up table from session cleanup handler.
Roman Arutyunyan <arut@nginx.com>
parents:
8771
diff
changeset
|
290 void |
6e2c23481abb
HTTP/3: clean up table from session cleanup handler.
Roman Arutyunyan <arut@nginx.com>
parents:
8771
diff
changeset
|
291 ngx_http_v3_cleanup_table(ngx_http_v3_session_t *h3c) |
8456
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
292 { |
8775
6e2c23481abb
HTTP/3: clean up table from session cleanup handler.
Roman Arutyunyan <arut@nginx.com>
parents:
8771
diff
changeset
|
293 ngx_uint_t n; |
6e2c23481abb
HTTP/3: clean up table from session cleanup handler.
Roman Arutyunyan <arut@nginx.com>
parents:
8771
diff
changeset
|
294 ngx_http_v3_dynamic_table_t *dt; |
8456
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
295 |
8775
6e2c23481abb
HTTP/3: clean up table from session cleanup handler.
Roman Arutyunyan <arut@nginx.com>
parents:
8771
diff
changeset
|
296 dt = &h3c->table; |
6e2c23481abb
HTTP/3: clean up table from session cleanup handler.
Roman Arutyunyan <arut@nginx.com>
parents:
8771
diff
changeset
|
297 |
6e2c23481abb
HTTP/3: clean up table from session cleanup handler.
Roman Arutyunyan <arut@nginx.com>
parents:
8771
diff
changeset
|
298 if (dt->elts == NULL) { |
6e2c23481abb
HTTP/3: clean up table from session cleanup handler.
Roman Arutyunyan <arut@nginx.com>
parents:
8771
diff
changeset
|
299 return; |
6e2c23481abb
HTTP/3: clean up table from session cleanup handler.
Roman Arutyunyan <arut@nginx.com>
parents:
8771
diff
changeset
|
300 } |
8456
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
301 |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
302 for (n = 0; n < dt->nelts; n++) { |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
303 ngx_free(dt->elts[n]); |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
304 } |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
305 |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
306 ngx_free(dt->elts); |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
307 } |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
308 |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
309 |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
310 static ngx_int_t |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
311 ngx_http_v3_evict(ngx_connection_t *c, size_t need) |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
312 { |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
313 size_t size, target; |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
314 ngx_uint_t n; |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
315 ngx_http_v3_header_t *h; |
8770
67f0eb150047
HTTP/3: renamed ngx_http_v3_connection_t to ngx_http_v3_session_t.
Roman Arutyunyan <arut@nginx.com>
parents:
8769
diff
changeset
|
316 ngx_http_v3_session_t *h3c; |
8456
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
317 ngx_http_v3_dynamic_table_t *dt; |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
318 |
8768
40d710a66aef
HTTP/3: ngx_http_v3_get_session() macro.
Roman Arutyunyan <arut@nginx.com>
parents:
8767
diff
changeset
|
319 h3c = ngx_http_v3_get_session(c); |
8456
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
320 dt = &h3c->table; |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
321 |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
322 if (need > dt->capacity) { |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
323 ngx_log_error(NGX_LOG_ERR, c->log, 0, |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
324 "not enough dynamic table capacity"); |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
325 return NGX_ERROR; |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
326 } |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
327 |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
328 target = dt->capacity - need; |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
329 n = 0; |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
330 |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
331 while (dt->size > target) { |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
332 h = dt->elts[n++]; |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
333 size = ngx_http_v3_table_entry_size(&h->name, &h->value); |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
334 |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
335 ngx_log_debug4(NGX_LOG_DEBUG_HTTP, c->log, 0, |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
336 "http3 evict [%ui] \"%V\":\"%V\" size:%uz", |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
337 dt->base, &h->name, &h->value, size); |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
338 |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
339 ngx_free(h); |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
340 dt->size -= size; |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
341 } |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
342 |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
343 if (n) { |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
344 dt->nelts -= n; |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
345 dt->base += n; |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
346 ngx_memmove(dt->elts, &dt->elts[n], dt->nelts * sizeof(void *)); |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
347 } |
8215 | 348 |
349 return NGX_OK; | |
350 } | |
351 | |
352 | |
353 ngx_int_t | |
354 ngx_http_v3_duplicate(ngx_connection_t *c, ngx_uint_t index) | |
355 { | |
8456
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
356 ngx_str_t name, value; |
8770
67f0eb150047
HTTP/3: renamed ngx_http_v3_connection_t to ngx_http_v3_session_t.
Roman Arutyunyan <arut@nginx.com>
parents:
8769
diff
changeset
|
357 ngx_http_v3_session_t *h3c; |
8456
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
358 ngx_http_v3_dynamic_table_t *dt; |
8215 | 359 |
360 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0, "http3 duplicate %ui", index); | |
361 | |
8768
40d710a66aef
HTTP/3: ngx_http_v3_get_session() macro.
Roman Arutyunyan <arut@nginx.com>
parents:
8767
diff
changeset
|
362 h3c = ngx_http_v3_get_session(c); |
8456
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
363 dt = &h3c->table; |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
364 |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
365 if (dt->base + dt->nelts <= index) { |
8460
72f9ff4e0a88
HTTP/3: close QUIC connection with HTTP/QPACK errors when needed.
Roman Arutyunyan <arut@nginx.com>
parents:
8456
diff
changeset
|
366 return NGX_HTTP_V3_ERR_ENCODER_STREAM_ERROR; |
8215 | 367 } |
368 | |
8456
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
369 index = dt->base + dt->nelts - 1 - index; |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
370 |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
371 if (ngx_http_v3_lookup(c, index, &name, &value) != NGX_OK) { |
8460
72f9ff4e0a88
HTTP/3: close QUIC connection with HTTP/QPACK errors when needed.
Roman Arutyunyan <arut@nginx.com>
parents:
8456
diff
changeset
|
372 return NGX_HTTP_V3_ERR_ENCODER_STREAM_ERROR; |
8215 | 373 } |
374 | |
8456
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
375 return ngx_http_v3_insert(c, &name, &value); |
8215 | 376 } |
377 | |
378 | |
379 ngx_int_t | |
380 ngx_http_v3_ack_header(ngx_connection_t *c, ngx_uint_t stream_id) | |
381 { | |
382 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0, | |
383 "http3 ack header %ui", stream_id); | |
384 | |
8766
70701edfc5d4
HTTP/3: fixed decoder stream stubs.
Roman Arutyunyan <arut@nginx.com>
parents:
8630
diff
changeset
|
385 /* we do not use dynamic tables */ |
8215 | 386 |
8766
70701edfc5d4
HTTP/3: fixed decoder stream stubs.
Roman Arutyunyan <arut@nginx.com>
parents:
8630
diff
changeset
|
387 return NGX_HTTP_V3_ERR_DECODER_STREAM_ERROR; |
8215 | 388 } |
389 | |
390 | |
391 ngx_int_t | |
392 ngx_http_v3_inc_insert_count(ngx_connection_t *c, ngx_uint_t inc) | |
393 { | |
394 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0, | |
395 "http3 increment insert count %ui", inc); | |
396 | |
8766
70701edfc5d4
HTTP/3: fixed decoder stream stubs.
Roman Arutyunyan <arut@nginx.com>
parents:
8630
diff
changeset
|
397 /* we do not use dynamic tables */ |
8215 | 398 |
8766
70701edfc5d4
HTTP/3: fixed decoder stream stubs.
Roman Arutyunyan <arut@nginx.com>
parents:
8630
diff
changeset
|
399 return NGX_HTTP_V3_ERR_DECODER_STREAM_ERROR; |
8215 | 400 } |
401 | |
402 | |
8456
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
403 ngx_int_t |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
404 ngx_http_v3_lookup_static(ngx_connection_t *c, ngx_uint_t index, |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
405 ngx_str_t *name, ngx_str_t *value) |
8215 | 406 { |
8456
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
407 ngx_uint_t nelts; |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
408 ngx_http_v3_header_t *h; |
8215 | 409 |
8456
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
410 nelts = sizeof(ngx_http_v3_static_table) |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
411 / sizeof(ngx_http_v3_static_table[0]); |
8215 | 412 |
8456
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
413 if (index >= nelts) { |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
414 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0, |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
415 "http3 static[%ui] lookup out of bounds: %ui", |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
416 index, nelts); |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
417 return NGX_ERROR; |
8215 | 418 } |
419 | |
8456
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
420 h = &ngx_http_v3_static_table[index]; |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
421 |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
422 ngx_log_debug3(NGX_LOG_DEBUG_HTTP, c->log, 0, |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
423 "http3 static[%ui] lookup \"%V\":\"%V\"", |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
424 index, &h->name, &h->value); |
8215 | 425 |
8456
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
426 if (name) { |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
427 *name = h->name; |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
428 } |
8215 | 429 |
8456
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
430 if (value) { |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
431 *value = h->value; |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
432 } |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
433 |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
434 return NGX_OK; |
8215 | 435 } |
436 | |
437 | |
8456
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
438 ngx_int_t |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
439 ngx_http_v3_lookup(ngx_connection_t *c, ngx_uint_t index, ngx_str_t *name, |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
440 ngx_str_t *value) |
8215 | 441 { |
8456
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
442 ngx_http_v3_header_t *h; |
8770
67f0eb150047
HTTP/3: renamed ngx_http_v3_connection_t to ngx_http_v3_session_t.
Roman Arutyunyan <arut@nginx.com>
parents:
8769
diff
changeset
|
443 ngx_http_v3_session_t *h3c; |
8456
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
444 ngx_http_v3_dynamic_table_t *dt; |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
445 |
8768
40d710a66aef
HTTP/3: ngx_http_v3_get_session() macro.
Roman Arutyunyan <arut@nginx.com>
parents:
8767
diff
changeset
|
446 h3c = ngx_http_v3_get_session(c); |
8456
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
447 dt = &h3c->table; |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
448 |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
449 if (index < dt->base || index - dt->base >= dt->nelts) { |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
450 ngx_log_debug3(NGX_LOG_DEBUG_HTTP, c->log, 0, |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
451 "http3 dynamic[%ui] lookup out of bounds: [%ui,%ui]", |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
452 index, dt->base, dt->base + dt->nelts); |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
453 return NGX_ERROR; |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
454 } |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
455 |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
456 h = dt->elts[index - dt->base]; |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
457 |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
458 ngx_log_debug3(NGX_LOG_DEBUG_HTTP, c->log, 0, |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
459 "http3 dynamic[%ui] lookup \"%V\":\"%V\"", |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
460 index, &h->name, &h->value); |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
461 |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
462 if (name) { |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
463 *name = h->name; |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
464 } |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
465 |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
466 if (value) { |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
467 *value = h->value; |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
468 } |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
469 |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
470 return NGX_OK; |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
471 } |
8215 | 472 |
8456
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
473 |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
474 ngx_int_t |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
475 ngx_http_v3_decode_insert_count(ngx_connection_t *c, ngx_uint_t *insert_count) |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
476 { |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
477 ngx_uint_t max_entries, full_range, max_value, |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
478 max_wrapped, req_insert_count; |
8492
65c1fc5fae15
HTTP/3: renamed server configuration variables from v3cf to h3scf.
Roman Arutyunyan <arut@nginx.com>
parents:
8460
diff
changeset
|
479 ngx_http_v3_srv_conf_t *h3scf; |
8770
67f0eb150047
HTTP/3: renamed ngx_http_v3_connection_t to ngx_http_v3_session_t.
Roman Arutyunyan <arut@nginx.com>
parents:
8769
diff
changeset
|
480 ngx_http_v3_session_t *h3c; |
8456
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
481 ngx_http_v3_dynamic_table_t *dt; |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
482 |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
483 /* QPACK 4.5.1.1. Required Insert Count */ |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
484 |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
485 if (*insert_count == 0) { |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
486 return NGX_OK; |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
487 } |
8215 | 488 |
8768
40d710a66aef
HTTP/3: ngx_http_v3_get_session() macro.
Roman Arutyunyan <arut@nginx.com>
parents:
8767
diff
changeset
|
489 h3c = ngx_http_v3_get_session(c); |
8456
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
490 dt = &h3c->table; |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
491 |
8769
9ec3e71f8a61
HTTP/3: reference h3c directly from ngx_http_connection_t.
Roman Arutyunyan <arut@nginx.com>
parents:
8768
diff
changeset
|
492 h3scf = ngx_http_v3_get_module_srv_conf(c, ngx_http_v3_module); |
8456
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
493 |
8492
65c1fc5fae15
HTTP/3: renamed server configuration variables from v3cf to h3scf.
Roman Arutyunyan <arut@nginx.com>
parents:
8460
diff
changeset
|
494 max_entries = h3scf->max_table_capacity / 32; |
8456
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
495 full_range = 2 * max_entries; |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
496 |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
497 if (*insert_count > full_range) { |
8460
72f9ff4e0a88
HTTP/3: close QUIC connection with HTTP/QPACK errors when needed.
Roman Arutyunyan <arut@nginx.com>
parents:
8456
diff
changeset
|
498 return NGX_HTTP_V3_ERR_DECOMPRESSION_FAILED; |
8456
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
499 } |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
500 |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
501 max_value = dt->base + dt->nelts + max_entries; |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
502 max_wrapped = (max_value / full_range) * full_range; |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
503 req_insert_count = max_wrapped + *insert_count - 1; |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
504 |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
505 if (req_insert_count > max_value) { |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
506 if (req_insert_count <= full_range) { |
8460
72f9ff4e0a88
HTTP/3: close QUIC connection with HTTP/QPACK errors when needed.
Roman Arutyunyan <arut@nginx.com>
parents:
8456
diff
changeset
|
507 return NGX_HTTP_V3_ERR_DECOMPRESSION_FAILED; |
8215 | 508 } |
509 | |
8456
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
510 req_insert_count -= full_range; |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
511 } |
8215 | 512 |
8456
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
513 if (req_insert_count == 0) { |
8460
72f9ff4e0a88
HTTP/3: close QUIC connection with HTTP/QPACK errors when needed.
Roman Arutyunyan <arut@nginx.com>
parents:
8456
diff
changeset
|
514 return NGX_HTTP_V3_ERR_DECOMPRESSION_FAILED; |
8215 | 515 } |
516 | |
8456
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
517 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0, |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
518 "http3 decode insert_count %ui -> %ui", |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
519 *insert_count, req_insert_count); |
8215 | 520 |
8456
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
521 *insert_count = req_insert_count; |
8215 | 522 |
8456
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
523 return NGX_OK; |
8215 | 524 } |
525 | |
526 | |
527 ngx_int_t | |
528 ngx_http_v3_check_insert_count(ngx_connection_t *c, ngx_uint_t insert_count) | |
529 { | |
8456
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
530 size_t n; |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
531 ngx_pool_cleanup_t *cln; |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
532 ngx_http_v3_block_t *block; |
8770
67f0eb150047
HTTP/3: renamed ngx_http_v3_connection_t to ngx_http_v3_session_t.
Roman Arutyunyan <arut@nginx.com>
parents:
8769
diff
changeset
|
533 ngx_http_v3_session_t *h3c; |
8492
65c1fc5fae15
HTTP/3: renamed server configuration variables from v3cf to h3scf.
Roman Arutyunyan <arut@nginx.com>
parents:
8460
diff
changeset
|
534 ngx_http_v3_srv_conf_t *h3scf; |
8456
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
535 ngx_http_v3_dynamic_table_t *dt; |
8215 | 536 |
8768
40d710a66aef
HTTP/3: ngx_http_v3_get_session() macro.
Roman Arutyunyan <arut@nginx.com>
parents:
8767
diff
changeset
|
537 h3c = ngx_http_v3_get_session(c); |
8456
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
538 dt = &h3c->table; |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
539 |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
540 n = dt->base + dt->nelts; |
8215 | 541 |
542 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0, | |
8456
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
543 "http3 check insert count req:%ui, have:%ui", |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
544 insert_count, n); |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
545 |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
546 if (n >= insert_count) { |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
547 return NGX_OK; |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
548 } |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
549 |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
550 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "http3 block stream"); |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
551 |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
552 block = NULL; |
8215 | 553 |
8456
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
554 for (cln = c->pool->cleanup; cln; cln = cln->next) { |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
555 if (cln->handler == ngx_http_v3_unblock) { |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
556 block = cln->data; |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
557 break; |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
558 } |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
559 } |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
560 |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
561 if (block == NULL) { |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
562 cln = ngx_pool_cleanup_add(c->pool, sizeof(ngx_http_v3_block_t)); |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
563 if (cln == NULL) { |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
564 return NGX_ERROR; |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
565 } |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
566 |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
567 cln->handler = ngx_http_v3_unblock; |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
568 |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
569 block = cln->data; |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
570 block->queue.prev = NULL; |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
571 block->connection = c; |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
572 block->nblocked = &h3c->nblocked; |
8215 | 573 } |
574 | |
8456
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
575 if (block->queue.prev == NULL) { |
8769
9ec3e71f8a61
HTTP/3: reference h3c directly from ngx_http_connection_t.
Roman Arutyunyan <arut@nginx.com>
parents:
8768
diff
changeset
|
576 h3scf = ngx_http_v3_get_module_srv_conf(c, ngx_http_v3_module); |
8456
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
577 |
8492
65c1fc5fae15
HTTP/3: renamed server configuration variables from v3cf to h3scf.
Roman Arutyunyan <arut@nginx.com>
parents:
8460
diff
changeset
|
578 if (h3c->nblocked == h3scf->max_blocked_streams) { |
8456
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
579 ngx_log_error(NGX_LOG_INFO, c->log, 0, |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
580 "client exceeded http3_max_blocked_streams limit"); |
8460
72f9ff4e0a88
HTTP/3: close QUIC connection with HTTP/QPACK errors when needed.
Roman Arutyunyan <arut@nginx.com>
parents:
8456
diff
changeset
|
581 return NGX_HTTP_V3_ERR_DECOMPRESSION_FAILED; |
8456
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
582 } |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
583 |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
584 h3c->nblocked++; |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
585 ngx_queue_insert_tail(&h3c->blocked, &block->queue); |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
586 } |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
587 |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
588 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0, |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
589 "http3 blocked:%ui", h3c->nblocked); |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
590 |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
591 return NGX_BUSY; |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
592 } |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
593 |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
594 |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
595 static void |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
596 ngx_http_v3_unblock(void *data) |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
597 { |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
598 ngx_http_v3_block_t *block = data; |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
599 |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
600 if (block->queue.prev) { |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
601 ngx_queue_remove(&block->queue); |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
602 block->queue.prev = NULL; |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
603 (*block->nblocked)--; |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
604 } |
8215 | 605 } |
606 | |
607 | |
608 static ngx_int_t | |
609 ngx_http_v3_new_header(ngx_connection_t *c) | |
610 { | |
8770
67f0eb150047
HTTP/3: renamed ngx_http_v3_connection_t to ngx_http_v3_session_t.
Roman Arutyunyan <arut@nginx.com>
parents:
8769
diff
changeset
|
611 ngx_queue_t *q; |
67f0eb150047
HTTP/3: renamed ngx_http_v3_connection_t to ngx_http_v3_session_t.
Roman Arutyunyan <arut@nginx.com>
parents:
8769
diff
changeset
|
612 ngx_connection_t *bc; |
67f0eb150047
HTTP/3: renamed ngx_http_v3_connection_t to ngx_http_v3_session_t.
Roman Arutyunyan <arut@nginx.com>
parents:
8769
diff
changeset
|
613 ngx_http_v3_block_t *block; |
67f0eb150047
HTTP/3: renamed ngx_http_v3_connection_t to ngx_http_v3_session_t.
Roman Arutyunyan <arut@nginx.com>
parents:
8769
diff
changeset
|
614 ngx_http_v3_session_t *h3c; |
8456
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
615 |
8768
40d710a66aef
HTTP/3: ngx_http_v3_get_session() macro.
Roman Arutyunyan <arut@nginx.com>
parents:
8767
diff
changeset
|
616 h3c = ngx_http_v3_get_session(c); |
8456
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
617 |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
618 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0, |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
619 "http3 new dynamic header, blocked:%ui", h3c->nblocked); |
8215 | 620 |
8456
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
621 while (!ngx_queue_empty(&h3c->blocked)) { |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
622 q = ngx_queue_head(&h3c->blocked); |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
623 block = (ngx_http_v3_block_t *) q; |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
624 bc = block->connection; |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
625 |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
626 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, bc->log, 0, "http3 unblock stream"); |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
627 |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
628 ngx_http_v3_unblock(block); |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
629 ngx_post_event(bc->read, &ngx_posted_events); |
c9538aef3211
HTTP/3: refactored dynamic table implementation.
Roman Arutyunyan <arut@nginx.com>
parents:
8409
diff
changeset
|
630 } |
8215 | 631 |
632 return NGX_OK; | |
633 } | |
8226
268f4389130d
Refactored HTTP/3 parser.
Roman Arutyunyan <arut@nginx.com>
parents:
8215
diff
changeset
|
634 |
268f4389130d
Refactored HTTP/3 parser.
Roman Arutyunyan <arut@nginx.com>
parents:
8215
diff
changeset
|
635 |
268f4389130d
Refactored HTTP/3 parser.
Roman Arutyunyan <arut@nginx.com>
parents:
8215
diff
changeset
|
636 ngx_int_t |
268f4389130d
Refactored HTTP/3 parser.
Roman Arutyunyan <arut@nginx.com>
parents:
8215
diff
changeset
|
637 ngx_http_v3_set_param(ngx_connection_t *c, uint64_t id, uint64_t value) |
268f4389130d
Refactored HTTP/3 parser.
Roman Arutyunyan <arut@nginx.com>
parents:
8215
diff
changeset
|
638 { |
268f4389130d
Refactored HTTP/3 parser.
Roman Arutyunyan <arut@nginx.com>
parents:
8215
diff
changeset
|
639 switch (id) { |
268f4389130d
Refactored HTTP/3 parser.
Roman Arutyunyan <arut@nginx.com>
parents:
8215
diff
changeset
|
640 |
268f4389130d
Refactored HTTP/3 parser.
Roman Arutyunyan <arut@nginx.com>
parents:
8215
diff
changeset
|
641 case NGX_HTTP_V3_PARAM_MAX_TABLE_CAPACITY: |
268f4389130d
Refactored HTTP/3 parser.
Roman Arutyunyan <arut@nginx.com>
parents:
8215
diff
changeset
|
642 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0, |
268f4389130d
Refactored HTTP/3 parser.
Roman Arutyunyan <arut@nginx.com>
parents:
8215
diff
changeset
|
643 "http3 param QPACK_MAX_TABLE_CAPACITY:%uL", value); |
268f4389130d
Refactored HTTP/3 parser.
Roman Arutyunyan <arut@nginx.com>
parents:
8215
diff
changeset
|
644 break; |
268f4389130d
Refactored HTTP/3 parser.
Roman Arutyunyan <arut@nginx.com>
parents:
8215
diff
changeset
|
645 |
268f4389130d
Refactored HTTP/3 parser.
Roman Arutyunyan <arut@nginx.com>
parents:
8215
diff
changeset
|
646 case NGX_HTTP_V3_PARAM_MAX_HEADER_LIST_SIZE: |
268f4389130d
Refactored HTTP/3 parser.
Roman Arutyunyan <arut@nginx.com>
parents:
8215
diff
changeset
|
647 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0, |
268f4389130d
Refactored HTTP/3 parser.
Roman Arutyunyan <arut@nginx.com>
parents:
8215
diff
changeset
|
648 "http3 param SETTINGS_MAX_HEADER_LIST_SIZE:%uL", value); |
268f4389130d
Refactored HTTP/3 parser.
Roman Arutyunyan <arut@nginx.com>
parents:
8215
diff
changeset
|
649 break; |
268f4389130d
Refactored HTTP/3 parser.
Roman Arutyunyan <arut@nginx.com>
parents:
8215
diff
changeset
|
650 |
268f4389130d
Refactored HTTP/3 parser.
Roman Arutyunyan <arut@nginx.com>
parents:
8215
diff
changeset
|
651 case NGX_HTTP_V3_PARAM_BLOCKED_STREAMS: |
268f4389130d
Refactored HTTP/3 parser.
Roman Arutyunyan <arut@nginx.com>
parents:
8215
diff
changeset
|
652 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0, |
268f4389130d
Refactored HTTP/3 parser.
Roman Arutyunyan <arut@nginx.com>
parents:
8215
diff
changeset
|
653 "http3 param QPACK_BLOCKED_STREAMS:%uL", value); |
268f4389130d
Refactored HTTP/3 parser.
Roman Arutyunyan <arut@nginx.com>
parents:
8215
diff
changeset
|
654 break; |
268f4389130d
Refactored HTTP/3 parser.
Roman Arutyunyan <arut@nginx.com>
parents:
8215
diff
changeset
|
655 |
268f4389130d
Refactored HTTP/3 parser.
Roman Arutyunyan <arut@nginx.com>
parents:
8215
diff
changeset
|
656 default: |
268f4389130d
Refactored HTTP/3 parser.
Roman Arutyunyan <arut@nginx.com>
parents:
8215
diff
changeset
|
657 |
268f4389130d
Refactored HTTP/3 parser.
Roman Arutyunyan <arut@nginx.com>
parents:
8215
diff
changeset
|
658 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0, |
268f4389130d
Refactored HTTP/3 parser.
Roman Arutyunyan <arut@nginx.com>
parents:
8215
diff
changeset
|
659 "http3 param #%uL:%uL", id, value); |
268f4389130d
Refactored HTTP/3 parser.
Roman Arutyunyan <arut@nginx.com>
parents:
8215
diff
changeset
|
660 } |
268f4389130d
Refactored HTTP/3 parser.
Roman Arutyunyan <arut@nginx.com>
parents:
8215
diff
changeset
|
661 |
268f4389130d
Refactored HTTP/3 parser.
Roman Arutyunyan <arut@nginx.com>
parents:
8215
diff
changeset
|
662 return NGX_OK; |
268f4389130d
Refactored HTTP/3 parser.
Roman Arutyunyan <arut@nginx.com>
parents:
8215
diff
changeset
|
663 } |