From 70ce17828d24be1582e6395aa37567ef4eadac62 Mon Sep 17 00:00:00 2001 From: jixinyi Date: Tue, 22 Jan 2019 16:10:59 +0800 Subject: 调用maat新接口 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mctrl | 1 + 1 file changed, 1 insertion(+) create mode 160000 mctrl diff --git a/mctrl b/mctrl new file mode 160000 index 0000000..e8ff90f --- /dev/null +++ b/mctrl @@ -0,0 +1 @@ +Subproject commit e8ff90ff7bc164b94b2422e2de13dd996cbb0a25 -- cgit v1.2.3 From 7511ee02db8415b2b6dc0329ecd844ae46979d11 Mon Sep 17 00:00:00 2001 From: jixinyi Date: Tue, 22 Jan 2019 16:21:33 +0800 Subject: 调用maat新接口 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mctrl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mctrl b/mctrl index e8ff90f..12e3ddf 160000 --- a/mctrl +++ b/mctrl @@ -1 +1 @@ -Subproject commit e8ff90ff7bc164b94b2422e2de13dd996cbb0a25 +Subproject commit 12e3ddf5a28c1c01b3e07a0b218bbd7e1fab7efe -- cgit v1.2.3 From 0d4cfe2f5eedaa15ed9ec1ea80a87d658f8a1a71 Mon Sep 17 00:00:00 2001 From: jixinyi Date: Tue, 22 Jan 2019 16:37:08 +0800 Subject: 调用maat新接口 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mctrl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mctrl b/mctrl index 12e3ddf..cb91256 160000 --- a/mctrl +++ b/mctrl @@ -1 +1 @@ -Subproject commit 12e3ddf5a28c1c01b3e07a0b218bbd7e1fab7efe +Subproject commit cb912567041f993b09bd07f57e9516bdaefc59a5 -- cgit v1.2.3 From 25a2c2af66f8eb0fd71f019e0f0b421b62b48a8b Mon Sep 17 00:00:00 2001 From: jixinyi Date: Tue, 22 Jan 2019 17:33:23 +0800 Subject: 删除旧demo MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mctrl | 1 - 1 file changed, 1 deletion(-) delete mode 160000 mctrl diff --git a/mctrl b/mctrl deleted file mode 160000 index cb91256..0000000 --- a/mctrl +++ /dev/null @@ -1 +0,0 @@ -Subproject commit cb912567041f993b09bd07f57e9516bdaefc59a5 -- cgit v1.2.3 From ecd3fcca846bf1357c297170bd2f24c772e85a82 Mon Sep 17 00:00:00 2001 From: jixinyi Date: Tue, 22 Jan 2019 17:47:22 +0800 Subject: 调用maat新接口 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...7\264\346\230\216\346\226\207\346\241\243.docx" | Bin 0 -> 15898 bytes mctrl/bin/conf/mctrl.conf | 25 +++++++++++++++++++++ mctrl/bin/conf/table_info.conf | 23 +++++++++++++++++++ mctrl/bin/mctrl | Bin 0 -> 44640 bytes mctrl/bin/mctrl_r2 | 4 ++++ mctrl/bin/mctrl_r3 | 18 +++++++++++++++ 6 files changed, 70 insertions(+) create mode 100644 "mctrl/IP\351\241\271\347\233\256MCTRL\350\257\264\346\230\216\346\226\207\346\241\243.docx" create mode 100644 mctrl/bin/conf/mctrl.conf create mode 100644 mctrl/bin/conf/table_info.conf create mode 100644 mctrl/bin/mctrl create mode 100644 mctrl/bin/mctrl_r2 create mode 100644 mctrl/bin/mctrl_r3 diff --git "a/mctrl/IP\351\241\271\347\233\256MCTRL\350\257\264\346\230\216\346\226\207\346\241\243.docx" "b/mctrl/IP\351\241\271\347\233\256MCTRL\350\257\264\346\230\216\346\226\207\346\241\243.docx" new file mode 100644 index 0000000..083b05f Binary files /dev/null and "b/mctrl/IP\351\241\271\347\233\256MCTRL\350\257\264\346\230\216\346\226\207\346\241\243.docx" differ diff --git a/mctrl/bin/conf/mctrl.conf b/mctrl/bin/conf/mctrl.conf new file mode 100644 index 0000000..7d2c3d6 --- /dev/null +++ b/mctrl/bin/conf/mctrl.conf @@ -0,0 +1,25 @@ +[Mctrl] +table_info_path=./conf/table_info.conf +max_thread_num=1 +logger_level=30 +logger_path=./log/ir_mctrl.log + +[Mctrl_DYNAMIC] +Maat_redis_ip=192.168.11.243 +Maat_redis_port=6800 +Maat_redis_index=1 + +[Mctrl_STATIC] +Maat_redis_ip=192.168.11.243 +Maat_redis_port=6379 +Maat_redis_index=6 + +[Mctrl_INTERCEPT] +Maat_redis_ip=192.168.11.243 +Maat_redis_port=6800 +Maat_redis_index=1 + +[Mctrl_NOMINEE] +Maat_redis_ip=192.168.11.243 +Maat_redis_port=6800 +Maat_redis_index=5 diff --git a/mctrl/bin/conf/table_info.conf b/mctrl/bin/conf/table_info.conf new file mode 100644 index 0000000..be3c64c --- /dev/null +++ b/mctrl/bin/conf/table_info.conf @@ -0,0 +1,23 @@ +#each collumn seperate with '\t' +#id (0~65535) +#name string +#type one of ip,expr,expr_plus,digest,intval,compile or plugin +#src_charset one of GBK,BIG5,UNICODE,UTF8 +#dst_charset combined by GBK,BIG5,UNICODE,UTF8,seperate with '/' +#do_merege [yes/no] +#cross cache [number] +#quick mode [quickon/quickoff], default [quickoff] +#For ip/intval/digest/compile/group table. +#id name type +# +#For plugin table. The first column's id is 1. 0 as not speicified. +#id name type column_define +# +#For expr/expr_plus Table +#id name type src_charset dst_charset do_merge cross_cache quick_mode +0 IR_STATIC_NOMINEE_IP plugin {"key":1,"valid":15} -- +1 IR_DYNAMIC_NOMINEE_IP plugin {"key":1,"valid":9} -- +2 IR_DNAT_POLICY plugin {"key":1,"valid":12} -- +3 IR_NOMINEE_IP plugin {"key":1,"valid":5} -- +4 IR_INTERCEPT_IP plugin {"key":1,"valid":14} -- +5 IR_CANDIDATE_IP plugin {"key":1,"valid":6} -- diff --git a/mctrl/bin/mctrl b/mctrl/bin/mctrl new file mode 100644 index 0000000..a8f13a1 Binary files /dev/null and b/mctrl/bin/mctrl differ diff --git a/mctrl/bin/mctrl_r2 b/mctrl/bin/mctrl_r2 new file mode 100644 index 0000000..485bd0e --- /dev/null +++ b/mctrl/bin/mctrl_r2 @@ -0,0 +1,4 @@ +killall mctrl_r3 mctrl +./mctrl_r3 &> /dev/null & +#./kill_sapp_by_mem.sh &> /dev/null & + diff --git a/mctrl/bin/mctrl_r3 b/mctrl/bin/mctrl_r3 new file mode 100644 index 0000000..2373dd4 --- /dev/null +++ b/mctrl/bin/mctrl_r3 @@ -0,0 +1,18 @@ +#!/bin/sh + +while [ 1 ]; do + count=`ls -l core.* |wc -l` + echo $count + if [ $count -lt 5 ] + then + echo "set unlimited" + ulimit -c unlimited + else + ulimit -c 0 + fi + + ./mctrl > /dev/null + echo program crashed, restart at `date +"%w %Y/%m/%d, %H:%M:%S"` >> RESTART.log + sleep 10 +done +~ -- cgit v1.2.3 From b2ba01d0af45565a35fcff8806dbc7450befd968 Mon Sep 17 00:00:00 2001 From: 陈冠林 Date: Thu, 24 Jan 2019 10:36:46 +0800 Subject: vpn_cgi文档和安装包 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...233\264\346\226\260\346\214\207\345\215\227.docx" | Bin 0 -> 17277 bytes vpn_cgi/vpn_cgi-master.tar.gz | Bin 0 -> 35332618 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 "vpn_cgi/VPN_CGI\345\256\211\350\243\205\345\222\214\346\233\264\346\226\260\346\214\207\345\215\227.docx" create mode 100644 vpn_cgi/vpn_cgi-master.tar.gz diff --git "a/vpn_cgi/VPN_CGI\345\256\211\350\243\205\345\222\214\346\233\264\346\226\260\346\214\207\345\215\227.docx" "b/vpn_cgi/VPN_CGI\345\256\211\350\243\205\345\222\214\346\233\264\346\226\260\346\214\207\345\215\227.docx" new file mode 100644 index 0000000..ebd07e5 Binary files /dev/null and "b/vpn_cgi/VPN_CGI\345\256\211\350\243\205\345\222\214\346\233\264\346\226\260\346\214\207\345\215\227.docx" differ diff --git a/vpn_cgi/vpn_cgi-master.tar.gz b/vpn_cgi/vpn_cgi-master.tar.gz new file mode 100644 index 0000000..40a73bd Binary files /dev/null and b/vpn_cgi/vpn_cgi-master.tar.gz differ -- cgit v1.2.3