mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-07-23 21:57:02 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

HTTP/3: http3_max_uni_streams directive.

Browse Source 
The directive limits the number of uni streams client is allowed to create.
This commit is contained in:
Roman Arutyunyan 2021-07-29 12:17:56 +03:00
parent 7a8fa11828
commit 2f833198b8
3 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,6 +53,7 @@
#define NGX_HTTP_V3_DEFAULT_MAX_TABLE_CAPACITY 16384 #define NGX_HTTP_V3_DEFAULT_MAX_TABLE_CAPACITY 16384
#define NGX_HTTP_V3_DEFAULT_MAX_BLOCKED_STREAMS 16 #define NGX_HTTP_V3_DEFAULT_MAX_BLOCKED_STREAMS 16
#define NGX_HTTP_V3_DEFAULT_MAX_CONCURRENT_PUSHES 10 #define NGX_HTTP_V3_DEFAULT_MAX_CONCURRENT_PUSHES 10
#define NGX_HTTP_V3_DEFAULT_MAX_UNI_STREAMS 3
/* HTTP/3 errors */ /* HTTP/3 errors */
#define NGX_HTTP_V3_ERR_NO_ERROR 0x100 #define NGX_HTTP_V3_ERR_NO_ERROR 0x100
@ -99,6 +100,7 @@ typedef struct {
size_t max_table_capacity; size_t max_table_capacity;
ngx_uint_t max_blocked_streams; ngx_uint_t max_blocked_streams;
ngx_uint_t max_concurrent_pushes; ngx_uint_t max_concurrent_pushes;
ngx_uint_t max_uni_streams;
} ngx_http_v3_srv_conf_t; } ngx_http_v3_srv_conf_t;

12
src/http/v3/ngx_http_v3_module.c
View File

@ -42,6 +42,13 @@ static ngx_command_t ngx_http_v3_commands[] = {
offsetof(ngx_http_v3_srv_conf_t, max_concurrent_pushes), offsetof(ngx_http_v3_srv_conf_t, max_concurrent_pushes),
NULL }, NULL },
{ ngx_string("http3_max_uni_streams"),
NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
ngx_conf_set_num_slot,
NGX_HTTP_SRV_CONF_OFFSET,
offsetof(ngx_http_v3_srv_conf_t, max_uni_streams),
NULL },
{ ngx_string("http3_push"), { ngx_string("http3_push"),
NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
ngx_http_v3_push, ngx_http_v3_push,
@ -104,6 +111,7 @@ ngx_http_v3_create_srv_conf(ngx_conf_t *cf)
h3scf->max_table_capacity = NGX_CONF_UNSET_SIZE; h3scf->max_table_capacity = NGX_CONF_UNSET_SIZE;
h3scf->max_blocked_streams = NGX_CONF_UNSET_UINT; h3scf->max_blocked_streams = NGX_CONF_UNSET_UINT;
h3scf->max_concurrent_pushes = NGX_CONF_UNSET_UINT; h3scf->max_concurrent_pushes = NGX_CONF_UNSET_UINT;
h3scf->max_uni_streams = NGX_CONF_UNSET_UINT;
return h3scf; return h3scf;
} }
@ -127,6 +135,10 @@ ngx_http_v3_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
prev->max_concurrent_pushes, prev->max_concurrent_pushes,
NGX_HTTP_V3_DEFAULT_MAX_CONCURRENT_PUSHES); NGX_HTTP_V3_DEFAULT_MAX_CONCURRENT_PUSHES);
ngx_conf_merge_uint_value(conf->max_uni_streams,
prev->max_uni_streams,
NGX_HTTP_V3_DEFAULT_MAX_UNI_STREAMS);
return NGX_CONF_OK; return NGX_CONF_OK;
} }

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

@ -35,10 +35,24 @@ static ngx_connection_t *ngx_http_v3_get_uni_stream(ngx_connection_t *c,
void void
ngx_http_v3_init_uni_stream(ngx_connection_t *c) ngx_http_v3_init_uni_stream(ngx_connection_t *c)
{ {
uint64_t n;
ngx_http_v3_srv_conf_t *h3scf;
ngx_http_v3_uni_stream_t *us; ngx_http_v3_uni_stream_t *us;
ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "http3 init uni stream"); ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "http3 init uni stream");
h3scf = ngx_http_v3_get_module_srv_conf(c, ngx_http_v3_module);
n = c->quic->id >> 2;
if (n >= h3scf->max_uni_streams) {
ngx_http_v3_finalize_connection(c,
NGX_HTTP_V3_ERR_STREAM_CREATION_ERROR,
"reached maximum number of uni streams");
ngx_http_close_connection(c);
return;
}
c->quic->cancelable = 1; c->quic->cancelable = 1;
us = ngx_pcalloc(c->pool, sizeof(ngx_http_v3_uni_stream_t)); us = ngx_pcalloc(c->pool, sizeof(ngx_http_v3_uni_stream_t));