From 25b68f62281c56638d10de5532eb15db4d767383 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Tue, 27 Oct 2020 08:26:54 +0000 Subject: [PATCH 1/8] Increase OMR API check --- omr-service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/omr-service b/omr-service index fd8d77d..3890f2b 100755 --- a/omr-service +++ b/omr-service @@ -30,7 +30,7 @@ _glorytun_tcp() { } _omr_api() { - [ -z "$(curl -s -k -m 3 https://127.0.0.1:65500/)" ] && { + [ -z "$(curl -s -k -m 30 https://127.0.0.1:65500/)" ] && { logger -t "OMR-Service" "Restart OMR-Admin" systemctl -q restart omr-admin } From a218449b4ad5aa178d52e259ec1a14a509f75eb9 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Tue, 27 Oct 2020 08:30:12 +0000 Subject: [PATCH 2/8] Set to 0.1018 --- debian9-x86_64.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian9-x86_64.sh b/debian9-x86_64.sh index 82cca13..dd6820a 100644 --- a/debian9-x86_64.sh +++ b/debian9-x86_64.sh @@ -47,10 +47,10 @@ V2RAY_PLUGIN_VERSION="v1.4.3" EASYRSA_VERSION="3.0.6" SHADOWSOCKS_VERSION="38871da8baf5cfa400983dcdf918397e48655203" VPS_DOMAIN=${VPS_DOMAIN:-$(wget -4 -qO- -T 2 http://hostname.openmptcprouter.com)} -VPSPATH="server-test" +VPSPATH="server" VPSURL="https://www.openmptcprouter.com/" -OMR_VERSION="0.1018-test" +OMR_VERSION="0.1018" DIR=$( pwd ) #" From cba153e2d77ddfd4836b74eb75257f9999f61e25 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Wed, 28 Oct 2020 14:55:21 +0000 Subject: [PATCH 3/8] Use cubic and bbr by default --- shadowsocks.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/shadowsocks.conf b/shadowsocks.conf index 8de0b56..302bbe0 100644 --- a/shadowsocks.conf +++ b/shadowsocks.conf @@ -45,7 +45,7 @@ net.ipv4.tcp_wmem = 4096 65536 33554432 net.ipv4.tcp_mtu_probing = 0 # for low-latency network, use cubic instead -net.ipv4.tcp_congestion_control = bbr +net.ipv4.tcp_congestion_control = cubic net.core.default_qdisc = fq # Default conntrack is too small net.netfilter.nf_conntrack_max = 131072 @@ -56,4 +56,5 @@ net.ipv4.conf.default.log_martians = 0 # MPTCP settings net.mptcp.mptcp_checksum = 0 net.mptcp.mptcp_syn_retries = 2 +net.mptcp.mptcp_scheduler = blest net.ipv4.tcp_ecn=1 From 9e09d25e9500030efc4c0357721c035c34e9eca7 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Thu, 29 Oct 2020 07:48:48 +0000 Subject: [PATCH 4/8] Update version --- debian9-x86_64.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian9-x86_64.sh b/debian9-x86_64.sh index c7810b4..812dcb2 100644 --- a/debian9-x86_64.sh +++ b/debian9-x86_64.sh @@ -50,7 +50,7 @@ VPS_DOMAIN=${VPS_DOMAIN:-$(wget -4 -qO- -T 2 http://hostname.openmptcprouter.com VPSPATH="server" VPSURL="https://www.openmptcprouter.com/" -OMR_VERSION="0.1018" +OMR_VERSION="0.1019" DIR=$( pwd ) #" From f4beb2f5a59c87f04b838fae244286dca6da822d Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Sat, 31 Oct 2020 11:53:25 +0000 Subject: [PATCH 5/8] Increase version --- debian9-x86_64.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian9-x86_64.sh b/debian9-x86_64.sh index 812dcb2..3e4ada9 100644 --- a/debian9-x86_64.sh +++ b/debian9-x86_64.sh @@ -50,7 +50,7 @@ VPS_DOMAIN=${VPS_DOMAIN:-$(wget -4 -qO- -T 2 http://hostname.openmptcprouter.com VPSPATH="server" VPSURL="https://www.openmptcprouter.com/" -OMR_VERSION="0.1019" +OMR_VERSION="0.1020" DIR=$( pwd ) #" From 68211f2033de3c476947167d7a4b6082e1138d48 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Tue, 3 Nov 2020 16:45:29 +0000 Subject: [PATCH 6/8] Fix on current-vpn file doesn't exist --- debian9-x86_64.sh | 1 + omr-service | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian9-x86_64.sh b/debian9-x86_64.sh index 3e4ada9..3f1b13b 100644 --- a/debian9-x86_64.sh +++ b/debian9-x86_64.sh @@ -389,6 +389,7 @@ if [ "$OMR_ADMIN" = "yes" ]; then pip3 -q install fastapi netjsonconfig python-multipart -U mkdir -p /etc/openmptcprouter-vps-admin/omr-6in4 mkdir -p /etc/openmptcprouter-vps-admin/intf + [ ! -f "/etc/openmptcprouter-vps-admin/current-vpn" ] && echo "glorytun_tcp" > /etc/openmptcprouter-vps-admin/current-vpn mkdir -p /var/opt/openmptcprouter if [ "$SOURCES" = "yes" ]; then wget -O /lib/systemd/system/omr-admin.service ${VPSURL}${VPSPATH}/omr-admin.service.in diff --git a/omr-service b/omr-service index 114c1b8..38002d3 100755 --- a/omr-service +++ b/omr-service @@ -27,7 +27,7 @@ _glorytun_tcp() { for intf in /etc/glorytun-tcp/tun*; do [ "$(echo $intf | grep key)" = "" ] && /etc/glorytun-tcp/post.sh ${intf} done - if [ "$(cat /etc/openmptcprouter-vps-admin/current-vpn)" = "glorytun_tcp" ]; then + if [ -f /etc/openmptcprouter-vps-admin/current-vpn ] && [ "$(cat /etc/openmptcprouter-vps-admin/current-vpn)" = "glorytun_tcp" ]; then if [ "$(ping -c 5 -w 5 10.255.255.2 | grep '100%')" != "" ]; then logger -t "OMR-Service" "No answer from VPN client end, restart Glorytun-TCP" systemctl restart glorytun-tcp@tun0 From 521a620e99324fd98951737763fefc4b3ce5acf9 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Fri, 6 Nov 2020 16:30:53 +0000 Subject: [PATCH 7/8] Update version --- debian9-x86_64.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian9-x86_64.sh b/debian9-x86_64.sh index e4a8043..d76c87e 100644 --- a/debian9-x86_64.sh +++ b/debian9-x86_64.sh @@ -50,7 +50,7 @@ VPS_DOMAIN=${VPS_DOMAIN:-$(wget -4 -qO- -T 2 http://hostname.openmptcprouter.com VPSPATH="server" VPSURL="https://www.openmptcprouter.com/" -OMR_VERSION="0.1020" +OMR_VERSION="0.1021" DIR=$( pwd ) #" From c1e2859ff3ed4e733e667213205199ab1b21353f Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Tue, 10 Nov 2020 07:53:59 +0000 Subject: [PATCH 8/8] Increase version number --- debian9-x86_64.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian9-x86_64.sh b/debian9-x86_64.sh index 1a12d74..7ba12f8 100644 --- a/debian9-x86_64.sh +++ b/debian9-x86_64.sh @@ -50,7 +50,7 @@ VPS_DOMAIN=${VPS_DOMAIN:-$(wget -4 -qO- -T 2 http://hostname.openmptcprouter.com VPSPATH="server" VPSURL="https://www.openmptcprouter.com/" -OMR_VERSION="0.1021" +OMR_VERSION="0.1022" DIR=$( pwd ) #"