diff src/stream/ngx_stream_quic_module.c @ 8628:45db1b5c1706 quic

QUIC: connection multiplexing per port. Also, connection migration within a single worker is implemented.
author Roman Arutyunyan <arut@nginx.com>
date Wed, 11 Nov 2020 11:57:50 +0000
parents bed310672f39
children 279ad36f2f4b
line wrap: on
line diff
--- a/src/stream/ngx_stream_quic_module.c
+++ b/src/stream/ngx_stream_quic_module.c
@@ -105,9 +105,9 @@ static ngx_command_t  ngx_stream_quic_co
       offsetof(ngx_quic_conf_t, tp.ack_delay_exponent),
       &ngx_stream_quic_ack_delay_exponent_bounds },
 
-    { ngx_string("quic_active_migration"),
+    { ngx_string("quic_disable_active_migration"),
       NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_TAKE1,
-      ngx_conf_set_num_slot,
+      ngx_conf_set_flag_slot,
       NGX_STREAM_SRV_CONF_OFFSET,
       offsetof(ngx_quic_conf_t, tp.disable_active_migration),
       NULL },
@@ -236,7 +236,7 @@ ngx_stream_quic_create_srv_conf(ngx_conf
     conf->tp.initial_max_streams_bidi = NGX_CONF_UNSET_UINT;
     conf->tp.initial_max_streams_uni = NGX_CONF_UNSET_UINT;
     conf->tp.ack_delay_exponent = NGX_CONF_UNSET_UINT;
-    conf->tp.disable_active_migration = NGX_CONF_UNSET_UINT;
+    conf->tp.disable_active_migration = NGX_CONF_UNSET;
     conf->tp.active_connection_id_limit = NGX_CONF_UNSET_UINT;
 
     conf->retry = NGX_CONF_UNSET;
@@ -290,8 +290,8 @@ ngx_stream_quic_merge_srv_conf(ngx_conf_
                               prev->tp.ack_delay_exponent,
                               NGX_QUIC_DEFAULT_ACK_DELAY_EXPONENT);
 
-    ngx_conf_merge_uint_value(conf->tp.disable_active_migration,
-                              prev->tp.disable_active_migration, 1);
+    ngx_conf_merge_value(conf->tp.disable_active_migration,
+                              prev->tp.disable_active_migration, 0);
 
     ngx_conf_merge_uint_value(conf->tp.active_connection_id_limit,
                               prev->tp.active_connection_id_limit, 2);