支持WiredCFG获取配置；支持直接生效表串联设备生效范围；调整最新的库表名列表；

12 files changed, 141 insertions, 54 deletions

diff --git a/bin/conf/maat_table_info.conf b/bin/conf/maat_table_info.conf
deleted file mode 100644
index 3e96996..0000000
--- a/bin/conf/maat_table_info.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-#each collumn seperate with '\t'
-#id	(0~65535(
-#name string
-#type one of ip,expr,compile or plugin
-#src_charset one of GBK,BIG5,UNICODE,UTF8
-#dst_charset combined by GBK,BIG5,UNICODE,UTF8,seperate with '/'
-#do_merege yes or no
-#id	name	type	IS_VALID_INDEX
-0	APP_DOMAIN	plugin	{"valid":7,"tag":11}
-1	APP_DYN_SEV_IP_CB	plugin	{"valid":9,"tag":10}
-2	APP_POLICY	plugin	{"valid":7,"tag":11}
-3	APP_STATIC_SEV_IP	plugin	{"valid":14,"tag":18}
-4	LIMIT_DOMAIN	plugin	{"valid":7,"tag":11}
-5	LIMIT_DYN_IP_CB	plugin	{"valid":9,"tag":10}
-6	PXY_DYN_SEV_IP_CB	plugin	{"valid":9,"tag":10}
-7	PXY_INTERCEPT_DOMAIN	plugin	{"valid":7,"tag":11}
-8	LIMIT_IP	plugin	{"valid":14,"tag":18}
-9	PXY_INTERCEPT_IP	plugin	{"valid":14,"tag":18}
-10	INLINE_IP_CB	plugin	{"valid":14,"tag":18}
-11	IR_STATIC_IP_POOL_CB	plugin	{"valid":9,"tag":12}
-12	DK_CLI_IP_CB	plugin	{"valid":14,"tag":18}
-13	IPD_DYN_SUBSCIBE_IP	plugin	{"valid":9,"tag":12}
-14	IR_DYN_SIFT_IP	plugin	{"valid":9,"tag":12}
-15	ANTI_DDOS_ATTACK_CB	plugin	{"valid":14,"tag":18}
diff --git a/bin/conf/maat_table_info.conf.lnk b/bin/conf/maat_table_info.conf.lnk
new file mode 100644
index 0000000..c362838
--- /dev/null
+++ b/bin/conf/maat_table_info.conf.lnk
diff --git a/bin/conf/maat_table_info_tag.conf b/bin/conf/maat_table_info_tag.conf
new file mode 100644
index 0000000..80cb161
--- /dev/null
+++ b/bin/conf/maat_table_info_tag.conf
@@ -0,0 +1,21 @@
+#each collumn seperate with '\t'
+#id	(0~65535(
+#name string
+#type one of ip,expr,compile or plugin
+#src_charset one of GBK,BIG5,UNICODE,UTF8
+#dst_charset combined by GBK,BIG5,UNICODE,UTF8,seperate with '/'
+#do_merege yes or no
+#id	name	type	IS_VALID_INDEX
+0	APP_DOMAIN	plugin	{"valid":7,"tag":11}
+1	APP_DYN_SEV_IP_CB	plugin	{"valid":9,"tag":10}
+2	APP_POLICY	plugin	{"valid":7,"tag":11}
+3	APP_STATIC_SEV_IP	plugin	{"valid":14,"tag":18}
+4	PXY_DYN_SEV_IP_CB	plugin	{"valid":9,"tag":10}
+5	PXY_INTERCEPT_DOMAIN	plugin	{"valid":7,"tag":11}
+6	PXY_INTERCEPT_IP	plugin	{"valid":14,"tag":18}
+7	INLINE_IP_CB	plugin	{"valid":14,"tag":18}
+8	IR_INTERCEPT_IP	plugin	{"valid":14,"tag":18}
+9	DK_CLI_IP_CB	plugin	{"valid":14,"tag":18}
+10	IPD_DYN_SUBSCIBE_IP	plugin	{"valid":9,"tag":12}
+11	ANTI_DDOS_ATTACK_CB	plugin	{"valid":14,"tag":18}
+12	MM_DYN_VOIP_DROP	plugin	{"valid":14,"tag":18}
diff --git a/bin/conf/maat_table_info_valid.conf b/bin/conf/maat_table_info_valid.conf
new file mode 100644
index 0000000..ef6242e
--- /dev/null
+++ b/bin/conf/maat_table_info_valid.conf
@@ -0,0 +1,21 @@
+#each collumn seperate with '\t'
+#id	(0~65535(
+#name string
+#type one of ip,expr,compile or plugin
+#src_charset one of GBK,BIG5,UNICODE,UTF8
+#dst_charset combined by GBK,BIG5,UNICODE,UTF8,seperate with '/'
+#do_merege yes or no
+#id	name	type	IS_VALID_INDEX
+0	APP_DOMAIN	plugin	7
+1	APP_DYN_SEV_IP_CB	plugin	9
+2	APP_POLICY	plugin	7
+3	APP_STATIC_SEV_IP	plugin	14
+4	PXY_DYN_SEV_IP_CB	plugin	9
+5	PXY_INTERCEPT_DOMAIN	plugin	7
+6	PXY_INTERCEPT_IP	plugin	14
+7	INLINE_IP_CB	plugin	14
+8	IR_INTERCEPT_IP	plugin	14
+9	DK_CLI_IP_CB	plugin	14
+10	IPD_DYN_SUBSCIBE_IP	plugin	9
+11	ANTI_DDOS_ATTACK_CB	plugin	14
+12	MM_DYN_VOIP_DROP	plugin	14
diff --git a/bin/conf/pangu_valve.conf b/bin/conf/pangu_valve.conf
index 06ebc99..c47ab51 100644
--- a/bin/conf/pangu_valve.conf
+++ b/bin/conf/pangu_valve.conf
@@ -1,32 +1,40 @@
-[SYSTEM]
-C3_AUTH_DATA=B9840E2442951834
-C3_CCC_LISTS=10.3.48.1:10005;
-
-HASH_TABLE_SIZE=8388608
-SW_HNODE_TIMEOUT_MIN=1
-#1-file; 2-redis
-MAAT_CONFIG_RECV_WAY=2
-MAAT_TABLE_INFO_PATH=./conf/maat_table_info.conf
-#MAAT_EFFECTIVE_RANGE={}
+[WIRED_INFO]
+APP_NAME=PANGU_VALVE_CONF
+SELF_IP=10.4.20.161
+REMOTE_DIR=ASTANA
+KEY_CNT=23
+RAWFILE_CNT=2
+WIRED_TIME=2018-12-09T19:48:31
 
