From e0743bf23d37efe2cacf6dee5c30e51acd779225 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Thu, 12 Mar 2020 09:41:34 +0100
Subject: [PATCH 01/16] Fix dns

---
 openmptcprouter/files/etc/uci-defaults/1940-omr-dns | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openmptcprouter/files/etc/uci-defaults/1940-omr-dns b/openmptcprouter/files/etc/uci-defaults/1940-omr-dns
index 76870b1eb..78eb30b17 100755
--- a/openmptcprouter/files/etc/uci-defaults/1940-omr-dns
+++ b/openmptcprouter/files/etc/uci-defaults/1940-omr-dns
@@ -17,7 +17,7 @@ if [ "$(uci -q get openmptcprouter.latest_versions)" = "" ]; then
 		EOF
 	fi
 fi
-if [ "$(uci -q show dhcp | grep 'use-application-dns.net'" = "" ]; then
+if [ "$(uci -q show dhcp | grep 'use-application-dns.net')" = "" ]; then
 	uci -q batch <<-EOF >/dev/null
 		add_list dhcp.@dnsmasq[-1].server="/use-application-dns.net/"
 		commit dhcp

From a9fce6c1bf75d765f1ec0014f563cfb3fe0dc349 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Thu, 12 Mar 2020 18:47:40 +0100
Subject: [PATCH 02/16] Fix firewall from router

---
 openmptcprouter/files/etc/init.d/openmptcprouter-vps | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/openmptcprouter/files/etc/init.d/openmptcprouter-vps b/openmptcprouter/files/etc/init.d/openmptcprouter-vps
