From 526793f24eb760b631ac19d5df9ecfd743eedcba Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Fri, 14 Feb 2020 21:47:44 +0100
Subject: [PATCH 1/9] Disable lzo

---
 openvpn-tun0.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openvpn-tun0.conf b/openvpn-tun0.conf
index c95e3b4..2b09931 100644
--- a/openvpn-tun0.conf
+++ b/openvpn-tun0.conf
@@ -19,6 +19,6 @@ sndbuf 0
 rcvbuf 0
 tls-server
 tls-version-min 1.2
-compress lzo
+#compress lzo
 push "route 10.255.252.1 255.255.255.255"
 client-config-dir ccd

From b403a27bd184ae5c2ba802b40412c274b469cc28 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Fri, 14 Feb 2020 21:48:06 +0100
Subject: [PATCH 2/9] Update admin script and fix for Ubuntu

---
 debian9-x86_64.sh | 46 +++++++++++++++++++++++++++++-----------------
 1 file changed, 29 insertions(+), 17 deletions(-)

diff --git a/debian9-x86_64.sh b/debian9-x86_64.sh
index 8e23067..feaa7d9 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="60a72b11bedb94ccc03da58d8c418642c0230402"
+OMR_ADMIN_VERSION="983ac0349b63e011043b5b4c1e4fd0dadea9cb9b"
 DSVPN_VERSION="3b99d2ef6c02b2ef68b5784bec8adfdd55b29b1a"
 #V2RAY_VERSION="v1.1.0"
 V2RAY_VERSION="v1.2.0-8-g59b8f4f"
@@ -308,10 +308,16 @@ if [ "$OMR_ADMIN" = "yes" ]; then
 	fi
 	#apt-get -y install unzip gunicorn python3-flask-restful python3-openssl python3-pip python3-setuptools python3-wheel
 	#apt-get -y install unzip python3-openssl python3-pip python3-setuptools python3-wheel
-	apt-get -y install python3-passlib python3-jwt python3-netaddr
+	if [ "$ID" = "ubuntu" ]; then
+		apt-get -y install python3-passlib python3-netaddr
+		apt-get -y remove python3-jwt
+		pip3 -q install pyjwt
+	else
+		apt-get -y install python3-passlib python3-jwt python3-netaddr
+	fi
 	echo '-- pip3 install needed python modules'
 	#pip3 install pyjwt passlib uvicorn fastapi netjsonconfig python-multipart netaddr
-	pip3 install fastapi netjsonconfig python-multipart uvicorn
+	pip3 -q install fastapi netjsonconfig python-multipart uvicorn
 	mkdir -p /etc/openmptcprouter-vps-admin/omr-6in4
 	mkdir -p /var/opt/openmptcprouter
 	wget -O /lib/systemd/system/omr-admin.service https://www.openmptcprouter.com/${VPSPATH}/omr-admin.service.in
@@ -358,7 +364,7 @@ if [ "$update" = "0" ] || [ ! -f /etc/shadowsocks-libev/manager.json ]; then
 	SHADOWSOCKS_PASS_JSON=$(echo $SHADOWSOCKS_PASS | sed 's/+/-/g; s/\//_/g;')
 	if [ $NBCPU -gt 1 ]; then
 		for i in $NBCPU; do
-			sed -i '0,/65101/ s/        "65101.*/&\n&/' manager.json
+			sed -i '0,/65101/ s/        "65101.*/&\n&/' /etc/shadowsocks-libev/manager.json
 		done
 	fi
 	#sed -i "s:MySecretKey:$SHADOWSOCKS_PASS_JSON:g" /etc/shadowsocks-libev/config.json
@@ -502,19 +508,25 @@ if [ "$OPENVPN" = "yes" ]; then
 		cd /tmp
 		tar xzvf EasyRSA-unix-v${EASYRSA_VERSION}.tgz
 		cd /tmp/EasyRSA-v${EASYRSA_VERSION}
