Mercurial > hg > nginx
changeset 8970:7106a918a277 quic
QUIC: the "quic_active_connection_id_limit" directive.
The directive sets corresponding transport parameter and limits number of
created client ids.
| author | Vladimir Homutov <vl@nginx.com> |
|---|---|
| date | Tue, 18 Jan 2022 12:49:55 +0300 |
| parents | 065c73221b7b |
| children | 1e2f4e9c8195 |
| files | src/event/quic/ngx_event_quic.h src/event/quic/ngx_event_quic_transport.c src/http/v3/ngx_http_v3_module.c src/stream/ngx_stream_quic_module.c |
| diffstat | 4 files changed, 27 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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;
--- 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->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;
--- 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_comman 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 * 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 *c 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;
--- 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_co 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 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_ 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;