-CONSUL_SWITCH=0
-CONSUL_REQ_TIMEOUT=4
-CONSUL_LOCK_DELAY=5
-CONSUL_SESSION_TTL=10
-CONSUL_LEADER_KEY=PANGU_VALVE/valve_leader01
-CONSUL_WIREDCFG_APPNAME=PANGU_VALVE/CFG_AKA
-LOCAL_NET_NAME=eth2
-SERVICE_TOPLIMIT_SW=0
+[WIRED_RAW_FILE]
+MAAT_REDIS_INFO.conf=./PANGU_VALVE_CONF_rawfile/MAAT_REDIS_INFO.conf
+SERVICE_ID_MAP.conf=./PANGU_VALVE_CONF_rawfile/SERVICE_ID_MAP.conf
 
 [LOG]
-RUN_LOG_DIR=./log
-RUN_LOG_LV=10
-#ASMIS_PROC_NAME=PANGU/valve
+#ASMIS_PROC_NAME=Pangu/PanguValve
 #ASMIS_HEART_INTERVAL=10
-FS_STAT_APPNAME=PANGU_VALVE
-STATISTIC_INTERVAL=60
-FS_STAT_MODE=1
-FS_STAT_DST_IP=10.172.128.2
+FS_STAT_APPNAME=ValveAstana
+FS_STAT_DST_IP=10.4.20.204
 FS_STAT_DST_PORT=8125
+FS_STAT_MODE=1
 FS_STAT_TRIG=1
+RUN_LOG_DIR=./log
+RUN_LOG_LV=10
+STATISTIC_INTERVAL=60
 
