QUIC: added "quic" listen parameter.

The parameter allows processing HTTP/0.9-2 over QUIC.

Also, introduced ngx_http_quic_module and moved QUIC settings there

1 files changed, 0 insertions, 243 deletions

diff --git a/src/http/v3/ngx_http_v3_module.c b/src/http/v3/ngx_http_v3_module.c
index 386209cb7..58d75f6f7 100644
--- a/src/http/v3/ngx_http_v3_module.c
+++ b/src/http/v3/ngx_http_v3_module.c
@@ -10,114 +10,8 @@
 #include <ngx_http.h>
 
 
-static char *ngx_http_v3_max_ack_delay(ngx_conf_t *cf, void *post, void *data);
-static char *ngx_http_v3_max_udp_payload_size(ngx_conf_t *cf, void *post,
-    void *data);
-
-
-static ngx_conf_post_t  ngx_http_v3_max_ack_delay_post =
-    { ngx_http_v3_max_ack_delay };
-static ngx_conf_post_t  ngx_http_v3_max_udp_payload_size_post =
-    { ngx_http_v3_max_udp_payload_size };
-static ngx_conf_num_bounds_t  ngx_http_v3_ack_delay_exponent_bounds =
-    { ngx_conf_check_num_bounds, 0, 20 };
-static ngx_conf_num_bounds_t  ngx_http_v3_active_connection_id_limit_bounds =
-    { ngx_conf_check_num_bounds, 2, -1 };
-
-
 static ngx_command_t  ngx_http_v3_commands[] = {
 
-    { ngx_string("quic_max_idle_timeout"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_msec_slot,
-      NGX_HTTP_SRV_CONF_OFFSET,
-      offsetof(ngx_http_v3_srv_conf_t, quic.max_idle_timeout),
-      NULL },
-
-    { ngx_string("quic_max_ack_delay"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_msec_slot,
-      NGX_HTTP_SRV_CONF_OFFSET,
-      offsetof(ngx_http_v3_srv_conf_t, quic.max_ack_delay),
-      &ngx_http_v3_max_ack_delay_post },
-
-    { ngx_string("quic_max_udp_payload_size"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_size_slot,
-      NGX_HTTP_SRV_CONF_OFFSET,
-      offsetof(ngx_http_v3_srv_conf_t, quic.max_udp_payload_size),
-      &ngx_http_v3_max_udp_payload_size_post },
-
-    { ngx_string("quic_initial_max_data"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_size_slot,
-      NGX_HTTP_SRV_CONF_OFFSET,
-      offsetof(ngx_http_v3_srv_conf_t, quic.initial_max_data),
-      NULL },
-
-    { ngx_string("quic_initial_max_stream_data_bidi_local"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_size_slot,
-      NGX_HTTP_SRV_CONF_OFFSET,
-      offsetof(ngx_http_v3_srv_conf_t, quic.initial_max_stream_data_bidi_local),
-      NULL },
-
-    { ngx_string("quic_initial_max_stream_data_bidi_remote"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_size_slot,
-      NGX_HTTP_SRV_CONF_OFFSET,
-      offsetof(ngx_http_v3_srv_conf_t, quic.initial_max_stream_data_bidi_remote),
-      NULL },
-
-    { ngx_string("quic_initial_max_stream_data_uni"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_size_slot,
-      NGX_HTTP_SRV_CONF_OFFSET,
-      offsetof(ngx_http_v3_srv_conf_t, quic.initial_max_stream_data_uni),
-      NULL },
-
-    { ngx_string("quic_initial_max_streams_bidi"),
-      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.initial_max_streams_bidi),
-      NULL },
-
-    { ngx_string("quic_initial_max_streams_uni"),
-      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.initial_max_streams_uni),
-      NULL },
-
-    { ngx_string("quic_ack_delay_exponent"),
-      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.ack_delay_exponent),
-      &ngx_http_v3_ack_delay_exponent_bounds },
-
-    { ngx_string("quic_active_migration"),
-      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.disable_active_migration),
-      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),
-      &ngx_http_v3_active_connection_id_limit_bounds },
-
-    { ngx_string("quic_retry"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_FLAG,
-      ngx_conf_set_flag_slot,
-      NGX_HTTP_SRV_CONF_OFFSET,
-      offsetof(ngx_http_v3_srv_conf_t, quic.retry),
-      NULL },
-
     { ngx_string("http3_max_field_size"),
       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
       ngx_conf_set_size_slot,
@@ -143,8 +37,6 @@ static ngx_command_t  ngx_http_v3_commands[] = {
 };
 
 
-static ngx_int_t ngx_http_variable_quic(ngx_http_request_t *r,
-    ngx_http_variable_value_t *v, uintptr_t data);
 static ngx_int_t ngx_http_variable_http3(ngx_http_request_t *r,
     ngx_http_variable_value_t *v, uintptr_t data);
 static ngx_int_t ngx_http_v3_add_variables(ngx_conf_t *cf);
@@ -185,8 +77,6 @@ ngx_module_t  ngx_http_v3_module = {
 
 
 static ngx_http_variable_t  ngx_http_v3_vars[] = {
-    { ngx_string("quic"), NULL, ngx_http_variable_quic,
-      0, 0, 0 },
 
     { ngx_string("http3"), NULL, ngx_http_variable_http3,
       0, 0, 0 },
@@ -196,26 +86,6 @@ static ngx_http_variable_t  ngx_http_v3_vars[] = {
 
 
 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) {
-
-        v->len = 4;
-        v->valid = 1;
-        v->no_cacheable = 1;
-        v->not_found = 0;
-        v->data = (u_char *) "quic";
-        return NGX_OK;
-    }
-
-    v->not_found = 1;
-
-    return NGX_OK;
-}
-
-
-static ngx_int_t
 ngx_http_variable_http3(ngx_http_request_t *r,
     ngx_http_variable_value_t *v, uintptr_t data)
 {
@@ -264,31 +134,6 @@ ngx_http_v3_create_srv_conf(ngx_conf_t *cf)
         return NULL;
     }
 
-    /*
-     * set by ngx_pcalloc():
-     *  v3cf->quic.original_dcid = { 0, NULL };
-     *  v3cf->quic.initial_scid = { 0, NULL };
-     *  v3cf->quic.retry_scid = { 0, NULL };
-     *  v3cf->quic.stateless_reset_token = { 0 }
-     *  conf->quic.preferred_address = NULL
-     */
-
-    v3cf->quic.max_idle_timeout = NGX_CONF_UNSET_MSEC;
-    v3cf->quic.max_ack_delay = NGX_CONF_UNSET_MSEC;
-
-    v3cf->quic.max_udp_payload_size = NGX_CONF_UNSET_SIZE;
-    v3cf->quic.initial_max_data = NGX_CONF_UNSET_SIZE;
-    v3cf->quic.initial_max_stream_data_bidi_local = NGX_CONF_UNSET_SIZE;
-    v3cf->quic.initial_max_stream_data_bidi_remote = NGX_CONF_UNSET_SIZE;
-    v3cf->quic.initial_max_stream_data_uni = NGX_CONF_UNSET_SIZE;
-    v3cf->quic.initial_max_streams_bidi = NGX_CONF_UNSET_UINT;
-    v3cf->quic.initial_max_streams_uni = NGX_CONF_UNSET_UINT;
-    v3cf->quic.ack_delay_exponent = NGX_CONF_UNSET_UINT;
-    v3cf->quic.disable_active_migration = NGX_CONF_UNSET_UINT;
-    v3cf->quic.active_connection_id_limit = NGX_CONF_UNSET_UINT;
-
-    v3cf->quic.retry = NGX_CONF_UNSET;
-
     v3cf->max_field_size = NGX_CONF_UNSET_SIZE;
     v3cf->max_table_capacity = NGX_CONF_UNSET_SIZE;
     v3cf->max_blocked_streams = NGX_CONF_UNSET_UINT;
@@ -303,57 +148,6 @@ ngx_http_v3_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
     ngx_http_v3_srv_conf_t *prev = parent;
     ngx_http_v3_srv_conf_t *conf = child;
 
-    ngx_conf_merge_msec_value(conf->quic.max_idle_timeout,
-                              prev->quic.max_idle_timeout, 60000);
-
-    ngx_conf_merge_msec_value(conf->quic.max_ack_delay,
-                              prev->quic.max_ack_delay,
-                              NGX_QUIC_DEFAULT_MAX_ACK_DELAY);
-
-    ngx_conf_merge_size_value(conf->quic.max_udp_payload_size,
-                              prev->quic.max_udp_payload_size,
-                              NGX_QUIC_MAX_UDP_PAYLOAD_SIZE);
-
-    ngx_conf_merge_size_value(conf->quic.initial_max_data,
-                              prev->quic.initial_max_data,
-                              16 * NGX_QUIC_STREAM_BUFSIZE);
-
-    ngx_conf_merge_size_value(conf->quic.initial_max_stream_data_bidi_local,
-                              prev->quic.initial_max_stream_data_bidi_local,
-                              NGX_QUIC_STREAM_BUFSIZE);
-
-    ngx_conf_merge_size_value(conf->quic.initial_max_stream_data_bidi_remote,
-                              prev->quic.initial_max_stream_data_bidi_remote,
-                              NGX_QUIC_STREAM_BUFSIZE);
-
-    ngx_conf_merge_size_value(conf->quic.initial_max_stream_data_uni,
-                              prev->quic.initial_max_stream_data_uni,
-                              NGX_QUIC_STREAM_BUFSIZE);
-
-    ngx_conf_merge_uint_value(conf->quic.initial_max_streams_bidi,
-                              prev->quic.initial_max_streams_bidi, 16);
-
-    ngx_conf_merge_uint_value(conf->quic.initial_max_streams_uni,
-                              prev->quic.initial_max_streams_uni, 16);
-
-    ngx_conf_merge_uint_value(conf->quic.ack_delay_exponent,
-                              prev->quic.ack_delay_exponent,
-                              NGX_QUIC_DEFAULT_ACK_DELAY_EXPONENT);
-
-    ngx_conf_merge_uint_value(conf->quic.disable_active_migration,
-                              prev->quic.disable_active_migration, 1);
-
-    ngx_conf_merge_uint_value(conf->quic.active_connection_id_limit,
-                              prev->quic.active_connection_id_limit, 2);
-
-    ngx_conf_merge_value(conf->quic.retry, prev->quic.retry, 0);
-
-    if (conf->quic.retry) {
-        if (RAND_bytes(conf->quic.token_key, sizeof(conf->quic.token_key)) <= 0) {
-            return NGX_CONF_ERROR;
-        }
-    }
-
     ngx_conf_merge_size_value(conf->max_field_size,
                               prev->max_field_size,
                               NGX_HTTP_V3_DEFAULT_MAX_FIELD_SIZE);
@@ -368,40 +162,3 @@ ngx_http_v3_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
 
     return NGX_CONF_OK;
 }
-
-
-static char *
-ngx_http_v3_max_ack_delay(ngx_conf_t *cf, void *post, void *data)
-{
-    ngx_msec_t *sp = data;
-
-    if (*sp > 16384) {
-        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                           "\"quic_max_ack_delay\" must be less than 16384");
-
-        return NGX_CONF_ERROR;
-    }
-
-    return NGX_CONF_OK;
-}
-
-
-static char *
-ngx_http_v3_max_udp_payload_size(ngx_conf_t *cf, void *post, void *data)
-{
-    size_t *sp = data;
-
-    if (*sp < NGX_QUIC_MIN_INITIAL_SIZE
-        || *sp > NGX_QUIC_MAX_UDP_PAYLOAD_SIZE)
-    {
-        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                           "\"quic_max_udp_payload_size\" must be between "
-                           "%d and %d",
-                           NGX_QUIC_MIN_INITIAL_SIZE,
-                           NGX_QUIC_MAX_UDP_PAYLOAD_SIZE);
-
-        return NGX_CONF_ERROR;
-    }
-
-    return NGX_CONF_OK;
-}