From e880e13d163d923b22884025d4fe9859f06f7a9d Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Fri, 1 Sep 2023 09:24:52 +0200
Subject: [PATCH] Revert VPN MTU to 1500 and default VPN to Glorytun TCP

---
 mptcp/files/etc/init.d/mptcp                        | 4 ++--
 openmptcprouter/files/etc/uci-defaults/2020-omr-vpn | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/mptcp/files/etc/init.d/mptcp b/mptcp/files/etc/init.d/mptcp
index 29790f1dd..a8d3a95c1 100755
--- a/mptcp/files/etc/init.d/mptcp
+++ b/mptcp/files/etc/init.d/mptcp
@@ -91,9 +91,9 @@ interface_max_metric() {
 		fi
 	elif [ "$1" = "omrvpn" ]; then
 		uci -q batch <<-EOF >/dev/null
-			set network.${config}.metric=9000
+			set network.${config}.metric=1500
 			commit network
-			set openmptcprouter.${config}.metric=9000
+			set openmptcprouter.${config}.metric=1500
 			commit openmptcprouter
 		EOF
 	elif [ "$1" = "omr6in4" ]; then
diff --git a/openmptcprouter/files/etc/uci-defaults/2020-omr-vpn b/openmptcprouter/files/etc/uci-defaults/2020-omr-vpn
index e97097043..5e1e38c7a 100755
--- a/openmptcprouter/files/etc/uci-defaults/2020-omr-vpn
+++ b/openmptcprouter/files/etc/uci-defaults/2020-omr-vpn
@@ -149,16 +149,16 @@ if [ "$(uci -q get network.tun0.mtu)" = "1200" ] || [ -z "$(uci -q get network.t
 	uci -q batch <<-EOF >/dev/null
 		set network.tun0=device
 		set network.tun0.name='tun0'
-		set network.tun0.mtu=9000
+		set network.tun0.mtu=1500
 		commit network
 	EOF
 fi
 
 if [ "$(uci -q get openmptcprouter.settings.vpn)" = "" ]; then
 	uci -q batch <<-EOF >/dev/null
-		set openmptcprouter.settings.vpn='glorytun_udp'
-		set glorytun-udp.vpn.enable='1'
-		commit glorytun-udp
+		set openmptcprouter.settings.vpn='glorytun_tcp'
+		set glorytun.vpn.enable='1'
+		commit glorytun
 		commit openmptcprouter
 	EOF
 fi