Merge branch 'master' of git.mesalab.cn:IPReuse/Deploy_Env

17 files changed, 70 insertions, 0 deletions

diff --git a/mctrl/IP项目MCTRL说明文档.docx b/mctrl/IP项目MCTRL说明文档.docx
new file mode 100644
index 0000000..083b05f
--- /dev/null
+++ b/mctrl/IP项目MCTRL说明文档.docx
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
--- /dev/null
+++ b/mctrl/bin/mctrl
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
+~     
diff --git a/mrl/MRL部署及常见日志说明-简版.docx b/mrl/MRL部署及常见日志说明-简版.docx
new file mode 100644
index 0000000..4d09b6e
--- /dev/null
+++ b/mrl/MRL部署及常见日志说明-简版.docx
diff --git a/mrl/mrl_run.zip b/mrl/mrl_run.zip
new file mode 100644
index 0000000..8c07196
--- /dev/null
+++ b/mrl/mrl_run.zip
diff --git a/udpecho/udpecho部署及常见日志说明-简版.docx b/udpecho/udpecho部署及常见日志说明-简版.docx
new file mode 100644
index 0000000..f9143fb
--- /dev/null
+++ b/udpecho/udpecho部署及常见日志说明-简版.docx
diff --git a/udpecho/udpechp_run.zip b/udpecho/udpechp_run.zip
new file mode 100644
index 0000000..d5502be
--- /dev/null
+++ b/udpecho/udpechp_run.zip
diff --git a/vpn_cgi/VPN_CGI安装和更新指南.docx b/vpn_cgi/VPN_CGI安装和更新指南.docx
new file mode 100644
index 0000000..ebd07e5
--- /dev/null
+++ b/vpn_cgi/VPN_CGI安装和更新指南.docx
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
--- /dev/null
+++ b/vpn_cgi/vpn_cgi-master.tar.gz
diff --git a/vpn_install/SoftEtherVPN.tar b/vpn_install/SoftEtherVPN.tar
new file mode 100644
index 0000000..57bd450
--- /dev/null
+++ b/vpn_install/SoftEtherVPN.tar
diff --git a/vpn_install/cmake-3.13.1.tar.gz b/vpn_install/cmake-3.13.1.tar.gz
new file mode 100644
index 0000000..11f4ba9
--- /dev/null
+++ b/vpn_install/cmake-3.13.1.tar.gz
diff --git a/vpn_install/softether-vpnclient-v4.28-9669-beta-2018.09.11-windows-x86_x64-intel.exe b/vpn_install/softether-vpnclient-v4.28-9669-beta-2018.09.11-windows-x86_x64-intel.exe
new file mode 100644
index 0000000..df7ebb0
--- /dev/null
+++ b/vpn_install/softether-vpnclient-v4.28-9669-beta-2018.09.11-windows-x86_x64-intel.exe
diff --git a/vpn_install/softether-vpnserver_vpnbridge-v4.28-9669-beta-2018.09.11-windows-x86_x64-intel.exe b/vpn_install/softether-vpnserver_vpnbridge-v4.28-9669-beta-2018.09.11-windows-x86_x64-intel.exe
new file mode 100644
index 0000000..0a351d4
--- /dev/null
+++ b/vpn_install/softether-vpnserver_vpnbridge-v4.28-9669-beta-2018.09.11-windows-x86_x64-intel.exe
diff --git a/vpn_install/vpnserver安装与配置说明.docx b/vpn_install/vpnserver安装与配置说明.docx
new file mode 100644
index 0000000..275a058
--- /dev/null
+++ b/vpn_install/vpnserver安装与配置说明.docx