-		mkdir -p /etc/openvpn/ca/pki/private /etc/openvpn/ca/pki/issued
-		./easyrsa init-pki
-		./easyrsa --batch build-ca nopass
-		EASYRSA_CERT_EXPIRE=3650 ./easyrsa build-server-full server nopass
-		EASYRSA_CERT_EXPIRE=3650 EASYRSA_REQ_CN=openmptcprouter ./easyrsa build-client-full "openmptcprouter" nopass
-		EASYRSA_CRL_DAYS=3650 ./easyrsa gen-crl
-		mv pki/ca.crt /etc/openvpn/ca/pki/ca.crt
-		mv pki/private/ca.key /etc/openvpn/ca/pki/private/ca.key
-		mv pki/issued/server.crt /etc/openvpn/ca/pki/issued/server.crt
-		mv pki/private/server.key /etc/openvpn/ca/pki/private/server.key
-		mv pki/crl.pem /etc/openvpn/ca/pki/crl.pem
-		mv pki/issued/openmptcprouter.crt /etc/openvpn/ca/pki/issued/openmptcprouter.crt
-		mv pki/private/openmptcprouter.key /etc/openvpn/ca/pki/private/openmptcprouter.key
+		mkdir /etc/openvpn/ca
+		cp easyrsa /etc/openvpn/ca/
+		cp openssl-easyrsa.cnf /etc/openvpn/ca/
+		cp vars.example /etc/openvpn/ca/vars
+		cp -r x509-types /etc/openvpn/ca/
+
+		#mkdir -p /etc/openvpn/ca/pki/private /etc/openvpn/ca/pki/issued
+		#./easyrsa init-pki
+		#./easyrsa --batch build-ca nopass
+		#EASYRSA_CERT_EXPIRE=3650 ./easyrsa build-server-full server nopass
+		#EASYRSA_CERT_EXPIRE=3650 EASYRSA_REQ_CN=openmptcprouter ./easyrsa build-client-full "openmptcprouter" nopass
+		#EASYRSA_CRL_DAYS=3650 ./easyrsa gen-crl
+		#mv pki/ca.crt /etc/openvpn/ca/pki/ca.crt
+		#mv pki/private/ca.key /etc/openvpn/ca/pki/private/ca.key
+		#mv pki/issued/server.crt /etc/openvpn/ca/pki/issued/server.crt
+		#mv pki/private/server.key /etc/openvpn/ca/pki/private/server.key
+		#mv pki/crl.pem /etc/openvpn/ca/pki/crl.pem
+		#mv pki/issued/openmptcprouter.crt /etc/openvpn/ca/pki/issued/openmptcprouter.crt
+		#mv pki/private/openmptcprouter.key /etc/openvpn/ca/pki/private/openmptcprouter.key
 	fi
 
 	if [ -f "/etc/openvpn/server/server.crt" ]; then

From ca9daabd149f21871b8af5e93fdbbce6c27b8970 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Fri, 21 Feb 2020 17:11:02 +0100
Subject: [PATCH 3/9] Update omr-admin

---
 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 feaa7d9..916fd91 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="983ac0349b63e011043b5b4c1e4fd0dadea9cb9b"
+OMR_ADMIN_VERSION="4ed9794b3ccc75d0d0bc01dc4d2ae689e51bb3de"
 DSVPN_VERSION="3b99d2ef6c02b2ef68b5784bec8adfdd55b29b1a"
 #V2RAY_VERSION="v1.1.0"
 V2RAY_VERSION="v1.2.0-8-g59b8f4f"

From 4b47717168ce3c96dd5d2566ac051dd7485d7dc8 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Fri, 21 Feb 2020 17:17:51 +0100
Subject: [PATCH 4/9] Add missing files

---
 dsvpn-run                         |  19 +++++++++++++++++++
 dsvpn-server@.service.in          |  10 ++++++++++
 dsvpn0-config                     |   5 +++++
 glorytun-tcp-post.sh              |   8 ++++++++
 glorytun-udp-post.sh              |   8 ++++++++
 omr6in4@.service.in               |  11 +++++++++++
 openmptcprouter-shorewall.tar.gz  | Bin 0 -> 4022 bytes
 openmptcprouter-shorewall6.tar.gz | Bin 0 -> 3724 bytes
 8 files changed, 61 insertions(+)
 create mode 100644 dsvpn-run
 create mode 100644 dsvpn-server@.service.in
 create mode 100644 dsvpn0-config
 create mode 100644 glorytun-tcp-post.sh
 create mode 100644 glorytun-udp-post.sh
 create mode 100644 omr6in4@.service.in
 create mode 100644 openmptcprouter-shorewall.tar.gz
 create mode 100644 openmptcprouter-shorewall6.tar.gz

