From 650638da698b70edea23a67b868ee63f77087070 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Mon, 18 Jun 2018 17:27:41 +0000 Subject: [PATCH] Change some default MPTCP parameters, reload network if VPN seems to be down --- debian9-x86_64.sh | 6 +++--- omr-6in4-service | 2 ++ shadowsocks.conf | 10 +++++++--- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/debian9-x86_64.sh b/debian9-x86_64.sh index 633ac1e..78f68a8 100644 --- a/debian9-x86_64.sh +++ b/debian9-x86_64.sh @@ -106,7 +106,7 @@ fi if [ "$MLVPN" = "yes" ]; then cd /tmp - wget -O /tmp/debian9-x86_64-mlvpn.sh http://www.openmptcprouter.com/server/debian-x86_64-mlvpn.sh + wget -O /tmp/debian9-x86_64-mlvpn.sh http://www.openmptcprouter.com/server/debian9-x86_64-mlvpn.sh sh debian9-x86_64-mlvpn.sh fi @@ -236,9 +236,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.25 >:' /etc/motd + sed -i 's:< OpenMPTCProuter VPS [0-9]*\.[0-9]* >:< OpenMPCTProuter VPS 0.26 >:' /etc/motd else - echo '< OpenMPTCProuter VPS 0.25 >' >> /etc/motd + echo '< OpenMPTCProuter VPS 0.26 >' >> /etc/motd fi if [ "$update" = "0" ]; then diff --git a/omr-6in4-service b/omr-6in4-service index 539556a..a21218d 100755 --- a/omr-6in4-service +++ b/omr-6in4-service @@ -31,6 +31,7 @@ _ping() { while true; do source /etc/shorewall/params.vpn + local iface currentaddr=$(ip addr show omr-6in4 | grep link/sit | awk '{print $2}' | tr -d "\n") currentpeer=$(ip addr show omr-6in4 | grep link/sit | awk '{print $4}' | tr -d "\n") if [ -n "$currentpeer" ]; then @@ -60,6 +61,7 @@ $allip_mlvpn" break fi done < <(printf '%s\n' "$allip") + [ -z "$iface" ] && systemctl -q restart systemd-networkd fi fi sleep 5 diff --git a/shadowsocks.conf b/shadowsocks.conf index fae949c..8908ce1 100644 --- a/shadowsocks.conf +++ b/shadowsocks.conf @@ -1,6 +1,6 @@ # local sysctl settings can be stored in this directory # max open files -fs.file-max = 51200 +fs.file-max = 512000 # max read buffer net.core.rmem_max = 134217728 # max write buffer @@ -37,10 +37,14 @@ net.ipv4.tcp_rmem = 4096 87380 134217728 # TCP write buffer net.ipv4.tcp_wmem = 4096 65536 134217728 # turn on path MTU discovery -net.ipv4.tcp_mtu_probing = 0 +net.ipv4.tcp_mtu_probing = 1 # for low-latency network, use cubic instead net.ipv4.tcp_congestion_control = olia # Default conntrack is too small -net.netfilter.nf_conntrack_max=131072 +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