+[SYSTEM]
+C3_AUTH_DATA=B9840E2442951834
+C3_CCC_LISTS=10.4.34.1:10005;10.4.34.2:10005;10.4.34.3:10005;
+CONSUL_LEADER_KEY=PanguValve/ValveLeader01
+CONSUL_LOCK_DELAY=5
+CONSUL_REQ_TIMEOUT=4
+CONSUL_SESSION_TTL=10
+#MAAT_EFFECTIVE_RANGE={"tags":[{"tag":"location","value":"Astana"}]}
+CONSUL_SWITCH=1
+HASH_TABLE_SIZE=16777216
+LOCAL_NET_NAME=eth2
+#1-file; 2-redis
+MAAT_CONFIG_RECV_WAY=2
+MAAT_TABLE_INFO_PATH=./conf/maat_table_info.conf
+SERVICE_TOPLIMIT_SW=0
+SW_HNODE_TIMEOUT_MIN=1
diff --git a/bin/conf/table_info/maat_info.conf b/bin/conf/table_info/maat_info.conf
index d0eeeee..d363f08 100644
--- a/bin/conf/table_info/maat_info.conf
+++ b/bin/conf/table_info/maat_info.conf
@@ -1,6 +1,6 @@
 #INS_NAME	MAAT_ROOT			VERSION_FILE				REDIS_IP	RPORT	RINDEX	TABLE_NAMES_LIST
-STATIC	./conf/maat_cfg1/	./conf/version_static.txt	10.3.34.1	6379	5	APP_POLICY;APP_DOMAIN;PXY_INTERCEPT_DOMAIN;LIMIT_DOMAIN;APP_STATIC_SEV_IP;LIMIT_IP;PXY_INTERCEPT_IP;INLINE_IP_CB;IR_STATIC_IP_POOL_CB
-DYNAMIC1	./conf/maat_cfg2/	./conf/version_dynamic2.txt	10.3.47.1	6379	0	ANTI_DDOS_ATTACK_CB;IR_DYN_SIFT_IP
-DYNAMIC2	./conf/maat_cfg2/	./conf/version_dynamic2.txt	10.3.47.1	6379	1	APP_DYN_SEV_IP_CB;PXY_DYN_SEV_IP_CB;LIMIT_DYN_IP_CB;IPD_DYN_SUBSCIBE_IP
+STATIC	./conf/maat_cfg1/	./conf/version_static.txt	10.3.34.1	6379	5	APP_POLICY;APP_DOMAIN;PXY_INTERCEPT_DOMAIN;APP_STATIC_SEV_IP;PXY_INTERCEPT_IP;INLINE_IP_CB
+DYNAMIC1	./conf/maat_cfg2/	./conf/version_dynamic2.txt	10.3.47.1	6379	0	ANTI_DDOS_ATTACK_CB;IR_INTERCEPT_IP;MM_DYN_VOIP_DROP
+DYNAMIC2	./conf/maat_cfg2/	./conf/version_dynamic2.txt	10.3.47.1	6379	1	APP_DYN_SEV_IP_CB;PXY_DYN_SEV_IP_CB;IPD_DYN_SUBSCIBE_IP
 DYNAMIC3	./conf/maat_cfg2/	./conf/version_dynamic3.txt	10.3.47.1	6379	2	DK_CLI_IP_CB
 