diff --git a/dsvpn-run b/dsvpn-run
new file mode 100644
index 0000000..e4d1ff8
--- /dev/null
+++ b/dsvpn-run
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+set -e
+
+if [ ! -f "$1" ]; then
+        echo "usage: $(basename "$0") FILE"
+        exit 1
+fi
+
+. "$(readlink -f "$1")"
+
+exec dsvpn \
+	${MODE:+server} \
+	"$1".key \
+	auto \
+	${PORT:+65401} \
+	${DEV:+dsvpn0} \
+	${LOCALTUNIP:+10.255.251.1} \
+	${REMOTETUNIP:+10.255.251.1}
diff --git a/dsvpn-server@.service.in b/dsvpn-server@.service.in
new file mode 100644
index 0000000..25cc20e
--- /dev/null
+++ b/dsvpn-server@.service.in
@@ -0,0 +1,10 @@
+[Unit]
+Description=Dead Simple VPN - Server on %I
+
+[Service]
+ExecStart=/usr/local/bin/dsvpn-run /etc/dsvpn/%i
+Restart=always
+RestartSec=15
+
+[Install]
+WantedBy=network.target
\ No newline at end of file
diff --git a/dsvpn0-config b/dsvpn0-config
new file mode 100644
index 0000000..c4164cf
--- /dev/null
+++ b/dsvpn0-config
@@ -0,0 +1,5 @@
+PORT=65401
+DEV=dsvpn0
+MODE=server
+LOCALTUNIP=10.255.251.1
+REMOTETUNIP=10.255.251.2
\ No newline at end of file
diff --git a/glorytun-tcp-post.sh b/glorytun-tcp-post.sh
new file mode 100644
index 0000000..f494e11
--- /dev/null
+++ b/glorytun-tcp-post.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+. "$(readlink -f "$1")"
+
+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}
diff --git a/glorytun-udp-post.sh b/glorytun-udp-post.sh
new file mode 100644
index 0000000..73a3853
--- /dev/null
+++ b/glorytun-udp-post.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+. "$(readlink -f "$1")"
+
+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}
diff --git a/omr6in4@.service.in b/omr6in4@.service.in
new file mode 100644
index 0000000..71b3542
--- /dev/null
+++ b/omr6in4@.service.in
@@ -0,0 +1,11 @@
+[Unit]
+Description=OMR6IN4 on %I
+After=network.target network-online.target
+
+[Service]
+Type=oneshot
+ExecStart=/usr/local/bin/omr-6in4-run start /etc/openmptcprouter-vps-admin/omr-6in4/%i
+ExecStop=/usr/local/bin/omr-6in4-run start /etc/openmptcprouter-vps-admin/omr-6in4/%i
+
+[Install]
+WantedBy=multi-user.target
diff --git a/openmptcprouter-shorewall.tar.gz b/openmptcprouter-shorewall.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..35205d4a7af607260a4ee5ac279a89e71d04bc42
GIT binary patch
literal 4022
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

literal 0
HcmV?d00001

diff --git a/openmptcprouter-shorewall6.tar.gz b/openmptcprouter-shorewall6.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..b43e80d7b9d33faaf6040d937ef897624dd030ce
GIT binary patch
literal 3724
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

literal 0
HcmV?d00001


From e5976b3f613cf2fc729d195a5f456bf5295cc7aa Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Fri, 21 Feb 2020 17:48:24 +0100
Subject: [PATCH 5/9] Ajout de omr-6in4-run

---
 omr-6in4-run | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100755 omr-6in4-run

diff --git a/omr-6in4-run b/omr-6in4-run
new file mode 100755
index 0000000..69f8d0d
--- /dev/null
+++ b/omr-6in4-run
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+set -e
+
+if [ ! -f "$2" ]; then
+        echo "usage: $(basename "$0") FILE"
+        exit 1
+fi
+
+. "$(readlink -f "$2")"
+
+DEV="omr-6in4-$(basename "$2")"
+
+if [ "$1" = "start" ]; then
+        [ -n "$(ip tunnel show ${DEV})" ] && ip tunnel del ${DEV} 2>&1 >/dev/null
+        ip tunnel add ${DEV} mode sit remote ${REMOTEIP} local ${LOCALIP}
+        ip -6 addr add ${LOCALIP6} dev ${DEV}
+        ip link set ${DEV} up
+fi
+if [ "$1" = "stop" ]; then
+        ip tunnel del ${DEV}
+fi

