加入DNAT_POLICY表处理逻辑，修改CANDIDATE处理

1 files changed, 15 insertions, 7 deletions

diff --git a/src/ir_mctrl.h b/src/ir_mctrl.h
index 2e58d2b..16e07a8 100644
--- a/src/ir_mctrl.h
+++ b/src/ir_mctrl.h
@@ -16,25 +16,30 @@
 #define MCTRL_CONF_FILE				"./conf/mctrl.conf"
 
 //table name
-#define NOMINEE_IP					"IR_NOMINEE_IP"
-#define INTERCEPT_IP				"IR_INTERCEPT_IP"
-#define STATIC_NOMINEE_IP 			"IR_STATIC_NOMINEE_IP"
-#define DYNAMIC_NOMINEE_IP			"IR_DYNAMIC_NOMINEE_IP"
-#define CANDIDATE_IP				"IR_CANDIDATE_IP"
+#define NOMINEE_TABLE					"IR_NOMINEE_IP"
+#define INTERCEPT_TABLE					"IR_INTERCEPT_IP"
+#define STATIC_NOMINEE_TABLE 			"IR_STATIC_NOMINEE_IP"
+#define DYNAMIC_NOMINEE_TABLE			"IR_DYNAMIC_NOMINEE_IP"
+#define CANDIDATE_TABLE					"IR_CANDIDATE_IP"
+#define DNAT_POLICY_TABLE				"IR_DNAT_POLICY"
 
+#define	SLEEP_TIME						86400
 #define TIME_OUT						1800
 #define MAX_THREAD_NUM                1
 
 //nominee_type
-#define STATIC_NOMINEE				1
-#define DYNAMIC_NOMINEE				2
+#define STATIC_NOMINEE_INFO				1
+#define DYNAMIC_NOMINEE_INFO			2
+#define D_POLICY_INFO					3
 
 //htable flag
 #define	S_OR_D_ORIGIN_FLAG				8
 #define INTERCEPT_FLAG					4
 #define NOMINEE_FLAG					2
 #define CANDIDATE_FLAG					1
+#define D_POLICY_FLAG					3
 
+#define DP_AND_I_FLAG					7
 #define O_AND_C_FLAG					9
 #define O_AND_N_FLAG					10
 #define O_AND_C_AND_N_FLAG				11
@@ -65,6 +70,7 @@ struct IR_MCTRL_INFO
 	char effective_range[MAX_STRING_LEN];
 	char user_region[MAX_STRING_LEN];
 	char op_time[MAX_TIME_LEN]; 
+	int do_log;
 	int htable_flag;	
 	int nominee_type;
 	int version;
@@ -80,8 +86,10 @@ struct mctrl_glocal_info
 	MESA_htable_handle s_d_htable;
 	int update_type_s;
 	int update_type_d;
+	int update_type_dp;
 	int version_s;
 	int version_d;
+	int version_dp;
 };