diff options
author | 2018-09-20 02:08:56 +0000 | |
---|---|---|
committer | 2018-09-20 02:08:56 +0000 | |
commit | 9f145958f0a168661b0dd4d376366d8428946ed3 (patch) | |
tree | 86bde0735773386781f12f6f75cbf637f3872acf /stacks/lwip_stack | |
parent | ea51d29ba72637b088d0e8cc781364968726e0ae (diff) | |
parent | c40c114f2cc079fa363f53ce5927491503f03f6c (diff) |
Merge "Feat: Resource recycle + nStackMaster Code removal"
Diffstat (limited to 'stacks/lwip_stack')
-rw-r--r-- | stacks/lwip_stack/lwip_src/ip_module/configuration_reader.c | 6 | ||||
-rw-r--r-- | stacks/lwip_stack/src/alarm/alarm.c | 4 | ||||
-rw-r--r-- | stacks/lwip_stack/src/maintain/fw_mt_config.c | 38 |
3 files changed, 2 insertions, 46 deletions
diff --git a/stacks/lwip_stack/lwip_src/ip_module/configuration_reader.c b/stacks/lwip_stack/lwip_src/ip_module/configuration_reader.c index d5b228b..03b5998 100644 --- a/stacks/lwip_stack/lwip_src/ip_module/configuration_reader.c +++ b/stacks/lwip_stack/lwip_src/ip_module/configuration_reader.c @@ -823,13 +823,7 @@ read_fn (i32 fd) return; } - const char *old_hbt_cnt = "6"; - const char *new_hbt_cnt = "60"; - nsfw_set_soft_para (NSFW_PROC_MASTER, NSFW_HBT_COUNT_PARAM, - (void *) new_hbt_cnt, sizeof (u16)); (void) read_configuration (); // if it returns -1, the err desc info will be wrote to g_config_data, so no need to check return value. - nsfw_set_soft_para (NSFW_PROC_MASTER, NSFW_HBT_COUNT_PARAM, - (void *) old_hbt_cnt, sizeof (u16)); offset = 0; left = MAX_IP_MODULE_BUFF_SIZE; diff --git a/stacks/lwip_stack/src/alarm/alarm.c b/stacks/lwip_stack/src/alarm/alarm.c index 5f89cdd..c158144 100644 --- a/stacks/lwip_stack/src/alarm/alarm.c +++ b/stacks/lwip_stack/src/alarm/alarm.c @@ -158,11 +158,9 @@ ns_alarm_module_init (void *param) switch (proc_type) { case NSFW_PROC_MAIN: - - case NSFW_PROC_MASTER: case NSFW_PROC_CTRL: - /* [S138713][p00329905][20171219]modify ip address to vm id */ + /* modify ip address to vm id */ pst_vm_id = getenv ("VM_ID"); if (INVALID_STR_LEN (pst_vm_id, MIN_VM_ID_LEN, MAX_VM_ID_LEN)) diff --git a/stacks/lwip_stack/src/maintain/fw_mt_config.c b/stacks/lwip_stack/src/maintain/fw_mt_config.c index 400eaa0..403a46e 100644 --- a/stacks/lwip_stack/src/maintain/fw_mt_config.c +++ b/stacks/lwip_stack/src/maintain/fw_mt_config.c @@ -558,8 +558,7 @@ init_base_config (cfg_module_param * param) { /* initial default config */ /* omc_ctrl single log file should be 10M */ - if (param->proc_type == NSFW_PROC_MASTER - || param->proc_type == NSFW_PROC_CTRL) + if (param->proc_type == NSFW_PROC_CTRL) { init_master_def_config_items (); } @@ -684,26 +683,6 @@ init_main_log_cfg_para () set_log_init_para (&log_para); } -NSTACK_STATIC void -init_master_log_cfg_para () -{ - struct log_init_para log_para; - log_para.mon_log_size = g_cfg_item_info[CFG_SEG_LOG][0].value; - log_para.mon_log_count = g_cfg_item_info[CFG_SEG_LOG][1].value; - - /* log path valid check */ - if (0 == access (g_cfg_item_info[CFG_SEG_PATH][0].pvalue, W_OK)) - { - log_para.mon_log_path = g_cfg_item_info[CFG_SEG_PATH][0].pvalue; - } - else - { - log_para.mon_log_path = g_cfg_item_info[CFG_SEG_PATH][0].default_str; - } - - set_log_init_para (&log_para); -} - /* nStackCtrl is the diff process with main, cannot use main process info, need get the configure info respectively */ /* omc_ctrl single log file should be 10M */ @@ -739,17 +718,6 @@ init_module_cfg_nstackmain () init_main_log_cfg_para (); } -/*===========config init for nstack master=============*/ - -NSTACK_STATIC void -init_module_cfg_nstackmaster () -{ - /* init config data */ - init_module_cfg_default (); - - init_master_log_cfg_para (); -} - /*===========config init for nstack ctrl=============*/ /* nStackCtrl is the diff process with main, @@ -776,10 +744,6 @@ config_module_init (cfg_module_param * param) init_module_cfg_nstackmain (); break; - case NSFW_PROC_MASTER: - init_module_cfg_nstackmaster (); - break; - case NSFW_PROC_CTRL: init_module_cfg_nstackctrl (); break; |