From 1cb16f2b180b1eea4e88c1ca6108160baf6554f9 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Fri, 21 Feb 2020 17:51:25 +0100
Subject: [PATCH 6/9] Update glorytun UDP

---
 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 916fd91..ec6bcfe 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.80"
 KERNEL_PACKAGE_VERSION="1.6+c62d9f6"
 KERNEL_RELEASE="${KERNEL_VERSION}-mptcp_${KERNEL_PACKAGE_VERSION}"
-GLORYTUN_UDP_VERSION="7f30cdc5ee2e89f0008144ad71f4c0bd4215a0f4"
+GLORYTUN_UDP_VERSION="13703fb15fb6a225ccf2488e3680ac14331c1c9e"
 #MLVPN_VERSION="8f9720978b28c1954f9f229525333547283316d2"
 MLVPN_VERSION="f45cec350a6879b8b020143a78134a022b5df2a7"
 OBFS_VERSION="486bebd9208539058e57e23a12f23103016e09b4"

From 745205f7cc204dc32500c3218d7cbc95456d00d1 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Mon, 24 Feb 2020 12:14:32 +0100
Subject: [PATCH 7/9] Update omr-admin

---
 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 ec6bcfe..695baef 100644
--- a/debian9-x86_64.sh
+++ b/debian9-x86_64.sh
@@ -23,7 +23,7 @@ GLORYTUN_UDP_VERSION="13703fb15fb6a225ccf2488e3680ac14331c1c9e"
 #MLVPN_VERSION="8f9720978b28c1954f9f229525333547283316d2"
 MLVPN_VERSION="f45cec350a6879b8b020143a78134a022b5df2a7"
 OBFS_VERSION="486bebd9208539058e57e23a12f23103016e09b4"
-OMR_ADMIN_VERSION="4ed9794b3ccc75d0d0bc01dc4d2ae689e51bb3de"
+OMR_ADMIN_VERSION="17443771404fa8c08e393a2f45744ddaf4293f15"
 DSVPN_VERSION="3b99d2ef6c02b2ef68b5784bec8adfdd55b29b1a"
 #V2RAY_VERSION="v1.1.0"
 V2RAY_VERSION="v1.2.0-8-g59b8f4f"

From 16b2df675fc192f657806a04f113318bf4ea14bd Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Mon, 24 Feb 2020 12:20:38 +0100
Subject: [PATCH 8/9] Update omr-admin

---
 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 695baef..caaaa60 100644
--- a/debian9-x86_64.sh
+++ b/debian9-x86_64.sh
@@ -23,7 +23,7 @@ GLORYTUN_UDP_VERSION="13703fb15fb6a225ccf2488e3680ac14331c1c9e"
 #MLVPN_VERSION="8f9720978b28c1954f9f229525333547283316d2"
 MLVPN_VERSION="f45cec350a6879b8b020143a78134a022b5df2a7"
 OBFS_VERSION="486bebd9208539058e57e23a12f23103016e09b4"
-OMR_ADMIN_VERSION="17443771404fa8c08e393a2f45744ddaf4293f15"
+OMR_ADMIN_VERSION="9f69540b62b9919123dc39e256421ad4d55f51dc"
 DSVPN_VERSION="3b99d2ef6c02b2ef68b5784bec8adfdd55b29b1a"
 #V2RAY_VERSION="v1.1.0"
 V2RAY_VERSION="v1.2.0-8-g59b8f4f"

From 5ed1d71da581e6a76aec272f2bc85dbfac65e528 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Mon, 24 Feb 2020 14:56:10 +0100
Subject: [PATCH 9/9] Put back omr-service

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

diff --git a/debian9-x86_64.sh b/debian9-x86_64.sh
index caaaa60..06efc7e 100644
--- a/debian9-x86_64.sh
+++ b/debian9-x86_64.sh
@@ -698,9 +698,9 @@ 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
@@ -708,7 +708,7 @@ 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 omr.service
+systemctl enable omr.service
 
 # Change SSH port to 65222
 sed -i 's:#Port 22:Port 65222:g' /etc/ssh/sshd_config
diff --git a/omr-service b/omr-service
index 4320f55..44f0305 100755
--- a/omr-service
+++ b/omr-service
@@ -113,7 +113,7 @@ $allip_mlvpn"
 				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
+				#systemctl -q restart systemd-networkd
 				_multipath
 				sleep 10
 			}