From 1f97aa71ecaa75dfd646495a13534b10405b500c Mon Sep 17 00:00:00 2001 From: Vladimir Homutov Date: Tue, 18 Jan 2022 12:49:55 +0300 Subject: [PATCH] QUIC: the "quic_active_connection_id_limit" directive. The directive sets corresponding transport parameter and limits number of created client ids. --- src/event/quic/ngx_event_quic.h | 1 + src/event/quic/ngx_event_quic_transport.c | 2 +- src/http/v3/ngx_http_v3_module.c | 12 ++++++++++++ src/stream/ngx_stream_quic_module.c | 13 +++++++++++++ 4 files changed, 27 insertions(+), 1 deletion(-) diff --git a/src/event/quic/ngx_event_quic.h b/src/event/quic/ngx_event_quic.h index 9481fef62..195184754 100644 --- a/src/event/quic/ngx_event_quic.h +++ b/src/event/quic/ngx_event_quic.h @@ -40,6 +40,7 @@ typedef struct { size_t stream_buffer_size; ngx_uint_t max_concurrent_streams_bidi; ngx_uint_t max_concurrent_streams_uni; + ngx_uint_t active_connection_id_limit; ngx_int_t stream_close_code; ngx_int_t stream_reject_code_uni; ngx_int_t stream_reject_code_bidi; diff --git a/src/event/quic/ngx_event_quic_transport.c b/src/event/quic/ngx_event_quic_transport.c index 0ff42de2d..949d2691b 100644 --- a/src/event/quic/ngx_event_quic_transport.c +++ b/src/event/quic/ngx_event_quic_transport.c @@ -1974,7 +1974,7 @@ ngx_quic_init_transport_params(ngx_quic_tp_t *tp, ngx_quic_conf_t *qcf) tp->max_ack_delay = NGX_QUIC_DEFAULT_MAX_ACK_DELAY; tp->ack_delay_exponent = NGX_QUIC_DEFAULT_ACK_DELAY_EXPONENT; - tp->active_connection_id_limit = 2; + tp->active_connection_id_limit = qcf->active_connection_id_limit; tp->disable_active_migration = qcf->disable_active_migration; return NGX_OK; diff --git a/src/http/v3/ngx_http_v3_module.c b/src/http/v3/ngx_http_v3_module.c index 455b613e1..d274a3bf2 100644 --- a/src/http/v3/ngx_http_v3_module.c +++ b/src/http/v3/ngx_http_v3_module.c @@ -104,6 +104,13 @@ static ngx_command_t ngx_http_v3_commands[] = { 0, NULL }, + { ngx_string("quic_active_connection_id_limit"), + 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, quic.active_connection_id_limit), + NULL }, + ngx_null_command }; @@ -240,6 +247,7 @@ ngx_http_v3_create_srv_conf(ngx_conf_t *cf) h3scf->quic.gso_enabled = NGX_CONF_UNSET; h3scf->quic.stream_close_code = NGX_HTTP_V3_ERR_NO_ERROR; h3scf->quic.stream_reject_code_bidi = NGX_HTTP_V3_ERR_REQUEST_REJECTED; + h3scf->quic.active_connection_id_limit = NGX_CONF_UNSET_UINT; return h3scf; } @@ -280,6 +288,10 @@ ngx_http_v3_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child) ngx_conf_merge_str_value(conf->quic.host_key, prev->quic.host_key, ""); + ngx_conf_merge_uint_value(conf->quic.active_connection_id_limit, + prev->quic.active_connection_id_limit, + 2); + if (conf->quic.host_key.len == 0) { conf->quic.host_key.len = NGX_QUIC_DEFAULT_HOST_KEY_LEN; diff --git a/src/stream/ngx_stream_quic_module.c b/src/stream/ngx_stream_quic_module.c index 34f1e18ef..0505df501 100644 --- a/src/stream/ngx_stream_quic_module.c +++ b/src/stream/ngx_stream_quic_module.c @@ -67,6 +67,13 @@ static ngx_command_t ngx_stream_quic_commands[] = { 0, NULL }, + { ngx_string("quic_active_connection_id_limit"), + NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_TAKE1, + ngx_conf_set_num_slot, + NGX_STREAM_SRV_CONF_OFFSET, + offsetof(ngx_quic_conf_t, active_connection_id_limit), + NULL }, + ngx_null_command }; @@ -176,6 +183,8 @@ ngx_stream_quic_create_srv_conf(ngx_conf_t *cf) conf->retry = NGX_CONF_UNSET; conf->gso_enabled = NGX_CONF_UNSET; + conf->active_connection_id_limit = NGX_CONF_UNSET_UINT; + return conf; } @@ -204,6 +213,10 @@ ngx_stream_quic_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child) ngx_conf_merge_str_value(conf->host_key, prev->host_key, ""); + ngx_conf_merge_uint_value(conf->active_connection_id_limit, + conf->active_connection_id_limit, + 2); + if (conf->host_key.len == 0) { conf->host_key.len = NGX_QUIC_DEFAULT_HOST_KEY_LEN;