diff --git a/bin/conf/table_info/service_id_map.conf b/bin/conf/table_info/service_id_map.conf
new file mode 100644
index 0000000..fd9610a
--- /dev/null
+++ b/bin/conf/table_info/service_id_map.conf
@@ -0,0 +1,58 @@
+#service_id	limit_rate	grule_serv_type	RULE_SCOPE	limit_num
+#INLINE_IP_CB DROP
+3	0	10	1	1000
+#ANTIDDOS DROP
+5	0	7	1	1000
+#INLINE_IP_CB DROP IPSEC/GRE 0x19/0x1C
+25	0	10	1	1000
+28	0	10	1	1000
+
+#MM_DYN_VOIP_DROP DROP 0x112
+274	0	9	1	1000
+#IR_INTERCEPT_IP LOOP 0x340
+832	0	19	1	1000
+
+#PXY_INTERCEPT_IP MONITOR 0x200/0x202/0x205
+512	0	21	1	1000
+514	0	21	1	1000
+514	10	21	1	1000
+514	20	21	1	1000
+514	30	21	1	1000
+514	40	21	1	1000
+514	50	21	1	1000
+514	60	21	1	1000
+514	70	21	1	1000
+514	80	21	1	1000
+514	90	21	1	1000
+514	100	21	1	1000
+517	0	21	1	1000
+
+#PXY_INTERCEPT_DOMAIN MONITOR 0x201/0x203
+513	0	22	1	1000
+515	0	22	1	1000
+515	10	22	1	1000
+515	20	22	1	1000
+515	30	22	1	1000
+515	40	22	1	1000
+515	50	22	1	1000
+515	60	22	1	1000
+515	70	22	1	1000
+515	80	22	1	1000
+515	90	22	1	1000
+515	100	22	1	1000
+
+#APP_POLICY REJECT 0x21
+33	0	8	1	1000
+#APP_POLICY MONITOR 0x91
+145	0	18	1	1000
+#IPD_DYN_SUBSCIBE_IP
+#DK_CLI_IP_CB
+1045	0	18	1	1000
+#APP_POLICY DROP 0x410
+1040	0	8	1	1000
+##APP_POLICY LIMIT 0x420
+1056	0	246	1	1000
+1056	10	247	1	1000
+1056	20	248	1	1000
+1056	30	249	1	1000
+1056	40	250	1	1000
diff --git a/bin/conf/table_info/service_id_map_test.conf b/bin/conf/table_info/service_id_map_test.conf
index c46a0ef..b272b4f 100644
--- a/bin/conf/table_info/service_id_map_test.conf
+++ b/bin/conf/table_info/service_id_map_test.conf
@@ -11,6 +11,9 @@
 #INLINE_IP_CB DROP GRE 0x1C
 28	0	1	1	1000
 
+#MM_DYN_VOIP_DROP DROP 0x112
+274	0	9	1	1000
+
 #IR_STATIC_IP_POOL LOOP 0x340
 832	0	1	1	1000
 #IR_DYN_SIFT_IP LOOP 0x341
diff --git a/bin/conf/table_info/table_info_one.conf b/bin/conf/table_info/table_info_one.conf
index 4973cd7..8045389 100644
--- a/bin/conf/table_info/table_info_one.conf
+++ b/bin/conf/table_info/table_info_one.conf
@@ -1,9 +1,9 @@
 #table_one:tabid	servid	type
-LIMIT_IP:1		5	REGION_TYPE_IP
 PXY_INTERCEPT_IP:2	6	REGION_TYPE_IP
 INLINE_IP_CB:3		7	REGION_TYPE_IP
 IR_INTERCEPT_IP:4	8	REGION_TYPE_IP
 DK_CLI_IP_CB:5		9	REGION_TYPE_IP
 IPD_DYN_SUBSCIBE_IP:6	10	REGION_TYPE_POOL
 ANTI_DDOS_ATTACK_CB:7	11	REGION_TYPE_IP
+MM_DYN_VOIP_DROP:8	12	REGION_TYPE_IP
 
diff --git a/bin/conf/table_info/table_info_tree.conf b/bin/conf/table_info/table_info_tree.conf
index 1dab0db..d99c494 100644
--- a/bin/conf/table_info/table_info_tree.conf
+++ b/bin/conf/table_info/table_info_tree.conf
@@ -2,5 +2,5 @@
 APP_POLICY:11	APP_DOMAIN:12		APP_DYN_SEV_IP_CB:13	1	REGION_TYPE_FIND
 APP_POLICY:11	NULL			APP_STATIC_SEV_IP:14	2	REGION_TYPE_IP
 NULL		PXY_INTERCEPT_DOMAIN:15	PXY_DYN_SEV_IP_CB:16	3	REGION_TYPE_FIND
-NULL		LIMIT_DOMAIN:17		LIMIT_DYN_IP_CB:18	4	REGION_TYPE_FIND
+#NULL		LIMIT_DOMAIN:17		LIMIT_DYN_IP_CB:18	4	REGION_TYPE_FIND
 
diff --git a/bin/pangu_valve b/bin/pangu_valve
index 4b468d0..650a4fa 100644
--- a/bin/pangu_valve
+++ b/bin/pangu_valve
diff --git a/bin/pangu_valve_test b/bin/pangu_valve_test
index bf0091b..d12954d 100644
--- a/bin/pangu_valve_test
+++ b/bin/pangu_valve_test