diff options
| author | jixinyi <[email protected]> | 2019-01-14 10:55:21 +0800 |
|---|---|---|
| committer | jixinyi <[email protected]> | 2019-01-14 10:55:21 +0800 |
| commit | 81457afe6bba22c1cc6c90c0067915e2379746f1 (patch) | |
| tree | 471de0c4ccfd99628a79e32ec1331b44c30f7638 | |
| parent | cdc88d025275a3f0a2e4ff8450c79e1d9123284b (diff) | |
适应修改后DNAT_POLICY库表
| -rw-r--r-- | bin/conf/table_info.conf | 10 | ||||
| -rw-r--r-- | bin/ir_mctrl | bin | 48952 -> 48952 bytes | |||
| -rw-r--r-- | src/ir_mctrl.cpp | 5 |
3 files changed, 10 insertions, 5 deletions
diff --git a/bin/conf/table_info.conf b/bin/conf/table_info.conf index c66db3a..3a13540 100644 --- a/bin/conf/table_info.conf +++ b/bin/conf/table_info.conf @@ -17,8 +17,10 @@ #id name type src_charset dst_charset do_merge cross_cache quick_mode 0 IR_STATIC_NOMINEE_IP plugin 15 -- 1 IR_DYNAMIC_NOMINEE_IP plugin 9 -- -2 IR_NOMINEE_IP plugin 5 -- -3 IR_CANDIDATE_IP plugin 6 -- -4 IR_INTERCEPT_IP plugin 14 -- -5 IR_DNAT_POLICY plugin 11 -- +2 IR_DNAT_POLICY plugin 12 -- +3 IR_INTERCEPT_IP plugin 14 -- +4 IR_NOMINEE_IP plugin 5 -- +5 IR_CANDIDATE_IP plugin 6 -- + + diff --git a/bin/ir_mctrl b/bin/ir_mctrl Binary files differindex 28851e5..39db09f 100644 --- a/bin/ir_mctrl +++ b/bin/ir_mctrl diff --git a/src/ir_mctrl.cpp b/src/ir_mctrl.cpp index 57faac1..2c1fc96 100644 --- a/src/ir_mctrl.cpp +++ b/src/ir_mctrl.cpp @@ -434,7 +434,7 @@ void sta_dyn_policy_maat_update_cb(int table_id,const char* table_line,void* u_p mctrl_info.action=96; mctrl_info.service=832; mctrl_info.htable_flag=DNAT_POLICY_FLAG; - sscanf(table_line,"%d\t%d\t%s\t%s\t%d\t%*s\t%*s\t%d\t%*d\t%*d\t%d\t%*s\t%*s", + sscanf(table_line,"%d\t%d\t%s\t%s\t%d\t%*s\t%*s\t%*s\t%d\t%*d\t%*d\t%d\t%*s\t%*s", &mctrl_info.region_id,&mctrl_info.addr_type,mctrl_info.dst_ip,mctrl_info.dst_port,&mctrl_info.procotol, &mctrl_info.do_log,&mctrl_info.is_valid); mctrl_info.group_id=mctrl_info.region_id; @@ -777,6 +777,9 @@ int main(int argc, char * argv [ ]) candidate_id=Maat_table_register(mctrl_g.n_feather,CANDIDATE_TABLE_NAME); intercept_id=Maat_table_register(mctrl_g.i_feather,INTERCEPT_TABLE_NAME); + MESA_handle_runtime_log(mctrl_g.logger_handle,RLOG_LV_FATAL,(char*)"main","static table_id is:%d,dy_id is:%d,dp_id is:%d,nominee_table_id is:%d,intercept_table_id is:%d,candidate_table_id is:%d", + static_id,dynamic_id,dnat_policy_id,nominee_id,intercept_id,candidate_id); + if(nominee_id==-1||candidate_id==-1||intercept_id==-1) { MESA_handle_runtime_log(mctrl_g.logger_handle,RLOG_LV_FATAL,(char*)"main","Nom_Candidate_Intercept Database table register failed\n"); |