index 422bd375e..a7f6df2a5 100755
--- a/openmptcprouter/files/etc/init.d/openmptcprouter-vps
+++ b/openmptcprouter/files/etc/init.d/openmptcprouter-vps
@@ -552,7 +552,7 @@ _set_client2client() {
 _vps_firewall_redirect_port() {
 	local src proto src_dport
 	config_get src $1 src
-	config_get proto $1 proto
+	config_get proto $1 proto "tcp udp"
 	config_get src_dport $1 src_dport
 	config_get family $1 family "ipv4"
 	[ "$src" = "vpn" ] && [ -n "$proto" ] && [ -n "$src_dport" ] && {
@@ -609,6 +609,7 @@ _vps_firewall_close_port() {
 _set_vps_firewall() {
 	fwservername=$1
 	[ -z "$servername" ] && servername=$fwservername
+	[ -z "$fwservername" ] && fwservername=$servername
 	[ "$(uci -q get openmptcprouter.${fwservername}.nofwredirect)" = "1" ] && return
 	[ -z "$(uci -q get openmptcprouter.${fwservername}.username)" ] && return
 	[ -z "$(uci -q get openmptcprouter.${fwservername}.password)" ] && return

From 238bec629a8fd211caaad3fda809c59edb858533 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Fri, 13 Mar 2020 22:33:31 +0100
Subject: [PATCH 03/16] Set a warning in case of direct output

---
 .../luasrc/view/openmptcprouter/wanstatus.htm                   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm
index 1926abb1b..6b292f457 100644
--- a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm
+++ b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm
@@ -217,6 +217,8 @@
 				} else if (mArray.openmptcprouter.wan_addr != "")
 				{
 					var title = String.format("%s (%s)", _('Direct output'), mArray.openmptcprouter.wan_addr);
+					statusMessageClass = "warning";
+					statusIcon = "<%=resource%>/openmptcprouter/images/statusWarning.png";
 				} else if (mArray.openmptcprouter.ss_addr != "" && mArray.openmptcprouter.vps_status != "DOWN")
 				{
 					var title = String.format("%s (%s)", mArray.openmptcprouter.vps_hostname, mArray.openmptcprouter.ss_addr);

From fbbfb784b8bbf9db66542aad91a97b6e5a712f42 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Fri, 13 Mar 2020 22:34:02 +0100
Subject: [PATCH 04/16] Run openmptcprouter-vps when VPN up after down

---
 mptcp/files/usr/share/omr/post-tracking.d/post-tracking | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mptcp/files/usr/share/omr/post-tracking.d/post-tracking b/mptcp/files/usr/share/omr/post-tracking.d/post-tracking
index 08d13a604..e685a5cf6 100755
--- a/mptcp/files/usr/share/omr/post-tracking.d/post-tracking
+++ b/mptcp/files/usr/share/omr/post-tracking.d/post-tracking
@@ -272,6 +272,7 @@ if [ "$OMR_TRACKER_INTERFACE" = "glorytun" ] || [ "$OMR_TRACKER_INTERFACE" = "om
 	if ([ "$default_gw" != "$OMR_TRACKER_DEVICE_GATEWAY" ] || [ "$default_gw" = "" ]) && [ "$OMR_TRACKER_DEVICE_GATEWAY" != "" ]; then
 		_log "Tunnel up : Replace default route by $OMR_TRACKER_DEVICE_GATEWAY dev $OMR_TRACKER_DEVICE"
 		ip route replace default scope global nexthop via $OMR_TRACKER_DEVICE_GATEWAY dev $OMR_TRACKER_DEVICE
+		/etc/init.d/openmptcprouter-vps restart >/dev/null 2>&1
 	fi
 	if [ "$(uci -q get shadowsocks-libev.sss0.disabled)" != "1" ] && [ "$(uci -q get shadowsocks-libev.ss_rules.redir_udp)" = "hi2" ]; then
 		_log "Tunnel up disable use of ShadowSocks for UDP"

From 377687a9f94d3b35d6886f4cc4fc0778272460ea Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Fri, 13 Mar 2020 22:34:40 +0100
Subject: [PATCH 05/16] Fix omr-quota

---
 omr-quota/files/bin/omr-quota | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/omr-quota/files/bin/omr-quota b/omr-quota/files/bin/omr-quota
index 478169712..023340843 100755
--- a/omr-quota/files/bin/omr-quota
+++ b/omr-quota/files/bin/omr-quota
@@ -13,11 +13,11 @@ while true; do
 	rx=`vnstat -i $OMR_QUOTA_INTERFACE --json | jsonfilter -q -e '@.interfaces[0].traffic.months[-1].rx' | tr -d "\n"`
 	tx=`vnstat -i $OMR_QUOTA_INTERFACE --json | jsonfilter -q -e '@.interfaces[0].traffic.months[-1].tx' | tr -d "\n"`
 	tt=$((rx + tx))
-	if [ -n "$OMR_QUOTA_RX" ] && [ "$OMR_QUOTA_RX" -gt 0 ] && [ -n "$rx" ] && [ "$OMR_QUOTA_RX" -ge "$rx" ] && [ "$(ifstatus $OMR_QUOTA_INTERFACE | jsonfilter -e '@.up')" = "true" ]; then
+	if [ -n "$OMR_QUOTA_RX" ] && [ "$OMR_QUOTA_RX" -gt 0 ] && [ -n "$rx" ] && [ "$OMR_QUOTA_RX" -le "$rx" ] && [ "$(ifstatus $OMR_QUOTA_INTERFACE | jsonfilter -e '@.up')" = "true" ]; then
 		ifdown $OMR_QUOTA_INTERFACE
-	elif [ -n "$OMR_QUOTA_TX" ] && [ "$OMR_QUOTA_TX" -gt 0 ] && [ -n "$tx" ] && [ "$OMR_QUOTA_TX" -ge "$tx" ] && [ "$(ifstatus $OMR_QUOTA_INTERFACE | jsonfilter -e '@.up')" = "true" ]; then
+	elif [ -n "$OMR_QUOTA_TX" ] && [ "$OMR_QUOTA_TX" -gt 0 ] && [ -n "$tx" ] && [ "$OMR_QUOTA_TX" -le "$tx" ] && [ "$(ifstatus $OMR_QUOTA_INTERFACE | jsonfilter -e '@.up')" = "true" ]; then
 		ifdown $OMR_QUOTA_INTERFACE
-	elif [ -n "$OMR_QUOTA_TT" ] && [ "$OMR_QUOTA_TT" -gt 0 ] && [ -n "$tt" ] && [ "$OMR_QUOTA_TT" -ge "$tt" ] && [ "$(ifstatus $OMR_QUOTA_INTERFACE | jsonfilter -e '@.up')" = "true" ]; then
+	elif [ -n "$OMR_QUOTA_TT" ] && [ "$OMR_QUOTA_TT" -gt 0 ] && [ -n "$tt" ] && [ "$OMR_QUOTA_TT" -le "$tt" ] && [ "$(ifstatus $OMR_QUOTA_INTERFACE | jsonfilter -e '@.up')" = "true" ]; then
 		ifdown $OMR_QUOTA_INTERFACE
 	else 
 		ifup $OMR_QUOTA_INTERFACE

From c7a9e76a5f01e4ab1cf7a8d24d3396ec8f5b088c Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Sat, 14 Mar 2020 09:16:38 +0100
Subject: [PATCH 06/16] Reset CircleCI cache

---
 .circleci/config.yml | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d652afb5e..09f5593e5 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -30,8 +30,8 @@ jobs:
       - run:
           name: cache
           command: |
-            echo "cache 82 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
-            echo "cache 85 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
+            echo "cache 83 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
+            echo "cache 87 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
 
       - restore_cache:
           keys:
@@ -92,8 +92,8 @@ jobs:
       - run:
           name: cache
           command: |
-            echo "cache 82 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
-            echo "cache 85 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
+            echo "cache 83 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
+            echo "cache 87 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
 
       - restore_cache:
           keys:
@@ -152,8 +152,8 @@ jobs:
       - run:
           name: cache
           command: |
-            echo "cache 82 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
-            echo "cache 85 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
+            echo "cache 83 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
+            echo "cache 87 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
 
       - restore_cache:
           keys:
@@ -212,8 +212,8 @@ jobs:
       - run:
           name: cache
           command: |
-            echo "cache 82 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
-            echo "cache 85 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
+            echo "cache 83 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
+            echo "cache 87 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
 
       - restore_cache:
           keys:
@@ -272,8 +272,8 @@ jobs:
       - run:
           name: cache
           command: |
-            echo "cache 82 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
-            echo "cache 85 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
+            echo "cache 83 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
+            echo "cache 87 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
 
       - restore_cache:
           keys:
@@ -332,8 +332,8 @@ jobs:
       - run:
           name: cache
           command: |
-            echo "cache 82 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
-            echo "cache 85 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
+            echo "cache 83 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
+            echo "cache 87 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
 
       - restore_cache:
           keys:
@@ -395,8 +395,8 @@ jobs:
       - run:
           name: cache
           command: |
-            echo "cache 82 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
-            echo "cache 85 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
+            echo "cache 83 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
+            echo "cache 87 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
 
       - restore_cache:
           keys:
@@ -454,8 +454,8 @@ jobs:
       - run:
           name: cache
           command: |
-            echo "cache 82 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
-            echo "cache 85 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
+            echo "cache 83 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
+            echo "cache 87 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
 
       - restore_cache:
           keys:

From 3048a6057d4f86103999f5e18eb67efa580c51d9 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Sun, 15 Mar 2020 21:22:58 +0100
Subject: [PATCH 07/16] revert to a previous Glorytun UDP release again

---
 glorytun-udp/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/glorytun-udp/Makefile b/glorytun-udp/Makefile
index 4f4e70bf7..3889862fb 100644
--- a/glorytun-udp/Makefile
+++ b/glorytun-udp/Makefile
@@ -10,9 +10,9 @@ include $(TOPDIR)/rules.mk
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/angt/glorytun.git
-PKG_SOURCE_VERSION:=a9408e799ddbb74b5476fba70a495770322cd327
+PKG_SOURCE_VERSION:=b9aaab661fb879e891d34a91b5d2e78088fd9d9d
 PKG_NAME:=glorytun-udp
-PKG_VERSION:=0.3.0-$(PKG_SOURCE_VERSION)
+PKG_VERSION:=0.2.2-$(PKG_SOURCE_VERSION)
 PKG_RELEASE:=23
 
 PKG_FIXUP:=autoreconf

From 4d6e10b10a0654d80fd4ff5c0c3a664a59357371 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Mon, 16 Mar 2020 09:39:16 +0100
Subject: [PATCH 08/16] Fix GLorytun speed

---
 mptcp/files/usr/share/omr/post-tracking.d/post-tracking | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mptcp/files/usr/share/omr/post-tracking.d/post-tracking b/mptcp/files/usr/share/omr/post-tracking.d/post-tracking
index e685a5cf6..63c0ae2de 100755
--- a/mptcp/files/usr/share/omr/post-tracking.d/post-tracking
+++ b/mptcp/files/usr/share/omr/post-tracking.d/post-tracking
@@ -371,7 +371,7 @@ fi
 	[ -z "$download" ] && download="$(uci -q get sqm.$OMR_TRACKER_INTERFACE.download)"
 	upload="$(uci -q get network.$OMR_TRACKER_INTERFACE.uploadspeed)"
 	[ -z "$upload" ] && upload="$(uci -q get sqm.$OMR_TRACKER_INTERFACE.upload)"
-	if [ "$(pgrep glorytun-udp)" != "" ] && ([ "$(glorytun-udp path | grep $OMR_TRACKER_DEVICE_IP)" = "" ] || [ "$(glorytun-udp path $OMR_TRACKER_DEVICE_IP | awk '{print $15'})" = "0" ] || [ "$(glorytun-udp path $OMR_TRACKER_DEVICE_IP | awk '{print $18'})" = "0" ]); then
+	if [ "$(pgrep glorytun-udp)" != "" ] && ([ "$(glorytun-udp path | grep $OMR_TRACKER_DEVICE_IP)" = "" ] || [ "$(glorytun-udp path $OMR_TRACKER_DEVICE_IP | awk '{print $13}')" = "0" ] || [ "$(glorytun-udp path $OMR_TRACKER_DEVICE_IP | awk '{print $16}')" = "0" ]); then
 		if [ "$download" != "0" ] && [ "$download" != "" ] && [ "$upload" != "0" ] && [ "$upload" != "" ]; then
 			if [ "$(uci -q get glorytun.vpn.rateauto)" = "1" ]; then
 				glorytun-udp path $OMR_TRACKER_DEVICE_IP dev tun0 up rate auto tx ${upload}000 rx ${download}000  > /dev/null 2>&1

From d08ab5c8f1163361d1e5d80b89270cd287be12c1 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Mon, 16 Mar 2020 19:58:54 +0100
Subject: [PATCH 09/16] Increase Glorytun version

---
 glorytun-udp/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/glorytun-udp/Makefile b/glorytun-udp/Makefile
index 3889862fb..245d1f880 100644
--- a/glorytun-udp/Makefile
+++ b/glorytun-udp/Makefile
@@ -10,7 +10,8 @@ include $(TOPDIR)/rules.mk
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/angt/glorytun.git
-PKG_SOURCE_VERSION:=b9aaab661fb879e891d34a91b5d2e78088fd9d9d
+#PKG_SOURCE_VERSION:=b9aaab661fb879e891d34a91b5d2e78088fd9d9d
+PKG_SOURCE_VERSION:=42faaf816f8037d1fc2a5ef5fcf94e6681d613c0
 PKG_NAME:=glorytun-udp
 PKG_VERSION:=0.2.2-$(PKG_SOURCE_VERSION)
 PKG_RELEASE:=23

From f70e1133541a6cc89f6dd14abbd185eac0eecefb Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Mon, 16 Mar 2020 20:04:18 +0100
Subject: [PATCH 10/16] Add smsc75xx driver

---
 openmptcprouter-full/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openmptcprouter-full/Makefile b/openmptcprouter-full/Makefile
index 8340b2165..a0c42bc33 100644
--- a/openmptcprouter-full/Makefile
+++ b/openmptcprouter-full/Makefile
@@ -79,7 +79,7 @@ MY_DEPENDS := \
     !TARGET_mvebu:kmod-usb-net-huawei-cdc-ncm !TARGET_mvebu:kmod-usb-net-rndis !TARGET_mvebu:kmod-usb-net-cdc-ether !TARGET_mvebu:kmod-usb-net-ipheth !TARGET_mvebu:usbmuxd \
     kmod-rt2800-usb kmod-rtl8xxxu kmod-rtl8192cu kmod-net-rtl8192su \
     !TARGET_mvebu:luci-proto-qmi wpad-basic kmod-mt7601u kmod-rtl8187 \
-    wireguard luci-app-mlvpn mlvpn 464xlat
+    wireguard luci-app-mlvpn mlvpn 464xlat !TARGET_mvebu:kmod-usb-net-smsc75xx
 #    softethervpn5-client softethervpn5-server
 
 #    luci-app-mlvpn ubond \

From 9f3db7b8c79b71ed850e79606fb8a54cde0bdb5f Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Mon, 16 Mar 2020 20:04:58 +0100
Subject: [PATCH 11/16] Reset CircleCI cache

---
 .circleci/config.yml | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 09f5593e5..ca4798fd1 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -30,8 +30,8 @@ jobs:
       - run:
           name: cache
           command: |
-            echo "cache 83 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
-            echo "cache 87 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
+            echo "cache 84 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
+            echo "cache 88 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
 
       - restore_cache:
           keys:
@@ -92,8 +92,8 @@ jobs:
       - run:
           name: cache
           command: |
-            echo "cache 83 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
-            echo "cache 87 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
+            echo "cache 84 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
+            echo "cache 88 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
 
       - restore_cache:
           keys:
@@ -152,8 +152,8 @@ jobs:
       - run:
           name: cache
           command: |
-            echo "cache 83 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
-            echo "cache 87 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
+            echo "cache 84 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
+            echo "cache 88 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
 
       - restore_cache:
           keys:
@@ -212,8 +212,8 @@ jobs:
       - run:
           name: cache
           command: |
-            echo "cache 83 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
-            echo "cache 87 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
+            echo "cache 84 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
+            echo "cache 88 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
 
       - restore_cache:
           keys:
@@ -272,8 +272,8 @@ jobs:
       - run:
           name: cache
           command: |
-            echo "cache 83 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
-            echo "cache 87 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
+            echo "cache 84 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
+            echo "cache 88 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
 
       - restore_cache:
           keys:
@@ -332,8 +332,8 @@ jobs:
       - run:
           name: cache
           command: |
-            echo "cache 83 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
-            echo "cache 87 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
+            echo "cache 84 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
+            echo "cache 88 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
 
       - restore_cache:
           keys:
@@ -395,8 +395,8 @@ jobs:
       - run:
           name: cache
           command: |
-            echo "cache 83 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
-            echo "cache 87 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
+            echo "cache 84 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
+            echo "cache 88 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
 
       - restore_cache:
           keys:
@@ -454,8 +454,8 @@ jobs:
       - run:
           name: cache
           command: |
-            echo "cache 83 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
-            echo "cache 87 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
+            echo "cache 84 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
+            echo "cache 88 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
 
       - restore_cache:
           keys:

From b4eb32e09cdc66e8ff49c23a377e24db10041cba Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Tue, 17 Mar 2020 14:22:04 +0100
Subject: [PATCH 12/16] Add swconfig

---
 openmptcprouter-full/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openmptcprouter-full/Makefile b/openmptcprouter-full/Makefile
index a0c42bc33..194a1a2af 100644
--- a/openmptcprouter-full/Makefile
+++ b/openmptcprouter-full/Makefile
@@ -79,7 +79,7 @@ MY_DEPENDS := \
     !TARGET_mvebu:kmod-usb-net-huawei-cdc-ncm !TARGET_mvebu:kmod-usb-net-rndis !TARGET_mvebu:kmod-usb-net-cdc-ether !TARGET_mvebu:kmod-usb-net-ipheth !TARGET_mvebu:usbmuxd \
     kmod-rt2800-usb kmod-rtl8xxxu kmod-rtl8192cu kmod-net-rtl8192su \
     !TARGET_mvebu:luci-proto-qmi wpad-basic kmod-mt7601u kmod-rtl8187 \
-    wireguard luci-app-mlvpn mlvpn 464xlat !TARGET_mvebu:kmod-usb-net-smsc75xx
+    wireguard luci-app-mlvpn mlvpn 464xlat !TARGET_mvebu:kmod-usb-net-smsc75xx kmod-zram kmod-swconfig swconfig
 #    softethervpn5-client softethervpn5-server
 
 #    luci-app-mlvpn ubond \

From 159e3b7156cf0aec86f1d6675575da356625d244 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Tue, 17 Mar 2020 17:43:35 +0100
Subject: [PATCH 13/16] Fix redirect for MLVPN

---
 openmptcprouter/files/etc/init.d/openmptcprouter-vps | 1 +
 1 file changed, 1 insertion(+)

diff --git a/openmptcprouter/files/etc/init.d/openmptcprouter-vps b/openmptcprouter/files/etc/init.d/openmptcprouter-vps
index a7f6df2a5..79a2fe4c3 100755
--- a/openmptcprouter/files/etc/init.d/openmptcprouter-vps
+++ b/openmptcprouter/files/etc/init.d/openmptcprouter-vps
@@ -513,6 +513,7 @@ _set_vpn_ip() {
 	vpnip_remote_current="$(echo "$vps_config" | jsonfilter -q -e '@.vpn.localip')"
 	vpnip_remote=$(ip -4 r list dev ${vpnifname} | grep via | grep -v default | grep -v / | grep -v metric | awk '{print $1}' | tr -d "\n")
 	[ -z "$vpnip_remote" ] && vpnip_remote=$(ip -4 r list dev ${vpnifname} | grep kernel | awk '{print $1}' | tr -d "\n")
+	[ -z "$vpnip_remote" ] && vpnip_remote=$(ip -4 r list dev ${vpnifname} | grep "proto static src" | awk '{print $3}' | tr -d "\n")
 	if [ "$vpnip_remote" != "" ] && [ "$vpnip_local" != "" ] && ([ "$vpnip_remote" != "$vpnip_remote_current" ] || [ "$vpnip_local" != "$vpnip_local_current" ]); then
 		settings='{"remoteip" : "'$vpnip_local'","localip" : "'$vpnip_remote'"}'
 		result=$(_set_json "vpnips" "$settings")

From ce61d74f8a0fb9602304ac071f7404ba355b4d8e Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Wed, 18 Mar 2020 11:05:02 +0100
Subject: [PATCH 14/16] Fix Open ports on VPS side

---
 .../files/etc/init.d/openmptcprouter-vps      | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/openmptcprouter/files/etc/init.d/openmptcprouter-vps b/openmptcprouter/files/etc/init.d/openmptcprouter-vps
index 79a2fe4c3..b39426e7d 100755
--- a/openmptcprouter/files/etc/init.d/openmptcprouter-vps
+++ b/openmptcprouter/files/etc/init.d/openmptcprouter-vps
@@ -559,24 +559,30 @@ _vps_firewall_redirect_port() {
 	[ "$src" = "vpn" ] && [ -n "$proto" ] && [ -n "$src_dport" ] && {
 		if [ "$proto" = "tcp udp" ]; then
 			if [ "$family" = "ipv4" ]; then
-				vpsfwlist=$(echo "$vpsfwlist" | grep -v "$port	# OMR redirect router $src_dport port tcp")
+				vpsfwlist=$(echo "$vpsfwlist" | grep -v "$port	# OMR $username redirect router $src_dport port tcp")
+				[ "$username" = "openmptcprouter" ] && vpsfwlist=$(echo "$vpsfwlist" | grep -v "$port	# OMR redirect router $src_dport port tcp")
 			else
-				vpsfw6list=$(echo "$vpsfw6list" | grep -v "$port	# OMR redirect router $src_dport port tcp")
+				vpsfw6list=$(echo "$vpsfw6list" | grep -v "$port	# OMR $username redirect router $src_dport port tcp")
+				[ "$username" = "openmptcprouter" ] && vpsfw6list=$(echo "$vpsfw6list" | grep -v "$port	# OMR redirect router $src_dport port tcp")
 			fi
 			settings='{"name" : "router '$src_dport'","port" : "'$src_dport'","proto" : "tcp","fwtype" : "DNAT","ipproto" : "'$family'"}'
 			_set_json "shorewallopen" "$settings"
 			if [ "$family" = "ipv4" ]; then
-				vpsfwlist=$(echo "$vpsfwlist" | grep -v "$port	# OMR redirect router $src_dport port udp")
+				vpsfwlist=$(echo "$vpsfwlist" | grep -v "$port	# OMR $username redirect router $src_dport port udp")
+				[ "$username" = "openmptcprouter" ] && vpsfwlist=$(echo "$vpsfwlist" | grep -v "$port	# OMR redirect router $src_dport port udp")
 			else
-				vpsfw6list=$(echo "$vpsfw6list" | grep -v "$port	# OMR redirect router $src_dport port udp")
+				vpsfw6list=$(echo "$vpsfw6list" | grep -v "$port	# OMR $username redirect router $src_dport port udp")
+				[ "$username" = "openmptcprouter" ] && vpsfw6list=$(echo "$vpsfw6list" | grep -v "$port	# OMR redirect router $src_dport port udp")
 			fi
 			settings='{"name" : "router '$src_dport'","port" : "'$src_dport'","proto" : "udp","fwtype" : "DNAT","ipproto" : "'$family'"}'
 			_set_json "shorewallopen" "$settings"
 		else
 			if [ "$family" = "ipv4" ]; then
-				vpsfwlist=$(echo "$vpsfwlist" | grep -v "$port	# OMR redirect router $src_dport port $proto")
+				vpsfwlist=$(echo "$vpsfwlist" | grep -v "$port	# OMR $username redirect router $src_dport port $proto")
+				[ "$username" = "openmptcprouter" ] && vpsfwlist=$(echo "$vpsfwlist" | grep -v "$port	# OMR redirect router $src_dport port $proto")
 			else
-				vpsfw6list=$(echo "$vpsfw6list" | grep -v "$port	# OMR redirect router $src_dport port $proto")
+				vpsfw6list=$(echo "$vpsfw6list" | grep -v "$port	# OMR $username redirect router $src_dport port $proto")
+				[ "$username" = "openmptcprouter" ] && vpsfw6list=$(echo "$vpsfw6list" | grep -v "$port	# OMR redirect router $src_dport port $proto")
 			fi
 			settings='{"name" : "router '$src_dport'","port" : "'$src_dport'","proto" : "'$proto'","fwtype" : "DNAT","ipproto" : "'$family'"}'
 			_set_json "shorewallopen" "$settings"
@@ -625,6 +631,7 @@ _set_vps_firewall() {
 		EOF
 		return
 	}
+	username="$(uci -q get openmptcprouter.${fwservername}.username)"
 	settings='{"name" : "redirect router"}'
 	fw_list=$(_set_json "shorewalllist" "$settings")
 	vpsfwlist=$(echo $fw_list | jsonfilter -q -e '@.list[*]' | sed '/^[[:space:]]*$/d')

From 52441f7f53f3f09d48d146af400422684c3b9375 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Thu, 19 Mar 2020 20:36:00 +0100
Subject: [PATCH 15/16] Fix openvpn after update from old config

---
 openmptcprouter/files/etc/uci-defaults/2020-omr-vpn | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/openmptcprouter/files/etc/uci-defaults/2020-omr-vpn b/openmptcprouter/files/etc/uci-defaults/2020-omr-vpn
index c4fce511c..0d73bc7bc 100755
--- a/openmptcprouter/files/etc/uci-defaults/2020-omr-vpn
+++ b/openmptcprouter/files/etc/uci-defaults/2020-omr-vpn
@@ -44,6 +44,9 @@ if [ "$(uci -q get openvpn.omr.proto)" != "tcp-client" ]; then
 		commit openvpn
 	EOF
 fi
+
+uci -q delete openvpn.omr.secret
+
 #if [ "$(uci -q get openvpn.omr.com_lzo)" = "" ]; then
 #	uci -q batch <<-EOF >/dev/null
 #		set openvpn.omr.comp_lzo=adaptive

From ff8e2b7ecc45ebe05542cf7f0bbf7b18e8ae8468 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Thu, 19 Mar 2020 20:36:23 +0100
Subject: [PATCH 16/16] Add MPTCP over VPN interface in wan firewall

---
 openmptcprouter/files/etc/init.d/mptcpovervpn | 1 +
 1 file changed, 1 insertion(+)

diff --git a/openmptcprouter/files/etc/init.d/mptcpovervpn b/openmptcprouter/files/etc/init.d/mptcpovervpn
index e6240157d..27346a09b 100755
--- a/openmptcprouter/files/etc/init.d/mptcpovervpn
+++ b/openmptcprouter/files/etc/init.d/mptcpovervpn
@@ -33,6 +33,7 @@ mptcp_over_vpn() {
 				set network.ovpn${interface}.defaultroute='0'
 				set network.ovpn${interface}.peerdns='0'
 				set network.ovpn${interface}.proto='none'
+				set network.ovpn${interface}.ip4table='wan'
 				set network.ovpn${interface}.multipath='${multipath}'
 				set network.${interface}.multipath='off'
 				commit network