diff --git a/conf/stellar.toml b/conf/stellar.toml index b00f519..0325d03 100644 --- a/conf/stellar.toml +++ b/conf/stellar.toml @@ -61,7 +61,7 @@ tcp_reassembly_max_segments = 256 # range: [2, 4096] # Note: free_expired_session_interval determines the precision of session_manager timeout free_expired_session_interval = 50 # range: [1, 60000] (ms) free_expired_session_batch = 1000 # range: [1, 60000] -froce_session_expire_before_exit = 0 # 1: force session to expire before exit, 0: wait for session to naturally expire before exit. +force_session_expire_before_exit = 0 # 1: force session to expire before exit, 0: wait for session to naturally expire before exit. # Note: free_expired_ip_frag_interval determines the precision of ip_reassembly timeout free_expired_ip_frag_interval = 50 # range: [1, 60000] (ms) diff --git a/src/core/stellar_config.cpp b/src/core/stellar_config.cpp index 36d95e3..da0c2d5 100644 --- a/src/core/stellar_config.cpp +++ b/src/core/stellar_config.cpp @@ -473,16 +473,16 @@ static int parse_schedule_options(toml_table_t *root, struct schedule_options *o return -1; } - ptr = toml_raw_in(table, "froce_session_expire_before_exit"); + ptr = toml_raw_in(table, "force_session_expire_before_exit"); if (ptr == NULL) { - CONFIG_LOG_ERROR("config file missing schedule->froce_session_expire_before_exit"); + CONFIG_LOG_ERROR("config file missing schedule->force_session_expire_before_exit"); return -1; } - opts->froce_session_expire_before_exit = atoll(ptr); - if (opts->froce_session_expire_before_exit != 0 && opts->froce_session_expire_before_exit != 1) + opts->force_session_expire_before_exit = atoll(ptr); + if (opts->force_session_expire_before_exit != 0 && opts->force_session_expire_before_exit != 1) { - CONFIG_LOG_ERROR("config file invalid schedule->froce_session_expire_before_exit %ld, range [0, 1]", opts->froce_session_expire_before_exit); + CONFIG_LOG_ERROR("config file invalid schedule->force_session_expire_before_exit %ld, range [0, 1]", opts->force_session_expire_before_exit); return -1; } diff --git a/src/core/stellar_config.h b/src/core/stellar_config.h index 5c53c8b..8086331 100644 --- a/src/core/stellar_config.h +++ b/src/core/stellar_config.h @@ -14,7 +14,7 @@ struct schedule_options // Note: free_expired_session_interval determines the precision of session_manager timeout uint64_t free_expired_session_interval; // range: [1, 60000] (ms) uint64_t free_expired_session_batch; // range: [1, 60000] - uint64_t froce_session_expire_before_exit; // range: [0, 1] + uint64_t force_session_expire_before_exit; // range: [0, 1] // Note: free_expired_ip_frag_interval determines the precision of ip_reassembly timeout uint64_t free_expired_ip_frag_interval; // range: [1, 60000] (ms) diff --git a/src/core/stellar_core.cpp b/src/core/stellar_core.cpp index 992a45c..f4c3f2c 100644 --- a/src/core/stellar_core.cpp +++ b/src/core/stellar_core.cpp @@ -196,7 +196,7 @@ static void *work_thread(void *arg) struct plugin_manager_schema *plug_mgr = runtime->plug_mgr; uint64_t free_expired_session_interval = config->sched_opts.free_expired_session_interval; uint64_t free_expired_session_batch = config->sched_opts.free_expired_session_batch; - uint64_t froce_session_expire_before_exit = config->sched_opts.froce_session_expire_before_exit; + uint64_t force_session_expire_before_exit = config->sched_opts.force_session_expire_before_exit; uint64_t free_expired_ip_frag_interval = config->sched_opts.free_expired_ip_frag_interval; uint64_t free_expired_ip_frag_batch = config->sched_opts.free_expired_ip_frag_batch; uint64_t merge_stat_interval = config->sched_opts.merge_stat_interval; @@ -367,8 +367,8 @@ static void *work_thread(void *arg) while (sess_stat->tcp_sess_used > 0 || sess_stat->udp_sess_used > 0) { - // froce session expire - if (froce_session_expire_before_exit) + // force session expire + if (force_session_expire_before_exit) { free_expired_sessions(sess_mgr, free_expired_session_batch, UINT64_MAX); } diff --git a/test/decoders/http/test_based_on_stellar/env/stellar.toml b/test/decoders/http/test_based_on_stellar/env/stellar.toml index 9314c67..ebafdee 100644 --- a/test/decoders/http/test_based_on_stellar/env/stellar.toml +++ b/test/decoders/http/test_based_on_stellar/env/stellar.toml @@ -61,7 +61,7 @@ tcp_reassembly_max_segments = 256 # range: [2, 4096] # Note: free_expired_session_interval determines the precision of session_manager timeout free_expired_session_interval = 50 # range: [1, 60000] (ms) free_expired_session_batch = 100 # range: [1, 60000] -froce_session_expire_before_exit = 0 # 1: force session to expire before exit, 0: wait for session to naturally expire before exit. +force_session_expire_before_exit = 0 # 1: force session to expire before exit, 0: wait for session to naturally expire before exit. # Note: free_expired_ip_frag_interval determines the precision of ip_reassembly timeout free_expired_ip_frag_interval = 50 # range: [1, 60000] (ms) diff --git a/test/packet_inject/conf/stellar.toml b/test/packet_inject/conf/stellar.toml index 9c91997..109e6cb 100644 --- a/test/packet_inject/conf/stellar.toml +++ b/test/packet_inject/conf/stellar.toml @@ -61,7 +61,7 @@ tcp_reassembly_max_segments = 128 # range: [2, 4096] # Note: free_expired_session_interval determines the precision of session_manager timeout free_expired_session_interval = 50 # range: [1, 60000] (ms) free_expired_session_batch = 1000 # range: [1, 60000] -froce_session_expire_before_exit = 0 # 1: force session to expire before exit, 0: wait for session to naturally expire before exit. +force_session_expire_before_exit = 0 # 1: force session to expire before exit, 0: wait for session to naturally expire before exit. # Note: free_expired_ip_frag_interval determines the precision of ip_reassembly timeout free_expired_ip_frag_interval = 50 # range: [1, 60000] (ms)