From f0c637d85568124545b7304fb4671b4c849dda64 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Tue, 31 Dec 2019 08:53:31 +0100
Subject: [PATCH 01/21] Update to 0.1006

---
 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 b759bfb..2cbe8dd 100644
--- a/debian9-x86_64.sh
+++ b/debian9-x86_64.sh
@@ -30,9 +30,9 @@ V2RAY_VERSION="v1.2.0-2-g68e2207"
 EASYRSA_VERSION="3.0.6"
 SHADOWSOCKS_VERSION="3.3.3"
 VPS_DOMAIN=${VPS_DOMAIN:-$(wget -4 -qO- -T 2 http://hostname.openmptcprouter.com)}
-VPSPATH="server-test"
+VPSPATH="server"
 
-OMR_VERSION="0.1006-test1"
+OMR_VERSION="0.1006"
 
 set -e
 umask 0022

From 3b78f92411d83786d46ad3fb9ffb5ed895c09623 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Fri, 3 Jan 2020 12:04:26 +0100
Subject: [PATCH 02/21] Update release

---
 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 7e37f29..72955f8 100644
--- a/debian9-x86_64.sh
+++ b/debian9-x86_64.sh
@@ -32,7 +32,7 @@ SHADOWSOCKS_VERSION="3.3.3"
 VPS_DOMAIN=${VPS_DOMAIN:-$(wget -4 -qO- -T 2 http://hostname.openmptcprouter.com)}
 VPSPATH="server"
 
-OMR_VERSION="0.1006"
+OMR_VERSION="0.1007"
 
 set -e
 umask 0022

From a9ccf1cbd72e284e80e2716166342c19c3591cc5 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Sun, 5 Jan 2020 16:25:03 +0100
Subject: [PATCH 03/21] Fix update key

---
 debian9-x86_64.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian9-x86_64.sh b/debian9-x86_64.sh
index 7b5f5b4..122d5c1 100644
--- a/debian9-x86_64.sh
+++ b/debian9-x86_64.sh
@@ -307,8 +307,9 @@ if [ "$OMR_ADMIN" = "yes" ]; then
 	if [ -f /usr/local/bin/omr-admin.py ]; then
 		apt-get -y install jq
 		cp /tmp/openmptcprouter-vps-admin-${OMR_ADMIN_VERSION}/omr-admin.py /usr/local/bin/
-		OMR_ADMIN_PASS=$(grep -Po '"'"pass"'"\s*:\s*"\K([^"]*)' /etc/openmptcprouter-vps-admin/omr-admin-config.json | tr -d  "\n")
-		[ -z "$OMR_ADMIN_PASS" ] && OMR_ADMIN_PASS=$(cat /etc/openmptcprouter-vps-admin/omr-admin-config.json | jq -r .users[0].openmptcprouter.user_password | tr -d "\n")
+		OMR_ADMIN_PASS2=$(grep -Po '"'"pass"'"\s*:\s*"\K([^"]*)' /etc/openmptcprouter-vps-admin/omr-admin-config.json | tr -d  "\n")
+		[ -n "$OMR_ADMIN_PASS2" ] && OMR_ADMIN_PASS=$OMR_ADMIN_PASS2
+		[ -z "$OMR_ADMIN_PASS2" ] && OMR_ADMIN_PASS=$(cat /etc/openmptcprouter-vps-admin/omr-admin-config.json | jq -r .users[0].openmptcprouter.user_password | tr -d "\n")
 	else
 		cp /tmp/openmptcprouter-vps-admin-${OMR_ADMIN_VERSION}/omr-admin-config.json /etc/openmptcprouter-vps-admin/
 		cp /tmp/openmptcprouter-vps-admin-${OMR_ADMIN_VERSION}/omr-admin.py /usr/local/bin/

From a1166fc8339560adc64c2671450853d899e356ba Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Mon, 6 Jan 2020 12:46:20 +0100
Subject: [PATCH 04/21] Set to release 0.1008

---
 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 9e3860a..5934b35 100644
--- a/debian9-x86_64.sh
+++ b/debian9-x86_64.sh
@@ -32,7 +32,7 @@ SHADOWSOCKS_VERSION="3.3.3"
 VPS_DOMAIN=${VPS_DOMAIN:-$(wget -4 -qO- -T 2 http://hostname.openmptcprouter.com)}
 VPSPATH="server"
 
-OMR_VERSION="0.1007"
+OMR_VERSION="0.1008"
 
 set -e
 umask 0022

From 0ebc3a887f02257ade4bb8a19440d3f8a84e995d Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Mon, 24 Feb 2020 10:29:07 +0100
Subject: [PATCH 05/21] update omr-admin

---
 debian9-x86_64.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian9-x86_64.sh b/debian9-x86_64.sh
index 6b52955..9861193 100644
--- a/debian9-x86_64.sh
+++ b/debian9-x86_64.sh
@@ -23,7 +23,7 @@ GLORYTUN_UDP_VERSION="7f30cdc5ee2e89f0008144ad71f4c0bd4215a0f4"
 #MLVPN_VERSION="8f9720978b28c1954f9f229525333547283316d2"
 MLVPN_VERSION="f45cec350a6879b8b020143a78134a022b5df2a7"
 OBFS_VERSION="486bebd9208539058e57e23a12f23103016e09b4"
-OMR_ADMIN_VERSION="4ed9794b3ccc75d0d0bc01dc4d2ae689e51bb3de"
+OMR_ADMIN_VERSION="8e7379e5db352a30efbd6af60924ccad3b350fbd"
 DSVPN_VERSION="3b99d2ef6c02b2ef68b5784bec8adfdd55b29b1a"
 #V2RAY_VERSION="v1.1.0"
 V2RAY_VERSION="v1.2.0-8-g59b8f4f"
@@ -503,12 +503,12 @@ if [ "$OPENVPN" = "yes" ]; then
 	#	cd /etc/openvpn/server
 	#	openvpn --genkey --secret static.key
 	#fi
-	if [ "$ID" = "ubuntu" ] && [ "$VERSION_ID" = "18.04" ]; then
+	if [ "$ID" = "ubuntu" ] && [ "$VERSION_ID" = "18.04" ] && [ ! -d /etc/openvpn/ca ]; then
 		wget -O /tmp/EasyRSA-unix-v${EASYRSA_VERSION}.tgz https://github.com/OpenVPN/easy-rsa/releases/download/v3.0.6/EasyRSA-unix-v${EASYRSA_VERSION}.tgz
 		cd /tmp
 		tar xzvf EasyRSA-unix-v${EASYRSA_VERSION}.tgz
 		cd /tmp/EasyRSA-v${EASYRSA_VERSION}
-		mkdir /etc/openvpn/ca
+		mkdir -f /etc/openvpn/ca
 		cp easyrsa /etc/openvpn/ca/
 		cp openssl-easyrsa.cnf /etc/openvpn/ca/
 		cp vars.example /etc/openvpn/ca/vars

From 0d2e5cb9d9da92195c43af28c26f12b0934b27f2 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Mon, 24 Feb 2020 12:21:17 +0100
Subject: [PATCH 06/21] Update

---
 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 8a030c5..d4f005f 100644
--- a/debian9-x86_64.sh
+++ b/debian9-x86_64.sh
@@ -32,7 +32,7 @@ SHADOWSOCKS_VERSION="3.3.3"
 VPS_DOMAIN=${VPS_DOMAIN:-$(wget -4 -qO- -T 2 http://hostname.openmptcprouter.com)}
 VPSPATH="server"
 
-OMR_VERSION="0.1009"
+OMR_VERSION="0.1010"
 
 set -e
 umask 0022

From 868ea9de25c6aeccbead7379c704e0a96acf753c Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Wed, 26 Feb 2020 10:38:43 +0100
Subject: [PATCH 07/21] Fix DSVPN support

---
 dsvpn-run     | 10 +++++-----
 dsvpn0-config |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dsvpn-run b/dsvpn-run
index e4d1ff8..e4000c2 100644
--- a/dsvpn-run
+++ b/dsvpn-run
@@ -10,10 +10,10 @@ fi
 . "$(readlink -f "$1")"
 
 exec dsvpn \
-	${MODE:+server} \
+	${MODE} \
 	"$1".key \
 	auto \
-	${PORT:+65401} \
-	${DEV:+dsvpn0} \
-	${LOCALTUNIP:+10.255.251.1} \
-	${REMOTETUNIP:+10.255.251.1}
+	${PORT} \
+	${DEV} \
+	${LOCALTUNIP} \
+	${REMOTETUNIP}
diff --git a/dsvpn0-config b/dsvpn0-config
index c4164cf..933e98b 100644
--- a/dsvpn0-config
+++ b/dsvpn0-config
@@ -2,4 +2,4 @@ PORT=65401
 DEV=dsvpn0
 MODE=server
 LOCALTUNIP=10.255.251.1
-REMOTETUNIP=10.255.251.2
\ No newline at end of file
+REMOTETUNIP=10.255.251.2

From 9661a32943b6ee1e9d3638fb6eef1b728d40f34a Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Fri, 28 Feb 2020 08:25:12 +0100
Subject: [PATCH 08/21] Fix shorewall for 6in4

---
 openmptcprouter-shorewall6.tar.gz | Bin 3724 -> 3714 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/openmptcprouter-shorewall6.tar.gz b/openmptcprouter-shorewall6.tar.gz
index b43e80d7b9d33faaf6040d937ef897624dd030ce..47236d39571042db734cfdf6dddff46d2373ce96 100644
GIT binary patch
literal 3714
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

literal 3724
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


From 2aee1e583ea1ee233aee78ef6673480efc6b1cc0 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Fri, 28 Feb 2020 17:01:42 +0100
Subject: [PATCH 09/21] Tag to 0.1011

---
 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 22e0d82..b231ae6 100644
--- a/debian9-x86_64.sh
+++ b/debian9-x86_64.sh
@@ -32,7 +32,7 @@ SHADOWSOCKS_VERSION="3.3.3"
 VPS_DOMAIN=${VPS_DOMAIN:-$(wget -4 -qO- -T 2 http://hostname.openmptcprouter.com)}
 VPSPATH="server"
 
-OMR_VERSION="0.1010"
+OMR_VERSION="0.1011"
 
 set -e
 umask 0022

From 166495cdaf3f06601a9bc547c1def8a158a0ce47 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Sat, 29 Feb 2020 22:06:43 +0100
Subject: [PATCH 10/21] Fix multipath over tunnels

---
 debian9-x86_64.sh |  13 +++---
 omr-service       | 112 +---------------------------------------------
 2 files changed, 6 insertions(+), 119 deletions(-)

diff --git a/debian9-x86_64.sh b/debian9-x86_64.sh
index b231ae6..17f42ee 100644
--- a/debian9-x86_64.sh
+++ b/debian9-x86_64.sh
@@ -698,21 +698,18 @@ wget -O /usr/local/bin/multipath https://www.openmptcprouter.com/${VPSPATH}/mult
 chmod 755 /usr/local/bin/multipath
 
 # Add OpenMPTCProuter service
-#wget -O /usr/local/bin/omr-service https://www.openmptcprouter.com/${VPSPATH}/omr-service
-#chmod 755 /usr/local/bin/omr-service
-#wget -O /lib/systemd/system/omr.service https://www.openmptcprouter.com/${VPSPATH}/omr.service.in
+wget -O /usr/local/bin/omr-service https://www.openmptcprouter.com/${VPSPATH}/omr-service
+chmod 755 /usr/local/bin/omr-service
+wget -O /lib/systemd/system/omr.service https://www.openmptcprouter.com/${VPSPATH}/omr.service.in
 wget -O /usr/local/bin/omr-6in4-run https://www.openmptcprouter.com/${VPSPATH}/omr-6in4-run
 chmod 755 /usr/local/bin/omr-6in4-run
 wget -O /lib/systemd/system/omr6in4@.service https://www.openmptcprouter.com/${VPSPATH}/omr6in4%40.service.in
-if systemctl -q is-active omr.service; then
-	systemctl -q stop omr > /dev/null 2>&1
-	systemctl -q disable omr > /dev/null 2>&1
-fi
 if systemctl -q is-active omr-6in4.service; then
 	systemctl -q stop omr-6in4 > /dev/null 2>&1
 	systemctl -q disable omr-6in4 > /dev/null 2>&1
 fi
 systemctl enable omr6in4@user1.service
+systemctl enable omr.service
 
 # Change SSH port to 65222
 sed -i 's:#Port 22:Port 65222:g' /etc/ssh/sshd_config
@@ -920,7 +917,7 @@ else
 	echo 'Restarting glorytun and omr...'
 	systemctl -q start glorytun-tcp@tun0
 	systemctl -q start glorytun-udp@tun0
-	#systemctl -q restart omr
+	systemctl -q restart omr
 	echo 'done'
 	if [ "$OPENVPN" = "yes" ]; then
 		echo 'Restarting OpenVPN'
diff --git a/omr-service b/omr-service
index 3591277..c439d32 100755
--- a/omr-service
+++ b/omr-service
@@ -1,13 +1,5 @@
 #!/bin/bash
 # OpenMPTCProuter VPS service script
-# This script configure 6in4, multipath and firewall for current VPN
-
-if [ "$1" = "stop" ] && [ "$(ip link show omr-6in4 up 2>/dev/null)" ]; then
-	ip route del fd00::/8 via fe80::a00:2 dev omr-6in4
-	ip link set omr-6in4 down
-	ip tunnel del omr-6in4
-	exit 0
-fi
 
 _multipath() {
 	# Force multipath status
@@ -21,109 +13,7 @@ _multipath() {
 	done
 }
 
-# Add IPv6 tunnel
-if [ "$(ip link show omr-6in4 up 2>/dev/null)" ]; then
-	ip tunnel change omr-6in4 mode sit remote 10.255.255.2 local 10.255.255.1
-else
-	ip tunnel add omr-6in4 mode sit remote 10.255.255.2 local 10.255.255.1
-	ip addr add fe80::a00:1/126 dev omr-6in4 >/dev/null 2>&1
-fi
-ip link set omr-6in4 up
-ip route replace fd00::/8 via fe80::a00:2 dev omr-6in4
-
-_ping() {
-	local host=$1
-	ret=$(ping -4 "${host}" \
-		-W 5 \
-		-c 1 \
-		-q
-	)
-	[ -n "$ret" ] && echo "$ret" | grep -s " 0% packet loss" > /dev/null && {
-		return
-	}
-	false
-}
-
-_ping_range() {
-	local network=$1
-	for i in {2..50} ;do 
-		_ping $network$i
-		pingr=$?
-		if $(exit $pingr); then
-			ipd=$network$i
-			return
-		fi
-	done
-	false
-}
-
 while true; do
-	source /etc/shorewall/params.vpn
-	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
-		_ping $currentpeer
-		status=$?
-		if ! $(exit $status) || [ "$currentpeer" != "$OMR_ADDR" ]; then
-			allip_tcp=$(ip -4 addr show gt-tun0 2>/dev/null | grep inet)
-			allip_udp=$(ip -4 addr show gt-udp-tun0 2>/dev/null | grep inet)
-			[ -d "/sys/class/net/mlvpn0" ] && allip_mlvpn=$(ip -4 addr show mlvpn0 2>/dev/null | grep inet)
-			[ -d "/sys/class/net/tun0" ] && allip_openvpn=$(ip -4 addr show tun0 2>/dev/null | grep inet)
-			[ -d "/sys/class/net/dsvpn0" ] && allip_dsvpn=$(ip -4 addr show dsvpn0 2>/dev/null | grep inet)
-			if [ -f /etc/openmptcprouter-vps-admin/current-vpn ]; then
-				current_vpn="$(cat /etc/openmptcprouter-vps-admin/current-vpn)"
-				[ "$current_vpn" = "glorytun_tcp" ] && allip="$allip_tcp"
-				[ "$current_vpn" = "glorytun_udp" ] && allip="$allip_udp"
-				[ "$current_vpn" = "mlvpn" ] && allip="$allip_mlvpn"
-				[ "$current_vpn" = "openvpn" ] && allip="$allip_openvpn"
-				[ "$current_vpn" = "dsvpn" ] && allip="$allip_dsvpn"
-			fi
-			if [ -z "$allip" ]; then
-				allip="$allip_tcp
-$allip_udp
-$allip_openvpn
-$allip_dsvpn
-$allip_mlvpn"
-			fi
-			while IFS= read -r inet; do
-				ip=$(echo $inet | awk '{print $2}' | cut -d/ -f1 | tr -d "\n")
-				if [ "$ip" != "" ]; then
-					_ping_range $(echo $ip | sed 's/.1$/./' | tr -d "\n")
-					statusr=$?
-					if $(exit $statusr); then
-						_ping $ipd
-						statusp=$?
-						if $(exit $statusp); then
-							logger -t "OMR-Service" "Set new 6in4 tunnel IPs"
-							ip tunnel change omr-6in4 mode sit remote $ipd local $ip
-							#echo "VPS_ADDR=$ip" > /etc/shorewall/params.vpn
-							#echo "OMR_ADDR=$ipd" >> /etc/shorewall/params.vpn
-							iface=$(ip -4 addr | grep $ip/ | awk '{print $7}' | tr -d "\n")
-							#echo "VPS_IFACE=$iface" >> /etc/shorewall/params.vpn
-							#systemctl reload shorewall
-							_multipath
-							break
-						fi
-					fi
-				fi
-			done < <(printf '%s\n' "$allip")
-			[ -z "$iface" ] && [ -f /etc/openmptcprouter-vps-admin/current-vpn ] && {
-				logger -t "OMR-Service" "Restart Glorytun"
-				current_vpn="$(cat /etc/openmptcprouter-vps-admin/current-vpn)"
-				[ "$current_vpn" = "glorytun_tcp" ] && systemctl -q restart glorytun-tcp@tun0
-				[ "$current_vpn" = "glorytun_udp" ] && systemctl -q restart glorytun-udp@tun0
-				#systemctl -q restart systemd-networkd
-				_multipath
-				sleep 10
-			}
-		fi
-	fi
-	#result="$(curl -Isk -m 30 https://127.0.0.1:65500/status | head -n 1 | grep 405)"
-	#if [ "$result" = "" ]; then
-	#	logger -t "OMR-Service" "Restart OMR Admin"
-	#	systemctl -q restart omr-admin
-	#	sleep 10
-	#fi
+	_multipath
 	sleep 10
 done

From 1ec824f55ae0a69cf18a46f7b7b48b74049d1aaf Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Sat, 29 Feb 2020 22:08:04 +0100
Subject: [PATCH 11/21] Set to v0.1012

---
 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 17f42ee..db0b987 100644
--- a/debian9-x86_64.sh
+++ b/debian9-x86_64.sh
@@ -32,7 +32,7 @@ SHADOWSOCKS_VERSION="3.3.3"
 VPS_DOMAIN=${VPS_DOMAIN:-$(wget -4 -qO- -T 2 http://hostname.openmptcprouter.com)}
 VPSPATH="server"
 
-OMR_VERSION="0.1011"
+OMR_VERSION="0.1012"
 
 set -e
 umask 0022

From dc621e8272890b8688ed929b5a1018bfcd09c2b8 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Tue, 10 Mar 2020 18:15:54 +0100
Subject: [PATCH 12/21] Fix DSVPN

---
 dsvpn-run | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/dsvpn-run b/dsvpn-run
index e4d1ff8..e4000c2 100644
--- a/dsvpn-run
+++ b/dsvpn-run
@@ -10,10 +10,10 @@ fi
 . "$(readlink -f "$1")"
 
 exec dsvpn \
-	${MODE:+server} \
+	${MODE} \
 	"$1".key \
 	auto \
-	${PORT:+65401} \
-	${DEV:+dsvpn0} \
-	${LOCALTUNIP:+10.255.251.1} \
-	${REMOTETUNIP:+10.255.251.1}
+	${PORT} \
+	${DEV} \
+	${LOCALTUNIP} \
+	${REMOTETUNIP}

From eaf506836abf8d66ef25154c077884fa91d554d3 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Thu, 12 Mar 2020 19:38:43 +0100
Subject: [PATCH 13/21] Fix issue with Glorytun-UDP

---
 debian9-x86_64.sh | 3 +++
 omr-service       | 5 +++++
 2 files changed, 8 insertions(+)

diff --git a/debian9-x86_64.sh b/debian9-x86_64.sh
index 02702c3..f7a134c 100644
--- a/debian9-x86_64.sh
+++ b/debian9-x86_64.sh
@@ -901,6 +901,9 @@ else
 	echo 'Keys are not changed, shorewall rules files preserved'
 	echo 'You need OpenMPTCProuter >= 0.30'
 	echo '===================================================================================='
+	echo 'Restarting systemd daemon...'
+	systemctl -q restart daemon-reload
+	echo 'done'
 	echo 'Restarting systemd network...'
 	systemctl -q restart systemd-networkd
 	echo 'done'
diff --git a/omr-service b/omr-service
index c439d32..90d7550 100755
--- a/omr-service
+++ b/omr-service
@@ -13,7 +13,12 @@ _multipath() {
 	done
 }
 
+_glorytun_udp() {
+	[ -z "$(glorytun show dev gt-udp-tun0 2>/dev/null | grep server)" ] && systemctl -q restart glorytun-udp@*
+}
+
 while true; do
+	_glorytun_udp
 	_multipath
 	sleep 10
 done

From e75c5e92a76501b7afef786ac446fb297cbc6658 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Thu, 12 Mar 2020 19:39:49 +0100
Subject: [PATCH 14/21] Update version to 0.1014

---
 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 1a17ed4..db18291 100644
--- a/debian9-x86_64.sh
+++ b/debian9-x86_64.sh
@@ -32,7 +32,7 @@ SHADOWSOCKS_VERSION="3.3.3"
 VPS_DOMAIN=${VPS_DOMAIN:-$(wget -4 -qO- -T 2 http://hostname.openmptcprouter.com)}
 VPSPATH="server"
 
-OMR_VERSION="0.1013"
+OMR_VERSION="0.1014"
 
 set -e
 umask 0022

From 895182fdfe95ab275ab4ca5f9020ac42aeb78955 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Sun, 15 Mar 2020 23:41:24 +0100
Subject: [PATCH 15/21] Little changes

---
 debian9-x86_64.sh    |  2 +-
 glorytun-tcp-post.sh |  4 ++--
 glorytun-udp-post.sh |  4 ++--
 omr-service          | 13 ++++++++++++-
 4 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/debian9-x86_64.sh b/debian9-x86_64.sh
index f7a134c..26f5a43 100644
--- a/debian9-x86_64.sh
+++ b/debian9-x86_64.sh
@@ -902,7 +902,7 @@ else
 	echo 'You need OpenMPTCProuter >= 0.30'
 	echo '===================================================================================='
 	echo 'Restarting systemd daemon...'
-	systemctl -q restart daemon-reload
+	systemctl -q daemon-reload
 	echo 'done'
 	echo 'Restarting systemd network...'
 	systemctl -q restart systemd-networkd
diff --git a/glorytun-tcp-post.sh b/glorytun-tcp-post.sh
index f494e11..4df0358 100644
--- a/glorytun-tcp-post.sh
+++ b/glorytun-tcp-post.sh
@@ -4,5 +4,5 @@
 INTF=gt-${DEV}
 [ -z "$LOCALIP" ] && LOCALIP="10.255.255.1"
 [ -z "$BROADCASTIP" ] && BROADCASTIP="10.255.255.3"
-ip link set dev ${INTF} up
-ip addr add ${LOCALIP}/30 brd ${BROADCASTIP} dev ${INTF}
+ip link set dev ${INTF} up 2>&1 >/dev/null
+ip addr add ${LOCALIP}/30 brd ${BROADCASTIP} dev ${INTF} 2>&1 >/dev/null
diff --git a/glorytun-udp-post.sh b/glorytun-udp-post.sh
index 73a3853..4d8acad 100644
--- a/glorytun-udp-post.sh
+++ b/glorytun-udp-post.sh
@@ -4,5 +4,5 @@
 INTF=gt-udp-${DEV}
 [ -z "$LOCALIP" ] && LOCALIP="10.255.254.1"
 [ -z "$BROADCASTIP" ] && BROADCASTIP="10.255.254.3"
-ip link set dev ${INTF} up
-ip addr add ${LOCALIP}/30 brd ${BROADCASTIP} dev ${INTF}
+ip link set dev ${INTF} up 2>&1 >/dev/null
+ip addr add ${LOCALIP}/30 brd ${BROADCASTIP} dev ${INTF} 2>&1 >/dev/null
diff --git a/omr-service b/omr-service
index 90d7550..5f5cb98 100755
--- a/omr-service
+++ b/omr-service
@@ -14,11 +14,22 @@ _multipath() {
 }
 
 _glorytun_udp() {
-	[ -z "$(glorytun show dev gt-udp-tun0 2>/dev/null | grep server)" ] && systemctl -q restart glorytun-udp@*
+	[ -z "$(glorytun show dev gt-udp-tun0 2>/dev/null | grep server)" ] && {
+		logger -t "OMR-Service" "Restart Glorytun-UDP"
+		systemctl -q restart glorytun-udp@*
+	}
+}
+
+_omr_api() {
+	[ -z "$(curl -s -k -m 1 https://127.0.0.1:65500/)" ] && {
+		logger -t "OMR-Service" "Restart OMR-Admin"
+		systemctl -q restart omr-admin
+	}
 }
 
 while true; do
 	_glorytun_udp
 	_multipath
+	_omr_api
 	sleep 10
 done

From b8ad59a11dbcfb914eba53a54594ff3f5408b7e1 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Mon, 16 Mar 2020 19:52:20 +0100
Subject: [PATCH 16/21] Revert to a previous Glorytun UDP release

---
 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 26f5a43..5cfd15d 100644
--- a/debian9-x86_64.sh
+++ b/debian9-x86_64.sh
@@ -19,7 +19,7 @@ INTERFACE=${INTERFACE:-$(ip -o -4 route show to default | grep -m 1 -Po '(?<=dev
 KERNEL_VERSION="4.19.104"
 KERNEL_PACKAGE_VERSION="1.7+b864616"
 KERNEL_RELEASE="${KERNEL_VERSION}-mptcp_${KERNEL_PACKAGE_VERSION}"
-GLORYTUN_UDP_VERSION="a9408e799ddbb74b5476fba70a495770322cd327"
+GLORYTUN_UDP_VERSION="b9aaab661fb879e891d34a91b5d2e78088fd9d9d"
 #MLVPN_VERSION="8f9720978b28c1954f9f229525333547283316d2"
 MLVPN_VERSION="f45cec350a6879b8b020143a78134a022b5df2a7"
 OBFS_VERSION="486bebd9208539058e57e23a12f23103016e09b4"

From d44ece14ebbc3f36197a563a622e392ce0d3f6b8 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Mon, 16 Mar 2020 19:53:53 +0100
Subject: [PATCH 17/21] 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 f374bfe..f0f49cc 100644
--- a/debian9-x86_64.sh
+++ b/debian9-x86_64.sh
@@ -32,7 +32,7 @@ SHADOWSOCKS_VERSION="3.3.3"
 VPS_DOMAIN=${VPS_DOMAIN:-$(wget -4 -qO- -T 2 http://hostname.openmptcprouter.com)}
 VPSPATH="server"
 
-OMR_VERSION="0.1014"
+OMR_VERSION="0.1015"
 
 set -e
 umask 0022

From 33fa9f4f26ffbe7309afdd573640508b7ddc3233 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Tue, 17 Mar 2020 21:10:23 +0100
Subject: [PATCH 18/21] Update to latest glorytun-UDP release

---
 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 5cfd15d..2f0e217 100644
--- a/debian9-x86_64.sh
+++ b/debian9-x86_64.sh
@@ -19,7 +19,7 @@ INTERFACE=${INTERFACE:-$(ip -o -4 route show to default | grep -m 1 -Po '(?<=dev
 KERNEL_VERSION="4.19.104"
 KERNEL_PACKAGE_VERSION="1.7+b864616"
 KERNEL_RELEASE="${KERNEL_VERSION}-mptcp_${KERNEL_PACKAGE_VERSION}"
-GLORYTUN_UDP_VERSION="b9aaab661fb879e891d34a91b5d2e78088fd9d9d"
+GLORYTUN_UDP_VERSION="42faaf816f8037d1fc2a5ef5fcf94e6681d613c0"
 #MLVPN_VERSION="8f9720978b28c1954f9f229525333547283316d2"
 MLVPN_VERSION="f45cec350a6879b8b020143a78134a022b5df2a7"
 OBFS_VERSION="486bebd9208539058e57e23a12f23103016e09b4"

From adabff20cbd41d6016b00739b058d4d39ab467cb Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Fri, 20 Mar 2020 18:19:27 +0100
Subject: [PATCH 19/21] Add arch)amd64 keyword

---
 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 9596b93..1db26f9 100644
--- a/debian9-x86_64.sh
+++ b/debian9-x86_64.sh
@@ -109,7 +109,7 @@ if [ "$ID" = "debian" ] && [ "$VERSION_ID" = "9" ] && [ "$UPDATE_DEBIAN" = "yes"
 	VERSION_ID="10"
 fi
 # Add OpenMPTCProuter repo
-echo 'deb https://repo.openmptcprouter.com stretch main' > /etc/apt/sources.list.d/openmptcprouter.list
+echo 'deb [arch=amd64] https://repo.openmptcprouter.com stretch main' > /etc/apt/sources.list.d/openmptcprouter.list
 cat <<EOF | tee /etc/apt/preferences.d/openmptcprouter.pref
 Explanation: Prefer OpenMPTCProuter provided packages over the Debian native ones
 Package: *

From 42c7489c23627a87efbabe4775d71918a5f023dd Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Tue, 7 Apr 2020 16:06:54 +0200
Subject: [PATCH 20/21] Set VPN IP only when possible

---
 glorytun-tcp-post.sh |  6 ++++--
 glorytun-udp-post.sh |  6 ++++--
 omr-service          | 10 ++++++++++
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/glorytun-tcp-post.sh b/glorytun-tcp-post.sh
index 4df0358..1522d79 100644
--- a/glorytun-tcp-post.sh
+++ b/glorytun-tcp-post.sh
@@ -4,5 +4,7 @@
 INTF=gt-${DEV}
 [ -z "$LOCALIP" ] && LOCALIP="10.255.255.1"
 [ -z "$BROADCASTIP" ] && BROADCASTIP="10.255.255.3"
-ip link set dev ${INTF} up 2>&1 >/dev/null
-ip addr add ${LOCALIP}/30 brd ${BROADCASTIP} dev ${INTF} 2>&1 >/dev/null
+[ "$(ip addr show dev $INTF | grep -o 'inet [0-9]*\.[0-9]*\.[0-9]*\.[0-9]*' | grep -o '[0-9]*\.[0-9]*\.[0-9]*\.[0-9]*')" != "$LOCALIP" ] && {
+	ip link set dev ${INTF} up 2>&1 >/dev/null
+	ip addr add ${LOCALIP}/30 brd ${BROADCASTIP} dev ${INTF} 2>&1 >/dev/null
+}
diff --git a/glorytun-udp-post.sh b/glorytun-udp-post.sh
index 4d8acad..be4d46a 100644
--- a/glorytun-udp-post.sh
+++ b/glorytun-udp-post.sh
@@ -4,5 +4,7 @@
 INTF=gt-udp-${DEV}
 [ -z "$LOCALIP" ] && LOCALIP="10.255.254.1"
 [ -z "$BROADCASTIP" ] && BROADCASTIP="10.255.254.3"
-ip link set dev ${INTF} up 2>&1 >/dev/null
-ip addr add ${LOCALIP}/30 brd ${BROADCASTIP} dev ${INTF} 2>&1 >/dev/null
+[ "$(ip addr show dev $INTF | grep -o 'inet [0-9]*\.[0-9]*\.[0-9]*\.[0-9]*' | grep -o '[0-9]*\.[0-9]*\.[0-9]*\.[0-9]*')" != "$LOCALIP" ] && {
+	ip link set dev ${INTF} up 2>&1 >/dev/null
+	ip addr add ${LOCALIP}/30 brd ${BROADCASTIP} dev ${INTF} 2>&1 >/dev/null
+}
diff --git a/omr-service b/omr-service
index 5f5cb98..55c2c23 100755
--- a/omr-service
+++ b/omr-service
@@ -18,6 +18,15 @@ _glorytun_udp() {
 		logger -t "OMR-Service" "Restart Glorytun-UDP"
 		systemctl -q restart glorytun-udp@*
 	}
+	for intf in /etc/glorytun-udp/*; do
+		/etc/glorytun-udp/post.sh /etc/glorytun-udp/${intf}
+	done
+}
+
+_glorytun_tcp() {
+	for intf in /etc/glorytun-tcp/*; do
+		/etc/glorytun-tcp/post.sh /etc/glorytun-tcp/${intf}
+	done
 }
 
 _omr_api() {
@@ -29,6 +38,7 @@ _omr_api() {
 
 while true; do
 	_glorytun_udp
+	_glorytun_tcp
 	_multipath
 	_omr_api
 	sleep 10

From 9840ccd2025293c96617f38e5be8d3bb269ab374 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Tue, 7 Apr 2020 16:07:08 +0200
Subject: [PATCH 21/21] Update to 5.4 kernel

---
 debian9-x86_64.sh | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/debian9-x86_64.sh b/debian9-x86_64.sh
index 1db26f9..57726c3 100644
--- a/debian9-x86_64.sh
+++ b/debian9-x86_64.sh
@@ -16,21 +16,21 @@ MLVPN_PASS=${MLVPN_PASS:-$(head -c 32 /dev/urandom | base64 -w0)}
 OPENVPN=${OPENVPN:-yes}
 DSVPN=${DSVPN:-yes}
 INTERFACE=${INTERFACE:-$(ip -o -4 route show to default | grep -m 1 -Po '(?<=dev )(\S+)' | tr -d "\n")}
-KERNEL_VERSION="4.19.104"
-KERNEL_PACKAGE_VERSION="1.7+b864616"
+KERNEL_VERSION="5.4.0"
+KERNEL_PACKAGE_VERSION="1.8+1efcfb3"
 KERNEL_RELEASE="${KERNEL_VERSION}-mptcp_${KERNEL_PACKAGE_VERSION}"
-GLORYTUN_UDP_VERSION="42faaf816f8037d1fc2a5ef5fcf94e6681d613c0"
+GLORYTUN_UDP_VERSION="c113724eb0370ecd80d038192deeeb82a13ebed3"
 #MLVPN_VERSION="8f9720978b28c1954f9f229525333547283316d2"
 MLVPN_VERSION="f45cec350a6879b8b020143a78134a022b5df2a7"
 OBFS_VERSION="486bebd9208539058e57e23a12f23103016e09b4"
-OMR_ADMIN_VERSION="0bee06d21605c9d9b4494a77e71043ce432aa5c2"
+OMR_ADMIN_VERSION="d14741092dfe0ff550f09eee8a03865726114427"
 DSVPN_VERSION="3b99d2ef6c02b2ef68b5784bec8adfdd55b29b1a"
 #V2RAY_VERSION="v1.1.0"
 V2RAY_VERSION="v1.2.0-8-g59b8f4f"
 EASYRSA_VERSION="3.0.6"
 SHADOWSOCKS_VERSION="3.3.3"
 VPS_DOMAIN=${VPS_DOMAIN:-$(wget -4 -qO- -T 2 http://hostname.openmptcprouter.com)}
-VPSPATH="server"
+VPSPATH="server-test"
 
 OMR_VERSION="0.1015"
 
@@ -313,7 +313,7 @@ if [ "$OMR_ADMIN" = "yes" ]; then
 		apt-get -y remove python3-jwt
 		pip3 -q install pyjwt
 	else
-		apt-get -y install python3-passlib python3-jwt python3-netaddr
+		apt-get -y install python3-passlib python3-jwt python3-netaddr libuv1 python3-uvloop
 	fi
 	echo '-- pip3 install needed python modules'
 	#pip3 install pyjwt passlib uvicorn fastapi netjsonconfig python-multipart netaddr
@@ -914,14 +914,18 @@ else
 	fi
 	if [ "$DSVPN" = "yes" ]; then
 		echo 'Restarting dsvpn...'
+		systemctl -q start dsvpn-server@dsvpn0 || true
 		systemctl -q restart dsvpn-server@* || true
 		echo 'done'
 	fi
 	echo 'Restarting glorytun...'
+	systemctl -q start glorytun-tcp@tun0 || true
 	systemctl -q restart glorytun-tcp@* || true
+	systemctl -q start glorytun-udp@tun0 || true
 	systemctl -q restart glorytun-udp@* || true
 	echo 'done'
 	echo 'Restarting omr6in4...'
+	systemctl -q start omr6in4@user0 || true
 	systemctl -q restart omr6in4@* || true
 	echo 'done'
 	if [ "$OPENVPN" = "yes" ]; then