From c85cd751593fad4f5be234352f92f3f88e137a1b Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Fri, 27 Jul 2018 07:54:11 +0000 Subject: [PATCH] Change optimization --- config.json | 6 +++--- debian9-x86_64.sh | 20 ++++++++++---------- shadowsocks.conf | 12 +++++++----- 3 files changed, 20 insertions(+), 18 deletions(-) diff --git a/config.json b/config.json index 8f14eb5..66e680e 100644 --- a/config.json +++ b/config.json @@ -4,10 +4,10 @@ "local_port":1081, "mode":"tcp_and_udp", "key":"MySecretKey", - "timeout":120, + "timeout":400, "method":"aes-256-cfb", - "verbose":2, - "prefer_ipv6": true, + "verbose":0, + "prefer_ipv6": false, "fast_open": true, "reuse_port": true, "mptcp": true diff --git a/debian9-x86_64.sh b/debian9-x86_64.sh index f7a5dfd..437ecf1 100644 --- a/debian9-x86_64.sh +++ b/debian9-x86_64.sh @@ -30,21 +30,21 @@ apt-get -y install dirmngr patch #echo 'deb http://dl.bintray.com/cpaasch/deb jessie main' >> /etc/apt/sources.list echo 'deb http://deb.debian.org/debian stretch-backports main' > /etc/apt/sources.list.d/stretch-backports.list apt-get update -wget -O /tmp/linux-image-4.14.24-mptcp-64056fa.amd64.deb http://www.openmptcprouter.com/kernel/linux-image-4.14.24-mptcp-64056fa.amd64.deb -wget -O /tmp/linux-headers-4.14.24-mptcp-64056fa.amd64.deb http://www.openmptcprouter.com/kernel/linux-headers-4.14.24-mptcp-64056fa.amd64.deb +wget -O /tmp/linux-image-4.14.41-mptcp-5723e3d.amd64.deb http://www.openmptcprouter.com/kernel/linux-image-4.14.41-mptcp-5723e3d.amd64.deb +wget -O /tmp/linux-headers-4.14.41-mptcp-5723e3d.amd64.deb http://www.openmptcprouter.com/kernel/linux-headers-4.14.41-mptcp-5723e3d.amd64.deb # Rename bzImage to vmlinuz, needed when custom kernel was used cd /boot apt-get -y install rename rename 's/^bzImage/vmlinuz/s' * >/dev/null 2>&1 #apt-get -y install linux-mptcp -dpkg -E -i /tmp/linux-image-4.14.24-mptcp-64056fa.amd64.deb -dpkg -E -i /tmp/linux-headers-4.14.24-mptcp-64056fa.amd64.deb +dpkg -E -i /tmp/linux-image-4.14.41-mptcp-5723e3d.amd64.deb +dpkg -E -i /tmp/linux-headers-4.14.41-mptcp-5723e3d.amd64.deb # Check if mptcp kernel is grub default kernel echo "Set MPTCP kernel as grub default..." wget -O /tmp/update-grub.sh http://www.openmptcprouter.com/server/update-grub.sh cd /tmp -bash update-grub.sh 4.14.24-mptcp +bash update-grub.sh 4.14.41-mptcp #apt -t stretch-backports -y install shadowsocks-libev ## Compile Shadowsocks @@ -103,7 +103,7 @@ if [ "$OBFS" = "yes" ]; then make install cd /tmp rm -rf /tmp/simple-obfs - sed -i 's%"mptcp": true%"mptcp": true,\n"plugin": "/usr/local/bin/obfs-server",\n"plugin_opts": "obfs=http;mptcp;fast-open"%' /etc/shadowsocks-libev/config.json + sed -i 's%"mptcp": true%"mptcp": true,\n"plugin": "/usr/local/bin/obfs-server",\n"plugin_opts": "obfs=http;mptcp;fast-open;t=400"%' /etc/shadowsocks-libev/config.json else sed -i -e '/plugin/d' -e 's/,,//' /etc/shadowsocks-libev/config.json fi @@ -242,9 +242,9 @@ fi # Add OpenMPTCProuter VPS script version to /etc/motd if grep --quiet 'OpenMPTCProuter VPS' /etc/motd; then - sed -i 's:< OpenMPTCProuter VPS [0-9]*\.[0-9]* >:< OpenMPCTProuter VPS 0.34 >:' /etc/motd + sed -i 's:< OpenMPTCProuter VPS [0-9]*\.[0-9]* >:< OpenMPCTProuter VPS 0.36 >:' /etc/motd else - echo '< OpenMPTCProuter VPS 0.34 >' >> /etc/motd + echo '< OpenMPTCProuter VPS 0.36 >' >> /etc/motd fi if [ "$update" = "0" ]; then @@ -298,10 +298,10 @@ else systemctl -q restart omr-6in4 echo 'done' echo 'Restarting shadowsocks...' - systemctl -q restart shadowsocks-libev-server@config.service + systemctl -q restart shadowsocks-libev-server@config if [ $NBCPU -gt 1 ]; then for i in $NBCPU; do - systemctl restart shadowsocks-libev-server@config$i.service + systemctl restart shadowsocks-libev-server@config$i done fi echo 'done' diff --git a/shadowsocks.conf b/shadowsocks.conf index 8908ce1..f0d9efc 100644 --- a/shadowsocks.conf +++ b/shadowsocks.conf @@ -21,9 +21,9 @@ net.ipv4.tcp_tw_reuse = 1 # turn off fast timewait sockets recycling net.ipv4.tcp_tw_recycle = 0 # short FIN timeout -net.ipv4.tcp_fin_timeout = 30 +net.ipv4.tcp_fin_timeout = 20 # short keepalive time -net.ipv4.tcp_keepalive_time = 2400 +net.ipv4.tcp_keepalive_time = 1200 # outbound port range net.ipv4.ip_local_port_range = 10000 65000 # max SYN backlog @@ -32,12 +32,14 @@ net.ipv4.tcp_max_syn_backlog = 4096 net.ipv4.tcp_max_tw_buckets = 10000 # turn on TCP Fast Open on both client and server side net.ipv4.tcp_fastopen = 3 +# TCP buffer +net.ipv4.tcp_mem = 134217728 134277728 134217728 # TCP receive buffer net.ipv4.tcp_rmem = 4096 87380 134217728 # TCP write buffer -net.ipv4.tcp_wmem = 4096 65536 134217728 +net.ipv4.tcp_wmem = 4096 87380 134217728 # turn on path MTU discovery -net.ipv4.tcp_mtu_probing = 1 +net.ipv4.tcp_mtu_probing = 0 # for low-latency network, use cubic instead net.ipv4.tcp_congestion_control = olia @@ -47,4 +49,4 @@ net.netfilter.nf_conntrack_max = 131072 # MPTCP settings net.mptcp.mptcp_checksum = 0 -net.mptcp.mptcp_syn_retries = 30 \ No newline at end of file +net.mptcp.mptcp_syn_retries = 20