From 81789e00aceaadaaae1f222915e89bf0df0df8bd Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Fri, 24 Apr 2020 16:44:51 +0200
Subject: [PATCH 01/88] Simple restart modemmanager

---
 .../share/omr/post-tracking.d/post-tracking   | 23 ++++++-------------
 1 file changed, 7 insertions(+), 16 deletions(-)

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 2e19c0fc8..8331a65af 100755
--- a/mptcp/files/usr/share/omr/post-tracking.d/post-tracking
+++ b/mptcp/files/usr/share/omr/post-tracking.d/post-tracking
@@ -218,22 +218,13 @@ default_gw=$(ip route show default | grep -v "metric" | awk '/default/ {print $3
 # An interface in error will never be used in MPTCP
 if [ "$OMR_TRACKER_STATUS" = "ERROR" ]; then
 	if [ "$(uci -q get network.$OMR_TRACKER_INTERFACE.proto)" = "modemmanager" ]; then
-		timeout 1 mmcli -L | while read MODEM; do
-			MODEM_ID=$(echo $MODEM |  awk -F' ' '{print $1}' | awk -F/ '{print $6}')
-			MODEM_INFO="$(timeout 1 mmcli -m $MODEM_ID --output-keyvalue)"
-			if [ -n "$MODEM_INFO" ] && [ "$(echo "$MODEM_INFO" | grep 'modem.generic.device ' | awk -F": " '{print $2}')" = "$(uci -q get network.$OMR_TRACKER_INTERFACE.device)" ]; then
-				STATE=$(echo "$MODEM_INFO" | grep 'modem.generic.state' | awk -F": " '{print $2}')
-				if [ "$STATE" = "connected" ] || [ "$STATE" = "disabled" ] || [ "$STATE" = "searching" ] || [ "$STATE" = "registered" ] || [ "$STATE" = "idle" ]; then
-					_log "No answer from $OMR_TRACKER_INTERFACE ($OMR_TRACKER_DEVICE), restart interface"
-					_log "Set $OMR_TRACKER_INTERFACE down"
-					ifdown $OMR_TRACKER_INTERFACE
-					sleep 5
-					_log "Set $OMR_TRACKER_INTERFACE up"
-					ifup $OMR_TRACKER_INTERFACE
-					sleep 10
-				fi
-			fi
-		done
+		_log "No answer from $OMR_TRACKER_INTERFACE ($OMR_TRACKER_DEVICE), restart interface"
+		_log "Set $OMR_TRACKER_INTERFACE down"
+		ifdown $OMR_TRACKER_INTERFACE
+		sleep 5
+		_log "Set $OMR_TRACKER_INTERFACE up"
+		ifup $OMR_TRACKER_INTERFACE
+		sleep 10
 	fi
 
 	if [ "$OMR_TRACKER_PREV_STATUS" = "$OMR_TRACKER_STATUS" ]; then

From 9910e61efc547ccbce3ebe4164f8181fee083e42 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Sat, 25 Apr 2020 13:12:15 +0200
Subject: [PATCH 02/88] Add more info for qmi, modemmanger and huawei modems

---
 .../openmptcprouter/css/wanstatus.css         |  6 +++
 .../luasrc/view/openmptcprouter/wanstatus.htm |  9 +++-
 luci-app-openmptcprouter/root/bin/omr-huawei  | 45 ++++++++++++++++---
 .../root/bin/omr-modemmanager                 |  3 +-
 luci-app-openmptcprouter/root/bin/omr-qmi     |  2 +-
 .../root/usr/libexec/rpcd/openmptcprouter     | 33 +++++++++-----
 6 files changed, 77 insertions(+), 21 deletions(-)

diff --git a/luci-app-openmptcprouter/htdocs/luci-static/resources/openmptcprouter/css/wanstatus.css b/luci-app-openmptcprouter/htdocs/luci-static/resources/openmptcprouter/css/wanstatus.css
index 04786f927..3ea2fb277 100644
--- a/luci-app-openmptcprouter/htdocs/luci-static/resources/openmptcprouter/css/wanstatus.css
+++ b/luci-app-openmptcprouter/htdocs/luci-static/resources/openmptcprouter/css/wanstatus.css
@@ -293,6 +293,12 @@ Thanks :)*/
   font-weight: 700;
   color: #333333;
 }
+
+.network-node .info .title i {
+  font-weight: lighter;
+  font-size: 5px;
+}
+
 .network-node .info .status-message {
   display: block;
 }
diff --git a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm
index f485e4849..610ff3975 100644
--- a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm
+++ b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm
@@ -382,6 +382,7 @@
 					var operator = mArray.wans[i].operator;
 					var phonenumber = mArray.wans[i].phonenumber;
 					var donglestate = mArray.wans[i].donglestate;
+					var networktype = mArray.wans[i].networktype;
 					var gateway = mArray.wans[i].gateway;
 					if (anonymize == "true" && testPrivateIP(gateway) == false)
 					{
@@ -429,7 +430,7 @@
 					{
 						content += String.format('%s %s<br />',_('mtu:'), mtu);
 					}
-					if (operator !== '' && anonymize !== 'true')
+					if (operator !== '')
 					{
 						content += String.format('%s %s<br />',_('operator:'), operator);
 					}
@@ -437,7 +438,7 @@
 					{
 						content += String.format('%s %s<br />',_('phone number:'), phonenumber);
 					}
-					if (donglestate !== '' && anonymize !== 'true')
+					if (donglestate !== '')
 					{
 						content += String.format('%s %s<br />',_('state:'), donglestate);
 					}
@@ -455,6 +456,10 @@
 						else 
 							title += ' <img src="/luci-static/resources/icons/signal-75-100.png" />';
 					}
+					if (networktype !== '')
+					{
+						title += String.format(' <i>%s</i>',networktype);
+					}
 					if(ipaddr == '')
 					{
 						statusMessage += _('No IP defined') + '<br />';
diff --git a/luci-app-openmptcprouter/root/bin/omr-huawei b/luci-app-openmptcprouter/root/bin/omr-huawei
index 0efe8676f..7bb08c162 100755
--- a/luci-app-openmptcprouter/root/bin/omr-huawei
+++ b/luci-app-openmptcprouter/root/bin/omr-huawei
@@ -1,14 +1,47 @@
 #!/bin/sh
 MODEM_IP=`echo $1 | grep -E '^(192\.168|10\.|172\.1[6789]\.|172\.2[0-9]\.|172\.3[01]\.)'`
 [ -z "$MODEM_IP" ] && return
+INFO=$2
 SESTOK=$(curl -s -m 1 -X GET "http://$MODEM_IP/api/webserver/SesTokInfo")
 [ -z "$SESTOK" ] && return
 COOKIE=$(echo $SESTOK | sed -ne '/SesInfo/{s/.*<SesInfo>\(.*\)<\/SesInfo>.*/\1/p;q;}')
 COOKIE=$(echo $COOKIE | sed 's:SessionID=::')
 TOKEN=$(echo $SESTOK | sed -ne '/TokInfo/{s/.*<TokInfo>\(.*\)<\/TokInfo>.*/\1/p;q;}')
-curl -s -m 1 -X GET "http://$MODEM_IP/api/monitoring/status" -H "Cookie: SessionID=$COOKIE" -H "__RequestVerificationToken: $TOKEN" -H "Content-Type: text/xml" > /tmp/huawei-$1-status
-SIGNAL_ICON=$(cat /tmp/huawei-$1-status | grep SignalIcon | sed -e 's/<[^>]*>//g')
-MAX_SIGNAL=$(cat /tmp/huawei-$1-status | grep maxsignal | sed -e 's/<[^>]*>//g')
-if [ -n "$SIGNAL_ICON" ] && [ -n "$MAX_SIGNAL" ]; then
-        echo $((100 * ${SIGNAL_ICON} / ${MAX_SIGNAL}))
-fi
\ No newline at end of file
+tmpfile=$(mktemp)
+curl -s -m 1 -X GET "http://$MODEM_IP/api/monitoring/status" -H "Cookie: SessionID=$COOKIE" -H "__RequestVerificationToken: $TOKEN" -H "Content-Type: text/xml" > ${tmpfile}
+SIGNAL_STRENGTH=$(cat ${tmpfile} | grep SignalStrength | sed -e 's/<[^>]*>//g' | sed 's/[^\x00-\x7F]//g')
+if [ "$SIGNAL_STRENGTH" = "" ]; then
+	SIGNAL_ICON=$(cat ${tmpfile} | grep SignalIcon | sed -e 's/<[^>]*>//g' | sed 's/[^\x00-\x7F]//g')
+	MAX_SIGNAL=$(cat ${tmpfile} | grep maxsignal | sed -e 's/<[^>]*>//g' | sed 's/[^\x00-\x7F]//g')
+	if [ -n "$SIGNAL_ICON" ] && [ -n "$MAX_SIGNAL" ]; then
+	        PERCENT=$((100 * ${SIGNAL_ICON} / ${MAX_SIGNAL}))
+	fi
+else
+	echo "signal"
+	PERCENT=$SIGNAL_STRENGTH
+fi
+
+STATE=""
+CONNECTSTATE=$(cat ${tmpfile} | grep ConnectionStatus | sed -e 's/<[^>]*>//g' | sed 's/[^\x00-\x7F]//g')
+[ "$CONNECTSTATE" = "201" ] && STATE="connection failed, bandwidth exceeded"
+[ "$CONNECTSTATE" = "900" ] && STATE="connecting"
+[ "$CONNECTSTATE" = "901" ] && STATE="connected"
+[ "$CONNECTSTATE" = "902" ] && STATE="disconnected"
+[ "$CONNECTSTATE" = "903" ] && STATE="disconnecting"
+[ "$CONNECTSTATE" = "904" ] && STATE="connection failed or disabled"
+TYPE=""
+NETWORKTYPE=$(cat ${tmpfile} | grep CurrentNetworkType\> | sed -e 's/<[^>]*>//g' | sed 's/[^\x00-\x7F]//g' | tr -d "\n")
+[ "$NETWORKTYPE" = "2" ] || [ "$NETWORKTYPE" = "3" ] && TYPE="2g"
+[ "$NETWORKTYPE" = "4" ] || [ "$NETWORKTYPE" = "5" ] || [ "$NETWORKTYPE" = "6" ] || [ "$NETWORKTYPE" = "7" ] || [ "$NETWORKTYPE" = "8" ] || [ "$NETWORKTYPE" = "9" ] || [ "$NETWORKTYPE" = "17" ] || [ "$NETWORKTYPE" = "18" ] || [ "$NETWORKTYPE" = "41" ] || [ "$NETWORKTYPE" = "44" ] || [ "$NETWORKTYPE" = "45" ] || [ "$NETWORKTYPE" = "46" ] || [ "$NETWORKTYPE" = "64" ] || [ "$NETWORKTYPE" = "65" ] && TYPE="3g"
+[ "$NETWORKTYPE" = "19" ] || [ "$NETWORKTYPE" = "101" ] && TYPE="lte"
+rm -f ${tmpfile}
+OPERATOR=""
+if [ "$CONNECTSTATE" = "901" ]; then
+	tmpfile=$(mktemp)
+	curl -s -m 1 -X GET "http://$MODEM_IP/api/net/current-plmn" -H "Cookie: SessionID=$COOKIE" -H "__RequestVerificationToken: $TOKEN" -H "Content-Type: text/xml" > ${tmpfile}
+	OPERATOR=$(cat ${tmpfile} | grep FullName | sed -e 's/<[^>]*>//g' | sed 's/[^\x00-\x7F]//g')
+	rm -f ${tmpfile}
+fi
+NUMBER=""
+[ -z "$INFO" ] && echo "$PERCENT"
+[ "$INFO" = "all" ] && echo "$PERCENT;$OPERATOR;$NUMBER;$STATE;$TYPE"
diff --git a/luci-app-openmptcprouter/root/bin/omr-modemmanager b/luci-app-openmptcprouter/root/bin/omr-modemmanager
index 32ac93481..adb535fb3 100755
--- a/luci-app-openmptcprouter/root/bin/omr-modemmanager
+++ b/luci-app-openmptcprouter/root/bin/omr-modemmanager
@@ -10,8 +10,9 @@ timeout 1 mmcli -L | while read MODEM; do
 		OPERATOR=$(echo "$MODEM_INFO" | grep 'modem.3gpp.operator-name' | awk -F": " '{print $2}')
 		NUMBER=$(echo "$MODEM_INFO" | grep 'modem.generic.own-numbders.value[1]' | awk -F": " '{print $2}')
 		STATE=$(echo "$MODEM_INFO" | grep 'modem.generic.state' | awk -F": " '{print $2}')
+		TYPE=$(echo "$MODEM_INFO" | grep 'modem.generic.access-technologies.values[1]' | awk -F": " '{print $2}')
 		[ -z "$INFO" ] && echo $PERCENT
-		[ "$INFO" = "all" ] && echo "$PERCENT;$OPERATOR;$NUMBER;$STATE"
+		[ "$INFO" = "all" ] && echo "$PERCENT;$OPERATOR;$NUMBER;$STATE;$TYPE"
 		exit
 	fi
 done
diff --git a/luci-app-openmptcprouter/root/bin/omr-qmi b/luci-app-openmptcprouter/root/bin/omr-qmi
index 727250195..1a73d4f37 100755
--- a/luci-app-openmptcprouter/root/bin/omr-qmi
+++ b/luci-app-openmptcprouter/root/bin/omr-qmi
@@ -26,4 +26,4 @@ fi
 OPERATOR=$(timeout 1 uqmi -d $MODEM_INTF --get-serving-system | jsonfilter -e '@.plmn_description' | tr -d '\n')
 NUMBER=$(timeout 1 uqmi -d $MODEM_INTF --msisdn | jsonfilter -e '@' | tr -d '\n')
 STATE=$(timeout 1 uqmi -d $MODEM_INTF --get-data-status | jsonfilter -e '@' | tr -d '\n')
-[ "$INFO" = "all" ] && echo "$PERCENT;$OPERATOR;$NUMBER;$TATE"
\ No newline at end of file
+[ "$INFO" = "all" ] && echo "$PERCENT;$OPERATOR;$NUMBER;$TATE;$TYPE"
\ No newline at end of file
diff --git a/luci-app-openmptcprouter/root/usr/libexec/rpcd/openmptcprouter b/luci-app-openmptcprouter/root/usr/libexec/rpcd/openmptcprouter
index 599410c03..028736fd8 100755
--- a/luci-app-openmptcprouter/root/usr/libexec/rpcd/openmptcprouter
+++ b/luci-app-openmptcprouter/root/usr/libexec/rpcd/openmptcprouter
@@ -1040,6 +1040,7 @@ function interfaces_status()
 	    local operator = ""
 	    local phonenumber = ""
 	    local donglestate = ""
+	    local networktype = ""
 	    if gateway ~= "" then
 		    if uci:get("openmptcprouter", "settings", "disablegwping") ~= "1" and connectivity ~= "ERROR" then
 			    local gw_ping_test = ut.trim(sys.exec("ping -w 1 -c 1 " .. gateway .. " | grep '100% packet loss'"))
@@ -1051,7 +1052,14 @@ function interfaces_status()
 			    end
 		    end
 		    if uci:get("openmptcprouter", interface, "manufacturer") == "huawei" then
-			    signal = sys.exec("omr-huawei " .. gateway .. " | tr -d '\n'")
+			    intfdata = ut.trim(sys.exec("omr-huawei " .. gateway .. " all"))
+			    if intfdata ~= "" then
+				    signal = ut.trim(sys.exec("echo '".. intfdata .. "' | awk -F';' '{print $1}'"))
+				    operator = ut.trim(sys.exec("echo '".. intfdata .. "' | awk -F';' '{print $2}'"))
+				    phonenumber = ut.trim(sys.exec("echo '".. intfdata .. "' | awk -F';' '{print $3}'"))
+				    donglestate = ut.trim(sys.exec("echo '".. intfdata .. "' | awk -F';' '{print $4}'"))
+				    networktype = ut.trim(sys.exec("echo '".. intfdata .. "' | awk -F';' '{print $5}'"))
+			    end
 		    end
 	    elseif gateway == "" then
 		    gw_ping = "DOWN"
@@ -1062,24 +1070,26 @@ function interfaces_status()
 		    local proto = section['proto']
 		    if proto == "qmi" then
 			    local device = section['device']
-			    intfdata = sys.exec("omr-qmi " .. device .. " | tr -d '\n'")
+			    intfdata = ut.trim(sys.exec("omr-qmi " .. device .. " all"))
 			    if intfdata ~= "" then
-				    signal = sys.exec("echo ".. intfdata .. " | awk -F';' '{print $1}' | tr -d '\n'")
-				    operator = sys.exec("echo ".. intfdata .. " | awk -F';' '{print $2}' | tr -d '\n'")
-				    phonenumber = sys.exec("echo ".. intfdata .. " | awk -F';' '{print $3}' | tr -d '\n'")
-				    donglestate = sys.exec("echo ".. intfdata .. " | awk -F';' '{print $4}' | tr -d '\n'")
+				    signal = ut.trim(sys.exec("echo '".. intfdata .. "' | awk -F';' '{print $1}'"))
+				    operator = ut.trim(sys.exec("echo '".. intfdata .. "' | awk -F';' '{print $2}'"))
+				    phonenumber = ut.trim(sys.exec("echo '".. intfdata .. "' | awk -F';' '{print $3}'"))
+				    donglestate = ut.trim(sys.exec("echo '".. intfdata .. "' | awk -F';' '{print $4}'"))
+				    networktype = ut.trim(sys.exec("echo '".. intfdata .. "' | awk -F';' '{print $5}'"))
 			    end
 		    elseif proto == "3g" then
 			    local device = section['device']
 			    signal = sys.exec("omr-3g " .. device .. " | tr -d '\n'")
 		    elseif proto == "modemmanager" then
 			    local device = section['device']
-			    intfdata = sys.exec("omr-modemmanager " .. device .. " | tr -d '\n'")
+			    intfdata = ut.trim(sys.exec("omr-modemmanager " .. device .. " all"))
 			    if intfdata ~= "" then
-				    signal = sys.exec("echo ".. intfdata .. " | awk -F';' '{print $1}' | tr -d '\n'")
-				    operator = sys.exec("echo ".. intfdata .. " | awk -F';' '{print $2}' | tr -d '\n'")
-				    phonenumber = sys.exec("echo ".. intfdata .. " | awk -F';' '{print $3}' | tr -d '\n'")
-				    donglestate = sys.exec("echo ".. intfdata .. " | awk -F';' '{print $4}' | tr -d '\n'")
+				    signal = ut.trim(sys.exec("echo '".. intfdata .. "' | awk -F';' '{print $1}'"))
+				    operator = ut.trim(sys.exec("echo '".. intfdata .. "' | awk -F';' '{print $2}'"))
+				    phonenumber = ut.trim(sys.exec("echo '".. intfdata .. "' | awk -F';' '{print $3}'"))
+				    donglestate = ut.trim(sys.exec("echo '".. intfdata .. "' | awk -F';' '{print $4}'"))
+				    networktype = ut.trim(sys.exec("echo '".. intfdata .. "' | awk -F';' '{print $5}'"))
 			    end
 		    end
 	    end
@@ -1224,6 +1234,7 @@ function interfaces_status()
 		operator = operator,
 		phonenumber = phonenumber,
 		donglestate = donglestate,
+		networktype = networktype,
 	    }
 	    if ifname ~= nil and ifname:match("^tun.*") then
 		    table.insert(mArray.tunnels, data);

From 85bce00199329162a029d3630a391c5c201d1535 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Sun, 26 Apr 2020 13:21:26 +0200
Subject: [PATCH 03/88] Remove qmi and modemmanager data in config

---
 .../share/omr/post-tracking.d/post-tracking   | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

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 8331a65af..9ac28f24d 100755
--- a/mptcp/files/usr/share/omr/post-tracking.d/post-tracking
+++ b/mptcp/files/usr/share/omr/post-tracking.d/post-tracking
@@ -543,18 +543,19 @@ if [ "$(uci -q get openmptcprouter.$OMR_TRACKER_INTERFACE.lc)" = "" ] || [ $(($(
 			uci -q set openmptcprouter.$OMR_TRACKER_INTERFACE.lc=$(date +"%s")
 		fi
 	fi
-	protocol="$(uci -q get network.$OMR_TRACKER_INTERFACE.proto)"
-	if [ "$proto" = "qmi" ]; then
-		intfdata="$(omr-qmi $OMR_TRACKER_DEVICE all | tr -d '\n')"
-		uci -q set openmptcprouter.$OMR_TRACKER_INTERFACE.operator=$(echo $intfdata | awk -F";" '{print $2}')
-		uci -q set openmptcprouter.$OMR_TRACKER_INTERFACE.number=$(echo $intfdata | awk -F";" '{print $3}')
-		uci -q set openmptcprouter.$OMR_TRACKER_INTERFACE.state=$(echo $intfdata | awk -F";" '{print $4}')
-	elif [ "$proto" = "modemmanager" ]; then
-		intfdata="$(omr-modemmanager $OMR_TRACKER_DEVICE all)"
-		uci -q set openmptcprouter.$OMR_TRACKER_INTERFACE.operator=$(echo $intfdata | awk -F";" '{print $2}')
-		uci -q set openmptcprouter.$OMR_TRACKER_INTERFACE.number=$(echo $intfdata | awk -F";" '{print $3}')
-		uci -q set openmptcprouter.$OMR_TRACKER_INTERFACE.state=$(echo $intfdata | awk -F";" '{print $4}')
-	else
+	proto="$(uci -q get network.$OMR_TRACKER_INTERFACE.proto)"
+	#if [ "$proto" = "qmi" ]; then
+	#	intfdata="$(omr-qmi $OMR_TRACKER_DEVICE all | tr -d '\n')"
+	#	uci -q set openmptcprouter.$OMR_TRACKER_INTERFACE.operator=$(echo $intfdata | awk -F";" '{print $2}')
+	#	uci -q set openmptcprouter.$OMR_TRACKER_INTERFACE.number=$(echo $intfdata | awk -F";" '{print $3}')
+	#	uci -q set openmptcprouter.$OMR_TRACKER_INTERFACE.state=$(echo $intfdata | awk -F";" '{print $4}')
+	#elif [ "$proto" = "modemmanager" ]; then
+	#	intfdata="$(omr-modemmanager $OMR_TRACKER_DEVICE all)"
+	#	uci -q set openmptcprouter.$OMR_TRACKER_INTERFACE.operator=$(echo $intfdata | awk -F";" '{print $2}')
+	#	uci -q set openmptcprouter.$OMR_TRACKER_INTERFACE.number=$(echo $intfdata | awk -F";" '{print $3}')
+	#	uci -q set openmptcprouter.$OMR_TRACKER_INTERFACE.state=$(echo $intfdata | awk -F";" '{print $4}')
+	#else
+	if [ "$proto" != "qmi" ] && [ "$proto" != "modemmanager" ]; then
 		if [ -n "$OMR_TRACKER_DEVICE_GATEWAY" ] && [ -n "$(curl -s -m 1 -X GET http://$OMR_TRACKER_DEVICE_GATEWAY/api/webserver/SesTokInfo)" ]; then
 			uci -q set openmptcprouter.$OMR_TRACKER_INTERFACE.manufacturer='huawei'
 		else

From 00b4ff906df7e6ed5e19cbf1852d822b1c1b329d Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Mon, 27 Apr 2020 18:31:43 +0200
Subject: [PATCH 04/88] 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 35d0b5d1c..463628fe1 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -31,8 +31,8 @@ jobs:
       - run:
           name: cache
           command: |
-            echo "cache 92 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
-            echo "cache 94 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
+            echo "cache 93 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
+            echo "cache 95 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
 
       - restore_cache:
           keys:
@@ -94,8 +94,8 @@ jobs:
       - run:
           name: cache
           command: |
-            echo "cache 92 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
-            echo "cache 94 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
+            echo "cache 93 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
+            echo "cache 95 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
 
       - restore_cache:
           keys:
@@ -155,8 +155,8 @@ jobs:
       - run:
           name: cache
           command: |
-            echo "cache 92 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
-            echo "cache 94 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
+            echo "cache 93 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
+            echo "cache 95 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
 
       - restore_cache:
           keys:
@@ -216,8 +216,8 @@ jobs:
       - run:
           name: cache
           command: |
-            echo "cache 92 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
-            echo "cache 94 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
+            echo "cache 93 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
+            echo "cache 95 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
 
       - restore_cache:
           keys:
@@ -277,8 +277,8 @@ jobs:
       - run:
           name: cache
           command: |
-            echo "cache 92 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
-            echo "cache 94 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
+            echo "cache 93 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
+            echo "cache 95 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
 
       - restore_cache:
           keys:
@@ -338,8 +338,8 @@ jobs:
       - run:
           name: cache
           command: |
-            echo "cache 92 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
-            echo "cache 94 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
+            echo "cache 93 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
+            echo "cache 95 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
 
       - restore_cache:
           keys:
@@ -402,8 +402,8 @@ jobs:
       - run:
           name: cache
           command: |
-            echo "cache 92 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
-            echo "cache 94 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
+            echo "cache 93 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
+            echo "cache 95 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
 
       - restore_cache:
           keys:
@@ -462,8 +462,8 @@ jobs:
       - run:
           name: cache
           command: |
-            echo "cache 92 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
-            echo "cache 94 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
+            echo "cache 93 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
+            echo "cache 95 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
 
       - restore_cache:
           keys:

From d054fd8423875e77406beed07041a3c01a853baf Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Tue, 28 Apr 2020 14:46:01 +0200
Subject: [PATCH 05/88] Fix nginx HA startup

---
 luci-app-nginx-ha/root/etc/init.d/nginx-ha | 1 -
 1 file changed, 1 deletion(-)

diff --git a/luci-app-nginx-ha/root/etc/init.d/nginx-ha b/luci-app-nginx-ha/root/etc/init.d/nginx-ha
index a33371ef0..34f990de5 100755
--- a/luci-app-nginx-ha/root/etc/init.d/nginx-ha
+++ b/luci-app-nginx-ha/root/etc/init.d/nginx-ha
@@ -52,7 +52,6 @@ start_instance() {
 			listen ${listen:-0.0.0.0:6666} udp;
 			listen ${listen:-0.0.0.0:6666} so_keepalive=off;
 			proxy_pass ${1};
-			proxy_buffering off;
 		}
 	"
 }

From 6ad526f97289997d235bf626fb9613609211e435 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Wed, 29 Apr 2020 16:17:02 +0200
Subject: [PATCH 06/88] Update luci-proto-bonding

---
 .../luci-static/resources/protocol/bonding.js | 117 ++++++++----------
 1 file changed, 50 insertions(+), 67 deletions(-)

diff --git a/luci-proto-bonding/htdocs/luci-static/resources/protocol/bonding.js b/luci-proto-bonding/htdocs/luci-static/resources/protocol/bonding.js
index 5b9dc8afd..aadc2306d 100644
--- a/luci-proto-bonding/htdocs/luci-static/resources/protocol/bonding.js
+++ b/luci-proto-bonding/htdocs/luci-static/resources/protocol/bonding.js
@@ -2,24 +2,30 @@
 'require ui';
 'require uci';
 'require form';
+'require fs';
 'require network';
+'require tools.widgets as widgets';
+
 
 function getSelectableSlaves(section_id) {
 	var rv = [];
+	var NonUsableMac = /^(00:00:00:00:00:00|null)/;
 	var interfaces = uci.sections('network', 'interface');
 
 	return network.getDevices().then(function(devices) {
 		for (var i = 0; i < devices.length; i++) {
 			var in_use = false;
-			if (devices[i].ifname.match(/eth/)) {
+			var NotUsable = NonUsableMac.test(devices[i].getMAC());
+
+			// Only "real" interfaces for slaves needed
+			if (NotUsable == false) {
 				for (var j = 0; j < interfaces.length; j++) {
 					if (uci.get('network', interfaces[j]['.name'], 'proto') == 'bonding') {
-						var slaves = uci.get('network', interfaces[j]['.name'], 'slaves');
-						if (slaves != null) {
-							for (var k = 0; k < slaves.length; k++) {
-								if (devices[i].ifname == slaves[k] && interfaces[j]['.name'] != section_id) {
-									in_use = true;
-								}
+						var slaves = L.toArray(uci.get('network', interfaces[j]['.name'], 'slaves'));
+
+						for (var k = 0; k < slaves.length; k++) {
+							if (devices[i].ifname == slaves[k] && interfaces[j]['.name'] != section_id) {
+								in_use = true;
 							}
 						}
 					}
@@ -43,6 +49,21 @@ function validateEmpty(section, value) {
 	}
 }
 
+function updatePrimaries(section, value) {
+
+	var opt = this.map.lookupOption('slaves', section);
+	var selected_slaves = opt[0].formvalue(section);
+
+	var uielem = this.map.lookupOption('primary', section)[0].getUIElement(section);
+	uielem.clearChoices();
+
+	for (var i = 0; i < selected_slaves.length; i++) {
+		uielem.addChoices(selected_slaves[i], selected_slaves[i]);
+	}
+
+	return true;
+}
+
 function validate_arp_policy(section, value) {
 
 	var opt = this.map.lookupOption('link_monitoring', section);
@@ -80,8 +101,6 @@ function validate_arp_ip_targets(section, value) {
 
 function validate_primary_interface(section, value) {
 
-	var primary_valid = 'false';
-
 	var opt = this.map.lookupOption('bonding_policy', section);
 	var selected_policy = opt[0].formvalue(section);
 
@@ -92,17 +111,9 @@ function validate_primary_interface(section, value) {
 	var selected_primary = opt[0].formvalue(section);
 
 	if (selected_policy == 'active-backup' || selected_policy == 'balance-tlb' || selected_policy == 'balance-alb') {
-
-		for (var i = 0; i < selected_slaves.length; i++) {
-			if (selected_slaves[i] == selected_primary) {
-				primary_valid = 'true';
-			}
-		}
-
-		if (primary_valid == 'false') {
+		if (selected_slaves.filter(function(slave) { return slave == selected_primary }).length == 0)
 			return _('You must select a primary interface which is included in selected slave interfaces!');
-		}
-	}
+ 	}
 
 	return true;
 }
@@ -151,13 +162,14 @@ return network.registerProtocol('bonding', {
 				_('IPv4 address'),
 				_('The local IPv4 address'));
 		o.datatype = 'ip4addr';
-		o.validate = validateEmpty;
+		o.rmempty = false;
 
 		o = s.taboption('general', form.Value, 'netmask',
 				_('IPv4 netmask'),
 				_('The local IPv4 netmask'));
 		o.datatype = 'ip4addr';
 		o.validate = validateEmpty;
+		o.rmempty = false;
 		o.value("255.255.255.0");
 		o.value("255.255.0.0");
 		o.value("255.0.0.0");
@@ -165,7 +177,6 @@ return network.registerProtocol('bonding', {
 		o = s.taboption('advanced', form.MultiValue, 'slaves',
 				_('Slave Interfaces'),
 				_('Specifies which slave interfaces should be attached to this bonding interface'));
-
 		o.load = function(section_id) {
 			return getSelectableSlaves(section_id).then(L.bind(function(devices) {
 				for (var i = 0; i < devices.length; i++) {
@@ -178,19 +189,11 @@ return network.registerProtocol('bonding', {
 					return '';
 				}
 
-				var if_slaves = uci.get('network', section_id, 'slaves');
-
-				if (if_slaves != null) {
-					return if_slaves;
-				}
-
-				return;
+				return uci.get('network', section_id, 'slaves');
 			}, this));
 		};
-		o.cfgvalue = function(section_id) {
-			return uci.get('network', section_id, 'slaves');
-		};
-		o.validate = validateEmpty;
+		o.validate = updatePrimaries;
+		o.rmempty = false;
 		
 		o = s.taboption('advanced', form.ListValue, 'bonding_policy',
 				_('Bonding Policy'),
@@ -204,36 +207,16 @@ return network.registerProtocol('bonding', {
 		o.value('balance-tlb', _('Adaptive transmit load balancing (balance-tlb, 5)'));
 		o.value('balance-alb', _('Adaptive load balancing (balance-alb, 6)'));
 
-		o = s.taboption('advanced', form.ListValue, 'primary',
+		o = s.taboption('advanced', widgets.DeviceSelect, 'primary',
 				_('Primary Slave'),
 				_('Specifies which slave is the primary device. It will always be the active slave while it is available'));
 		o.depends('bonding_policy', 'active-backup');
 		o.depends('bonding_policy', 'balance-tlb');
 		o.depends('bonding_policy', 'balance-alb');
-
-		o.load = function(section_id) {
-			return getSelectableSlaves(section_id).then(L.bind(function(devices) {
-				for (var i = 0; i < devices.length; i++) {
-					this.value(devices[i], devices[i]);
-				}
-
-				if (devices.length == 0) {
-					this.placeholder = _('No more primaries available, can not save interface');
-					this.value('', '');
-					return '';
-				}
-
-				var primary = uci.get('network', section_id, 'primary');
-
-				if (primary != null) {
-					return primary;
-				}
-
-				return;
-			}, this));
-		};
-		o.cfgvalue = function(section_id) {
-			return uci.get('network', section_id, 'primary');
+		o.filter = function(section_id, value) {
+			// Never return anything as valid, as the valid possibilities
+			// will be set in the slaves validate function
+			return false;
 		};
 		o.validate = validate_primary_interface;
 
@@ -253,7 +236,7 @@ return network.registerProtocol('bonding', {
 				_('Specifies the minimum number of links that must be active before asserting carrier'));
 		o.datatype = 'uinteger';
 		o.default = 0;
-		o.validate = validateEmpty;
+		o.rmempty = false;
 		o.depends('bonding_policy', '802.3ad');
 
 		o = s.taboption('advanced', form.Value, 'ad_actor_sys_prio',
@@ -261,7 +244,7 @@ return network.registerProtocol('bonding', {
 				_('Specifies the system priority'));
 		o.datatype = 'range(1,65535)';
 		o.default = 65535;
-		o.validate = validateEmpty;
+		o.rmempty = false;
 		o.depends('bonding_policy', '802.3ad');
 
 		o = s.taboption('advanced', form.Value, 'ad_actor_system',
@@ -293,7 +276,7 @@ return network.registerProtocol('bonding', {
 				_("Specifies the number of packets to transmit through a slave before moving to the next one"));
 		o.datatype = 'range(0,65535)';
 		o.default = '1';
-		o.validate = validateEmpty;
+		o.rmempty = false;
 		o.depends('bonding_policy', 'balance-rr');
 
 		o = s.taboption('advanced', form.Value, 'lp_interval',
@@ -301,7 +284,7 @@ return network.registerProtocol('bonding', {
 				_("Specifies the number of seconds between instances where the bonding	driver sends learning packets to each slaves peer switch"));
 		o.datatype = 'range(1,2147483647)';
 		o.default = '1';
-		o.validate = validateEmpty;
+		o.rmempty = false;
 		o.depends('bonding_policy', 'balance-tlb');
 		o.depends('bonding_policy', 'balance-alb');
 
@@ -327,7 +310,7 @@ return network.registerProtocol('bonding', {
 				_("Specifies the number of peer notifications (gratuitous ARPs and unsolicited IPv6 Neighbor Advertisements) to be issued after a failover event"));
 		o.datatype = 'range(0,255)';
 		o.default = '1';
-		o.validate = validateEmpty;
+		o.rmempty = false;
 		o.depends('bonding_policy', 'active-backup');
 
 		o = s.taboption('advanced', form.ListValue, 'xmit_hash_policy',
@@ -350,7 +333,7 @@ return network.registerProtocol('bonding', {
 				_("Specifies the number of IGMP membership reports to be issued after a failover event in 200ms intervals"));
 		o.datatype = 'range(0,255)';
 		o.default = '1';
-		o.validate = validateEmpty;
+		o.rmempty = false;
 		o.depends('bonding_policy', 'balance-tlb');
 		o.depends('bonding_policy', 'balance-alb');
 
@@ -375,7 +358,7 @@ return network.registerProtocol('bonding', {
 				_("Specifies the ARP link monitoring frequency in milliseconds"));
 		o.datatype = 'uinteger';
 		o.default = '0';
-		o.validate = validateEmpty;
+		o.rmempty = false;
 		o.depends('link_monitoring', 'arp');
 
 		o = s.taboption('advanced', form.DynamicList, 'arp_ip_target',
@@ -412,7 +395,7 @@ return network.registerProtocol('bonding', {
 				_("Specifies the MII link monitoring frequency in milliseconds"));
 		o.datatype = 'uinteger';
 		o.default = '0';
-		o.validate = validateEmpty;
+		o.rmempty = false;
 		o.depends('link_monitoring', 'mii');
 
 		o = s.taboption('advanced', form.Value, 'downdelay',
@@ -420,7 +403,7 @@ return network.registerProtocol('bonding', {
 				_("Specifies the time in milliseconds to wait before disabling a slave after a link failure detection"));
 		o.datatype = 'uinteger';
 		o.default = '0';
-		o.validate = validateEmpty;
+		o.rmempty = false;
 		o.depends('link_monitoring', 'mii');
 
 		o = s.taboption('advanced', form.Value, 'updelay',
@@ -428,7 +411,7 @@ return network.registerProtocol('bonding', {
 				_("Specifies the time in milliseconds to wait before enabling a slave after a link recovery detection"));
 		o.datatype = 'uinteger';
 		o.default = '0';
-		o.validate = validateEmpty;
+		o.rmempty = false;
 		o.depends('link_monitoring', 'mii');
 
 		o = s.taboption('advanced', form.ListValue, 'use_carrier',

From c5c8bd41e3ce545bbefcbb7f9692346566d6357c Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Fri, 1 May 2020 11:03:21 +0200
Subject: [PATCH 07/88] Update OpenMPTCProuter theme

---
 .../luci-static/openmptcprouter/cascade.css   |   5 +-
 .../resources/menu-openmptcprouter.js         | 118 +++++++++++++++++
 .../view/themes/openmptcprouter/footer.htm    |   1 +
 .../view/themes/openmptcprouter/header.htm    |  10 +-
 .../view/themes/openmptcprouter/json-menu.htm | 119 ------------------
 5 files changed, 121 insertions(+), 132 deletions(-)
 create mode 100644 luci-theme-openmptcprouter/htdocs/luci-static/resources/menu-openmptcprouter.js
 delete mode 100644 luci-theme-openmptcprouter/luasrc/view/themes/openmptcprouter/json-menu.htm

diff --git a/luci-theme-openmptcprouter/htdocs/luci-static/openmptcprouter/cascade.css b/luci-theme-openmptcprouter/htdocs/luci-static/openmptcprouter/cascade.css
index 7ec2c0d87..523f978db 100644
--- a/luci-theme-openmptcprouter/htdocs/luci-static/openmptcprouter/cascade.css
+++ b/luci-theme-openmptcprouter/htdocs/luci-static/openmptcprouter/cascade.css
@@ -1792,6 +1792,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
 	background-color: #bfbfbf;
 	border-radius: 3px;
 	text-shadow: none;
+	margin-left: .4em;
 }
 
 a.label:link,
@@ -1822,10 +1823,6 @@ a.label:hover {
 /* LuCI specific items */
 .hidden { display: none }
 
-#xhr_poll_status {
-	  cursor: pointer;
-}
-
 form.inline { display: inline; margin-bottom: 0; }
 
 /*header .pull-right { padding-top: 8px; }*/
diff --git a/luci-theme-openmptcprouter/htdocs/luci-static/resources/menu-openmptcprouter.js b/luci-theme-openmptcprouter/htdocs/luci-static/resources/menu-openmptcprouter.js
new file mode 100644
index 000000000..5400276b0
--- /dev/null
+++ b/luci-theme-openmptcprouter/htdocs/luci-static/resources/menu-openmptcprouter.js
@@ -0,0 +1,118 @@
+'use strict';
+'require baseclass';
+'require ui';
+
+return baseclass.extend({
+	__init__: function() {
+		ui.menu.load().then(L.bind(this.render, this));
+	},
+
+	render: function(tree) {
+		var node = tree,
+		    url = '';
+
+		this.renderModeMenu(tree);
+
+		if (L.env.dispatchpath.length >= 3) {
+			for (var i = 0; i < 3 && node; i++) {
+				node = node.children[L.env.dispatchpath[i]];
+				url = url + (url ? '/' : '') + L.env.dispatchpath[i];
+			}
+
+			if (node)
+				this.renderTabMenu(node, url);
+		}
+
+		document.addEventListener('poll-start', this.handleBodyMargin);
+		document.addEventListener('poll-stop', this.handleBodyMargin);
+		document.addEventListener('uci-new-changes', this.handleBodyMargin);
+		document.addEventListener('uci-clear-changes', this.handleBodyMargin);
+		window.addEventListener('resize', this.handleBodyMargin);
+
+		this.handleBodyMargin();
+	},
+
+	renderTabMenu: function(tree, url, level) {
+		var container = document.querySelector('#tabmenu'),
+		    ul = E('ul', { 'class': 'tabs' }),
+		    children = ui.menu.getChildren(tree),
+		    activeNode = null;
+
+		for (var i = 0; i < children.length; i++) {
+			var isActive = (L.env.dispatchpath[3 + (level || 0)] == children[i].name),
+			    activeClass = isActive ? ' active' : '',
+			    className = 'tabmenu-item-%s %s'.format(children[i].name, activeClass);
+
+			ul.appendChild(E('li', { 'class': className }, [
+				E('a', { 'href': L.url(url, children[i].name) }, [ _(children[i].title) ] )]));
+
+			if (isActive)
+				activeNode = children[i];
+		}
+
+		if (ul.children.length == 0)
+			return E([]);
+
+		container.appendChild(ul);
+		container.style.display = '';
+
+		if (activeNode)
+			this.renderTabMenu(activeNode, url + '/' + activeNode.name, (level || 0) + 1);
+
+		return ul;
+	},
+
+	renderMainMenu: function(tree, url, level) {
+		var ul = level ? E('ul', { 'class': 'dropdown-menu' }) : document.querySelector('#topmenu'),
+		    children = ui.menu.getChildren(tree);
+
+		if (children.length == 0 || level > 1)
+			return E([]);
+
+		for (var i = 0; i < children.length; i++) {
+			var submenu = this.renderMainMenu(children[i], url + '/' + children[i].name, (level || 0) + 1),
+			    subclass = (!level && submenu.firstElementChild) ? 'dropdown' : null,
+			    linkclass = (!level && submenu.firstElementChild) ? 'menu' : null,
+			    linkurl = submenu.firstElementChild ? '#' : L.url(url, children[i].name);
+
+			var li = E('li', { 'class': subclass }, [
+				E('a', { 'class': linkclass, 'href': linkurl }, [ _(children[i].title) ]),
+				submenu
+			]);
+
+			ul.appendChild(li);
+		}
+
+		ul.style.display = '';
+
+		return ul;
+	},
+
+	renderModeMenu: function(tree) {
+		var ul = document.querySelector('#modemenu'),
+		    children = ui.menu.getChildren(tree);
+
+		for (var i = 0; i < children.length; i++) {
+			var isActive = (L.env.requestpath.length ? children[i].name == L.env.requestpath[0] : i == 0);
+
+			ul.appendChild(E('li', { 'class': isActive ? 'active' : null }, [
+				E('a', { 'href': L.url(children[i].name) }, [ _(children[i].title) ]),
+				' ',
+				E('span', { 'class': 'divider' }, [ '|' ])
+			]));
+
+			if (isActive)
+				this.renderMainMenu(children[i], children[i].name);
+		}
+
+		if (ul.children.length > 1)
+			ul.style.display = '';
+	},
+
+	handleBodyMargin: function(ev) {
+		var body = document.querySelector('body'),
+		    head = document.querySelector('header');
+
+		body.style.marginTop = head.offsetHeight + 'px';
+	}
+});
diff --git a/luci-theme-openmptcprouter/luasrc/view/themes/openmptcprouter/footer.htm b/luci-theme-openmptcprouter/luasrc/view/themes/openmptcprouter/footer.htm
index c1aafe071..2c3c4a07b 100644
--- a/luci-theme-openmptcprouter/luasrc/view/themes/openmptcprouter/footer.htm
+++ b/luci-theme-openmptcprouter/luasrc/view/themes/openmptcprouter/footer.htm
@@ -12,6 +12,7 @@
     <ul class="breadcrumb pull-right" id="modemenu" style="display:none"></ul>
    </footer>
   </div>
+  <script type="text/javascript">L.require('menu-openmptcprouter')</script>
  </body>
 </html>
 
diff --git a/luci-theme-openmptcprouter/luasrc/view/themes/openmptcprouter/header.htm b/luci-theme-openmptcprouter/luasrc/view/themes/openmptcprouter/header.htm
index 37b208ee5..6bc227f93 100644
--- a/luci-theme-openmptcprouter/luasrc/view/themes/openmptcprouter/header.htm
+++ b/luci-theme-openmptcprouter/luasrc/view/themes/openmptcprouter/header.htm
@@ -40,9 +40,6 @@
 		<% end -%>
 		<script src="<%=url('admin/translations', luci.i18n.context.lang)%><%# ?v=PKG_VERSION %>"></script>
 		<script src="<%=resource%>/cbi.js"></script>
-		<script src="<%=resource%>/xhr.js"></script>
-
-		<% include("themes/openmptcprouter/json-menu") %>
 	</head>
 
 	<body class="lang_<%=luci.i18n.context.lang%> <% if node then %><%= striptags( node.title ) %><%- end %>" data-page="<%= table.concat(disp.context.requestpath, "-") %>">
@@ -51,12 +48,7 @@
 				<div class="container">
 					<a class="brand" href="#" alt="OpenMPTCProuter"><img src="<%=resource%>/openmptcprouter/images/omr-logo.png" height="30" width="30" alt="OMR" /> OpenMPTCProuter</a>
 					<ul class="nav" id="topmenu" style="display:none"></ul>
-					<div class="pull-right">
-						<span id="xhr_poll_status" style="display:none" onclick="XHR.running() ? XHR.halt() : XHR.run()">
-							<span class="label success" id="xhr_poll_status_on"><%:Auto Refresh%> <%:on%></span>
-							<span class="label" id="xhr_poll_status_off" style="display:none"><%:Auto Refresh%> <%:off%></span>
-						</span>
-					</div>
+					<div id="indicators" class="pull-right"></div>
 				</div>
 			</div>
 		</header>
diff --git a/luci-theme-openmptcprouter/luasrc/view/themes/openmptcprouter/json-menu.htm b/luci-theme-openmptcprouter/luasrc/view/themes/openmptcprouter/json-menu.htm
deleted file mode 100644
index b38406f65..000000000
--- a/luci-theme-openmptcprouter/luasrc/view/themes/openmptcprouter/json-menu.htm
+++ /dev/null
@@ -1,119 +0,0 @@
-<script type="text/javascript">
-	(function() {
-		function get_children(node) {
-			var children = [];
-
-			for (var k in node.children) {
-				if (!node.children.hasOwnProperty(k))
-					continue;
-
-				if (!node.children[k].satisfied)
-					continue;
-
-				if (!node.children[k].hasOwnProperty('title'))
-					continue;
-
-				children.push(Object.assign(node.children[k], { name: k }));
-			}
-
-			return children.sort(function(a, b) {
-				return ((a.order || 1000) - (b.order || 1000));
-			});
-		}
-
-		function render_tabmenu(tree, url, level) {
-			var container = document.querySelector('#tabmenu'),
-			    ul = E('ul', { 'class': 'tabs' }),
-			    children = get_children(tree),
-			    activeNode = null;
-
-			for (var i = 0; i < children.length; i++) {
-				var isActive = (L.env.dispatchpath[3 + (level || 0)] == children[i].name),
-				    activeClass = isActive ? ' active' : '',
-				    className = 'tabmenu-item-%s %s'.format(children[i].name, activeClass);
-
-				ul.appendChild(E('li', { 'class': className }, [
-					E('a', { 'href': L.url(url, children[i].name) }, [ _(children[i].title) ] )]));
-
-				if (isActive)
-					activeNode = children[i];
-			}
-
-			if (ul.children.length == 0)
-				return E([]);
-
-			container.appendChild(ul);
-			container.style.display = '';
-
-			if (activeNode)
-				render_tabmenu(activeNode, url + '/' + activeNode.name, (level || 0) + 1);
-
-			return ul;
-		}
-
-		function render_mainmenu(tree, url, level) {
-			var ul = level ? E('ul', { 'class': 'dropdown-menu' }) : document.querySelector('#topmenu'),
-			    children = get_children(tree);
-
-			if (children.length == 0 || level > 1)
-				return E([]);
-
-			for (var i = 0; i < children.length; i++) {
-				var submenu = render_mainmenu(children[i], url + '/' + children[i].name, (level || 0) + 1),
-				    subclass = (!level && submenu.firstElementChild) ? 'dropdown' : null,
-				    linkclass = (!level && submenu.firstElementChild) ? 'menu' : null,
-				    linkurl = submenu.firstElementChild ? '#' : L.url(url, children[i].name);
-
-				var li = E('li', { 'class': subclass }, [
-					E('a', { 'class': linkclass, 'href': linkurl }, [ _(children[i].title) ]),
-					submenu
-				]);
-
-				ul.appendChild(li);
-			}
-
-			ul.style.display = '';
-
-			return ul;
-		}
-
-		function render_modemenu(tree) {
-			var ul = document.querySelector('#modemenu'),
-			    children = get_children(tree);
-
-			for (var i = 0; i < children.length; i++) {
-				var isActive = (L.env.requestpath.length ? children[i].name == L.env.requestpath[0] : i == 0);
-
-				ul.appendChild(E('li', { 'class': isActive ? 'active' : null }, [
-					E('a', { 'href': L.url(children[i].name) }, [ _(children[i].title) ]),
-					' ',
-					E('span', { 'class': 'divider' }, [ '|' ])
-				]));
-
-				if (isActive)
-					render_mainmenu(children[i], children[i].name);
-			}
-
-			if (ul.children.length > 1)
-				ul.style.display = '';
-		}
-
-		document.addEventListener('luci-loaded', function(ev) {
-			var tree = <%= luci.http.write_json(luci.dispatcher.context.authsession and luci.dispatcher.menu_json() or {}) %>,
-			    node = tree,
-			    url = '';
-
-			render_modemenu(tree);
-
-			if (L.env.dispatchpath.length >= 3) {
-				for (var i = 0; i < 3 && node; i++) {
-					node = node.children[L.env.dispatchpath[i]];
-					url = url + (url ? '/' : '') + L.env.dispatchpath[i];
-				}
-
-				if (node)
-					render_tabmenu(node, url);
-			}
-		});
-	})();
-</script>

From 5b14298f47d73655cc40c33e83e6e792e87682a1 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Fri, 1 May 2020 11:07:01 +0200
Subject: [PATCH 08/88] Add luci menu json

---
 .../usr/share/luci/menu.d/luci-app-dsvpn.json | 13 +++++++
 .../share/luci/menu.d/luci-app-firewall.json  |  1 +
 .../share/rpcd/acl.d/luci-app-firewall.json   | 24 ++++++++++++
 .../share/luci/menu.d/luci-app-glorytun.json  | 13 +++++++
 .../luci/menu.d/luci-app-https-dns-proxy.json | 13 +++++++
 .../usr/share/luci/menu.d/luci-app-iperf.json | 13 +++++++
 .../share/luci/menu.d/luci-app-macvlan.json   |  3 ++
 .../usr/share/luci/menu.d/luci-app-mail.json  | 13 +++++++
 .../usr/share/luci/menu.d/luci-app-mlvpn.json | 13 +++++++
 .../usr/share/luci/menu.d/luci-app-mptcp.json | 13 +++++++
 .../share/luci/menu.d/luci-app-nginx-ha.json  | 13 +++++++
 .../luci/menu.d/luci-app-omr-bypass.json      |  3 ++
 .../share/rpcd/acl.d/luci-app-omr-bypass.json |  2 +-
 .../share/luci/menu.d/luci-app-omr-dscp.json  | 13 +++++++
 .../share/luci/menu.d/luci-app-omr-quota.json | 13 +++++++
 .../luci/menu.d/luci-app-omr-tracker.json     | 13 +++++++
 .../luci/menu.d/luci-app-openmptcprouter.json | 13 +++++++
 .../menu.d/luci-app-shadowsocks-libev.json    | 39 +++++++++++++++++++
 .../share/luci/menu.d/luci-app-shutdown.json  |  3 ++
 .../usr/share/luci/menu.d/luci-app-snmpd.json | 13 +++++++
 20 files changed, 243 insertions(+), 1 deletion(-)
 create mode 100644 luci-app-dsvpn/root/usr/share/luci/menu.d/luci-app-dsvpn.json
 create mode 100644 luci-app-firewall/root/usr/share/rpcd/acl.d/luci-app-firewall.json
 create mode 100644 luci-app-glorytun/root/usr/share/luci/menu.d/luci-app-glorytun.json
 create mode 100644 luci-app-https-dns-proxy/root/usr/share/luci/menu.d/luci-app-https-dns-proxy.json
 create mode 100644 luci-app-iperf/root/usr/share/luci/menu.d/luci-app-iperf.json
 create mode 100644 luci-app-mail/root/usr/share/luci/menu.d/luci-app-mail.json
 create mode 100644 luci-app-mlvpn/root/usr/share/luci/menu.d/luci-app-mlvpn.json
 create mode 100644 luci-app-mptcp/root/usr/share/luci/menu.d/luci-app-mptcp.json
 create mode 100644 luci-app-nginx-ha/root/usr/share/luci/menu.d/luci-app-nginx-ha.json
 create mode 100644 luci-app-omr-dscp/root/usr/share/luci/menu.d/luci-app-omr-dscp.json
 create mode 100644 luci-app-omr-quota/root/usr/share/luci/menu.d/luci-app-omr-quota.json
 create mode 100644 luci-app-omr-tracker/root/usr/share/luci/menu.d/luci-app-omr-tracker.json
 create mode 100644 luci-app-openmptcprouter/root/usr/share/luci/menu.d/luci-app-openmptcprouter.json
 create mode 100644 luci-app-shadowsocks-libev/root/usr/share/luci/menu.d/luci-app-shadowsocks-libev.json
 create mode 100644 luci-app-snmpd/root/usr/share/luci/menu.d/luci-app-snmpd.json

diff --git a/luci-app-dsvpn/root/usr/share/luci/menu.d/luci-app-dsvpn.json b/luci-app-dsvpn/root/usr/share/luci/menu.d/luci-app-dsvpn.json
new file mode 100644
index 000000000..257a29fab
--- /dev/null
+++ b/luci-app-dsvpn/root/usr/share/luci/menu.d/luci-app-dsvpn.json
@@ -0,0 +1,13 @@
+{
+	"admin/vpn/dsvpn": {
+		"title": "DSVPN",
+		"order": 10,
+		"action": {
+			"type": "cbi",
+			"path": "dsvpn"
+		},
+		"depends": {
+			"acl": [ "luci-app-dsvpn" ]
+		}
+	}
+}
diff --git a/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json b/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json
index 35c7c62c4..f8a3553a7 100644
--- a/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json
+++ b/luci-app-firewall/root/usr/share/luci/menu.d/luci-app-firewall.json
@@ -7,6 +7,7 @@
 			"path": "admin/network/firewall/zones"
 		},
 		"depends": {
+			"acl": [ "luci-app-firewall" ],
 			"fs": { "/sbin/fw3": "executable" },
 			"uci": { "firewall": true }
 		}
diff --git a/luci-app-firewall/root/usr/share/rpcd/acl.d/luci-app-firewall.json b/luci-app-firewall/root/usr/share/rpcd/acl.d/luci-app-firewall.json
new file mode 100644
index 000000000..17d1fbab1
--- /dev/null
+++ b/luci-app-firewall/root/usr/share/rpcd/acl.d/luci-app-firewall.json
@@ -0,0 +1,24 @@
+{
+	"luci-app-firewall": {
+		"description": "Grant access to firewall configuration",
+		"read": {
+			"file": {
+				"/etc/firewall.user": [ "read" ]
+			},
+			"ubus": {
+				"file": [ "read" ],
+				"luci": [ "getConntrackHelpers" ]
+			},
+			"uci": [ "firewall" ]
+		},
+		"write": {
+			"file": {
+				"/etc/firewall.user": [ "write" ]
+			},
+			"ubus": {
+				"file": [ "write" ]
+			},
+			"uci": [ "firewall" ]
+		}
+	}
+}
diff --git a/luci-app-glorytun/root/usr/share/luci/menu.d/luci-app-glorytun.json b/luci-app-glorytun/root/usr/share/luci/menu.d/luci-app-glorytun.json
new file mode 100644
index 000000000..414accf0b
--- /dev/null
+++ b/luci-app-glorytun/root/usr/share/luci/menu.d/luci-app-glorytun.json
@@ -0,0 +1,13 @@
+{
+	"admin/vpn/glorytun": {
+		"title": "Glorytun",
+		"order": 20,
+		"action": {
+			"type": "cbi",
+			"path": "glorytun"
+		},
+		"depends": {
+			"acl": [ "luci-app-glorytun" ]
+		}
+	}
+}
diff --git a/luci-app-https-dns-proxy/root/usr/share/luci/menu.d/luci-app-https-dns-proxy.json b/luci-app-https-dns-proxy/root/usr/share/luci/menu.d/luci-app-https-dns-proxy.json
new file mode 100644
index 000000000..a2238b5c1
--- /dev/null
+++ b/luci-app-https-dns-proxy/root/usr/share/luci/menu.d/luci-app-https-dns-proxy.json
@@ -0,0 +1,13 @@
+{
+	"admin/services/https-dns-proxy": {
+		"title": "Proxy DNS Over HTTPS",
+		"order": 20,
+		"action": {
+			"type": "uci",
+			"path": "https-dns-proxy"
+		},
+		"depends": {
+			"acl": [ "luci-app-https-dns-proxy" ]
+		}
+	}
+}
diff --git a/luci-app-iperf/root/usr/share/luci/menu.d/luci-app-iperf.json b/luci-app-iperf/root/usr/share/luci/menu.d/luci-app-iperf.json
new file mode 100644
index 000000000..fa4f87669
--- /dev/null
+++ b/luci-app-iperf/root/usr/share/luci/menu.d/luci-app-iperf.json
@@ -0,0 +1,13 @@
+{
+	"admin/services/iperf": {
+		"title": "iPerf",
+		"order": 10,
+		"action": {
+			"type": "uci",
+			"path": "iperf"
+		},
+		"depends": {
+			"acl": [ "luci-app-iperf" ]
+		}
+	}
+}
diff --git a/luci-app-macvlan/root/usr/share/luci/menu.d/luci-app-macvlan.json b/luci-app-macvlan/root/usr/share/luci/menu.d/luci-app-macvlan.json
index 01c2164ee..3d7041b26 100644
--- a/luci-app-macvlan/root/usr/share/luci/menu.d/luci-app-macvlan.json
+++ b/luci-app-macvlan/root/usr/share/luci/menu.d/luci-app-macvlan.json
@@ -5,6 +5,9 @@
 		"action": {
 			"type": "view",
 			"path": "network/macvlan"
+		},
+		"depends": {
+			"acl": [ "luci-app-macvlan" ]
 		}
 	}
 }
diff --git a/luci-app-mail/root/usr/share/luci/menu.d/luci-app-mail.json b/luci-app-mail/root/usr/share/luci/menu.d/luci-app-mail.json
new file mode 100644
index 000000000..089af244c
--- /dev/null
+++ b/luci-app-mail/root/usr/share/luci/menu.d/luci-app-mail.json
@@ -0,0 +1,13 @@
+{
+	"admin/services/mail": {
+		"title": "E-Mail",
+		"order": 90,
+		"action": {
+			"type": "uci",
+			"path": "mail"
+		},
+		"depends": {
+			"acl": [ "luci-app-mail" ]
+		}
+	}
+}
diff --git a/luci-app-mlvpn/root/usr/share/luci/menu.d/luci-app-mlvpn.json b/luci-app-mlvpn/root/usr/share/luci/menu.d/luci-app-mlvpn.json
new file mode 100644
index 000000000..085d95305
--- /dev/null
+++ b/luci-app-mlvpn/root/usr/share/luci/menu.d/luci-app-mlvpn.json
@@ -0,0 +1,13 @@
+{
+	"admin/vpn/mlvpn": {
+		"title": "MLVPN",
+		"order": 30,
+		"action": {
+			"type": "cbi",
+			"path": "mlvpn"
+		},
+		"depends": {
+			"acl": [ "luci-app-mlvpn" ]
+		}
+	}
+}
diff --git a/luci-app-mptcp/root/usr/share/luci/menu.d/luci-app-mptcp.json b/luci-app-mptcp/root/usr/share/luci/menu.d/luci-app-mptcp.json
new file mode 100644
index 000000000..a3e457424
--- /dev/null
+++ b/luci-app-mptcp/root/usr/share/luci/menu.d/luci-app-mptcp.json
@@ -0,0 +1,13 @@
+{
+	"admin/network/mptcp": {
+		"title": "MPTCP",
+		"order": 10,
+		"action": {
+			"type": "cbi",
+			"path": "mptcp"
+		},
+		"depends": {
+			"acl": [ "luci-app-mptcp" ]
+		}
+	}
+}
diff --git a/luci-app-nginx-ha/root/usr/share/luci/menu.d/luci-app-nginx-ha.json b/luci-app-nginx-ha/root/usr/share/luci/menu.d/luci-app-nginx-ha.json
new file mode 100644
index 000000000..d9f54cc33
--- /dev/null
+++ b/luci-app-nginx-ha/root/usr/share/luci/menu.d/luci-app-nginx-ha.json
@@ -0,0 +1,13 @@
+{
+	"admin/services/nginx-ha": {
+		"title": "Nginx High Availability",
+		"order": 80,
+		"action": {
+			"type": "uci",
+			"path": "nginx-ha"
+		},
+		"depends": {
+			"acl": [ "luci-app-nginx-ha" ]
+		}
+	}
+}
diff --git a/luci-app-omr-bypass/root/usr/share/luci/menu.d/luci-app-omr-bypass.json b/luci-app-omr-bypass/root/usr/share/luci/menu.d/luci-app-omr-bypass.json
index c024c61e0..24cc23af3 100644
--- a/luci-app-omr-bypass/root/usr/share/luci/menu.d/luci-app-omr-bypass.json
+++ b/luci-app-omr-bypass/root/usr/share/luci/menu.d/luci-app-omr-bypass.json
@@ -5,6 +5,9 @@
 		"action": {
 			"type": "view",
 			"path": "services/omr-bypass"
+		},
+		"depends": {
+			"acl": [ "luci-app-omr-bypass" ]
 		}
 	}
 }
diff --git a/luci-app-omr-bypass/root/usr/share/rpcd/acl.d/luci-app-omr-bypass.json b/luci-app-omr-bypass/root/usr/share/rpcd/acl.d/luci-app-omr-bypass.json
index 154554d4d..3281f4fca 100644
--- a/luci-app-omr-bypass/root/usr/share/rpcd/acl.d/luci-app-omr-bypass.json
+++ b/luci-app-omr-bypass/root/usr/share/rpcd/acl.d/luci-app-omr-bypass.json
@@ -4,7 +4,7 @@
 	"read": {
 	    "file": {
 		"/proc/net/xt_ndpi/proto": [ "read" ],
-		"/proc/net/xt_ndpi/host_proto": [ "read" ],
+		"/proc/net/xt_ndpi/host_proto": [ "read" ]
 	    },
 	    "ubus": {
 		"luci-rpc": [ "getHostHints" ]
diff --git a/luci-app-omr-dscp/root/usr/share/luci/menu.d/luci-app-omr-dscp.json b/luci-app-omr-dscp/root/usr/share/luci/menu.d/luci-app-omr-dscp.json
new file mode 100644
index 000000000..db602b6ff
--- /dev/null
+++ b/luci-app-omr-dscp/root/usr/share/luci/menu.d/luci-app-omr-dscp.json
@@ -0,0 +1,13 @@
+{
+	"admin/network/omr-dscp": {
+		"title": "OMR-DSCP",
+		"order": 80,
+		"action": {
+			"type": "uci",
+			"path": "omr-dscp"
+		},
+		"depends": {
+			"acl": [ "luci-app-omr-dscp" ]
+		}
+	}
+}
diff --git a/luci-app-omr-quota/root/usr/share/luci/menu.d/luci-app-omr-quota.json b/luci-app-omr-quota/root/usr/share/luci/menu.d/luci-app-omr-quota.json
new file mode 100644
index 000000000..5b7149b3f
--- /dev/null
+++ b/luci-app-omr-quota/root/usr/share/luci/menu.d/luci-app-omr-quota.json
@@ -0,0 +1,13 @@
+{
+	"admin/network/quota": {
+		"title": "Quota",
+		"order": 90,
+		"action": {
+			"type": "uci",
+			"path": "quota"
+		},
+		"depends": {
+			"acl": [ "luci-app-omr-quota" ]
+		}
+	}
+}
diff --git a/luci-app-omr-tracker/root/usr/share/luci/menu.d/luci-app-omr-tracker.json b/luci-app-omr-tracker/root/usr/share/luci/menu.d/luci-app-omr-tracker.json
new file mode 100644
index 000000000..102c65c16
--- /dev/null
+++ b/luci-app-omr-tracker/root/usr/share/luci/menu.d/luci-app-omr-tracker.json
@@ -0,0 +1,13 @@
+{
+	"admin/services/omr-tracker": {
+		"title": "OMR-Tracker",
+		"order": 10,
+		"action": {
+			"type": "uci",
+			"path": "omr-tracker"
+		},
+		"depends": {
+			"acl": [ "luci-app-omr-tracker" ]
+		}
+	}
+}
diff --git a/luci-app-openmptcprouter/root/usr/share/luci/menu.d/luci-app-openmptcprouter.json b/luci-app-openmptcprouter/root/usr/share/luci/menu.d/luci-app-openmptcprouter.json
new file mode 100644
index 000000000..08c5b6f32
--- /dev/null
+++ b/luci-app-openmptcprouter/root/usr/share/luci/menu.d/luci-app-openmptcprouter.json
@@ -0,0 +1,13 @@
+{
+	"admin/system/openmptcprouter": {
+		"title": "OpenMPTCProuter",
+		"order": 1,
+		"action": {
+			"type": "uci",
+			"path": "openmptcprouter/wizard"
+		},
+		"depends": {
+			"acl": [ "luci-app-openmptcprouter" ]
+		}
+	}
+}
diff --git a/luci-app-shadowsocks-libev/root/usr/share/luci/menu.d/luci-app-shadowsocks-libev.json b/luci-app-shadowsocks-libev/root/usr/share/luci/menu.d/luci-app-shadowsocks-libev.json
new file mode 100644
index 000000000..aa29113fe
--- /dev/null
+++ b/luci-app-shadowsocks-libev/root/usr/share/luci/menu.d/luci-app-shadowsocks-libev.json
@@ -0,0 +1,39 @@
+{
+	"admin/services/shadowsocks-libev": {
+		"title": "Shadowsocks-libev",
+		"order": 59,
+		"action": {
+			"type": "firstchild"
+		},
+		"depends": {
+			"acl": [ "luci-app-shadowsocks-libev" ]
+		}
+	},
+
+	"admin/services/shadowsocks-libev/instances": {
+		"title": "Local Instances",
+		"order": 10,
+		"action": {
+			"type": "view",
+			"path": "shadowsocks-libev/instances"
+		}
+	},
+
+	"admin/services/shadowsocks-libev/servers": {
+		"title": "Remote Servers",
+		"order": 20,
+		"action": {
+			"type": "view",
+			"path": "shadowsocks-libev/servers"
+		}
+	},
+
+	"admin/services/shadowsocks-libev/rules": {
+		"title": "Redir Rules",
+		"order": 30,
+		"action": {
+			"type": "view",
+			"path": "shadowsocks-libev/rules"
+		}
+	}
+}
diff --git a/luci-app-shutdown/root/usr/share/luci/menu.d/luci-app-shutdown.json b/luci-app-shutdown/root/usr/share/luci/menu.d/luci-app-shutdown.json
index 128a53a8c..33012645e 100644
--- a/luci-app-shutdown/root/usr/share/luci/menu.d/luci-app-shutdown.json
+++ b/luci-app-shutdown/root/usr/share/luci/menu.d/luci-app-shutdown.json
@@ -5,6 +5,9 @@
 		"action": {
 			"type": "view",
 			"path": "system/shutdown"
+		},
+		"depends": {
+			"acl": [ "luci-app-shutdown" ]
 		}
 	}
 }
diff --git a/luci-app-snmpd/root/usr/share/luci/menu.d/luci-app-snmpd.json b/luci-app-snmpd/root/usr/share/luci/menu.d/luci-app-snmpd.json
new file mode 100644
index 000000000..5df5fa97a
--- /dev/null
+++ b/luci-app-snmpd/root/usr/share/luci/menu.d/luci-app-snmpd.json
@@ -0,0 +1,13 @@
+{
+	"admin/network/snmpd": {
+		"title": "SNMPd",
+		"order": 91,
+		"action": {
+			"type": "uci",
+			"path": "snmpd"
+		},
+		"depends": {
+			"acl": [ "luci-app-snmpd" ]
+		}
+	}
+}

From 5bfdf1648e88411c81c3af65332c156b39afb154 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Fri, 1 May 2020 11:07:25 +0200
Subject: [PATCH 09/88] Fix Luci OMR ByPass

---
 .../resources/view/services/omr-bypass.js     | 39 ++++++++++++++-----
 1 file changed, 30 insertions(+), 9 deletions(-)

diff --git a/luci-app-omr-bypass/htdocs/luci-static/resources/view/services/omr-bypass.js b/luci-app-omr-bypass/htdocs/luci-static/resources/view/services/omr-bypass.js
index 3ab345321..729c8a8ee 100644
--- a/luci-app-omr-bypass/htdocs/luci-static/resources/view/services/omr-bypass.js
+++ b/luci-app-omr-bypass/htdocs/luci-static/resources/view/services/omr-bypass.js
@@ -27,11 +27,14 @@ return L.view.extend({
 		s.addremove = true;
 		s.anonymous = true;
 
-		o = s.option(form.Value, 'domain', _('Domain'));
+		o = s.option(form.Value, 'name', _('Domain'));
 		o.rmempty = false;
 
 		o = s.option(widgets.DeviceSelect, 'interface', _('Interface'));
-		o.rmempty = false;
+		o.noaliases = true;
+		o.noinactive = true;
+		o.nocreate    = true;
+		o.ucioption = 'dev';
 
 		o = s.option(form.Value, 'note', _('Note'));
 		o.rmempty = true;
@@ -43,8 +46,11 @@ return L.view.extend({
 		o = s.option(form.Value, 'ip', _('IP'));
 		o.rmempty = false;
 
-		o = s.option(widgets.DeviceSelect, 'interface', _('Interface'));
-		o.rmempty = false;
+		o = s.option(widgets.DeviceSelect, 'interface', _('Interface'),_('When none selected, MPTCP master interface is used.'));
+		o.noaliases = true;
+		o.noinactive = true;
+		o.nocreate    = true;
+		o.ucioption = 'dev';
 
 		o = s.option(form.Value, 'note', _('Note'));
 		o.rmempty = true;
@@ -65,7 +71,10 @@ return L.view.extend({
 		o.value('udp');
 
 		o = s.option(widgets.DeviceSelect, 'interface', _('Interface'));
-		o.rmempty = false;
+		o.noaliases = true;
+		o.noinactive = true;
+		o.nocreate    = true;
+		o.ucioption = 'dev';
 
 		o = s.option(form.Value, 'note', _('Note'));
 		o.rmempty = true;
@@ -83,7 +92,10 @@ return L.view.extend({
 		});
 
 		o = s.option(widgets.DeviceSelect, 'interface', _('Interface'));
-		o.rmempty = false;
+		o.noaliases = true;
+		o.noinactive = true;
+		o.nocreate    = true;
+		o.ucioption = 'dev';
 
 		o = s.option(form.Value, 'note', _('Note'));
 		o.rmempty = true;
@@ -103,7 +115,10 @@ return L.view.extend({
 		});
 
 		o = s.option(widgets.DeviceSelect, 'interface', _('Interface'));
-		o.rmempty = false;
+		o.noaliases = true;
+		o.noinactive = true;
+		o.nocreate    = true;
+		o.ucioption = 'dev';
 
 		o = s.option(form.Value, 'note', _('Note'));
 		o.rmempty = true;
@@ -116,7 +131,10 @@ return L.view.extend({
 		o.rmempty = false;
 
 		o = s.option(widgets.DeviceSelect, 'interface', _('Interface'));
-		o.rmempty = false;
+		o.noaliases = true;
+		o.noinactive = true;
+		o.nocreate    = true;
+		o.ucioption = 'dev';
 
 		o = s.option(form.Value, 'note', _('Note'));
 		o.rmempty = true;
@@ -154,7 +172,10 @@ return L.view.extend({
 		};
 
 		o = s.option(widgets.DeviceSelect, 'interface', _('Interface'));
-		o.rmempty = false;
+		o.noaliases = true;
+		o.noinactive = true;
+		o.nocreate    = true;
+		o.ucioption = 'dev';
 
 		o = s.option(form.Value, 'note', _('Note'));
 		o.rmempty = true;

From f5dc724da7a9bceed0647a9c4a366e73ec4cbe27 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Fri, 1 May 2020 11:07:48 +0200
Subject: [PATCH 10/88] Add proto gre

---
 luci-proto-gre/Makefile                       |  21 ++++
 .../luci-static/resources/protocol/gre.js     |  96 ++++++++++++++++
 .../luci-static/resources/protocol/gretap.js  | 101 +++++++++++++++++
 .../luci-static/resources/protocol/grev6.js   |  98 +++++++++++++++++
 .../resources/protocol/grev6tap.js            | 103 ++++++++++++++++++
 5 files changed, 419 insertions(+)
 create mode 100644 luci-proto-gre/Makefile
 create mode 100644 luci-proto-gre/htdocs/luci-static/resources/protocol/gre.js
 create mode 100644 luci-proto-gre/htdocs/luci-static/resources/protocol/gretap.js
 create mode 100644 luci-proto-gre/htdocs/luci-static/resources/protocol/grev6.js
 create mode 100644 luci-proto-gre/htdocs/luci-static/resources/protocol/grev6tap.js

diff --git a/luci-proto-gre/Makefile b/luci-proto-gre/Makefile
new file mode 100644
index 000000000..804a46547
--- /dev/null
+++ b/luci-proto-gre/Makefile
@@ -0,0 +1,21 @@
+#
+# Based on luci-proto-ipip.
+# Credited author of luci-proto-ipip is Roger Pueyo Centelles <roger.pueyo@guifi.net>
+# Copyright 2016 Roger Pueyo Centelles <roger.pueyo@guifi.net>
+#
+# Modified by Jan Betik <jan.betik@svine.su>
+# Copyright 2020 Jan Betik <jan.betik@svine.su>
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TITLE:=Support for GRE tunnels (RFC2784)
+LUCI_DEPENDS:=+gre
+
+PKG_MAINTAINER:=Jan Betik <jan.betik@svine.su>
+
+include $(TOPDIR)/feeds/luci/luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
diff --git a/luci-proto-gre/htdocs/luci-static/resources/protocol/gre.js b/luci-proto-gre/htdocs/luci-static/resources/protocol/gre.js
new file mode 100644
index 000000000..e431bccd7
--- /dev/null
+++ b/luci-proto-gre/htdocs/luci-static/resources/protocol/gre.js
@@ -0,0 +1,96 @@
+'use strict';
+'require form';
+'require network';
+'require tools.widgets as widgets';
+
+network.registerPatternVirtual(/^gre4-.+$/);
+
+return network.registerProtocol('gre', {
+	getI18n: function() {
+		return _('GRE tunnel over IPv4');
+	},
+
+	getIfname: function() {
+		return this._ubus('l3_device') || 'gre4-%s'.format(this.sid);
+	},
+
+	getOpkgPackage: function() {
+		return 'gre';
+	},
+
+	isFloating: function() {
+		return true;
+	},
+
+	isVirtual: function() {
+		return true;
+	},
+
+	getDevices: function() {
+		return null;
+	},
+
+	containsDevice: function(ifname) {
+		return (network.getIfnameOf(ifname) == this.getIfname());
+	},
+
+	renderFormOptions: function(s) {
+		var o;
+
+		// -- general ---------------------------------------------------------------------
+
+		o = s.taboption('general', form.Value, 'peeraddr', _("Remote IPv4 address or FQDN"), _("The IPv4 address or the fully-qualified domain name of the remote tunnel end."));
+		o.optional = false;
+		o.datatype = 'or(hostname,ip4addr("nomask"))';
+
+		o = s.taboption('general', form.Value, 'ipaddr', _("Local IPv4 address"), _("The local IPv4 address over which the tunnel is created (optional)."));
+		o.optional = true;
+		o.datatype = 'ip4addr("nomask")';
+
+		// -- advanced ---------------------------------------------------------------------
+
+		o = s.taboption('advanced', widgets.NetworkSelect, 'tunlink', _("Bind interface"), _("Bind the tunnel to this interface (optional)."));
+		o.exclude = s.section;
+		o.nocreate = true;
+		o.optional = true;
+
+		o = s.taboption('advanced', form.Value, 'mtu', _("Override MTU"), _("Specify an MTU (Maximum Transmission Unit) other than the default (1280 bytes) (optional)."));
+		o.optional = true;
+		o.placeholder = 1280;
+		o.datatype = 'range(68, 9200)';
+
+		o = s.taboption('advanced', form.Value, 'ttl', _("Override TTL"), _("Specify a TTL (Time to Live) for the encapsulating packet other than the default (64) (optional)."));
+		o.optional = true;
+		o.placeholder = 64;
+		o.datatype = 'min(1)';
+
+		o = s.taboption('advanced', form.Value, 'tos', _('Override TOS'), _("Specify a TOS (Type of Service). Can be either <code>inherit</code> (the outer      header inherits the value of the inner header) or an hexadecimal value starting with <code>0x</code> (optional)."));
+		o.optional = true;
+		o.validate = function(section_id, value) {
+			if (value.length > 0 && !value.match(/^0x[a-fA-F0-9]{1,2}$/) && !value.match(/^inherit$/i))
+				return _('Invalid value');
+
+			return true;
+		};
+
+		o = s.taboption('advanced', form.Flag, 'df', _("Don't Fragment"), _("Enable the DF (Don't Fragment) flag of the encapsulating packets."));
+		o.default = o.enabled;
+
+		o = s.taboption('advanced', form.Flag, 'nohostroute', _("No host route"), _("Do not create host route to peer (optional)."));
+		o.optional = true;
+
+		o = s.taboption('advanced', form.Value, 'ikey', _("Incoming key"), _("Key for incoming packets (optional)."));
+		o.optional = true;
+		o.datatype = 'integer';
+
+		o = s.taboption('advanced', form.Value, 'okey', _("Outgoing key"), _("Key for outgoing packets (optinal)."));
+		o.optional = true;
+		o.datatype = 'integer';
+
+		s.taboption('advanced', form.Flag, 'icsum', _("Incoming checksum"), _("Require incoming checksum (optional)."));
+		s.taboption('advanced', form.Flag, 'ocsum', _("Outgoing checksum"), _("Compute outgoing checksum (optional)."));
+		s.taboption('advanced', form.Flag, 'iseqno', _("Incoming serialization"), _("Require incoming packets serialization (optional)."));
+		s.taboption('advanced', form.Flag, 'oseqno', _("Outgoing serialization"), _("Perform outgoing packets serialization (optional)."));
+
+	}
+});
diff --git a/luci-proto-gre/htdocs/luci-static/resources/protocol/gretap.js b/luci-proto-gre/htdocs/luci-static/resources/protocol/gretap.js
new file mode 100644
index 000000000..426b5d98d
--- /dev/null
+++ b/luci-proto-gre/htdocs/luci-static/resources/protocol/gretap.js
@@ -0,0 +1,101 @@
+'use strict';
+'require form';
+'require network';
+'require tools.widgets as widgets';
+
+network.registerPatternVirtual(/^gre4t-.+$/);
+
+return network.registerProtocol('gretap', {
+	getI18n: function() {
+		return _('GRETAP tunnel over IPv4');
+	},
+
+	getIfname: function() {
+		return this._ubus('l3_device') || 'gre4t-%s'.format(this.sid);
+	},
+
+	getOpkgPackage: function() {
+		return 'gre';
+	},
+
+	isFloating: function() {
+		return true;
+	},
+
+	isVirtual: function() {
+		return true;
+	},
+
+	getDevices: function() {
+		return null;
+	},
+
+	containsDevice: function(ifname) {
+		return (network.getIfnameOf(ifname) == this.getIfname());
+	},
+
+	renderFormOptions: function(s) {
+		var o;
+
+		// -- general ---------------------------------------------------------------------
+
+		o = s.taboption('general', form.Value, 'peeraddr', _("Remote IPv4 address or FQDN"), _("The IPv4 address or the fully-qualified domain name of the remote tunnel end."));
+		o.optional = false;
+		o.datatype = 'or(hostname,ip4addr("nomask"))';
+
+		o = s.taboption('general', form.Value, 'ipaddr', _("Local IPv4 address"), _("The local IPv4 address over which the tunnel is created (optional)."));
+		o.optional = true;
+		o.datatype = 'ip4addr("nomask")';
+
+		o = s.taboption('general', widgets.NetworkSelect, 'network', _("Network interface"), _("Logical network to which the tunnel will be added (bridged) (optional)."));
+		o.exclude = s.section;
+		o.nocreate = true;
+		o.optional = true;
+
+		// -- advanced ---------------------------------------------------------------------
+
+		o = s.taboption('advanced', widgets.NetworkSelect, 'tunlink', _("Bind interface"), _("Bind the tunnel to this interface (optional)."));
+		o.exclude = s.section;
+		o.nocreate = true;
+		o.optional = true;
+
+		o = s.taboption('advanced', form.Value, 'mtu', _("Override MTU"), _("Specify an MTU (Maximum Transmission Unit) other than the default (1280 bytes) (optional)."));
+		o.optional = true;
+		o.placeholder = 1280;
+		o.datatype = 'range(68, 9200)';
+
+		o = s.taboption('advanced', form.Value, 'ttl', _("Override TTL"), _("Specify a TTL (Time to Live) for the encapsulating packet other than the default (64) (optional)."));
+		o.optional = true;
+		o.placeholder = 64;
+		o.datatype = 'min(1)';
+
+		o = s.taboption('advanced', form.Value, 'tos', _('Override TOS'), _("Specify a TOS (Type of Service). Can be either <code>inherit</code> (the outer      header inherits the value of the inner header) or an hexadecimal value starting with <code>0x</code> (optional)."));
+		o.optional = true;
+		o.validate = function(section_id, value) {
+			if (value.length > 0 && !value.match(/^0x[a-fA-F0-9]{1,2}$/) && !value.match(/^inherit$/i))
+				return _('Invalid value');
+
+			return true;
+		};
+
+		o = s.taboption('advanced', form.Flag, 'df', _("Don't Fragment"), _("Enable the DF (Don't Fragment) flag of the encapsulating packets."));
+		o.default = o.enabled;
+
+		o = s.taboption('advanced', form.Flag, 'nohostroute', _("No host route"), _("Do not create host route to peer (optional)."));
+		o.optional = true;
+
+		o = s.taboption('advanced', form.Value, 'ikey', _("Incoming key"), _("Key for incoming packets (optional)."));
+		o.optional = true;
+		o.datatype = 'integer';
+
+		o = s.taboption('advanced', form.Value, 'okey', _("Outgoing key"), _("Key for outgoing packets (optinal)."));
+		o.optional = true;
+		o.datatype = 'integer';
+
+		s.taboption('advanced', form.Flag, 'icsum', _("Incoming checksum"), _("Require incoming checksum (optional)."));
+		s.taboption('advanced', form.Flag, 'ocsum', _("Outgoing checksum"), _("Compute outgoing checksum (optional)."));
+		s.taboption('advanced', form.Flag, 'iseqno', _("Incoming serialization"), _("Require incoming packets serialization (optional)."));
+		s.taboption('advanced', form.Flag, 'oseqno', _("Outgoing serialization"), _("Perform outgoing packets serialization (optional)."));
+
+	}
+});
diff --git a/luci-proto-gre/htdocs/luci-static/resources/protocol/grev6.js b/luci-proto-gre/htdocs/luci-static/resources/protocol/grev6.js
new file mode 100644
index 000000000..bd9a43e27
--- /dev/null
+++ b/luci-proto-gre/htdocs/luci-static/resources/protocol/grev6.js
@@ -0,0 +1,98 @@
+'use strict';
+'require form';
+'require network';
+'require tools.widgets as widgets';
+
+network.registerPatternVirtual(/^gre6-.+$/);
+
+return network.registerProtocol('grev6', {
+	getI18n: function() {
+		return _('GRE tunnel over IPv6');
+	},
+
+	getIfname: function() {
+		return this._ubus('l3_device') || 'gre6-%s'.format(this.sid);
+	},
+
+	getOpkgPackage: function() {
+		return 'gre';
+	},
+
+	isFloating: function() {
+		return true;
+	},
+
+	isVirtual: function() {
+		return true;
+	},
+
+	getDevices: function() {
+		return null;
+	},
+
+	containsDevice: function(ifname) {
+		return (network.getIfnameOf(ifname) == this.getIfname());
+	},
+
+	renderFormOptions: function(s) {
+		var o;
+
+		// -- general ---------------------------------------------------------------------
+
+		o = s.taboption('general', form.Value, 'peer6addr', _("Remote IPv6 address or FQDN"), _("The IPv6 address or the fully-qualified domain name of the remote tunnel end."));
+		o.optional = false;
+		o.datatype = 'or(hostname,ip6addr("nomask"))';
+
+		o = s.taboption('general', form.Value, 'ip6addr', _("Local IPv6 address"), _("The local IPv6 address over which the tunnel is created (optional)."));
+		o.optional = true;
+		o.datatype = 'ip6addr("nomask")';
+
+		o = s.taboption('general', widgets.NetworkSelect, 'weakif', _("Source interface"), _("Logical network from which to select the local endpoint if local IPv6 address is empty and no WAN IPv6 is available (optional)."));
+		o.exclude = s.section;
+		o.nocreate = true;
+		o.optional = true;
+
+		// -- advanced ---------------------------------------------------------------------
+
+		o = s.taboption('advanced', widgets.NetworkSelect, 'tunlink', _("Bind interface"), _("Bind the tunnel to this interface (optional)."));
+		o.exclude = s.section;
+		o.nocreate = true;
+		o.optional = true;
+
+		o = s.taboption('advanced', form.Value, 'mtu', _("Override MTU"), _("Specify an MTU (Maximum Transmission Unit) other than the default (1280 bytes) (optional)."));
+		o.optional = true;
+		o.placeholder = 1280;
+		o.datatype = 'range(68, 9200)';
+
+		o = s.taboption('advanced', form.Value, 'ttl', _("Override TTL"), _("Specify a TTL (Time to Live) for the encapsulating packet other than the default (64) (optional)."));
+		o.optional = true;
+		o.placeholder = 64;
+		o.datatype = 'min(1)';
+
+		o = s.taboption('advanced', form.Value, 'tos', _('Traffic Class'), _("Specify a Traffic Class. Can be either <code>inherit</code> (the outer header inherits the value of the inner header) or an hexadecimal value starting with <code>0x</code> (optional)."));
+		o.optional = true;
+		o.validate = function(section_id, value) {
+			if (value.length > 0 && !value.match(/^0x[a-fA-F0-9]{1,2}$/) && !value.match(/^inherit$/i))
+				return _('Invalid value');
+
+			return true;
+		};
+
+		o = s.taboption('advanced', form.Flag, 'nohostroute', _("No host route"), _("Do not create host route to peer (optional)."));
+		o.optional = true;
+
+		o = s.taboption('advanced', form.Value, 'ikey', _("Incoming key"), _("Key for incoming packets (optional)."));
+		o.optional = true;
+		o.datatype = 'integer';
+
+		o = s.taboption('advanced', form.Value, 'okey', _("Outgoing key"), _("Key for outgoing packets (optinal)."));
+		o.optional = true;
+		o.datatype = 'integer';
+
+		s.taboption('advanced', form.Flag, 'icsum', _("Incoming checksum"), _("Require incoming checksum (optional)."));
+		s.taboption('advanced', form.Flag, 'ocsum', _("Outgoing checksum"), _("Compute outgoing checksum (optional)."));
+		s.taboption('advanced', form.Flag, 'iseqno', _("Incoming serialization"), _("Require incoming packets serialization (optional)."));
+		s.taboption('advanced', form.Flag, 'oseqno', _("Outgoing serialization"), _("Perform outgoing packets serialization (optional)."));
+
+	}
+});
diff --git a/luci-proto-gre/htdocs/luci-static/resources/protocol/grev6tap.js b/luci-proto-gre/htdocs/luci-static/resources/protocol/grev6tap.js
new file mode 100644
index 000000000..3b1a50371
--- /dev/null
+++ b/luci-proto-gre/htdocs/luci-static/resources/protocol/grev6tap.js
@@ -0,0 +1,103 @@
+'use strict';
+'require form';
+'require network';
+'require tools.widgets as widgets';
+
+network.registerPatternVirtual(/^gre6t-.+$/);
+
+return network.registerProtocol('grev6tap', {
+	getI18n: function() {
+		return _('GRETAP tunnel over IPv6');
+	},
+
+	getIfname: function() {
+		return this._ubus('l3_device') || 'gre6t-%s'.format(this.sid);
+	},
+
+	getOpkgPackage: function() {
+		return 'gre';
+	},
+
+	isFloating: function() {
+		return true;
+	},
+
+	isVirtual: function() {
+		return true;
+	},
+
+	getDevices: function() {
+		return null;
+	},
+
+	containsDevice: function(ifname) {
+		return (network.getIfnameOf(ifname) == this.getIfname());
+	},
+
+	renderFormOptions: function(s) {
+		var o;
+
+		// -- general ---------------------------------------------------------------------
+
+		o = s.taboption('general', form.Value, 'peer6addr', _("Remote IPv6 address or FQDN"), _("The IPv6 address or the fully-qualified domain name of the remote tunnel end."));
+		o.optional = false;
+		o.datatype = 'or(hostname,ip6addr("nomask"))';
+
+		o = s.taboption('general', form.Value, 'ip6addr', _("Local IPv6 address"), _("The local IPv6 address over which the tunnel is created (optional)."));
+		o.optional = true;
+		o.datatype = 'ip6addr("nomask")';
+
+		o = s.taboption('general', widgets.NetworkSelect, 'weakif', _("Source interface"), _("Logical network from which to select the local endpoint if local IPv6 address is empty and no WAN IPv6 is available (optional)."));
+		o.exclude = s.section;
+		o.nocreate = true;
+		o.optional = true;
+
+		o = s.taboption('general', widgets.NetworkSelect, 'network', _("Network interface"), _("Logical network to which the tunnel will be added (bridged) (optional)."));
+		o.exclude = s.section;
+		o.nocreate = true;
+		o.optional = true;
+
+		// -- advanced ---------------------------------------------------------------------
+
+		o = s.taboption('advanced', widgets.NetworkSelect, 'tunlink', _("Bind interface"), _("Bind the tunnel to this interface (optional)."));
+		o.exclude = s.section;
+		o.nocreate = true;
+		o.optional = true;
+
+		o = s.taboption('advanced', form.Value, 'mtu', _("Override MTU"), _("Specify an MTU (Maximum Transmission Unit) other than the default (1280 bytes) (optional)."));
+		o.optional = true;
+		o.placeholder = 1280;
+		o.datatype = 'range(68, 9200)';
+
+		o = s.taboption('advanced', form.Value, 'ttl', _("Override TTL"), _("Specify a TTL (Time to Live) for the encapsulating packet other than the default (64) (optional)."));
+		o.optional = true;
+		o.placeholder = 64;
+		o.datatype = 'min(1)';
+
+		o = s.taboption('advanced', form.Value, 'tos', _('Traffic Class'), _("Specify a Traffic Class. Can be either <code>inherit</code> (the outer header inherits the value of the inner header) or an hexadecimal value starting with <code>0x</code> (optional)."));
+		o.optional = true;
+		o.validate = function(section_id, value) {
+			if (value.length > 0 && !value.match(/^0x[a-fA-F0-9]{1,2}$/) && !value.match(/^inherit$/i))
+				return _('Invalid value');
+
+			return true;
+		};
+
+		o = s.taboption('advanced', form.Flag, 'nohostroute', _("No host route"), _("Do not create host route to peer (optional)."));
+		o.optional = true;
+
+		o = s.taboption('advanced', form.Value, 'ikey', _("Incoming key"), _("Key for incoming packets (optional)."));
+		o.optional = true;
+		o.datatype = 'integer';
+
+		o = s.taboption('advanced', form.Value, 'okey', _("Outgoing key"), _("Key for outgoing packets (optinal)."));
+		o.optional = true;
+		o.datatype = 'integer';
+
+		s.taboption('advanced', form.Flag, 'icsum', _("Incoming checksum"), _("Require incoming checksum (optional)."));
+		s.taboption('advanced', form.Flag, 'ocsum', _("Outgoing checksum"), _("Compute outgoing checksum (optional)."));
+		s.taboption('advanced', form.Flag, 'iseqno', _("Incoming serialization"), _("Require incoming packets serialization (optional)."));
+		s.taboption('advanced', form.Flag, 'oseqno', _("Outgoing serialization"), _("Perform outgoing packets serialization (optional)."));
+
+	}
+});

From c199d8bc6097a7232d492ccf5b30b6d2d27f0669 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Fri, 1 May 2020 11:08:31 +0200
Subject: [PATCH 11/88] Use fd80 instead of fe80 for 6in4

---
 omr-6in4/files/bin/omr-6in4                   | 4 ++--
 omr-6in4/files/etc/uci-defaults/9010-omr-6in4 | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/omr-6in4/files/bin/omr-6in4 b/omr-6in4/files/bin/omr-6in4
index 594c9b2d0..34c03a17c 100755
--- a/omr-6in4/files/bin/omr-6in4
+++ b/omr-6in4/files/bin/omr-6in4
@@ -39,8 +39,8 @@ while true; do
 				ipv6_addr=$(ubus call network.interface.omr6in4 status | jsonfilter -q -l 1 -e '@["ipv6-address"][0].address' | tr -d "\n")
 				ip -6 addr add $ipv6_addr dev 6in4-omr6in4 > /dev/null 2>&1
 				ipv6_gw=$(ubus call network.interface.omr6in4 status | jsonfilter -q -l 1 -e '@.route[@.target="::"].nexthop' | tr -d "\n")
-				[ "$ipv6_gw" = "::" ] && ipv6_gw='fe80::a00:1'
-				[ -z "$ipv6_gw" ] && ipv6_gw='fe80::a00:1'
+				[ "$ipv6_gw" = "::" ] && ipv6_gw='fd80::a00:1'
+				[ -z "$ipv6_gw" ] && ipv6_gw='fd80::a00:1'
 				#[ -z "$ipv6_gw" ] && ipv6_gw='fe80::aff:ff01'
 				ip -6 route replace default via ${ipv6_gw} dev 6in4-omr6in4 > /dev/null 2>&1
 				if [ "$(uci -q get openmptcprouter.settings.uci_route)" = "1" ]; then
diff --git a/omr-6in4/files/etc/uci-defaults/9010-omr-6in4 b/omr-6in4/files/etc/uci-defaults/9010-omr-6in4
index 56ca8b282..3247a243d 100755
--- a/omr-6in4/files/etc/uci-defaults/9010-omr-6in4
+++ b/omr-6in4/files/etc/uci-defaults/9010-omr-6in4
@@ -10,8 +10,8 @@ if [ "$(uci -q show network | grep omr6in4)" = "" ]; then
 	set network.omr6in4.multipath=off
 	set network.omr6in4.ipaddr=10.255.255.2
 	set network.omr6in4.peeraddr=10.255.255.1
-	set network.omr6in4.gateway=fe80::a00:1
-	set network.omr6in4.ip6addr='fe80::a00:2/128'
+	set network.omr6in4.gateway=fd80::a00:1
+	set network.omr6in4.ip6addr='fd80::a00:2/128'
 	set network.omr6in4.auto='0'
 	commit network
 	EOF
@@ -27,7 +27,7 @@ fi
 
 if [ "$(uci -q get network.omr6in4.ip6addr)" = "" ]; then
 	uci -q batch <<-EOF >/dev/null
-	set network.omr6in4.ip6addr=fe80::a00:2
+	set network.omr6in4.ip6addr=fd80::a00:2
 	commit network
 	EOF
 fi

From 2ccc71337958a293dcae0918e4deab93da5c8730 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Fri, 1 May 2020 11:09:04 +0200
Subject: [PATCH 12/88] Fix post tracking

---
 .../usr/share/omr/post-tracking.d/post-tracking     | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

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 9ac28f24d..9212e83fb 100755
--- a/mptcp/files/usr/share/omr/post-tracking.d/post-tracking
+++ b/mptcp/files/usr/share/omr/post-tracking.d/post-tracking
@@ -385,13 +385,12 @@ if [ "$multipath_config" = "master" ]; then
 		if [ -n "$omrvpn_intf" ] && [ "$(ip route show default | awk '/default/ {print $5}' | grep $omrvpn_intf)" = "" ]; then
 			_log "Master 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
-		else
-			config_load openmptcprouter
-			if [ "$(uci -q get openmptcprouter.settings.master)" = "balancing" ]; then
-				config_foreach set_server_all_routes server
-			elif [ "$(uci -q get openmptcprouter.settings.master)" != "failover" ]; then
-				config_foreach set_server_default_route server
-			fi
+		fi
+		config_load openmptcprouter
+		if [ "$(uci -q get openmptcprouter.settings.master)" = "balancing" ]; then
+			config_foreach set_server_all_routes server
+		elif [ "$(uci -q get openmptcprouter.settings.master)" != "failover" ]; then
+			config_foreach set_server_default_route server
 		fi
 		ip route replace default via $OMR_TRACKER_DEVICE_GATEWAY dev $OMR_TRACKER_DEVICE table 991337
 	fi

From 8fdb3fef122ad054985f7936b57bbe6c4bc0225b Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Sat, 2 May 2020 18:24:09 +0200
Subject: [PATCH 13/88] Fix nginx-ha access

---
 .../root/usr/share/luci/menu.d/luci-app-nginx-ha.json           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/luci-app-nginx-ha/root/usr/share/luci/menu.d/luci-app-nginx-ha.json b/luci-app-nginx-ha/root/usr/share/luci/menu.d/luci-app-nginx-ha.json
index d9f54cc33..b62a8ab35 100644
--- a/luci-app-nginx-ha/root/usr/share/luci/menu.d/luci-app-nginx-ha.json
+++ b/luci-app-nginx-ha/root/usr/share/luci/menu.d/luci-app-nginx-ha.json
@@ -3,7 +3,7 @@
 		"title": "Nginx High Availability",
 		"order": 80,
 		"action": {
-			"type": "uci",
+			"type": "cbi",
 			"path": "nginx-ha"
 		},
 		"depends": {

From e4a6d5e4fbcb8d51aa3a4204f997c792e4559871 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Sat, 2 May 2020 18:24:57 +0200
Subject: [PATCH 14/88] Fix bypass port destination

---
 .../htdocs/luci-static/resources/view/services/omr-bypass.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/luci-app-omr-bypass/htdocs/luci-static/resources/view/services/omr-bypass.js b/luci-app-omr-bypass/htdocs/luci-static/resources/view/services/omr-bypass.js
index 729c8a8ee..edf03099b 100644
--- a/luci-app-omr-bypass/htdocs/luci-static/resources/view/services/omr-bypass.js
+++ b/luci-app-omr-bypass/htdocs/luci-static/resources/view/services/omr-bypass.js
@@ -62,13 +62,12 @@ return L.view.extend({
 		o = s.option(form.Value, 'dport', _('port'));
 		o.rmempty = false;
 
-		o = s.option(form.MultiValue, 'proto', _('protocol'));
+		o = s.option(form.ListValue, 'proto', _('protocol'));
 		o.default = 'tcp';
-		o.modalonly = true;
-		o.custom = true;
 		o.rmempty = false;
 		o.value('tcp');
 		o.value('udp');
+		o.value('icmp');
 
 		o = s.option(widgets.DeviceSelect, 'interface', _('Interface'));
 		o.noaliases = true;

From c468d149d7e709e18901fadda97b7f2394206636 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Tue, 5 May 2020 09:54:20 +0200
Subject: [PATCH 15/88] Add multiqueue option to glorytun TCP

---
 glorytun/glorytun.config | 3 ++-
 glorytun/init            | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/glorytun/glorytun.config b/glorytun/glorytun.config
index a0dfe1593..9ee6e41e6 100644
--- a/glorytun/glorytun.config
+++ b/glorytun/glorytun.config
@@ -9,4 +9,5 @@ config glorytun 'vpn'
 	option chacha20 '1'
 	option mtuauto '1'
 	option localip '10.255.255.2'
-	option remoteip '10.255.255.1'
\ No newline at end of file
+	option remoteip '10.255.255.1'
+	option multiqueue '1'
\ No newline at end of file
diff --git a/glorytun/init b/glorytun/init
index 116547ac0..5d0233157 100755
--- a/glorytun/init
+++ b/glorytun/init
@@ -74,6 +74,7 @@ start_instance() {
 	[ "${listener}" = "1" ] && procd_append_param command listener
 	[ "${mptcp}" = "1" ] && procd_append_param command mptcp
 	[ "${chacha20}" = "1" ] && procd_append_param command chacha20
+	[ "${multiqueue}" = "1" ] && procd_append_param command multiqueue
 
 	procd_append_param command \
 		retry count -1 const 500000 \

From 7e5b91842b1c644f2e822835ee3556bea32c3895 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Tue, 5 May 2020 09:55:13 +0200
Subject: [PATCH 16/88] Remove handover when updating config

---
 .../files/etc/uci-defaults/1920-omr-network            | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/openmptcprouter/files/etc/uci-defaults/1920-omr-network b/openmptcprouter/files/etc/uci-defaults/1920-omr-network
index 2c8a1231c..30693dae2 100755
--- a/openmptcprouter/files/etc/uci-defaults/1920-omr-network
+++ b/openmptcprouter/files/etc/uci-defaults/1920-omr-network
@@ -42,6 +42,15 @@ _setup_macvlan_update() {
 	EOF
 }
 
+_setup_mptcp_handover_to_on() {
+	if [ "$(uci -q get network.$1.multipath)" = "handover" ]; then
+		uci -q set network.$1.multipath=on
+	fi
+	if [ "$(uci -q get openmptcprouter.$1.multipath)" = "handover" ]; then
+		uci -q set openmptcprouter.$1.multipath=on
+	fi
+}
+
 _setup_multipath_off() {
     uci -q get "network.$1.multipath" >/dev/null && return
     uci -q set "network.$1.multipath=off"
@@ -64,6 +73,7 @@ _setup_wan_interface() {
 
 config_load network
 config_foreach _setup_macvlan_update interface
+config_foreach _setup_mptcp_handover_to_on interface
 
 if [ "$(uci -q show network.lan | grep multipath)" != "" ]; then
 	exit 0

From 7797f711cc7c38770b97613c8d70058dba7f6df8 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Tue, 5 May 2020 09:55:43 +0200
Subject: [PATCH 17/88] Fix when removing mptcp over vpn interface

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

diff --git a/openmptcprouter/files/etc/init.d/mptcpovervpn b/openmptcprouter/files/etc/init.d/mptcpovervpn
index 27346a09b..365df31ed 100755
--- a/openmptcprouter/files/etc/init.d/mptcpovervpn
+++ b/openmptcprouter/files/etc/init.d/mptcpovervpn
@@ -68,13 +68,14 @@ mptcp_over_vpn() {
 		[ -z "$multipath" ] && multipath="on"
 		uci -q batch <<-EOF >/dev/null
 			delete network.ovpn${interface}
-			commit network
 			delete openvpn.${interface}
 			commit openvpn
 			set openmptcprouter.${interface}.multipath="${multipath}"
+			set network.${interface}.multipath="${multipath}"
 			set openmptcprouter.${interface}.multipathvpn="0"
 			delete openmptcprouter.ovpn${interface}
 			commit openmptcprouter
+			commit network
 		EOF
 	fi
 }

From 463542a4afd6f56e82d7e6ba48a563ac247299b5 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Tue, 5 May 2020 09:56:23 +0200
Subject: [PATCH 18/88] Set a default value for omr-quota

---
 omr-quota/files/etc/init.d/omr-quota | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/omr-quota/files/etc/init.d/omr-quota b/omr-quota/files/etc/init.d/omr-quota
index 0d81f6634..4ed95c735 100755
--- a/omr-quota/files/etc/init.d/omr-quota
+++ b/omr-quota/files/etc/init.d/omr-quota
@@ -11,7 +11,7 @@ _validate_section() {
 		'txquota:uinteger'  \
 		'rxquota:uinteger'  \
 		'ttquota:uinteger'  \
-		'interval:uinteger' \
+		'interval:uinteger:30' \
 		'enabled:bool:0'
 }
 

From 94dd3ef97fcd28340dd447d9255e3f068e7dea91 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Tue, 5 May 2020 09:56:56 +0200
Subject: [PATCH 19/88] Better style for indicator

---
 .../htdocs/luci-static/openmptcprouter/cascade.css     | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/luci-theme-openmptcprouter/htdocs/luci-static/openmptcprouter/cascade.css b/luci-theme-openmptcprouter/htdocs/luci-static/openmptcprouter/cascade.css
index 523f978db..facffacbf 100644
--- a/luci-theme-openmptcprouter/htdocs/luci-static/openmptcprouter/cascade.css
+++ b/luci-theme-openmptcprouter/htdocs/luci-static/openmptcprouter/cascade.css
@@ -1782,7 +1782,8 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
 	line-height: 28px;
 }
 
-.label {
+.label,
+header [data-indicator] {
 	padding: 1px 3px 2px;
 	font-size: 9.75px;
 	font-weight: bold;
@@ -1795,6 +1796,10 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
 	margin-left: .4em;
 }
 
+header [data-indicator][data-clickable] {
+	cursor: pointer;
+}
+
 a.label:link,
 a.label:visited {
 	color: #fff;
@@ -1816,7 +1821,8 @@ a.label:hover {
 	background-color: #46a546;
 }
 
-.label.notice {
+.label.notice,
+header [data-indicator][data-style="active"] {
 	background-color: #62cffc;
 }
 

From c253fa189f9df0de8a0ca29dd98b492186e7b1e9 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Tue, 5 May 2020 10:24:56 +0200
Subject: [PATCH 20/88] Fix acl and menu json for apps

---
 .../root/usr/share/luci/menu.d/luci-app-https-dns-proxy.json  | 2 +-
 luci-app-iperf/root/usr/share/luci/menu.d/luci-app-iperf.json | 4 ++--
 luci-app-mail/root/usr/share/luci/menu.d/luci-app-mail.json   | 2 +-
 .../root/usr/share/luci/menu.d/luci-app-omr-dscp.json         | 4 ++--
 .../rpcd/acl.d/{luci-app-dscp.json => luci-app-omr-dscp.json} | 2 +-
 .../root/usr/share/luci/menu.d/luci-app-omr-quota.json        | 4 ++--
 .../root/usr/share/luci/menu.d/luci-app-omr-tracker.json      | 2 +-
 .../root/usr/share/luci/menu.d/luci-app-openmptcprouter.json  | 2 +-
 luci-app-snmpd/root/usr/share/luci/menu.d/luci-app-snmpd.json | 2 +-
 9 files changed, 12 insertions(+), 12 deletions(-)
 rename luci-app-omr-dscp/root/usr/share/rpcd/acl.d/{luci-app-dscp.json => luci-app-omr-dscp.json} (83%)

diff --git a/luci-app-https-dns-proxy/root/usr/share/luci/menu.d/luci-app-https-dns-proxy.json b/luci-app-https-dns-proxy/root/usr/share/luci/menu.d/luci-app-https-dns-proxy.json
index a2238b5c1..6b44c21df 100644
--- a/luci-app-https-dns-proxy/root/usr/share/luci/menu.d/luci-app-https-dns-proxy.json
+++ b/luci-app-https-dns-proxy/root/usr/share/luci/menu.d/luci-app-https-dns-proxy.json
@@ -3,7 +3,7 @@
 		"title": "Proxy DNS Over HTTPS",
 		"order": 20,
 		"action": {
-			"type": "uci",
+			"type": "cbi",
 			"path": "https-dns-proxy"
 		},
 		"depends": {
diff --git a/luci-app-iperf/root/usr/share/luci/menu.d/luci-app-iperf.json b/luci-app-iperf/root/usr/share/luci/menu.d/luci-app-iperf.json
index fa4f87669..dd6151ee0 100644
--- a/luci-app-iperf/root/usr/share/luci/menu.d/luci-app-iperf.json
+++ b/luci-app-iperf/root/usr/share/luci/menu.d/luci-app-iperf.json
@@ -3,8 +3,8 @@
 		"title": "iPerf",
 		"order": 10,
 		"action": {
-			"type": "uci",
-			"path": "iperf"
+			"type": "template",
+			"path": "iperf/test"
 		},
 		"depends": {
 			"acl": [ "luci-app-iperf" ]
diff --git a/luci-app-mail/root/usr/share/luci/menu.d/luci-app-mail.json b/luci-app-mail/root/usr/share/luci/menu.d/luci-app-mail.json
index 089af244c..6098e0a26 100644
--- a/luci-app-mail/root/usr/share/luci/menu.d/luci-app-mail.json
+++ b/luci-app-mail/root/usr/share/luci/menu.d/luci-app-mail.json
@@ -3,7 +3,7 @@
 		"title": "E-Mail",
 		"order": 90,
 		"action": {
-			"type": "uci",
+			"type": "cbi",
 			"path": "mail"
 		},
 		"depends": {
diff --git a/luci-app-omr-dscp/root/usr/share/luci/menu.d/luci-app-omr-dscp.json b/luci-app-omr-dscp/root/usr/share/luci/menu.d/luci-app-omr-dscp.json
index db602b6ff..bd3fe3960 100644
--- a/luci-app-omr-dscp/root/usr/share/luci/menu.d/luci-app-omr-dscp.json
+++ b/luci-app-omr-dscp/root/usr/share/luci/menu.d/luci-app-omr-dscp.json
@@ -3,8 +3,8 @@
 		"title": "OMR-DSCP",
 		"order": 80,
 		"action": {
-			"type": "uci",
-			"path": "omr-dscp"
+			"type": "cbi",
+			"path": "dscp"
 		},
 		"depends": {
 			"acl": [ "luci-app-omr-dscp" ]
diff --git a/luci-app-omr-dscp/root/usr/share/rpcd/acl.d/luci-app-dscp.json b/luci-app-omr-dscp/root/usr/share/rpcd/acl.d/luci-app-omr-dscp.json
similarity index 83%
rename from luci-app-omr-dscp/root/usr/share/rpcd/acl.d/luci-app-dscp.json
rename to luci-app-omr-dscp/root/usr/share/rpcd/acl.d/luci-app-omr-dscp.json
index 4cb8a0bb1..ec318e6ee 100644
--- a/luci-app-omr-dscp/root/usr/share/rpcd/acl.d/luci-app-dscp.json
+++ b/luci-app-omr-dscp/root/usr/share/rpcd/acl.d/luci-app-omr-dscp.json
@@ -1,5 +1,5 @@
 {
-    "luci-app-dscp": {
+    "luci-app-omr-dscp": {
 	"description": "Grant UCI access for luci-app-dscp",
 	"read": {
 	    "uci": [ "dscp" ]
diff --git a/luci-app-omr-quota/root/usr/share/luci/menu.d/luci-app-omr-quota.json b/luci-app-omr-quota/root/usr/share/luci/menu.d/luci-app-omr-quota.json
index 5b7149b3f..73ac0e6f4 100644
--- a/luci-app-omr-quota/root/usr/share/luci/menu.d/luci-app-omr-quota.json
+++ b/luci-app-omr-quota/root/usr/share/luci/menu.d/luci-app-omr-quota.json
@@ -3,8 +3,8 @@
 		"title": "Quota",
 		"order": 90,
 		"action": {
-			"type": "uci",
-			"path": "quota"
+			"type": "cbi",
+			"path": "quota/quota"
 		},
 		"depends": {
 			"acl": [ "luci-app-omr-quota" ]
diff --git a/luci-app-omr-tracker/root/usr/share/luci/menu.d/luci-app-omr-tracker.json b/luci-app-omr-tracker/root/usr/share/luci/menu.d/luci-app-omr-tracker.json
index 102c65c16..ed1c7a074 100644
--- a/luci-app-omr-tracker/root/usr/share/luci/menu.d/luci-app-omr-tracker.json
+++ b/luci-app-omr-tracker/root/usr/share/luci/menu.d/luci-app-omr-tracker.json
@@ -3,7 +3,7 @@
 		"title": "OMR-Tracker",
 		"order": 10,
 		"action": {
-			"type": "uci",
+			"type": "cbi",
 			"path": "omr-tracker"
 		},
 		"depends": {
diff --git a/luci-app-openmptcprouter/root/usr/share/luci/menu.d/luci-app-openmptcprouter.json b/luci-app-openmptcprouter/root/usr/share/luci/menu.d/luci-app-openmptcprouter.json
index 08c5b6f32..eea51e8f9 100644
--- a/luci-app-openmptcprouter/root/usr/share/luci/menu.d/luci-app-openmptcprouter.json
+++ b/luci-app-openmptcprouter/root/usr/share/luci/menu.d/luci-app-openmptcprouter.json
@@ -3,7 +3,7 @@
 		"title": "OpenMPTCProuter",
 		"order": 1,
 		"action": {
-			"type": "uci",
+			"type": "template",
 			"path": "openmptcprouter/wizard"
 		},
 		"depends": {
diff --git a/luci-app-snmpd/root/usr/share/luci/menu.d/luci-app-snmpd.json b/luci-app-snmpd/root/usr/share/luci/menu.d/luci-app-snmpd.json
index 5df5fa97a..771c4021a 100644
--- a/luci-app-snmpd/root/usr/share/luci/menu.d/luci-app-snmpd.json
+++ b/luci-app-snmpd/root/usr/share/luci/menu.d/luci-app-snmpd.json
@@ -3,7 +3,7 @@
 		"title": "SNMPd",
 		"order": 91,
 		"action": {
-			"type": "uci",
+			"type": "cbi",
 			"path": "snmpd"
 		},
 		"depends": {

From 400dc0e5740b463c193be2d1579437999ddc5e76 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Tue, 5 May 2020 10:26:24 +0200
Subject: [PATCH 21/88] LTE/3G/... in uppercase in status

---
 .../luci-static/resources/openmptcprouter/css/wanstatus.css      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/luci-app-openmptcprouter/htdocs/luci-static/resources/openmptcprouter/css/wanstatus.css b/luci-app-openmptcprouter/htdocs/luci-static/resources/openmptcprouter/css/wanstatus.css
index 3ea2fb277..878f540e1 100644
--- a/luci-app-openmptcprouter/htdocs/luci-static/resources/openmptcprouter/css/wanstatus.css
+++ b/luci-app-openmptcprouter/htdocs/luci-static/resources/openmptcprouter/css/wanstatus.css
@@ -297,6 +297,7 @@ Thanks :)*/
 .network-node .info .title i {
   font-weight: lighter;
   font-size: 5px;
+  text-transform: uppercase;
 }
 
 .network-node .info .status-message {

From d3a77da00594c5e2224a2cb26c6193086b844fe5 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Tue, 5 May 2020 10:27:02 +0200
Subject: [PATCH 22/88] Force reset cache of OMR status page

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

diff --git a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm
index 610ff3975..526b67ea2 100644
--- a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm
+++ b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm
@@ -31,9 +31,9 @@
 -- * Many tests
 -%>
 <%+header%>
-<link rel="stylesheet" type="text/css" href="<%=resource%>/openmptcprouter/css/wanstatus.css?v=git-18.120.38690-2678b12"/>
-<script type="text/javascript" src="<%=resource%>/seedrandom.js?v=git-18.120.38690-2678b12"></script>
-<script type="text/javascript" src="<%=resource%>/cbi.js?v=git-18.120.38690-2678b12"></script>
+<link rel="stylesheet" type="text/css" href="<%=resource%>/openmptcprouter/css/wanstatus.css?v=git-20"/>
+<script type="text/javascript" src="<%=resource%>/seedrandom.js?v=git-20"></script>
+<script type="text/javascript" src="<%=resource%>/cbi.js?v=git-20"></script>
 <script type="text/javascript">//<![CDATA[
 	var anonymize = false;
 	function getCookieValue(a) {

From d76151eef58949a6d07b38e37152f48552bbaab2 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Tue, 5 May 2020 10:27:41 +0200
Subject: [PATCH 23/88] Fix Operator from huawei

---
 luci-app-openmptcprouter/root/bin/omr-huawei | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/luci-app-openmptcprouter/root/bin/omr-huawei b/luci-app-openmptcprouter/root/bin/omr-huawei
index 7bb08c162..b334230f5 100755
--- a/luci-app-openmptcprouter/root/bin/omr-huawei
+++ b/luci-app-openmptcprouter/root/bin/omr-huawei
@@ -39,7 +39,7 @@ OPERATOR=""
 if [ "$CONNECTSTATE" = "901" ]; then
 	tmpfile=$(mktemp)
 	curl -s -m 1 -X GET "http://$MODEM_IP/api/net/current-plmn" -H "Cookie: SessionID=$COOKIE" -H "__RequestVerificationToken: $TOKEN" -H "Content-Type: text/xml" > ${tmpfile}
-	OPERATOR=$(cat ${tmpfile} | grep FullName | sed -e 's/<[^>]*>//g' | sed 's/[^\x00-\x7F]//g')
+	OPERATOR=$(cat ${tmpfile} | grep FullName | sed -e 's/<[^>]*>//g')
 	rm -f ${tmpfile}
 fi
 NUMBER=""

From 7f8c070254ef2edfd7a120c6c132af4a73b39d4a Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Tue, 5 May 2020 10:48:28 +0200
Subject: [PATCH 24/88] Fixes, low latency option and option to no add default
 gateway to internet

---
 .../luasrc/controller/openmptcprouter.lua     | 24 ++++++++++++++++++-
 .../luasrc/view/openmptcprouter/settings.htm  | 20 ++++++++++++++++
 .../etc/sysctl.d/zzz_openmptcprouter.conf     |  3 ++-
 .../root/etc/uci-defaults/openmptcprouter     |  6 +++++
 4 files changed, 51 insertions(+), 2 deletions(-)

diff --git a/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua b/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
index 7d83993a6..c32da267f 100644
--- a/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
+++ b/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
@@ -449,12 +449,17 @@ function wizard_add()
 	local encryption = luci.http.formvalue("encryption")
 	if encryption == "none" then
 		ucic:set("shadowsocks-libev","sss0","method","none")
+		ucic:save("shadowsocks-libev")
 	elseif encryption == "aes-256-gcm" then
 		ucic:set("shadowsocks-libev","sss0","method","aes-256-gcm")
 		ucic:set("glorytun","vpn","chacha20","0")
+		ucic:save("glorytun")
+		ucic:save("shadowsocks-libev")
 	elseif encryption == "chacha20-ietf-poly1305" then
 		ucic:set("shadowsocks-libev","sss0","method","chacha20-ietf-poly1305")
 		ucic:set("glorytun","vpn","chacha20","1")
+		ucic:save("glorytun")
+		ucic:save("shadowsocks-libev")
 	end
 
 	-- Set ShadowSocks settings
@@ -605,6 +610,7 @@ function wizard_add()
 	-- Restart all
 	if gostatus == true then
 		luci.sys.call("(env -i /bin/ubus call network reload) >/dev/null 2>/dev/null")
+		luci.sys.call("/etc/init.d/omr-tracker stop >/dev/null 2>/dev/null")
 		luci.sys.call("/etc/init.d/mptcp restart >/dev/null 2>/dev/null")
 		if openmptcprouter_vps_key ~= "" then
 			luci.sys.call("/etc/init.d/openmptcprouter-vps restart >/dev/null 2>/dev/null")
@@ -617,7 +623,7 @@ function wizard_add()
 		luci.sys.call("/etc/init.d/ubond restart >/dev/null 2>/dev/null")
 		luci.sys.call("/etc/init.d/openvpn restart >/dev/null 2>/dev/null")
 		luci.sys.call("/etc/init.d/dsvpn restart >/dev/null 2>/dev/null")
-		luci.sys.call("/etc/init.d/omr-tracker restart >/dev/null 2>/dev/null")
+		luci.sys.call("/etc/init.d/omr-tracker start >/dev/null 2>/dev/null")
 		luci.sys.call("/etc/init.d/omr-6in4 restart >/dev/null 2>/dev/null")
 		luci.sys.call("/etc/init.d/mptcpovervpn restart >/dev/null 2>/dev/null")
 		luci.sys.call("/etc/init.d/vnstat restart >/dev/null 2>/dev/null")
@@ -683,6 +689,10 @@ function settings_add()
 	local disablegwping = luci.http.formvalue("disablegwping") or "0"
 	ucic:set("openmptcprouter","settings","disablegwping",disablegwping)
 
+	-- Enable/disable default gateway
+	local disabledefaultgw = luci.http.formvalue("disabledefaultgw") or "1"
+	ucic:set("openmptcprouter","settings","defaultgw",disabledefaultgw)
+
 	-- Enable/disable server ping
 	local disableserverping = luci.http.formvalue("disableserverping") or "0"
 	ucic:set("openmptcprouter","settings","disableserverping",disableserverping)
@@ -701,6 +711,18 @@ function settings_add()
 		ucic:set("shadowsocks-libev",section[".name"],"fast_open",fastopen)
 	end)
 
+	-- Enable/disable no delay
+	local nodelay = luci.http.formvalue("enablenodelay") or "1"
+	ucic:set("openmptcprouter","settings","enable_nodelay",nodelay)
+	luci.sys.exec("sysctl -w net.ipv4.tcp_low_latency=%s" % nodelay)
+	luci.sys.exec("sed -i 's:^net.ipv4.tcp_low_latency=[0-9]*:net.ipv4.tcp_low_latency=%s:' /etc/sysctl.d/zzz_openmptcprouter.conf" % nodelay)
+	ucic:foreach("shadowsocks-libev", "ss_redir", function (section)
+		ucic:set("shadowsocks-libev",section[".name"],"no_delay",nodelay)
+	end)
+	ucic:foreach("shadowsocks-libev", "ss_local", function (section)
+		ucic:set("shadowsocks-libev",section[".name"],"no_delay",nodelay)
+	end)
+
 
 	-- Enable/disable obfs
 	local obfs = luci.http.formvalue("obfs") or "0"
diff --git a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm
index 4edca015c..fbd6fff04 100644
--- a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm
+++ b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm
@@ -164,6 +164,16 @@
 		    </div>
 		</div>
 	    </div>
+	    <div class="cbi-value">
+		<label class="cbi-value-title"><%:Enable TCP Low Latency%></label>
+		<div class="cbi-value-field">
+		    <input type="checkbox" name="enablenodelay" class="cbi-input-checkbox" value="1" <% if luci.model.uci.cursor():get("openmptcprouter","settings","enable_nodelay") == "1" then %>checked<% end %>>
+		    <br />
+		    <div class="cbi-value-description">
+			<%:Optimize for latency instead of bandwidth%>
+		    </div>
+		</div>
+	    </div>
 	    <div class="cbi-value">
 		<label class="cbi-value-title"><%:Save vnstats stats%></label>
 		<div class="cbi-value-field">
@@ -184,6 +194,16 @@
 		    </div>
 		</div>
 	    </div>
+	    <div class="cbi-value">
+		<label class="cbi-value-title"><%:Disable default gateway%></label>
+		<div class="cbi-value-field">
+		    <input type="checkbox" name="disabledefaultgw" class="cbi-input-checkbox" value="0" <% if luci.model.uci.cursor():get("openmptcprouter","settings","defaultgw") == "0" then %>checked<% end %>>
+		    <br />
+		    <div class="cbi-value-description">
+			<%:Disable default gateway, no internet if VPS are down%>
+		    </div>
+		</div>
+	    </div>
 	    <div class="cbi-value">
 		<label class="cbi-value-title"><%:Disable server ping%></label>
 		<div class="cbi-value-field">
diff --git a/luci-app-openmptcprouter/root/etc/sysctl.d/zzz_openmptcprouter.conf b/luci-app-openmptcprouter/root/etc/sysctl.d/zzz_openmptcprouter.conf
index 474d8b099..96bf976ce 100644
--- a/luci-app-openmptcprouter/root/etc/sysctl.d/zzz_openmptcprouter.conf
+++ b/luci-app-openmptcprouter/root/etc/sysctl.d/zzz_openmptcprouter.conf
@@ -2,4 +2,5 @@ net.ipv4.tcp_keepalive_time=7200
 net.ipv6.conf.all.disable_ipv6=0
 net.ipv4.tcp_fin_timeout=60
 net.ipv4.tcp_syn_retries=3
-net.ipv4.tcp_fastopen=3
\ No newline at end of file
+net.ipv4.tcp_fastopen=3
+net.ipv4.tcp_low_latency=1
diff --git a/luci-app-openmptcprouter/root/etc/uci-defaults/openmptcprouter b/luci-app-openmptcprouter/root/etc/uci-defaults/openmptcprouter
index f0f26b242..015737dbd 100755
--- a/luci-app-openmptcprouter/root/etc/uci-defaults/openmptcprouter
+++ b/luci-app-openmptcprouter/root/etc/uci-defaults/openmptcprouter
@@ -95,4 +95,10 @@ if [ "$(uci -q get openmptcprouter.settings.status_getip_timeout)" = "" ]; then
 		commit openmptcprouter
 	EOF
 fi
+if [ "$(uci -q get openmptcprouter.settings.enable_nodelay)" = "" ]; then
+	uci -q batch <<-EOF >/dev/null
+		set openmptcprouter.settings.enable_nodelay=1
+		commit openmptcprouter
+	EOF
+fi
 exit 0

From 7e53b4460af25f0083db012ebd4afcec35816817 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Tue, 5 May 2020 10:48:55 +0200
Subject: [PATCH 25/88] Post tracking changes needed for no default gateway
 option

---
 .../share/omr/post-tracking.d/post-tracking   | 32 +++++++++++++------
 1 file changed, 22 insertions(+), 10 deletions(-)

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 9212e83fb..cfb2d81c2 100755
--- a/mptcp/files/usr/share/omr/post-tracking.d/post-tracking
+++ b/mptcp/files/usr/share/omr/post-tracking.d/post-tracking
@@ -119,7 +119,7 @@ set_server_all_routes() {
 		routesintf=""
 		config_load network
 		config_foreach set_routes_intf interface
-		[ -n "$routesintf" ] && {
+		[ -n "$routesintf" ] && [ "$(echo $routesintf | grep $OMR_TRACKER_DEVICE_GATEWAY)" != "" ] && {
 			_log "Set server $server default route $serverip $routesintf"
 			ip route replace $serverip scope global $routesintf
 		}
@@ -250,7 +250,7 @@ if [ "$OMR_TRACKER_STATUS" = "ERROR" ]; then
 		#fi
 	}
 
-	if [ "$default_gw" = "$OMR_TRACKER_DEVICE_GATEWAY" ] || [ "$default_gw" = "" ]; then
+	if ([ "$default_gw" = "$OMR_TRACKER_DEVICE_GATEWAY" ] || [ "$default_gw" = "" ]) && [ "$(uci -q get openmptcprouter.settings.defaultgw)" != "0" ]; then
 		config_load network
 		config_foreach set_route interface $OMR_TRACKER_INTERFACE
 	fi
@@ -271,8 +271,10 @@ if [ "$OMR_TRACKER_STATUS" = "ERROR" ]; then
 		else
 			_log "$OMR_TRACKER_INTERFACE down because $OMR_TRACKER_STATUS_MSG"
 		fi
-		config_load network
-		config_foreach set_route interface $OMR_TRACKER_INTERFACE
+		if [ "$(uci -q get openmptcprouter.settings.defaultgw)" != "0" ]; then
+			config_load network
+			config_foreach set_route interface $OMR_TRACKER_INTERFACE
+		fi
 		if [ "$(uci -q get shadowsocks-libev.sss0.disabled)" != "1" ] && [ "$(uci -q get openmptcprouter.omr.shadowsocks)" = "up" ] && [ "$(uci -q get shadowsocks-libev.ss_rules.redir_udp)" = "" ] && [ "$(uci -q get shadowsocks-libev.hi2.mode)" = "tcp_and_udp" ]; then
 			_log "Tunnel down use ShadowSocks for UDP"
 			uci -q set shadowsocks-libev.ss_rules.redir_udp='hi2'
@@ -382,7 +384,7 @@ multipath_config=$(uci -q get "network.$OMR_TRACKER_INTERFACE.multipath")
 if [ "$multipath_config" = "master" ]; then
 	if ([ "$default_gw" != "$OMR_TRACKER_DEVICE_GATEWAY" ] || [ "$default_gw" = "" ]) && [ "$OMR_TRACKER_DEVICE_GATEWAY" != "" ] && [ "$(uci -q get openmptcprouter.settings.master)" != "balancing" ]; then
 		omrvpn_intf=$(uci -q get "network.omrvpn.ifname" || echo "tun")
-		if [ -n "$omrvpn_intf" ] && [ "$(ip route show default | awk '/default/ {print $5}' | grep $omrvpn_intf)" = "" ]; then
+		if [ -n "$omrvpn_intf" ] && [ "$(ip route show default | awk '/default/ {print $5}' | grep $omrvpn_intf)" = "" ] && [ "$(uci -q get openmptcprouter.settings.defaultgw)" != "0" ]; then
 			_log "Master 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
 		fi
@@ -394,7 +396,7 @@ if [ "$multipath_config" = "master" ]; then
 		fi
 		ip route replace default via $OMR_TRACKER_DEVICE_GATEWAY dev $OMR_TRACKER_DEVICE table 991337
 	fi
-	if [ "$(uci -q get openmptcprouter.settings.master)" = "balancing" ] && [ "$(ip route show default | grep weight)" = "" ]; then
+	if [ "$(uci -q get openmptcprouter.settings.master)" = "balancing" ] && [ "$(ip route show default | grep weight)" = "" ] && [ "$(uci -q get openmptcprouter.settings.defaultgw)" != "0" ]; then
 		omrvpn_intf=$(uci -q get "network.omrvpn.ifname" || echo "tun")
 		if [ -n "$omrvpn_intf" ] && [ "$(ip route show default | awk '/default/ {print $5}' | grep $omrvpn_intf)" = "" ]; then
 			ip route replace default via $OMR_TRACKER_DEVICE_GATEWAY dev $OMR_TRACKER_DEVICE table 991337
@@ -619,11 +621,21 @@ if [ "$(pgrep glorytun)" = "" ] && [ "$(uci -q get glorytun.vpn.enabled)" = "1"
 	/etc/init.d/glorytun-udp restart
 	sleep 5
 fi
-if [ "$(pgrep openvpn)" = "" ] && [ "$(uci -q get openvpn.omr.enabled)" = "1" ] && [ -f /etc/init.d/openvpn ]; then
-	_log "Can't find OpenVPN, restart it..."
-	/etc/init.d/openvpn restart
-	sleep 5
+
+if [ "$(pgrep openvpn)" = "" ] && [ -f /etc/init.d/openvpn ]; then
+	openvpn_enable=0
+	openvpn_enabled() {
+		[ "$(uci -q get openvpn.$1.enabled)" = "1" ] && openvpn_enable=1
+	}
+	config_load openvpn
+	config_foreach openvpn_enabled openvpn
+	if [ "$openvpn_enable" = "1" ]; then
+		_log "Can't find OpenVPN, restart it"
+		/etc/init.d/openvpn restart
+		sleep 5
+	fi
 fi
+
 if [ "$(pgrep mlvpn)" = "" ] && [ "$(uci -q get mlvpn.general.enable)" = "1" ] && [ -f /etc/init.d/mlvpn ]; then
 	_log "Can't find MLVPN, restart it..."
 	/etc/init.d/mlvpn restart

From 2539b04e168028d2b8bd1790c532e64c760c2d87 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Tue, 5 May 2020 10:50:14 +0200
Subject: [PATCH 26/88] Remove advanced reboot for all arch

---
 openmptcprouter-full/Makefile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/openmptcprouter-full/Makefile b/openmptcprouter-full/Makefile
index de964e2b2..a4badab0d 100644
--- a/openmptcprouter-full/Makefile
+++ b/openmptcprouter-full/Makefile
@@ -79,9 +79,10 @@ 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 kmod-zram kmod-swconfig swconfig kmod-ipt-nat kmod-ipt-nat6 luci-app-advanced-reboot luci-app-https-dns-proxy kmod-tcp-nanqinlang iptables-mod-ipopt igmpproxy ss mptcpd iptraf-ng \
+    wireguard luci-app-mlvpn mlvpn 464xlat !TARGET_mvebu:kmod-usb-net-smsc75xx kmod-zram kmod-swconfig swconfig kmod-ipt-nat kmod-ipt-nat6 luci-app-https-dns-proxy kmod-tcp-nanqinlang iptables-mod-ipopt igmpproxy ss mptcpd iptraf-ng \
     luci-app-acl block-mount blockd fstools luci-app-shutdown
-# luci-theme-openwrt-2020  luci-proto-bonding luci-app-statistics
+#     luci-theme-bootstrap luci-theme-openwrt-2020 luci-theme-openwrt luci-app-status
+#  luci-proto-bonding luci-app-statistics luci-proto-gre
 #    softethervpn5-client softethervpn5-server
 
 #    luci-app-mlvpn ubond \

From 0af0a63df51aa2b3fd92a531e934de33f09adc3b Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Tue, 5 May 2020 10:51:37 +0200
Subject: [PATCH 27/88] 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 463628fe1..d36d7d36d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -31,8 +31,8 @@ jobs:
       - run:
           name: cache
           command: |
-            echo "cache 93 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
-            echo "cache 95 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
+            echo "cache 94 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
+            echo "cache 96 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
 
       - restore_cache:
           keys:
@@ -94,8 +94,8 @@ jobs:
       - run:
           name: cache
           command: |
-            echo "cache 93 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
-            echo "cache 95 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
+            echo "cache 94 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
+            echo "cache 96 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
 
       - restore_cache:
           keys:
@@ -155,8 +155,8 @@ jobs:
       - run:
           name: cache
           command: |
-            echo "cache 93 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
-            echo "cache 95 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
+            echo "cache 94 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
+            echo "cache 96 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
 
       - restore_cache:
           keys:
@@ -216,8 +216,8 @@ jobs:
       - run:
           name: cache
           command: |
-            echo "cache 93 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
-            echo "cache 95 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
+            echo "cache 94 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
+            echo "cache 96 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
 
       - restore_cache:
           keys:
@@ -277,8 +277,8 @@ jobs:
       - run:
           name: cache
           command: |
-            echo "cache 93 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
-            echo "cache 95 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
+            echo "cache 94 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
+            echo "cache 96 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
 
       - restore_cache:
           keys:
@@ -338,8 +338,8 @@ jobs:
       - run:
           name: cache
           command: |
-            echo "cache 93 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
-            echo "cache 95 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
+            echo "cache 94 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
+            echo "cache 96 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
 
       - restore_cache:
           keys:
@@ -402,8 +402,8 @@ jobs:
       - run:
           name: cache
           command: |
-            echo "cache 93 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
-            echo "cache 95 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
+            echo "cache 94 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
+            echo "cache 96 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
 
       - restore_cache:
           keys:
@@ -462,8 +462,8 @@ jobs:
       - run:
           name: cache
           command: |
-            echo "cache 93 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
-            echo "cache 95 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
+            echo "cache 94 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
+            echo "cache 96 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
 
       - restore_cache:
           keys:

From 35cd6be3695809f015e402c7b26a091e8f6d69d4 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Wed, 6 May 2020 14:43:50 +0200
Subject: [PATCH 28/88] Remove luci-proto-bonding, added upstream

---
 luci-proto-bonding/Makefile                   |  17 -
 .../luci-static/resources/protocol/bonding.js | 425 ------------------
 2 files changed, 442 deletions(-)
 delete mode 100644 luci-proto-bonding/Makefile
 delete mode 100644 luci-proto-bonding/htdocs/luci-static/resources/protocol/bonding.js

diff --git a/luci-proto-bonding/Makefile b/luci-proto-bonding/Makefile
deleted file mode 100644
index 44a9bdaaf..000000000
--- a/luci-proto-bonding/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# Copyright (C) 2017 TDT AG <development@tdt.de>
-#
-# This is free software, licensed under the Apache License Version 2.0.
-# See https://www.apache.org/licenses/LICENSE-2.0 for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-LUCI_TITLE:=Support for Link Aggregation (Channel Bonding)
-LUCI_DEPENDS:=+proto-bonding
-
-PKG_MAINTAINER:=Helge Mader <ma@dev.tdt.de>
-
-include $(TOPDIR)/feeds/luci/luci.mk
-
-# call BuildPackage - OpenWrt buildroot signature
diff --git a/luci-proto-bonding/htdocs/luci-static/resources/protocol/bonding.js b/luci-proto-bonding/htdocs/luci-static/resources/protocol/bonding.js
deleted file mode 100644
index aadc2306d..000000000
--- a/luci-proto-bonding/htdocs/luci-static/resources/protocol/bonding.js
+++ /dev/null
@@ -1,425 +0,0 @@
-'use strict';
-'require ui';
-'require uci';
-'require form';
-'require fs';
-'require network';
-'require tools.widgets as widgets';
-
-
-function getSelectableSlaves(section_id) {
-	var rv = [];
-	var NonUsableMac = /^(00:00:00:00:00:00|null)/;
-	var interfaces = uci.sections('network', 'interface');
-
-	return network.getDevices().then(function(devices) {
-		for (var i = 0; i < devices.length; i++) {
-			var in_use = false;
-			var NotUsable = NonUsableMac.test(devices[i].getMAC());
-
-			// Only "real" interfaces for slaves needed
-			if (NotUsable == false) {
-				for (var j = 0; j < interfaces.length; j++) {
-					if (uci.get('network', interfaces[j]['.name'], 'proto') == 'bonding') {
-						var slaves = L.toArray(uci.get('network', interfaces[j]['.name'], 'slaves'));
-
-						for (var k = 0; k < slaves.length; k++) {
-							if (devices[i].ifname == slaves[k] && interfaces[j]['.name'] != section_id) {
-								in_use = true;
-							}
-						}
-					}
-				}
-				if (in_use == false) {
-					rv.push(devices[i].ifname);
-				}
-			}
-		}
-
-	return rv.sort();
-	});
-}
-
-function validateEmpty(section, value) {
-	if (value) {
-		return true;
-	}
-	else {
-		return _('Expecting: non-empty value');
-	}
-}
-
-function updatePrimaries(section, value) {
-
-	var opt = this.map.lookupOption('slaves', section);
-	var selected_slaves = opt[0].formvalue(section);
-
-	var uielem = this.map.lookupOption('primary', section)[0].getUIElement(section);
-	uielem.clearChoices();
-
-	for (var i = 0; i < selected_slaves.length; i++) {
-		uielem.addChoices(selected_slaves[i], selected_slaves[i]);
-	}
-
-	return true;
-}
-
-function validate_arp_policy(section, value) {
-
-	var opt = this.map.lookupOption('link_monitoring', section);
-	var selected_link_monitoring = opt[0].formvalue(section);
-
-	var opt = this.map.lookupOption('bonding_policy', section);
-	var selected_policy = opt[0].formvalue(section);
-
-	if (selected_link_monitoring == 'arp') {
-		if (selected_policy == '802.3ad' || selected_policy == 'balance-tlb' || selected_policy == 'balance-alb') {
-			return _('ARP monitoring is not supported for the selected policy!');
-		}
-	}
-
-	return true;
-}
-
-function validate_arp_ip_targets(section, value) {
-
-	var opt = this.map.lookupOption('link_monitoring', section);
-	var selected_link_monitoring = opt[0].formvalue(section);
-
-	var opt = this.map.lookupOption('arp_ip_target', section);
-	var selected_arp_ip_targets = opt[0].formvalue(section);
-
-	var opt = this.map.lookupOption('bonding_policy', section);
-	var selected_policy = opt[0].formvalue(section);
-
-	if (selected_link_monitoring == 'arp' && selected_arp_ip_targets.length == 0) {
-		return _('You must select at least one ARP IP target if ARP monitoring is selected!');
-	}
-
-	return true;
-}
-
-function validate_primary_interface(section, value) {
-
-	var opt = this.map.lookupOption('bonding_policy', section);
-	var selected_policy = opt[0].formvalue(section);
-
-	var opt = this.map.lookupOption('slaves', section);
-	var selected_slaves = opt[0].formvalue(section);
-
-	var opt = this.map.lookupOption('primary', section);
-	var selected_primary = opt[0].formvalue(section);
-
-	if (selected_policy == 'active-backup' || selected_policy == 'balance-tlb' || selected_policy == 'balance-alb') {
-		if (selected_slaves.filter(function(slave) { return slave == selected_primary }).length == 0)
-			return _('You must select a primary interface which is included in selected slave interfaces!');
- 	}
-
-	return true;
-}
-
-return network.registerProtocol('bonding', {
-	getI18n: function() {
-		return _('Link Aggregation (Channel Bonding)');
-	},
-
-	getIfname: function() {
-		return null;
-	},
-
-	getOpkgPackage: function() {
-		return 'bonding';
-	},
-
-	isFloating: function() {
-		return true;
-	},
-
-	isCreateable: function(ifname) {
-		return getSelectableSlaves(ifname).then(L.bind(function(devices) {
-			return devices.length == 0 ?  _('No more slaves available') : null;
-		}, this));
-
-		return _('No more slaves available');
-	},
-
-	isVirtual: function() {
-		return true;
-	},
-
-	getDevices: function() {
-		return null;
-	},
-
-	containsDevice: function(ifname) {
-		return (network.getIfnameOf(ifname) == this.getIfname());
-	},
-
-	renderFormOptions: function(s) {
-		var o;
-
-		o = s.taboption('general', form.Value, 'ipaddr',
-				_('IPv4 address'),
-				_('The local IPv4 address'));
-		o.datatype = 'ip4addr';
-		o.rmempty = false;
-
-		o = s.taboption('general', form.Value, 'netmask',
-				_('IPv4 netmask'),
-				_('The local IPv4 netmask'));
-		o.datatype = 'ip4addr';
-		o.validate = validateEmpty;
-		o.rmempty = false;
-		o.value("255.255.255.0");
-		o.value("255.255.0.0");
-		o.value("255.0.0.0");
-
-		o = s.taboption('advanced', form.MultiValue, 'slaves',
-				_('Slave Interfaces'),
-				_('Specifies which slave interfaces should be attached to this bonding interface'));
-		o.load = function(section_id) {
-			return getSelectableSlaves(section_id).then(L.bind(function(devices) {
-				for (var i = 0; i < devices.length; i++) {
-					this.value(devices[i], devices[i]);
-				}
-
-				if (devices.length == 0) {
-					this.placeholder = _('No more slaves available, can not save interface');
-					this.value('', '');
-					return '';
-				}
-
-				return uci.get('network', section_id, 'slaves');
-			}, this));
-		};
-		o.validate = updatePrimaries;
-		o.rmempty = false;
-		
-		o = s.taboption('advanced', form.ListValue, 'bonding_policy',
-				_('Bonding Policy'),
-				_('Specifies the mode to be used for this bonding interface'));
-		o.default = 'balance-rr';
-		o.value('balance-rr', _('Round-Robin policy (balance-rr, 0)'));
-		o.value('active-backup', _('Active-Backup policy (active-backup, 1)'));
-		o.value('balance-xor', _('XOR policy (balance-xor, 2)'));
-		o.value('broadcast', _('Broadcast policy (broadcast, 3)'));
-		o.value('802.3ad', _('IEEE 802.3ad Dynamic link aggregation (802.3ad, 4)'));
-		o.value('balance-tlb', _('Adaptive transmit load balancing (balance-tlb, 5)'));
-		o.value('balance-alb', _('Adaptive load balancing (balance-alb, 6)'));
-
-		o = s.taboption('advanced', widgets.DeviceSelect, 'primary',
-				_('Primary Slave'),
-				_('Specifies which slave is the primary device. It will always be the active slave while it is available'));
-		o.depends('bonding_policy', 'active-backup');
-		o.depends('bonding_policy', 'balance-tlb');
-		o.depends('bonding_policy', 'balance-alb');
-		o.filter = function(section_id, value) {
-			// Never return anything as valid, as the valid possibilities
-			// will be set in the slaves validate function
-			return false;
-		};
-		o.validate = validate_primary_interface;
-
-		o = s.taboption('advanced', form.ListValue, 'primary_reselect',
-				_('Reselection policy for primary slave'),
-				_('Specifies the reselection policy for the primary slave when failure of the active slave or recovery of the primary slave occurs'));
-		o.default = 'always';
-		o.value('always', _('Primary becomes active slave whenever it comes back up (always, 0)'));
-		o.value('better', _('Primary becomes active slave when it comes back up if speed and duplex better than current slave (better, 1)'));
-		o.value('failure', _('Only if current active slave fails and the primary slave is up (failure, 2)'));
-		o.depends('bonding_policy', 'active-backup');
-		o.depends('bonding_policy', 'balance-tlb');
-		o.depends('bonding_policy', 'balance-alb');
-
-		o = s.taboption('advanced', form.Value, 'min_links',
-				_('Minimum Number of Links'),
-				_('Specifies the minimum number of links that must be active before asserting carrier'));
-		o.datatype = 'uinteger';
-		o.default = 0;
-		o.rmempty = false;
-		o.depends('bonding_policy', '802.3ad');
-
-		o = s.taboption('advanced', form.Value, 'ad_actor_sys_prio',
-				_('System Priority'),
-				_('Specifies the system priority'));
-		o.datatype = 'range(1,65535)';
-		o.default = 65535;
-		o.rmempty = false;
-		o.depends('bonding_policy', '802.3ad');
-
-		o = s.taboption('advanced', form.Value, 'ad_actor_system',
-				_('MAC Address For The Actor'),
-				_("Specifies the mac-address for the actor in protocol packet exchanges (LACPDUs). If empty, masters' mac address defaults to system default"));
-		o.datatype = 'macaddr';
-		o.default = '';
-		o.depends('bonding_policy', '802.3ad');
-
-		o = s.taboption('advanced', form.ListValue, 'ad_select',
-				_('Aggregation Selection Logic'),
-				_('Specifies the aggregation selection logic to use'));
-		o.default = 'stable';
-		o.value('stable', _('Aggregator: All slaves down or has no slaves (stable, 0)'));
-		o.value('bandwidth', _('Aggregator: Slave added/removed or state changes (bandwidth, 1)'));
-		o.value('count', _('Aggregator: Chosen by the largest number of ports + slave added/removed or state changes (count, 2)'));
-		o.depends('bonding_policy', '802.3ad');
-
-		o = s.taboption('advanced', form.ListValue, 'lacp_rate',
-				_('LACPDU Packets'),
-				_('Specifies the rate in which the link partner will be asked to transmit LACPDU packets'));
-		o.default = 'slow';
-		o.value('slow', _('Every 30 seconds (slow, 0)'));
-		o.value('fast', _('Every second (fast, 1)'));
-		o.depends('bonding_policy', '802.3ad');
-
-		o = s.taboption('advanced', form.Value, 'packets_per_slave',
-				_('Packets To Transmit Before Moving To Next Slave'),
-				_("Specifies the number of packets to transmit through a slave before moving to the next one"));
-		o.datatype = 'range(0,65535)';
-		o.default = '1';
-		o.rmempty = false;
-		o.depends('bonding_policy', 'balance-rr');
-
-		o = s.taboption('advanced', form.Value, 'lp_interval',
-				_('Interval For Sending Learning Packets'),
-				_("Specifies the number of seconds between instances where the bonding	driver sends learning packets to each slaves peer switch"));
-		o.datatype = 'range(1,2147483647)';
-		o.default = '1';
-		o.rmempty = false;
-		o.depends('bonding_policy', 'balance-tlb');
-		o.depends('bonding_policy', 'balance-alb');
-
-		o = s.taboption('advanced', form.ListValue, 'tlb_dynamic_lb',
-				_('Enable Dynamic Shuffling Of Flows'),
-				_('Specifies whether to shuffle active flows across slaves based on the load'));
-		o.default = '1';
-		o.value('1', _('Yes'));
-		o.value('0', _('No'));
-		o.depends('bonding_policy', 'balance-tlb');
-
-		o = s.taboption('advanced', form.ListValue, 'fail_over_mac',
-				_('Set same MAC Address to all slaves'),
-				_('Specifies whether active-backup mode should set all slaves to the same MAC address at enslavement'));
-		o.default = 'none';
-		o.value('none', _('Yes (none, 0)'));
-		o.value('active', _('Set to currently active slave (active, 1)'));
-		o.value('follow', _('Set to first slave added to the bond (follow, 2)'));
-		o.depends('bonding_policy', 'active-backup');
-
-		o = s.taboption('advanced', form.Value, 'num_grat_arp__num_unsol_na',
-				_('Number of peer notifications after failover event'),
-				_("Specifies the number of peer notifications (gratuitous ARPs and unsolicited IPv6 Neighbor Advertisements) to be issued after a failover event"));
-		o.datatype = 'range(0,255)';
-		o.default = '1';
-		o.rmempty = false;
-		o.depends('bonding_policy', 'active-backup');
-
-		o = s.taboption('advanced', form.ListValue, 'xmit_hash_policy',
-				_('Transmit Hash Policy'),
-				_('Selects the transmit hash policy to use for slave selection'));
-		o.default = 'layer2';
-		o.value('layer2', _('Use XOR of hardware MAC addresses (layer2)'));
-		o.value('layer2+3', _('Use XOR of hardware MAC addresses and IP addresses (layer2+3)'));
-		o.value('layer3+4', _('Use upper layer protocol information (layer3+4)'));
-		o.value('encap2+3', _('Use XOR of hardware MAC addresses and IP addresses, rely on skb_flow_dissect (encap2+3)'));
-		o.value('encap3+4', _('Use upper layer protocol information, rely on skb_flow_dissect (encap3+4)'));
-		o.depends('bonding_policy', 'balance-rr');
-		o.depends('bonding_policy', 'active-backup');
-		o.depends('bonding_policy', 'balance-tlb');
-		o.depends('bonding_policy', 'balance-alb');
-		o.depends('bonding_policy', 'balance-xor');
-
-		o = s.taboption('advanced', form.Value, 'resend_igmp',
-				_('Number of IGMP membership reports'),
-				_("Specifies the number of IGMP membership reports to be issued after a failover event in 200ms intervals"));
-		o.datatype = 'range(0,255)';
-		o.default = '1';
-		o.rmempty = false;
-		o.depends('bonding_policy', 'balance-tlb');
-		o.depends('bonding_policy', 'balance-alb');
-
-		o = s.taboption('advanced', form.ListValue, 'all_slaves_active',
-				_('Drop Duplicate Frames'),
-				_('Specifies that duplicate frames (received on inactive ports) should be dropped or delivered'));
-		o.default = '0';
-		o.value('0', _('Yes'));
-		o.value('1', _('No'));
-
-		o = s.taboption('advanced', form.ListValue, 'link_monitoring',
-				_('Link Monitoring'),
-				_('Method of link monitoring'));
-		o.default = 'off';
-		o.value('off', _('Off'));
-		o.value('arp', _('ARP'));
-		o.value('mii', _('MII'));
-		o.validate = validate_arp_policy;
-
-		o = s.taboption('advanced', form.Value, 'arp_interval',
-				_('ARP Interval'),
-				_("Specifies the ARP link monitoring frequency in milliseconds"));
-		o.datatype = 'uinteger';
-		o.default = '0';
-		o.rmempty = false;
-		o.depends('link_monitoring', 'arp');
-
-		o = s.taboption('advanced', form.DynamicList, 'arp_ip_target',
-				_('ARP IP Targets'),
-				_('Specifies the IP addresses to use for ARP monitoring'));
-		o.datatype = 'ipaddr';
-		o.cast = 'string';
-		o.depends('link_monitoring', 'arp');
-		o.validate = validate_arp_ip_targets;
-
-		o = s.taboption('advanced', form.ListValue, 'arp_all_targets',
-				_('ARP mode to consider a slave as being up'),
-				_('Specifies the quantity of ARP IP targets that must be reachable'));
-		o.default = 'any';
-		o.value('any', _('Consider the slave up when any ARP IP target is reachable (any, 0)'));
-		o.value('all', _('Consider the slave up when all ARP IP targets are reachable (all, 1)'));
-		o.depends({link_monitoring: 'arp', bonding_policy: 'active-backup'});
-
-		o = s.taboption('advanced', form.ListValue, 'arp_validate',
-				_('ARP Validation'),
-				_('Specifies whether ARP probes and replies should be validated or non-ARP traffic should be filtered for link monitoring'));
-		o.default = 'filter';
-		o.value('none', _('No validation or filtering'));
-		o.value('active', _('Validation only for active slave'));
-		o.value('backup', _('Validation only for backup slaves'));
-		o.value('all', _('Validation for all slaves'));
-		o.value('filter', _('Filtering for all slaves, no validation'));
-		o.value('filter_active', _('Filtering for all slaves, validation only for active slave'));
-		o.value('filter_backup', _('Filtering for all slaves, validation only for backup slaves'));
-		o.depends('link_monitoring', 'arp');
-
-		o = s.taboption('advanced', form.Value, 'miimon',
-				_('MII Interval'),
-				_("Specifies the MII link monitoring frequency in milliseconds"));
-		o.datatype = 'uinteger';
-		o.default = '0';
-		o.rmempty = false;
-		o.depends('link_monitoring', 'mii');
-
-		o = s.taboption('advanced', form.Value, 'downdelay',
-				_('Down Delay'),
-				_("Specifies the time in milliseconds to wait before disabling a slave after a link failure detection"));
-		o.datatype = 'uinteger';
-		o.default = '0';
-		o.rmempty = false;
-		o.depends('link_monitoring', 'mii');
-
-		o = s.taboption('advanced', form.Value, 'updelay',
-				_('Up Delay'),
-				_("Specifies the time in milliseconds to wait before enabling a slave after a link recovery detection"));
-		o.datatype = 'uinteger';
-		o.default = '0';
-		o.rmempty = false;
-		o.depends('link_monitoring', 'mii');
-
-		o = s.taboption('advanced', form.ListValue, 'use_carrier',
-				_('Method to determine link status'),
-				_('Specifies whether or not miimon should use MII or ETHTOOL ioctls vs. netif_carrier_ok()'));
-		o.default = '1';
-		o.value('0', _('MII / ETHTOOL ioctls'));
-		o.value('1', _('netif_carrier_ok()'));
-		o.depends('link_monitoring', 'mii');
-	}
-});

From f7476239ad245051e76b396d53561d99f269aae6 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Mon, 11 May 2020 09:57:25 +0200
Subject: [PATCH 29/88] Fix macvlan creation

---
 luci-app-macvlan/root/etc/init.d/macvlan | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/luci-app-macvlan/root/etc/init.d/macvlan b/luci-app-macvlan/root/etc/init.d/macvlan
index eb51d3808..b82725472 100755
--- a/luci-app-macvlan/root/etc/init.d/macvlan
+++ b/luci-app-macvlan/root/etc/init.d/macvlan
@@ -46,11 +46,22 @@ _create_interface() {
 		_ifname=$1
 	}
 	config_get _masterifname "$1" ifname
+	[ "$1" != "$_ifname" ] && {
+		uci batch <<-EOF
+			delete macvlan.$1
+			set macvlan.$_ifname=macvlan
+			set macvlan.$_ifname.name=$_ifname
+			set macvlan.$_ifname.ifname=$_masterifname
+			commit macvlan
+		EOF
+	}
+	logger -t "MACVLAN" "Create interface $_ifname based on $_masterifname"
 	uci batch <<-EOF
 		set network.$_ifname=interface
 		set network.$_ifname.type=macvlan
 		set network.$_ifname.proto=static
 		set network.$_ifname.masterintf=$_masterifname
+		commit network
 	EOF
 }
 
@@ -67,6 +78,7 @@ _setup_interface() {
 	config_get _type "$1" type
 
 	[ "$_type" = "macvlan" ] && [ "$(uci -q get macvlan.$1)" = "" ] && {
+		logger -t "MACVLAN" "Delete $1"
 		uci -q batch <<-EOF
 			delete network.$1
 			delete network.$1_dev

From 746927113b9845d39c5fffd73ecdbdd085d5ac57 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Mon, 11 May 2020 09:58:20 +0200
Subject: [PATCH 30/88] Fix error in log when launching omr-bypass

---
 .../root/etc/init.d/omr-bypass                | 190 ++++++++++--------
 1 file changed, 107 insertions(+), 83 deletions(-)

diff --git a/luci-app-omr-bypass/root/etc/init.d/omr-bypass b/luci-app-omr-bypass/root/etc/init.d/omr-bypass
index bd99749b4..cf703c14d 100755
--- a/luci-app-omr-bypass/root/etc/init.d/omr-bypass
+++ b/luci-app-omr-bypass/root/etc/init.d/omr-bypass
@@ -57,10 +57,12 @@ _bypass_domain() {
 			for ip in $resolve; do
 				_bypass_ip $ip $intf
 			done
-			resolve=$(dig aaaa +timeout=1 +nocmd +noall +answer $domain | awk '{print $5}')
-			for ip in $resolve; do
-				_bypass_ip $ip $intf
-			done
+			if [ "$disableipv6" != "1" ]; then
+				resolve=$(dig aaaa +timeout=1 +nocmd +noall +answer $domain | awk '{print $5}')
+				for ip in $resolve; do
+					_bypass_ip $ip $intf
+				done
+			fi
 		fi
 		if [ "$(uci -q get dhcp.@dnsmasq[0].ipset | grep /$domain/)" = "" ]; then
 			uci -q add_list dhcp.@dnsmasq[0].ipset="/$domain/omr_dst_bypass_$intf,omr6_dst_bypass_$intf"
@@ -92,22 +94,26 @@ _bypass_mac() {
 		-A omr-bypass -m mac --mac-source $mac -j MARK --set-mark 0x539
 		COMMIT
 		EOF
-		ip6tables-restore -w --wait=60  --noflush <<-EOF
-		*mangle
-		-A omr-bypass6 -m mac --mac-source $mac -j MARK --set-mark 0x6539
-		COMMIT
-		EOF
+		if [ "$disableipv6" != "1" ]; then
+			ip6tables-restore -w --wait=60  --noflush <<-EOF
+			*mangle
+			-A omr-bypass6 -m mac --mac-source $mac -j MARK --set-mark 0x6539
+			COMMIT
+			EOF
+		fi
 	else
 		iptables-restore -w --wait=60  --noflush <<-EOF
 		*mangle
 		-A omr-bypass -m mac --mac-source $mac -j MARK --set-mark 0x539$intfid
 		COMMIT
 		EOF
-		ip6tables-restore -w --wait=60  --noflush <<-EOF
-		*mangle
-		-A omr-bypass6 -m mac --mac-source $mac -j MARK --set-mark 0x6539$intfid
-		COMMIT
-		EOF
+		if [ "$disableipv6" != "1" ]; then
+			ip6tables-restore -w --wait=60  --noflush <<-EOF
+			*mangle
+			-A omr-bypass6 -m mac --mac-source $mac -j MARK --set-mark 0x6539$intfid
+			COMMIT
+			EOF
+		fi
 	fi
 }
 
@@ -162,6 +168,7 @@ _bypass_dest_port() {
 
 	[ -z "$intf" ] && intf="all"
 	[ -z "$dport" ] && return
+	dport="$(echo $dport | sed 's/-/:/')"
 	[ -z "$proto" ] && return
 	if [ "$intf" = "all" ]; then
 		iptables-restore -w --wait=60  --noflush <<-EOF
@@ -169,22 +176,26 @@ _bypass_dest_port() {
 		-A omr-bypass --protocol $proto --destination-port $dport -j MARK --set-mark 0x539
 		COMMIT
 		EOF
-		ip6tables-restore -w --wait=60  --noflush <<-EOF
-		*mangle
-		-A omr-bypass6 --protocol $proto --destination-port $dport -j MARK --set-mark 0x6539
-		COMMIT
-		EOF
+		if [ "$disableipv6" != "1" ]; then
+			ip6tables-restore -w --wait=60  --noflush <<-EOF
+			*mangle
+			-A omr-bypass6 --protocol $proto --destination-port $dport -j MARK --set-mark 0x6539
+			COMMIT
+			EOF
+		fi
 	else
 		iptables-restore -w --wait=60  --noflush <<-EOF
 		*mangle
 		-A omr-bypass --protocol $proto --destination-port $dport -j MARK --set-mark 0x539$intfid
 		COMMIT
 		EOF
-		ip6tables-restore -w --wait=60  --noflush <<-EOF
-		*mangle
-		-A omr-bypass6 --protocol $proto --destination-port $dport -j MARK --set-mark 0x6539$intfid
-		COMMIT
-		EOF
+		if [ "$disableipv6" != "1" ]; then
+			ip6tables-restore -w --wait=60  --noflush <<-EOF
+			*mangle
+			-A omr-bypass6 --protocol $proto --destination-port $dport -j MARK --set-mark 0x6539$intfid
+			COMMIT
+			EOF
+		fi
 	fi
 }
 
@@ -203,22 +214,26 @@ _bypass_proto() {
 		-A omr-bypass-dpi -m ndpi --proto $proto -j MARK --set-mark 0x539
 		COMMIT
 		EOF
-		ip6tables-restore -w --wait=60  --noflush <<-EOF
-		*mangle
-		-A omr-bypass6-dpi -m ndpi --proto $proto -j MARK --set-mark 0x6539
-		COMMIT
-		EOF
+		if [ "$disableipv6" != "1" ]; then
+			ip6tables-restore -w --wait=60  --noflush <<-EOF
+			*mangle
+			-A omr-bypass6-dpi -m ndpi --proto $proto -j MARK --set-mark 0x6539
+			COMMIT
+			EOF
+		fi
 	else
 		iptables-restore -w --wait=60  --noflush <<-EOF
 		*mangle
 		-A omr-bypass-dpi -m ndpi --proto $proto -j MARK --set-mark 0x539$intfid
 		COMMIT
 		EOF
-		ip6tables-restore -w --wait=60  --noflush <<-EOF
-		*mangle
-		-A omr-bypass6-dpi -m ndpi --proto $proto -j MARK --set-mark 0x6539$intfid
-		COMMIT
-		EOF
+		if [ "$disableipv6" != "1" ]; then
+			ip6tables-restore -w --wait=60  --noflush <<-EOF
+			*mangle
+			-A omr-bypass6-dpi -m ndpi --proto $proto -j MARK --set-mark 0x6539$intfid
+			COMMIT
+			EOF
+		fi
 	fi
 	# Use dnsmasq ipset to bypass domains of the proto
 	local domains
@@ -289,23 +304,25 @@ _intf_rule() {
 		COMMIT
 		EOF
 	fi
-	if [ "$(ip6tables --wait=40 -t mangle -L | grep omr6_dst_bypass_$intf)" = "" ]; then
-		ip6tables-restore -w --wait=60 --noflush <<-EOF
-		*mangle
-		-I omr-bypass6 1 -m set --match-set omr6_dst_bypass_$intf dst -j MARK --set-mark 0x6539$count
-		COMMIT
-		EOF
-	fi
-	if [ "$(ip6tables --wait=40 -t nat -L | grep ss_rules6_pre_src)" != "" ] && [ "$(ip6tables --wait=40 -t nat -L | grep omr6_dst_bypass_$intf)" = "" ]; then
-		ip6tables-restore -w --wait=60 --noflush <<-EOF
-		*nat
-		-I ss_rules6_dst 1 -m set --match-set omr6_dst_bypass_$intf dst -j RETURN
-		-I ss_rules6_local_out 1 -m set --match-set omr6_dst_bypass_$intf dst -j RETURN
-		-I ss_rules6_local_out 2 -m mark --mark 0x6539$count -j RETURN
-		-I ss_rules6_pre_src 1 -m set --match-set omr6_dst_bypass_$intf dst -j MARK --set-mark 0x6539$count
-		-I ss_rules6_pre_src 2 -m mark --mark 0x6539$count -j RETURN
-		COMMIT
-		EOF
+	if [ "$disableipv6" != "1" ]; then
+		if [ "$(ip6tables --wait=40 -t mangle -L | grep omr6_dst_bypass_$intf)" = "" ]; then
+			ip6tables-restore -w --wait=60 --noflush <<-EOF
+			*mangle
+			-I omr-bypass6 1 -m set --match-set omr6_dst_bypass_$intf dst -j MARK --set-mark 0x6539$count
+			COMMIT
+			EOF
+		fi
+		if [ "$(ip6tables --wait=40 -t nat -L | grep ss_rules6_pre_src)" != "" ] && [ "$(ip6tables --wait=40 -t nat -L | grep omr6_dst_bypass_$intf)" = "" ]; then
+			ip6tables-restore -w --wait=60 --noflush <<-EOF
+			*nat
+			-I ss_rules6_dst 1 -m set --match-set omr6_dst_bypass_$intf dst -j RETURN
+			-I ss_rules6_local_out 1 -m set --match-set omr6_dst_bypass_$intf dst -j RETURN
+			-I ss_rules6_local_out 2 -m mark --mark 0x6539$count -j RETURN
+			-I ss_rules6_pre_src 1 -m set --match-set omr6_dst_bypass_$intf dst -j MARK --set-mark 0x6539$count
+			-I ss_rules6_pre_src 2 -m mark --mark 0x6539$count -j RETURN
+			COMMIT
+			EOF
+		fi
 	fi
 	uci -q set omr-bypass.$intf=interface
 	uci -q set omr-bypass.$intf.id=$count
@@ -353,6 +370,7 @@ start_service() {
 	logger -t "omr-bypass" "Starting OMR-ByPass..."
 	config_load omr-bypass
 	config_foreach _add_proto proto
+	disableipv6="$(uci -q get openmptcprouter.settings.disable_ipv6)"
 
 	[ -n "$RELOAD" ] && [ "$(ipset --list | grep omr_dst_bypass_all)" = "" ] && {
 		unset RELOAD
@@ -372,13 +390,15 @@ start_service() {
 	-I PREROUTING 1 -m addrtype ! --dst-type LOCAL -j omr-bypass
 	COMMIT
 	EOF
-	ip6tables-save --counters | grep -v omr-bypass6 | ip6tables-restore -w --counters
-	ip6tables-restore -w --wait=60  --noflush <<-EOF
-	*mangle
-	:omr-bypass6 -
-	-I PREROUTING 1 -m addrtype ! --dst-type LOCAL -j omr-bypass6
-	COMMIT
-	EOF
+	if [ "$disableipv6" != "1" ]; then
+		ip6tables-save --counters | grep -v omr-bypass6 | ip6tables-restore -w --counters
+		ip6tables-restore -w --wait=60  --noflush <<-EOF
+		*mangle
+		:omr-bypass6 -
+		-I PREROUTING 1 -m addrtype ! --dst-type LOCAL -j omr-bypass6
+		COMMIT
+		EOF
+	fi
 	
 	config_load network
 	config_foreach _intf_rule interface
@@ -433,23 +453,25 @@ start_service() {
 		COMMIT
 		EOF
 	fi
-	if [ "$(ip6tables --wait=40 -t mangle -L | grep 'match-set omr6_dst_bypass_all dst MARK set')" = "" ]; then
-		ip6tables-restore --wait=60 --noflush <<-EOF
-		*mangle
-		-A omr-bypass6 -m set --match-set omr6_dst_bypass_all dst -j MARK --set-mark 0x6539
-		COMMIT
-		EOF
-	fi
-	if [ "$(ip6tables --wait=40 -t nat -L | grep ss_rules6_pre_src)" != "" ] && [ "$(ip6tables --wait=40 -t nat -L | grep omr6_dst_bypass_all)" = "" ]; then
-		ip6tables-restore --wait=60 --noflush <<-EOF
-		*nat
-		-I ss_rules6_dst 1 -m set --match-set omr6_dst_bypass_all dst -j RETURN
-		-I ss_rules6_local_out 1 -m set --match-set omr6_dst_bypass_all dst -j RETURN
-		-I ss_rules6_local_out 2 -m mark --mark 0x6539 -j RETURN
-		-I ss_rules6_pre_src 1 -m set --match-set omr6_dst_bypass_all dst -j MARK --set-mark 0x6539
-		-I ss_rules6_pre_src 2 -m mark --mark 0x6539 -j RETURN
-		COMMIT
-		EOF
+	if [ "$disableipv6" != "1" ]; then
+		if [ "$(ip6tables --wait=40 -t mangle -L | grep 'match-set omr6_dst_bypass_all dst MARK set')" = "" ]; then
+			ip6tables-restore -w --wait=60 --noflush <<-EOF
+			*mangle
+			-A omr-bypass6 -m set --match-set omr6_dst_bypass_all dst -j MARK --set-mark 0x6539
+			COMMIT
+			EOF
+		fi
+		if [ "$(ip6tables --wait=40 -t nat -L | grep ss_rules6_pre_src)" != "" ] && [ "$(ip6tables --wait=40 -t nat -L | grep omr6_dst_bypass_all)" = "" ]; then
+			ip6tables-restore -w --wait=60 --noflush <<-EOF
+			*nat
+			-I ss_rules6_dst 1 -m set --match-set omr6_dst_bypass_all dst -j RETURN
+			-I ss_rules6_local_out 1 -m set --match-set omr6_dst_bypass_all dst -j RETURN
+			-I ss_rules6_local_out 2 -m mark --mark 0x6539 -j RETURN
+			-I ss_rules6_pre_src 1 -m set --match-set omr6_dst_bypass_all dst -j MARK --set-mark 0x6539
+			-I ss_rules6_pre_src 2 -m mark --mark 0x6539 -j RETURN
+			COMMIT
+			EOF
+		fi
 	fi
 
 	iptables-save --counters | grep -v omr-bypass-dpi | iptables-restore -w --counters
@@ -460,14 +482,16 @@ start_service() {
 	-A POSTROUTING -m addrtype --dst-type LOCAL -j omr-bypass-dpi
 	COMMIT
 	EOF
-	ip6tables-save --counters | grep -v omr-bypass6-dpi | ip6tables-restore --counters
-	ip6tables-restore --wait=60  --noflush <<-EOF
-	*mangle
-	:omr-bypass6-dpi -
-	-A PREROUTING -m addrtype ! --dst-type LOCAL -j omr-bypass6-dpi
-	-A POSTROUTING -m addrtype --dst-type LOCAL -j omr-bypass6-dpi
-	COMMIT
-	EOF
+	if [ "$disableipv6" != "1" ]; then
+		ip6tables-save --counters | grep -v omr-bypass6-dpi | ip6tables-restore -w --counters
+		ip6tables-restore -w --wait=60  --noflush <<-EOF
+		*mangle
+		:omr-bypass6-dpi -
+		-A PREROUTING -m addrtype ! --dst-type LOCAL -j omr-bypass6-dpi
+		-A POSTROUTING -m addrtype --dst-type LOCAL -j omr-bypass6-dpi
+		COMMIT
+		EOF
+	fi
 	config_load omr-bypass
 	config_foreach _bypass_proto dpis
 

From 8ed49706ac8a17d9606f0d291a911fc751119d32 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Mon, 11 May 2020 09:59:03 +0200
Subject: [PATCH 31/88] Fix error in omr-dscp and allow - in port range

---
 luci-app-omr-dscp/root/etc/init.d/omr-dscp | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/luci-app-omr-dscp/root/etc/init.d/omr-dscp b/luci-app-omr-dscp/root/etc/init.d/omr-dscp
index e71f79b6f..70b7bd17b 100755
--- a/luci-app-omr-dscp/root/etc/init.d/omr-dscp
+++ b/luci-app-omr-dscp/root/etc/init.d/omr-dscp
@@ -81,6 +81,8 @@ _add_dscp_rules() {
 	direction="" ; config_get direction "$1" direction "upload"
 	comment=""   ; config_get comment "$1" comment "-"
 
+	src_port="$(echo $src_port | sed 's/-/:)"
+	dest_port="$(echo $dest_port | sed 's/-/:)"
 	case "$direction" in
 		upload|both)
 			# Apply the rule locally
@@ -142,28 +144,28 @@ _add_dscp_output_chain() {
 _remove_prerouting_chain() {
 	_ipt4 -F "$1" 2>/dev/null || return
 	_ipt4 -D PREROUTING -i "$lan_device" -j "$1"
-	_ipt4 -X "$1"
+	_ipt4 -X "$1" 2>/dev/null
 	_ipt6 -F "$1" 2>/dev/null || return
 	_ipt6 -D PREROUTING -i "$lan_device" -j "$1"
-	_ipt6 -X "$1"
+	_ipt6 -X "$1" 2>/dev/null
 }
 
 _remove_postrouting_chain() {
 	_ipt4 -F "$1" 2>/dev/null || return
 	_ipt4 -D POSTROUTING -j "$1"
-	_ipt4 -X "$1"
+	_ipt4 -X "$1" 2>/dev/null
 	_ipt6 -F "$1" 2>/dev/null || return
 	_ipt6 -D POSTROUTING -j "$1"
-	_ipt6 -X "$1"
+	_ipt6 -X "$1" 2>/dev/null
 }
 
 _remove_output_chain() {
 	_ipt4 -F "$1" 2>/dev/null || return
 	_ipt4 -D OUTPUT -j "$1"
-	_ipt4 -X "$1"
+	_ipt4 -X "$1" 2>/dev/null
 	_ipt6 -F "$1" 2>/dev/null || return
 	_ipt6 -D OUTPUT -j "$1"
-	_ipt6 -X "$1"
+	_ipt6 -X "$1" 2>/dev/null
 }
 
 _remove_ipset_dnsmasq() {

From c328a4ea1c18a92cb49ff0b44d9211dd880aeca9 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Mon, 11 May 2020 09:59:32 +0200
Subject: [PATCH 32/88] Fix box size in OMR status

---
 .../luci-static/resources/openmptcprouter/css/wanstatus.css | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/luci-app-openmptcprouter/htdocs/luci-static/resources/openmptcprouter/css/wanstatus.css b/luci-app-openmptcprouter/htdocs/luci-static/resources/openmptcprouter/css/wanstatus.css
index 878f540e1..e15b2e915 100644
--- a/luci-app-openmptcprouter/htdocs/luci-static/resources/openmptcprouter/css/wanstatus.css
+++ b/luci-app-openmptcprouter/htdocs/luci-static/resources/openmptcprouter/css/wanstatus.css
@@ -247,7 +247,7 @@ Thanks :)*/
   width: 400px;
   max-width: 400px;
   box-sizing: border-box;
-  height: 170px;
+  min-height: 170px;
 }
 .network-node .equipment-icon {
   position: relative;
@@ -322,10 +322,10 @@ Thanks :)*/
   padding-right: 195px;
 }
 #omr {
-  height: 190px;
+  min-height: 190px;
 }
 #omr-vps {
-  height: 160px;
+  min-height: 160px;
 }
 .space {
   height: 55px;

From 5352c9baa03f0690ae3113dd1d85b5769753a7b0 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Mon, 11 May 2020 10:00:14 +0200
Subject: [PATCH 33/88] Allow to disable a server

---
 .../luasrc/controller/openmptcprouter.lua     | 19 ++++++++++++++-----
 .../luasrc/view/openmptcprouter/wizard.htm    |  9 +++++++++
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua b/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
index c32da267f..16e7c075d 100644
--- a/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
+++ b/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
@@ -344,6 +344,7 @@ function wizard_add()
 
 	-- Retrieve all server settings
 	local serversnb = 0
+	local disablednb = 0
 	local servers = luci.http.formvaluetable("server")
 	for server, _ in pairs(servers) do
 		local server_ip = luci.http.formvalue("%s.server_ip" % server) or ""
@@ -352,9 +353,14 @@ function wizard_add()
 		-- OpenMPTCProuter VPS
 		local openmptcprouter_vps_key = luci.http.formvalue("%s.openmptcprouter_vps_key" % server) or ""
 		local openmptcprouter_vps_username = luci.http.formvalue("%s.openmptcprouter_vps_username" % server) or ""
+		local openmptcprouter_vps_disabled = luci.http.formvalue("%s.openmptcprouter_vps_disabled" % server) or ""
+		if openmptcprouter_vps_disabled == "1" then
+			disablednb = disablednb + 1
+		end
 		ucic:set("openmptcprouter",server,"server")
 		ucic:set("openmptcprouter",server,"username",openmptcprouter_vps_username)
 		ucic:set("openmptcprouter",server,"password",openmptcprouter_vps_key)
+		ucic:set("openmptcprouter",server,"disabled",openmptcprouter_vps_disabled)
 		if master == server or (master == "" and serversnb == 0) then
 			ucic:set("openmptcprouter",server,"get_config","1")
 			ucic:set("openmptcprouter",server,"master","1")
@@ -465,6 +471,9 @@ function wizard_add()
 	-- Set ShadowSocks settings
 	local shadowsocks_key = luci.http.formvalue("shadowsocks_key")
 	local shadowsocks_disable = luci.http.formvalue("disableshadowsocks") or "0"
+	if disablednb == serversnb then
+		shadowsocks_disable = 1
+	end
 	if shadowsocks_key ~= "" then
 		ucic:set("shadowsocks-libev","sss0","key",shadowsocks_key)
 		--ucic:set("shadowsocks-libev","sss0","method","chacha20-ietf-poly1305")
@@ -489,7 +498,7 @@ function wizard_add()
 	end
 
 	-- Set Glorytun settings
-	if default_vpn:match("^glorytun.*") then
+	if default_vpn:match("^glorytun.*") and disablednb ~= serversnb then
 		ucic:set("glorytun","vpn","enable",1)
 	else
 		ucic:set("glorytun","vpn","enable",0)
@@ -523,7 +532,7 @@ function wizard_add()
 	ucic:commit("glorytun")
 
 	-- Set A Dead Simple VPN settings
-	if default_vpn == "dsvpn" then
+	if default_vpn == "dsvpn" and disablednb ~= serversnb  then
 		ucic:set("dsvpn","vpn","enable",1)
 	else
 		ucic:set("dsvpn","vpn","enable",0)
@@ -546,7 +555,7 @@ function wizard_add()
 	ucic:commit("dsvpn")
 
 	-- Set MLVPN settings
-	if default_vpn == "mlvpn" then
+	if default_vpn == "mlvpn" and disablednb ~= serversnb  then
 		ucic:set("mlvpn","general","enable",1)
 		ucic:set("network","omrvpn","proto","dhcp")
 	else
@@ -566,7 +575,7 @@ function wizard_add()
 	ucic:commit("mlvpn")
 
 	-- Set UBOND settings
-	if default_vpn == "ubond" then
+	if default_vpn == "ubond" and disablednb ~= serversnb  then
 		ucic:set("ubond","general","enable",1)
 		ucic:set("network","omrvpn","proto","dhcp")
 	else
@@ -585,7 +594,7 @@ function wizard_add()
 	ucic:save("ubond")
 	ucic:commit("ubond")
 
-	if default_vpn == "openvpn" then
+	if default_vpn == "openvpn" and disablednb ~= serversnb  then
 		ucic:set("openvpn","omr","enabled",1)
 		ucic:set("network","omrvpn","proto","none")
 	else
diff --git a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm
index 49870ca19..cf410db78 100644
--- a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm
+++ b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm
@@ -110,6 +110,15 @@ end
 		</div>
 	    <%
 		    end
+	    %>
+		<br />
+		<div class="cbi-value">
+		    <label class="cbi-value-title"><%:Disable server%></label>
+		    <div class="cbi-value-field">
+			<input class="cbi-input-radio" type="checkbox" name="<%=servername%>.openmptcprouter_vps_disabled" value="1" <% if uci:get("openmptcprouter",servername,"openmptcprouter_vps_disabled") == "1" then %>checked<% end %>/>
+		    </div>
+		</div>
+	    <%
 		end)
 	    %>
 		<div class="cbi-section-create">

From 840628a78e98305871c764db386147da66d6edc1 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Mon, 11 May 2020 10:01:00 +0200
Subject: [PATCH 34/88] Fix huawei operator name

---
 luci-app-openmptcprouter/root/bin/omr-huawei | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/luci-app-openmptcprouter/root/bin/omr-huawei b/luci-app-openmptcprouter/root/bin/omr-huawei
index b334230f5..566ae4e61 100755
--- a/luci-app-openmptcprouter/root/bin/omr-huawei
+++ b/luci-app-openmptcprouter/root/bin/omr-huawei
@@ -39,7 +39,8 @@ OPERATOR=""
 if [ "$CONNECTSTATE" = "901" ]; then
 	tmpfile=$(mktemp)
 	curl -s -m 1 -X GET "http://$MODEM_IP/api/net/current-plmn" -H "Cookie: SessionID=$COOKIE" -H "__RequestVerificationToken: $TOKEN" -H "Content-Type: text/xml" > ${tmpfile}
-	OPERATOR=$(cat ${tmpfile} | grep FullName | sed -e 's/<[^>]*>//g')
+	OPERATOR=$(grep FullName ${tmpfile} | cut -f2 -d'>' | cut -f1 -d'<')
+	#$(cat ${tmpfile} | grep FullName | sed -e 's/<[^>]*>//g' | sed 's/[^\x00-\x7F]//g' | tr -d "\n")
 	rm -f ${tmpfile}
 fi
 NUMBER=""

From f921c081b9ba26a89f04389a8625b9f18dfb579c Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Mon, 11 May 2020 10:33:20 +0200
Subject: [PATCH 35/88] Fix disable server

---
 .../luasrc/controller/openmptcprouter.lua        | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua b/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
index 16e7c075d..033c5c787 100644
--- a/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
+++ b/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
@@ -354,13 +354,9 @@ function wizard_add()
 		local openmptcprouter_vps_key = luci.http.formvalue("%s.openmptcprouter_vps_key" % server) or ""
 		local openmptcprouter_vps_username = luci.http.formvalue("%s.openmptcprouter_vps_username" % server) or ""
 		local openmptcprouter_vps_disabled = luci.http.formvalue("%s.openmptcprouter_vps_disabled" % server) or ""
-		if openmptcprouter_vps_disabled == "1" then
-			disablednb = disablednb + 1
-		end
 		ucic:set("openmptcprouter",server,"server")
 		ucic:set("openmptcprouter",server,"username",openmptcprouter_vps_username)
 		ucic:set("openmptcprouter",server,"password",openmptcprouter_vps_key)
-		ucic:set("openmptcprouter",server,"disabled",openmptcprouter_vps_disabled)
 		if master == server or (master == "" and serversnb == 0) then
 			ucic:set("openmptcprouter",server,"get_config","1")
 			ucic:set("openmptcprouter",server,"master","1")
@@ -370,12 +366,16 @@ function wizard_add()
 			ucic:set("openmptcprouter",server,"master","0")
 			ucic:set("openmptcprouter",server,"backup","1")
 		end
-		ucic:set("openmptcprouter",server,"ip",server_ip)
-		ucic:set("openmptcprouter",server,"port","65500")
-		ucic:save("openmptcprouter")
+		if openmptcprouter_vps_disabled == "1" then
+			disablednb = disablednb + 1
+		end
 		if server_ip ~= "" then
 			serversnb = serversnb + 1
 		end
+		ucic:set("openmptcprouter",server,"disabled",openmptcprouter_vps_disabled)
+		ucic:set("openmptcprouter",server,"ip",server_ip)
+		ucic:set("openmptcprouter",server,"port","65500")
+		ucic:save("openmptcprouter")
 	end
 
 	local ss_servers_nginx = {}
@@ -388,7 +388,7 @@ function wizard_add()
 		local master = luci.http.formvalue("master") or ""
 		local server_ip = luci.http.formvalue("%s.server_ip" % server) or ""
 		-- We have an IP, so set it everywhere
-		if server_ip ~= "" then
+		if server_ip ~= "" and luci.http.formvalue("%s.openmptcprouter_vps_disabled" % server) ~= "1" then
 			-- Check if we have more than one IP, in this case use Nginx HA
 			if serversnb > 1 then
 				if master == server then

From 4a2afd6f870a666bb7450b609acc2c1e3d8574e6 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Mon, 11 May 2020 10:34:16 +0200
Subject: [PATCH 36/88] Doesn't add a disabled server to route

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

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 cfb2d81c2..693ad9bc8 100755
--- a/mptcp/files/usr/share/omr/post-tracking.d/post-tracking
+++ b/mptcp/files/usr/share/omr/post-tracking.d/post-tracking
@@ -34,6 +34,8 @@ set_server_default_route() {
 	local server=$1
 	local serverip
 	config_get serverip $server ip
+	config_get disabled $server disabled
+	[ "$disabled" = "1" ] && return
 	multipath_config_route=$(uci -q get network.$OMR_TRACKER_INTERFACE.multipath)
 	[ -z "$multipath_config_route" ] && multipath_config_route=$(uci -q get network.$OMR_TRACKER_INTERFACE.multipath || echo "off")
 	if [ "$serverip" != "" ] && [ "$OMR_TRACKER_DEVICE_GATEWAY" != "" ] && [ "$(ip route show dev $OMR_TRACKER_DEVICE metric 1 | grep $serverip | grep $OMR_TRACKER_DEVICE_GATEWAY)" = "" ] && [ "$multipath_config_route" != "off" ]; then
@@ -46,6 +48,8 @@ delete_server_default_route() {
 	local server=$1
 	local serverip
 	config_get serverip $server ip
+	config_get disabled $server disabled
+	[ "$disabled" = "1" ] && return
 	if [ "$serverip" != "" ] && [ "$(ip route show $serverip metric 1)" != "" ]; then
 		_log "Delete server ($serverip) default route"
 		ip route del $serverip metric 1 >/dev/null 2>&1
@@ -110,6 +114,8 @@ set_server_all_routes() {
 	local server=$1
 	local serverip
 	config_get serverip $server ip
+	config_get disabled $server disabled
+	[ "$disabled" = "1" ] && return
 	interface_if=$(uci -q get network.$OMR_TRACKER_INTERFACE.ifname)
 	[ -z "$interface_if" ] && interface_if=$(ifstatus "$OMR_TRACKER_INTERFACE" 2>/dev/null | jsonfilter -q -e '@["l3_device"]')
 	[ -z "$interface_if" ] && interface_if=$(ifstatus "${OMR_TRACKER_INTERFACE}_4" 2>/dev/null | jsonfilter -q -e '@["l3_device"]')
@@ -132,6 +138,8 @@ set_server_route() {
 	local server=$1
 	local serverip
 	config_get serverip $server ip
+	config_get disabled $server disabled
+	[ "$disabled" = "1" ] && return
 	local metric=$2
 	[ -z "$metric" ] && metric=$(uci -q get network.$OMR_TRACKER_INTERFACE.metric)
 	multipath_config_route=$(uci -q get network.$OMR_TRACKER_INTERFACE.multipath)

From 9a42cb18cd2ec77c2fce4fce04ba0ebf92d7d0b8 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Mon, 11 May 2020 10:34:39 +0200
Subject: [PATCH 37/88] Increase rpcd timeout

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

diff --git a/openmptcprouter/files/etc/uci-defaults/2060-omr-system b/openmptcprouter/files/etc/uci-defaults/2060-omr-system
index 12cb92bdd..a22438426 100755
--- a/openmptcprouter/files/etc/uci-defaults/2060-omr-system
+++ b/openmptcprouter/files/etc/uci-defaults/2060-omr-system
@@ -4,7 +4,7 @@ uci -q batch <<-EOF >/dev/null
 	set system.ntp.use_dhcp='0'
 	set system.ntp.enable_server='1'
 	commit system
-	set rpcd.@rpcd[0].timeout=90
+	set rpcd.@rpcd[0].timeout=120
 	commit rpcd
 EOF
 exit 0
\ No newline at end of file

From 2d2c33f3e79c49ae83249bb7e1c98e9c916bc2ed Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Mon, 11 May 2020 10:35:29 +0200
Subject: [PATCH 38/88] Doesn't try to change firewall if not needed

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

diff --git a/openmptcprouter/files/etc/init.d/openmptcprouter-vps b/openmptcprouter/files/etc/init.d/openmptcprouter-vps
index 0d700ef4e..a29e9a3be 100755
--- a/openmptcprouter/files/etc/init.d/openmptcprouter-vps
+++ b/openmptcprouter/files/etc/init.d/openmptcprouter-vps
@@ -566,6 +566,16 @@ _vps_firewall_redirect_port() {
 	config_get enabled $1 enabled "1"
 	[ "$src" = "vpn" ] && [ -n "$proto" ] && [ -n "$src_dport" ] && [ "$enabled" != "0" ] && {
 		if [ "$proto" = "tcp udp" ]; then
+			checkfw=""
+			if [ "$family" = "ipv4" ]; then
+				checkfw=$(echo "$vpsfwlist" | grep "$src_dport	# OMR $username redirect router $src_dport port tcp")
+			else
+				checkfw=$(echo "$vpsfw6list" | grep "$src_dport	# OMR $username redirect router $src_dport port tcp")
+			fi
+			if [ "$checkfw" = "" ]; then
+				settings='{"name" : "router '$src_dport'","port" : "'$src_dport'","proto" : "tcp","fwtype" : "DNAT","ipproto" : "'$family'"}'
+				_set_json "shorewallopen" "$settings"
+			fi
 			if [ "$family" = "ipv4" ]; then
 				vpsfwlist=$(echo "$vpsfwlist" | grep -v "$src_dport	# OMR $username redirect router $src_dport port tcp")
 				[ "$username" = "openmptcprouter" ] && vpsfwlist=$(echo "$vpsfwlist" | grep -v "$src_dport	# OMR redirect router $src_dport port tcp")
@@ -573,8 +583,17 @@ _vps_firewall_redirect_port() {
 				vpsfw6list=$(echo "$vpsfw6list" | grep -v "$src_dport	# OMR $username redirect router $src_dport port tcp")
 				[ "$username" = "openmptcprouter" ] && vpsfw6list=$(echo "$vpsfw6list" | grep -v "$src_dport	# 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"
+
+			checkfw=""
+			if [ "$family" = "ipv4" ]; then
+				checkfw=$(echo "$vpsfwlist" | grep "$src_dport	# OMR $username redirect router $src_dport port udp")
+			else
+				checkfw=$(echo "$vpsfw6list" | grep "$src_dport	# OMR $username redirect router $src_dport port udp")
+			fi
+			if [ "$checkfw" = "" ]; then
+				settings='{"name" : "router '$src_dport'","port" : "'$src_dport'","proto" : "udp","fwtype" : "DNAT","ipproto" : "'$family'"}'
+				_set_json "shorewallopen" "$settings"
+			fi
 			if [ "$family" = "ipv4" ]; then
 				vpsfwlist=$(echo "$vpsfwlist" | grep -v "$src_dport	# OMR $username redirect router $src_dport port udp")
 				[ "$username" = "openmptcprouter" ] && vpsfwlist=$(echo "$vpsfwlist" | grep -v "$src_dport	# OMR redirect router $src_dport port udp")
@@ -582,9 +601,17 @@ _vps_firewall_redirect_port() {
 				vpsfw6list=$(echo "$vpsfw6list" | grep -v "$src_dport	# OMR $username redirect router $src_dport port udp")
 				[ "$username" = "openmptcprouter" ] && vpsfw6list=$(echo "$vpsfw6list" | grep -v "$src_dport	# 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
+			checkfw=""
+			if [ "$family" = "ipv4" ]; then
+				checkfw=$(echo "$vpsfwlist" | grep "$src_dport	# OMR $username redirect router $src_dport port $proto")
+			else
+				checkfw=$(echo "$vpsfw6list" | grep "$src_dport	# OMR $username redirect router $src_dport port $proto")
+			fi
+			if [ "$checkfw" = "" ]; then
+				settings='{"name" : "router '$src_dport'","port" : "'$src_dport'","proto" : "'$proto'","fwtype" : "DNAT","ipproto" : "'$family'"}'
+				_set_json "shorewallopen" "$settings"
+			fi
 			if [ "$family" = "ipv4" ]; then
 				vpsfwlist=$(echo "$vpsfwlist" | grep -v "$src_dport	# OMR $username redirect router $src_dport port $proto")
 				[ "$username" = "openmptcprouter" ] && vpsfwlist=$(echo "$vpsfwlist" | grep -v "$src_dport	# OMR redirect router $src_dport port $proto")
@@ -592,8 +619,6 @@ _vps_firewall_redirect_port() {
 				vpsfw6list=$(echo "$vpsfw6list" | grep -v "$src_dport	# OMR $username redirect router $src_dport port $proto")
 				[ "$username" = "openmptcprouter" ] && vpsfw6list=$(echo "$vpsfw6list" | grep -v "$src_dport	# 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"
 		fi
 	}
 }

From 76ae9b06086fa1244fb4b5141085a176ca1b8efd Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Mon, 11 May 2020 10:36:25 +0200
Subject: [PATCH 39/88] Update ndpi-netfilter2

---
 ndpi-netfilter2/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ndpi-netfilter2/Makefile b/ndpi-netfilter2/Makefile
index 5b8ae47d3..5cd3dcdf8 100644
--- a/ndpi-netfilter2/Makefile
+++ b/ndpi-netfilter2/Makefile
@@ -11,7 +11,7 @@ include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=ndpi-netfilter2
 PKG_RELEASE:=2
-PKG_REV:=7aa4c293f23d6ab1fac5574c8e9c486cb1ced93d
+PKG_REV:=77d882638232fb9236123b50b9aac8bccc409ed9
 PKG_VERSION:=3.2-$(PKG_REV)
 
 PKG_SOURCE_PROTO:=git

From 483e96728b4bb1e8420d713595f08ee99fba2ae5 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Wed, 13 May 2020 21:46:35 +0200
Subject: [PATCH 40/88] Add src port bypass

---
 .../resources/view/services/omr-bypass.js     | 23 +++++++++++
 .../root/etc/init.d/omr-bypass                | 41 +++++++++++++++++++
 2 files changed, 64 insertions(+)

diff --git a/luci-app-omr-bypass/htdocs/luci-static/resources/view/services/omr-bypass.js b/luci-app-omr-bypass/htdocs/luci-static/resources/view/services/omr-bypass.js
index edf03099b..82edc2a0d 100644
--- a/luci-app-omr-bypass/htdocs/luci-static/resources/view/services/omr-bypass.js
+++ b/luci-app-omr-bypass/htdocs/luci-static/resources/view/services/omr-bypass.js
@@ -78,6 +78,29 @@ return L.view.extend({
 		o = s.option(form.Value, 'note', _('Note'));
 		o.rmempty = true;
 
+		s = m.section(form.GridSection, 'src_port', _('Ports source'));
+		s.addremove = true;
+		s.anonymous = true;
+
+		o = s.option(form.Value, 'sport', _('port'));
+		o.rmempty = false;
+
+		o = s.option(form.ListValue, 'proto', _('protocol'));
+		o.default = 'tcp';
+		o.rmempty = false;
+		o.value('tcp');
+		o.value('udp');
+		o.value('icmp');
+
+		o = s.option(widgets.DeviceSelect, 'interface', _('Interface'));
+		o.noaliases = true;
+		o.noinactive = true;
+		o.nocreate    = true;
+		o.ucioption = 'dev';
+
+		o = s.option(form.Value, 'note', _('Note'));
+		o.rmempty = true;
+
 		s = m.section(form.GridSection, 'macs', _('MAC-Address'));
 		s.addremove = true;
 		s.anonymous = true;
diff --git a/luci-app-omr-bypass/root/etc/init.d/omr-bypass b/luci-app-omr-bypass/root/etc/init.d/omr-bypass
index cf703c14d..cc7df9533 100755
--- a/luci-app-omr-bypass/root/etc/init.d/omr-bypass
+++ b/luci-app-omr-bypass/root/etc/init.d/omr-bypass
@@ -199,6 +199,46 @@ _bypass_dest_port() {
 	fi
 }
 
+_bypass_src_port() {
+	local intf
+	config_get sport $1 sport
+	config_get proto $1 proto
+	config_get intf $1 interface
+	local intfid="$(uci -q get omr-bypass.$intf.id)"
+
+	[ -z "$intf" ] && intf="all"
+	[ -z "$sport" ] && return
+	sport="$(echo $sport | sed 's/-/:/')"
+	[ -z "$proto" ] && return
+	if [ "$intf" = "all" ]; then
+		iptables-restore -w --wait=60  --noflush <<-EOF
+		*mangle
+		-A omr-bypass --protocol $proto --source-port $sport -j MARK --set-mark 0x539
+		COMMIT
+		EOF
+		if [ "$disableipv6" != "1" ]; then
+			ip6tables-restore -w --wait=60  --noflush <<-EOF
+			*mangle
+			-A omr-bypass6 --protocol $proto --source-port $sport -j MARK --set-mark 0x6539
+			COMMIT
+			EOF
+		fi
+	else
+		iptables-restore -w --wait=60  --noflush <<-EOF
+		*mangle
+		-A omr-bypass --protocol $proto --source-port $sport -j MARK --set-mark 0x539$intfid
+		COMMIT
+		EOF
+		if [ "$disableipv6" != "1" ]; then
+			ip6tables-restore -w --wait=60  --noflush <<-EOF
+			*mangle
+			-A omr-bypass6 --protocol $proto --source-port $sport -j MARK --set-mark 0x6539$intfid
+			COMMIT
+			EOF
+		fi
+	fi
+}
+
 _bypass_proto() {
 	local proto
 	local intf
@@ -410,6 +450,7 @@ start_service() {
 	config_foreach _bypass_mac macs
 	config_foreach _bypass_lan_ip lan_ip
 	config_foreach _bypass_dest_port dest_port
+	config_foreach _bypass_src_port src_port
 	config_foreach _bypass_asn asns
 	dnsmasqipset=$(uci -q get dhcp.@dnsmasq[0].ipset | sed 's/ /\n/g' | grep -v dst_bypass)
 	uci -q delete dhcp.@dnsmasq[0].ipset

From 6d3927ec777443d1a199cf2d72b85cc9c7f3df1d Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Thu, 14 May 2020 21:11:13 +0200
Subject: [PATCH 41/88] Display as error what should be an error

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

diff --git a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm
index 526b67ea2..08f29e1b4 100644
--- a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm
+++ b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm
@@ -511,6 +511,11 @@
 					{
 						statusMessage += _('IPv6 route received') + '<br />'
 					}
+					if (statusMessage !== "" && statusMessageClass !== "error")
+					{
+						statusMessageClass = "warning";
+						statusIcon = "<%=resource%>/openmptcprouter/images/statusWarning.png";
+					}
 					content += String.format('multipath: %s<br />',multipath);
 					if(mArray.wans[i].qos && mArray.wans[i].download > 0 && mArray.wans[i].upload > 0)
 					{

From ac9c29af6be21ad357702c22cb4cce83b22aa626 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Thu, 14 May 2020 21:11:50 +0200
Subject: [PATCH 42/88] Add ULA in wizard

---
 .../luasrc/controller/openmptcprouter.lua     |  2 ++
 .../root/usr/libexec/rpcd/openmptcprouter     | 28 +++++++++++++------
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua b/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
index 033c5c787..1323f8916 100644
--- a/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
+++ b/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
@@ -306,6 +306,8 @@ function wizard_add()
 	ucic:set("openmptcprouter","settings","disable_ipv6",disableipv6)
 	--local ut = require "luci.util"
 	--local result = ut.ubus("openmptcprouter", "set_ipv6_state", { disable_ipv6 = disableipv6 })
+	local ula = luci.http.formvalue("ula") or ""
+	ucic:set("network","globals","ula_prefix",ula)
 
 	-- Get VPN set by default
 	local default_vpn = luci.http.formvalue("default_vpn") or "glorytun_tcp"
diff --git a/luci-app-openmptcprouter/root/usr/libexec/rpcd/openmptcprouter b/luci-app-openmptcprouter/root/usr/libexec/rpcd/openmptcprouter
index 028736fd8..c2c52d557 100755
--- a/luci-app-openmptcprouter/root/usr/libexec/rpcd/openmptcprouter
+++ b/luci-app-openmptcprouter/root/usr/libexec/rpcd/openmptcprouter
@@ -821,7 +821,8 @@ function interfaces_status()
 					mArray.openmptcprouter["tun_state"] = "DOWN"
 				end
 				if mArray.openmptcprouter["ipv6"] == "enabled" then
-					local tunnel_ping6_test = ut.trim(sys.exec("ping6 -w 1 -c 1 fe80::a00:1%6in4-omr6in4 | grep '100% packet loss'"))
+					local tunnel_ipv6_gw = uci:get("network","omr6in4","gateway")
+					local tunnel_ping6_test = ut.trim(sys.exec("ping6 -w 1 -c 1 " .. tunnel_ipv6_gw .. "%6in4-omr6in4 | grep '100% packet loss'"))
 					if tunnel_ping6_test == "" then
 						mArray.openmptcprouter["tun6_state"] = "UP"
 					else
@@ -1118,11 +1119,12 @@ function interfaces_status()
 		    end
 	    end
 
-	    local multipath_available
+	    local multipath_available = ""
+	    local multipath_available_state = ""
 	    if connectivity ~= "ERROR" and mArray.openmptcprouter["dns"] == true and ifname ~= nil and ifname ~= "" and gateway ~= "" and gw_ping == "UP" then
 		    -- Test if multipath can work on the connection
-		    local multipath_available_state = uci:get("openmptcprouter",interface,"mptcp_status") or ""
-		    if multipath_available_state == "" then
+		    -- local multipath_available_state = uci:get("openmptcprouter",interface,"mptcp_status") or ""
+		    -- if multipath_available_state == "" then
 			    if mArray.openmptcprouter["external_check"] ~= false then
 			    --if mArray.openmptcprouter["service_addr"] ~= "" then
 			    --    multipath_available_state = ut.trim(sys.exec("omr-tracebox-mptcp " .. mArray.openmptcprouter["service_addr"] .. " " .. ifname .. " | grep 'MPTCP disabled'"))
@@ -1130,12 +1132,12 @@ function interfaces_status()
 				    multipath_available_state = ut.trim(sys.exec("omr-mptcp-intf " .. ifname .. " | grep 'Nay, Nay, Nay'"))
 			    --end
 			    end
-		    else
-			    multipath_available_state = ut.trim(sys.exec("echo '" .. multipath_available_state .. "' | grep 'MPTCP disabled'"))
-		    end
+		    -- else
+		    --    multipath_available_state = ut.trim(sys.exec("echo '" .. multipath_available_state .. "' | grep 'MPTCP disabled'"))
+		    -- end
 		    if multipath_available_state == "" then
 			    multipath_available = "OK"
-		    --else
+		    else
 		    --	    if mArray.openmptcprouter["external_check"] ~= false then
 		    --		    multipath_available_state_wan = ut.trim(sys.exec("omr-mptcp-intf " .. ifname .. " | grep 'Nay, Nay, Nay'"))
 		    --		    if multipath_available_state_wan == "" then
@@ -1144,7 +1146,7 @@ function interfaces_status()
 		    --				    mArray.openmptcprouter["server_mptcp"] = "disabled"
 		    --			    end
 		    --		    else
-		    --			    multipath_available = "ERROR"
+		    	    multipath_available = "ERROR"
 		    --			    connectivity = "WARNING"
 		    --		    end
 		    --	    else
@@ -1208,6 +1210,12 @@ function interfaces_status()
 			    end
 		    end
 	    end
+	    local rx = ""
+	    local tx = ""
+	    if ifname ~= "" and ifname ~= nil then
+		    rx = ut.trim(sys.exec("devstatus " .. ifname .. " | jsonfilter -e '@.statistics.rx_bytes'"))
+		    tx = ut.trim(sys.exec("devstatus " .. ifname .. " | jsonfilter -e '@.statistics.tx_bytes'"))
+	    end
 	    local data = {
 		label = section["label"] or interface,
 		name = interface,
@@ -1235,6 +1243,8 @@ function interfaces_status()
 		phonenumber = phonenumber,
 		donglestate = donglestate,
 		networktype = networktype,
+		rx = rx,
+		tx = tx,
 	    }
 	    if ifname ~= nil and ifname:match("^tun.*") then
 		    table.insert(mArray.tunnels, data);

From 2fb1dc5f77081fc1ada1aceab6ebe8601be6f5e5 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Thu, 14 May 2020 21:12:32 +0200
Subject: [PATCH 43/88] Add ULA in wizard display

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

diff --git a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm
index cf410db78..85fd5169b 100644
--- a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm
+++ b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm
@@ -149,6 +149,25 @@ end
 	    </div>
 	</fieldset>
 	<span id="advancedsettings" style="display:none;">
+	<fieldset class="cbi-section" id="ipv6">
+	    <legend><%:IPv6 settings%></legend>
+	    <div class="cbi-value">
+		<label class="cbi-value-title"><%:Enable IPv6%></label>
+		<div class="cbi-value-field">
+		    <input class="cbi-input-checkbox" type="checkbox" name="enableipv6" value="0" <% if uci:get("openmptcprouter","settings","disable_ipv6") == "0" then %>checked<% end %> />
+		    <br />
+		    <div class="cbi-value-description">
+		        <%:You should disable IPv6 here if server doesn't provide IPv6.%>
+		    </div>
+		</div>
+	    </div>
+	    <div class="cbi-value">
+		<label class="cbi-value-title"><%:IPv6 ULA-Prefix%></label>
+		<div class="cbi-value-field">
+		    <input type="text" name="ula" class="cbi-input-text" value="<%=uci:get("network","globals","ula_prefix")%>" />
+		</div>
+	    </div>
+	</fieldset>
 	<fieldset class="cbi-section" id="shadowsocks">
 	    <legend><%:ShadowSocks settings%></legend>
 	    <div class="cbi-section-descr"><%:By default ShadowSocks is used for TCP traffic.%></div>

From 3bfa7c30c1759de56006cf674a6ca6172516d4ee Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Thu, 14 May 2020 21:13:40 +0200
Subject: [PATCH 44/88] Update MLVPN

---
 mlvpn/Makefile                     | 17 +++++++----------
 mlvpn/patches/021-mlvpn-bind.patch | 11 -----------
 2 files changed, 7 insertions(+), 21 deletions(-)
 delete mode 100644 mlvpn/patches/021-mlvpn-bind.patch

diff --git a/mlvpn/Makefile b/mlvpn/Makefile
index e12c619ab..b81a2dc6a 100644
--- a/mlvpn/Makefile
+++ b/mlvpn/Makefile
@@ -8,16 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mlvpn
-#PKG_VERSION:=6f13423b
-#PKG_VERSION:=8f972097
-#PKG_VERSION:=f45cec35
-PKG_VERSION:=3cf976fe
+PKG_VERSION:=67f9f31d
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
-#PKG_SOURCE_URL:=https://github.com/zehome/MLVPN.git
-#PKG_SOURCE_VERSION:=6f13423b8108f46edb9f230deee20e3741abe64c
-#PKG_SOURCE_DATE:=2017-09-01
+PKG_SOURCE_URL:=https://github.com/zehome/MLVPN.git
+PKG_SOURCE_VERSION:=67f9f31ddd6dba9514e51b36e855a2a5e973ee93
+PKG_SOURCE_DATE:=2020-03-29
 #PKG_SOURCE_URL:=https://github.com/markfoodyburton/MLVPN.git
 #PKG_SOURCE_VERSION:=8f9720978b28c1954f9f229525333547283316d2
 #PKG_SOURCE_DATE:=2018-09-03
@@ -26,9 +23,9 @@ PKG_SOURCE_PROTO:=git
 #PKG_SOURCE_VERSION:=f45cec350a6879b8b020143a78134a022b5df2a7
 #PKG_SOURCE_DATE:=2019-05-31
 
-PKG_SOURCE_URL:=https://github.com/link4all/MLVPN.git
-PKG_SOURCE_VERSION:=3cf976fe37a118a47bc42f51c0294beba0499652
-PKG_SOURCE_DATE:=2019-07-13
+#PKG_SOURCE_URL:=https://github.com/link4all/MLVPN.git
+#PKG_SOURCE_VERSION:=3cf976fe37a118a47bc42f51c0294beba0499652
+#PKG_SOURCE_DATE:=2019-07-13
 
 
 PKG_LICENSE:=BSD-2-Clause
diff --git a/mlvpn/patches/021-mlvpn-bind.patch b/mlvpn/patches/021-mlvpn-bind.patch
deleted file mode 100644
index 42221bd9f..000000000
--- a/mlvpn/patches/021-mlvpn-bind.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/mlvpn.c	2018-08-25 07:39:53.625002006 +0200
-+++ b/src/mlvpn.c	2018-08-25 07:40:35.696481066 +0200
-@@ -1019,7 +1019,7 @@
- #endif
-     if (*t->binddev) {
-       memset(&ifr, 0, sizeof(ifr));
--      snprintf(ifr.ifr_name, sizeof(ifr.ifr_name) - 1, t->binddev);
-+      snprintf(ifr.ifr_name, sizeof(ifr.ifr_name) - 1, "%s", t->binddev);
-       if (setsockopt(fd, SOL_SOCKET, SO_BINDTODEVICE, (void *)&ifr, sizeof(ifr)) < 0) {
-         log_warn(NULL, "failed to bind on interface %s", t->binddev);
-       }

From dc05eb6cb716141e73550e689ab7885f4c25ec50 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Thu, 14 May 2020 21:14:17 +0200
Subject: [PATCH 45/88] Only reset route cache for MPTCP init

---
 mptcp/files/etc/init.d/mptcp | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/mptcp/files/etc/init.d/mptcp b/mptcp/files/etc/init.d/mptcp
index 6fb249137..4aa582f07 100755
--- a/mptcp/files/etc/init.d/mptcp
+++ b/mptcp/files/etc/init.d/mptcp
@@ -62,7 +62,7 @@ interface_multipath_settings() {
 		[ "$config" = "lan" ] && mode="off"
 		[ "$config" = "omrvpn" ] && mode="off"
 		[ "$config" = "omr6in4" ] && mode="off"
-		[ "$mode" = "" ] && mode="on"
+		[ "$mode" = "" ] && mode="off"
 		logger -t "MPTCP" "Multipath not defined for $config set to $mode"
 		uci -q set network.${config}.multipath="$mode"
 		uci -q set openmptcprouter.${config}.multipath="$mode"
@@ -363,9 +363,12 @@ start_service() {
 	#config_foreach remove rule
 	#config_foreach remove rule6
 	[ -z "$intf" ] && [ -n "$(uci -q get network.@route[-1])" ] && {
-		logger -t "MPTCP" "Flush main table"
-		ip route flush table main
-		ip -6 route flush table main
+	#	logger -t "MPTCP" "Flush main table"
+	#	ip route flush table main
+	#	ip -6 route flush table main
+		logger -t "MPTCP" "Flush route cache"
+		ip route flush cache
+		ip -6 route flush cache
 	}
 	config_foreach interface_multipath_settings interface $intf
 	set_multipath

From b1c88d424b41743c5146428ac22789812f2233ab Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Thu, 14 May 2020 21:14:42 +0200
Subject: [PATCH 46/88] Various changes in tracking like when a VPS is disabled

---
 .../share/omr/post-tracking.d/post-tracking   | 50 +++++++++----------
 1 file changed, 25 insertions(+), 25 deletions(-)

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 693ad9bc8..e2467a66f 100755
--- a/mptcp/files/usr/share/omr/post-tracking.d/post-tracking
+++ b/mptcp/files/usr/share/omr/post-tracking.d/post-tracking
@@ -2,16 +2,16 @@
 
 SETROUTE=false
 set_route() {
-	local multipath_config interface_gw interface_if
+	local multipath_config_route interface_gw interface_if
 	INTERFACE=$1
 	PREVINTERFACE=$2
-	multipath_config=$(uci -q get network.$INTERFACE.multipath)
-	[ -z "$multipath_config" ] && multipath_config=$(uci -q get openmptcprouter.$INTERFACE.multipath || echo "off")
+	multipath_config_route=$(uci -q get openmptcprouter.$INTERFACE.multipath)
+	[ -z "$multipath_config_route" ] && multipath_config_route=$(uci -q get network.$INTERFACE.multipath || echo "off")
 	interface_if=$(ifstatus "$INTERFACE" 2>/dev/null | jsonfilter -q -e '@["l3_device"]')
 	[ -z "$interface_if" ] && interface_if=$(ifstatus "${INTERFACE}_4" 2>/dev/null | jsonfilter -q -e '@["l3_device"]')
 	[ -z "$interface_if" ] && interface_if=$(uci -q get network.$INTERFACE.ifname)
 	interface_current_config=$(uci -q get openmptcprouter.$INTERFACE.state || echo "up")
-	if [ "$multipath_config" != "off" ] && [ "$SETROUTE" != true ] && [ "$INTERFACE" != "$PREVINTERFACE" ] && [ "$interface_current_config" = "up" ]; then
+	if [ "$multipath_config_route" != "off" ] && [ "$SETROUTE" != true ] && [ "$INTERFACE" != "$PREVINTERFACE" ] && [ "$interface_current_config" = "up" ]; then
 		interface_gw="$(uci -q get network.$INTERFACE.gateway)"
 		if [ -z "$interface_gw" ]; then
 			interface_gw=$(ubus call network.interface.$INTERFACE status 2>/dev/null | jsonfilter -q -l 1 -e '@.inactive.route[@.target="0.0.0.0"].nexthop' | tr -d "\n")
@@ -32,11 +32,11 @@ set_route() {
 
 set_server_default_route() {
 	local server=$1
-	local serverip
+	local serverip multipath_config_route
 	config_get serverip $server ip
 	config_get disabled $server disabled
 	[ "$disabled" = "1" ] && return
-	multipath_config_route=$(uci -q get network.$OMR_TRACKER_INTERFACE.multipath)
+	multipath_config_route=$(uci -q get openmptcprouter.$OMR_TRACKER_INTERFACE.multipath)
 	[ -z "$multipath_config_route" ] && multipath_config_route=$(uci -q get network.$OMR_TRACKER_INTERFACE.multipath || echo "off")
 	if [ "$serverip" != "" ] && [ "$OMR_TRACKER_DEVICE_GATEWAY" != "" ] && [ "$(ip route show dev $OMR_TRACKER_DEVICE metric 1 | grep $serverip | grep $OMR_TRACKER_DEVICE_GATEWAY)" = "" ] && [ "$multipath_config_route" != "off" ]; then
 		_log "Set server $server ($serverip) default route via $OMR_TRACKER_DEVICE_GATEWAY"
@@ -57,16 +57,16 @@ delete_server_default_route() {
 }
 
 set_routes_intf() {
+	local multipath_config_route
 	local INTERFACE=$1
-	multipath_config=$(uci -q get network.$INTERFACE.multipath)
-	[ -z "$multipath_config" ] && multipath_config_route=$(uci -q get network.$INTERFACE.multipath || echo "off")
+	multipath_config_route=$(uci -q get openmptcprouter.$INTERFACE.multipath)
+	[ -z "$multipath_config_route" ] && multipath_config_route=$(uci -q get network.$INTERFACE.multipath || echo "off")
 	interface_if=$(ifstatus "$INTERFACE" 2>/dev/null | jsonfilter -q -e '@["l3_device"]')
 	[ -z "$interface_if" ] && interface_if=$(ifstatus "${INTERFACE}_4" 2>/dev/null | jsonfilter -q -e '@["l3_device"]')
 	[ -z "$interface_if" ] && interface_if=$(uci -q get network.$INTERFACE.ifname)
 	#multipath_current_config=$(multipath $interface_if | grep 'deactivated')
 	interface_current_config=$(uci -q get openmptcprouter.$INTERFACE.state || echo "up")
-	#if [ "$multipath_config" != "off" ] && [ "$multipath_current_config" = "" ] && [ "$interface_if" != "" ]; then
-	if [ "$multipath_config" != "off" ] && [ "$interface_current_config" = "up" ] && [ "$interface_if" != "" ]; then
+	if [ "$multipath_config_route" != "off" ] && [ "$interface_current_config" = "up" ] && [ "$interface_if" != "" ]; then
 		interface_gw="$(uci -q get network.$INTERFACE.gateway)"
 		if [ -z "$interface_gw" ]; then
 			interface_gw=$(ubus call network.interface.$INTERFACE status 2>/dev/null | jsonfilter -q -l 1 -e '@.inactive.route[@.target="0.0.0.0"].nexthop' | tr -d "\n")
@@ -85,15 +85,15 @@ set_routes_intf() {
 }
 
 set_route_balancing() {
-	local multipath_config interface_gw interface_if
+	local multipath_config_route interface_gw interface_if
 	INTERFACE=$1
-	multipath_config=$(uci -q get network.$INTERFACE.multipath)
-	[ -z "$multipath_config" ] && multipath_config=$(uci -q get openmptcprouter.$INTERFACE.multipath || echo "off")
+	multipath_config_route=$(uci -q get openmptcprouter.$INTERFACE.multipath)
+	[ -z "$multipath_config_route" ] && multipath_config_route=$(uci -q get network.$INTERFACE.multipath || echo "off")
 	interface_if=$(ifstatus "$INTERFACE" 2>/dev/null | jsonfilter -q -e '@["l3_device"]')
 	[ -z "$interface_if" ] && interface_if=$(ifstatus "${INTERFACE}_4" 2>/dev/null | jsonfilter -q -e '@["l3_device"]')
 	[ -z "$interface_if" ] && interface_if=$(uci -q get network.$INTERFACE.ifname)
 	interface_current_config=$(uci -q get openmptcprouter.$INTERFACE.state || echo "up")
-	if [ "$multipath_config" != "off" ] && [ "$interface_current_config" = "up" ]; then
+	if [ "$multipath_config_route" != "off" ] && [ "$interface_current_config" = "up" ]; then
 		interface_gw="$(uci -q get network.$INTERFACE.gateway)"
 		if [ -z "$interface_gw" ]; then
 			interface_gw=$(ubus call network.interface.$INTERFACE status 2>/dev/null | jsonfilter -q -l 1 -e '@.inactive.route[@.target="0.0.0.0"].nexthop' | tr -d "\n")
@@ -112,15 +112,14 @@ set_route_balancing() {
 
 set_server_all_routes() {
 	local server=$1
-	local serverip
+	local serverip multipath_config_route
 	config_get serverip $server ip
 	config_get disabled $server disabled
 	[ "$disabled" = "1" ] && return
 	interface_if=$(uci -q get network.$OMR_TRACKER_INTERFACE.ifname)
 	[ -z "$interface_if" ] && interface_if=$(ifstatus "$OMR_TRACKER_INTERFACE" 2>/dev/null | jsonfilter -q -e '@["l3_device"]')
 	[ -z "$interface_if" ] && interface_if=$(ifstatus "${OMR_TRACKER_INTERFACE}_4" 2>/dev/null | jsonfilter -q -e '@["l3_device"]')
-	multipath_config_route=$(uci -q get network.$OMR_TRACKER_INTERFACE.multipath)
-	[ -z "$multipath_config_route" ] && multipath_config_route=$(uci -q get openmptcprouter.$OMR_TRACKER_INTERFACE.multipath || echo "off")
+	multipath_config_route=$(uci -q get openmptcprouter.$OMR_TRACKER_INTERFACE.multipath || echo "off")
 	if [ "$serverip" != "" ] && [ "$OMR_TRACKER_DEVICE_GATEWAY" != "" ] && [ "$(ip route show $serverip | grep nexthop | grep $OMR_TRACKER_DEVICE_GATEWAY | grep $OMR_TRACKER_DEVICE)" = "" ] && [ "$multipath_config_route" != "off" ]; then
 		routesintf=""
 		config_load network
@@ -136,14 +135,14 @@ set_server_all_routes() {
 
 set_server_route() {
 	local server=$1
-	local serverip
+	local serverip multipath_config_route
 	config_get serverip $server ip
 	config_get disabled $server disabled
 	[ "$disabled" = "1" ] && return
 	local metric=$2
 	[ -z "$metric" ] && metric=$(uci -q get network.$OMR_TRACKER_INTERFACE.metric)
-	multipath_config_route=$(uci -q get network.$OMR_TRACKER_INTERFACE.multipath)
-	[ "$multipath_config_route" ] && multipath_config_route=$(uci -q get openmptcprouter.$OMR_TRACKER_INTERFACE.multipath || echo "off")
+	multipath_config_route=$(uci -q get openmptcprouter.$OMR_TRACKER_INTERFACE.multipath)
+	[ "$multipath_config_route" ] && multipath_config_route=$(uci -q get network.$OMR_TRACKER_INTERFACE.multipath || echo "off")
 	interface_if=$(uci -q get network.$OMR_TRACKER_INTERFACE.ifname)
 	[ -z "$interface_if" ] && interface_if=$(ifstatus "$OMR_TRACKER_INTERFACE" 2>/dev/null | jsonfilter -q -e '@["l3_device"]')
 	[ -z "$interface_if" ] && interface_if=$(ifstatus "${OMR_TRACKER_INTERFACE}_4" 2>/dev/null | jsonfilter -q -e '@["l3_device"]')
@@ -240,9 +239,9 @@ if [ "$OMR_TRACKER_STATUS" = "ERROR" ]; then
 	fi
 	[ "$multipath_status" = "off" ] || {
 		if [ "$OMR_TRACKER_STATUS_MSG" = "" ]; then
-			_log "$OMR_TRACKER_DEVICE switched off"
+			_log "$OMR_TRACKER_INTERFACE ($OMR_TRACKER_DEVICE) switched off"
 		else
-			_log "$OMR_TRACKER_DEVICE switched off because $OMR_TRACKER_STATUS_MSG"
+			_log "$OMR_TRACKER_INTERFACE ($OMR_TRACKER_DEVICE) switched off because $OMR_TRACKER_STATUS_MSG"
 		fi
 		uci -q set openmptcprouter.$OMR_TRACKER_INTERFACE.state='down'
 		#if [ "$(sysctl -n net.mptcp.mptcp_enabled | tr -d '\n')" = "1" ]; then
@@ -376,6 +375,7 @@ if [ "$OMR_TRACKER_INTERFACE" = "glorytun" ] || [ "$OMR_TRACKER_INTERFACE" = "om
 fi
 
 if [ "$OMR_TRACKER_PREV_STATUS" != "" ] && [ "$OMR_TRACKER_PREV_STATUS" != "$OMR_TRACKER_STATUS" ]; then
+	_log "$OMR_TRACKER_INTERFACE ($OMR_TRACKER_DEVICE) switched up"
 	mail_alert="$(uci -q get omr-tracker.$OMR_TRACKER_INTERFACE.mail_alert)"
 	[ -z "$mail_alert" ] && mail_alert="$(uci -q get omr-tracker.defaults.mail_alert)"
 	[ "$mail_alert" = "1" ] && {
@@ -387,8 +387,8 @@ if [ "$OMR_TRACKER_PREV_STATUS" != "" ] && [ "$OMR_TRACKER_PREV_STATUS" != "$OMR
 	dns_flush
 fi
 
-multipath_config=$(uci -q get "network.$OMR_TRACKER_INTERFACE.multipath")
-[ -z "$multipath_config" ] && multipath_config=$(uci -q get "openmptcprouter.$OMR_TRACKER_INTERFACE.multipath" || echo "off")
+multipath_config=$(uci -q get "openmtpcprouter.$OMR_TRACKER_INTERFACE.multipath")
+[ -z "$multipath_config" ] && multipath_config=$(uci -q get "network.$OMR_TRACKER_INTERFACE.multipath" || echo "off")
 if [ "$multipath_config" = "master" ]; then
 	if ([ "$default_gw" != "$OMR_TRACKER_DEVICE_GATEWAY" ] || [ "$default_gw" = "" ]) && [ "$OMR_TRACKER_DEVICE_GATEWAY" != "" ] && [ "$(uci -q get openmptcprouter.settings.master)" != "balancing" ]; then
 		omrvpn_intf=$(uci -q get "network.omrvpn.ifname" || echo "tun")
@@ -588,7 +588,7 @@ fi
 	uci -q set openmptcprouter.$OMR_TRACKER_INTERFACE.latency="$OMR_TRACKER_LATENCY"
 	#[ -z "$(uci -q get openmptcprouter.$OMR_TRACKER_INTERFACE.latency_max)" ] && uci -q set openmptcprouter.$OMR_TRACKER_INTERFACE.latency_max="$OMR_TRACKER_LATENCY"
 	#[ "$(uci -q get openmptcprouter.$OMR_TRACKER_INTERFACE.latency_max)" -lt "$OMR_TRACKER_LATENCY" ] && uci -q set openmptcprouter.$OMR_TRACKER_INTERFACE.latency_max="$OMR_TRACKER_LATENCY"
-	if [ "$multipath_config" = "on" ] && [ "$(uci -q get network.$OMR_TRACKER_INTERFACE.multipath)" != "master" ] && ([ "$(uci -q get openmptcprouter.settings.master)" = "dynamic" ] || (([ "$(uci -q get openmptcprouter.settings.master)" = "change" ] || [ "$(uci -q get openmptcprouter.settings.master)" = "" ]) && [ "$(uci -q get openmptcprouter.settings.master_lcintf | grep $OMR_TRACKER_INTERFACE)" = "" ])); then
+	if [ "$multipath_config" = "on" ] && [ "$(uci -q get openmptcprouter.$OMR_TRACKER_INTERFACE.multipath)" != "master" ] && ([ "$(uci -q get openmptcprouter.settings.master)" = "dynamic" ] || (([ "$(uci -q get openmptcprouter.settings.master)" = "change" ] || [ "$(uci -q get openmptcprouter.settings.master)" = "" ]) && [ "$(uci -q get openmptcprouter.settings.master_lcintf | grep $OMR_TRACKER_INTERFACE)" = "" ])); then
 		masterintf="$(uci -q show network | grep multipath=\'master\' | cut -d'.' -f2)"
 		[ -z "$masterintf" ] && masterintf="$(uci -q show openmptcprouter | grep multipath=\'master\' | cut -d'.' -f2)"
 		masterlatency="$(uci -q get openmptcprouter.$masterintf.latency | tr -d '\n')"

From c0a26cbaa2fa554b409547921ab9b5a7ad1c7044 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Thu, 14 May 2020 21:15:12 +0200
Subject: [PATCH 47/88] Changes in linux sysctl settings

---
 shadowsocks-libev/files/shadowsocks.conf | 25 ++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/shadowsocks-libev/files/shadowsocks.conf b/shadowsocks-libev/files/shadowsocks.conf
index d6390e2c4..1c4703f5b 100644
--- a/shadowsocks-libev/files/shadowsocks.conf
+++ b/shadowsocks-libev/files/shadowsocks.conf
@@ -2,14 +2,14 @@
 # max open files
 fs.file-max = 512000
 # max read buffer
-net.core.rmem_max = 15000000
+net.core.rmem_max = 67108864
 # max write buffer
-net.core.wmem_max = 7500000
-net.core.optmem_max = 7500000
+net.core.wmem_max = 67108864
+net.core.optmem_max = 33554432
 # default read buffer
-net.core.rmem_default = 131072
+#net.core.rmem_default = 131072
 # default write buffer
-net.core.wmem_default = 131072
+#net.core.wmem_default = 131072
 # max processor input queue
 net.core.netdev_max_backlog = 4096
 # max backlog
@@ -34,13 +34,13 @@ net.ipv4.tcp_max_tw_buckets = 10000
 # turn on TCP Fast Open on both client and server side
 #net.ipv4.tcp_fastopen = 3
 # TCP receive buffer
-net.ipv4.tcp_rmem = 4096 524288 7500000
+net.ipv4.tcp_rmem = 4096 87380 33554432
 # TCP write buffer
-net.ipv4.tcp_wmem = 4096 524288 7500000
+net.ipv4.tcp_wmem = 4096 65536 33554432
 # TCP buffer
-net.ipv4.tcp_mem = 768174 7500000 15000000
+net.ipv4.tcp_mem = 8092 131072 67108864
 # UDP buffer
-net.ipv4.udp_mem = 768174 75000000 150000000
+net.ipv4.udp_mem = 8092 131072 67108864
 # turn off path MTU discovery
 net.ipv4.tcp_mtu_probing = 0
 
@@ -48,7 +48,8 @@ net.ipv4.tcp_mtu_probing = 0
 # net.ipv4.tcp_congestion_control = balia
 
 # Default conntrack is too small
-net.netfilter.nf_conntrack_max=131072
+net.netfilter.nf_conntrack_max = 131072
 
-net.ipv4.tcp_ecn=1
-net.ipv4.tcp_retries2=10
\ No newline at end of file
+net.ipv4.tcp_ecn = 1
+net.ipv4.tcp_retries2 = 10
+#net.ipv4.tcp_sack = 0

From 4894da909eaaa145c6160b0395f10956d4591ad9 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Thu, 14 May 2020 21:15:36 +0200
Subject: [PATCH 48/88] Set ULA to VPS API

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

diff --git a/openmptcprouter/files/etc/init.d/openmptcprouter-vps b/openmptcprouter/files/etc/init.d/openmptcprouter-vps
index a29e9a3be..01c37518e 100755
--- a/openmptcprouter/files/etc/init.d/openmptcprouter-vps
+++ b/openmptcprouter/files/etc/init.d/openmptcprouter-vps
@@ -521,8 +521,9 @@ _set_vpn_ip() {
 	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")
+	ula="$(uci -q get network.globals.ula_prefix)"
 	if [ "$vpnip_remote" != "" ] && [ "$vpnip_local" != "" ] && ([ "$vpnip_remote" != "$vpnip_remote_current" ] || [ "$vpnip_local" != "$vpnip_local_current" ]); then
-		settings='{"remoteip" : "'$vpnip_local'","localip" : "'$vpnip_remote'"}'
+		settings='{"remoteip" : "'$vpnip_local'","localip" : "'$vpnip_remote'","ula" : "'$ula'"}'
 		result=$(_set_json "vpnips" "$settings")
 	fi
 }
@@ -717,6 +718,13 @@ _set_config_from_vps() {
 		/etc/init.d/omr-tracker restart
 	fi
 
+	ula="$(echo "$vps_config" | jsonfilter -q -e '@.6in4.ula')"
+	if [ -n "$ula" ]; then
+			uci -q batch <<-EOF >/dev/null
+			set network.globals.ula_prefix=$ula
+			EOF
+	fi
+
 	# Set current VPN
 	current_vpn="$(uci -q get openmptcprouter.settings.vpn)"
 	if [ -z "$current_vpn" ] || [ -n "$vps_lastchange" ] || [ "$user_permission" = "ro" ]; then

From ff7e84bf78b040fe26de77505d1c032e5646c852 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Thu, 14 May 2020 21:16:12 +0200
Subject: [PATCH 49/88] Fixes for IPv6 support

---
 omr-6in4/files/bin/omr-6in4        |  1 +
 omr-6in4/files/etc/init.d/omr-6in4 | 10 ++++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/omr-6in4/files/bin/omr-6in4 b/omr-6in4/files/bin/omr-6in4
index 34c03a17c..34a02a3e5 100755
--- a/omr-6in4/files/bin/omr-6in4
+++ b/omr-6in4/files/bin/omr-6in4
@@ -42,6 +42,7 @@ while true; do
 				[ "$ipv6_gw" = "::" ] && ipv6_gw='fd80::a00:1'
 				[ -z "$ipv6_gw" ] && ipv6_gw='fd80::a00:1'
 				#[ -z "$ipv6_gw" ] && ipv6_gw='fe80::aff:ff01'
+				ip -6 route add ${ipv6_gw} dev 6in4-omr6in4
 				ip -6 route replace default via ${ipv6_gw} dev 6in4-omr6in4 > /dev/null 2>&1
 				if [ "$(uci -q get openmptcprouter.settings.uci_route)" = "1" ]; then
 					uci -q batch <<-EOF
diff --git a/omr-6in4/files/etc/init.d/omr-6in4 b/omr-6in4/files/etc/init.d/omr-6in4
index 91d593f06..f467994c0 100755
--- a/omr-6in4/files/etc/init.d/omr-6in4
+++ b/omr-6in4/files/etc/init.d/omr-6in4
@@ -10,6 +10,10 @@
 	USE_PROCD=1
 }
 
+set_shadowsocks_address() {
+	config_set "$1" local_address "$2"
+}
+
 set_ipv6_state() {
 	local disable_ipv6="$(uci -q get openmptcprouter.settings.disable_ipv6)"
 	[ -z "$disable_ipv6" ] && disable_ipv6="1"
@@ -32,8 +36,9 @@ set_ipv6_state() {
 			delete dhcp.lan.ra_default
 			delete dhcp.lan.ra_management
 			delete dhcp.lan.ra_preference
-			set shadowsocks-libev.hi.local_address="0.0.0.0"
 		EOF
+		config_load shadowsocks-libev
+		config_foreach set_shadowsocks_address ss_redir "0.0.0.0"
 	else
 		logger -t "omr-6in4" "Enable IPv6"
 		uci -q batch <<-EOF >/dev/null
@@ -44,8 +49,9 @@ set_ipv6_state() {
 			set dhcp.lan.ra_management="1"
 			set network.lan.ipv6="1"
 			set network.lan.delegate="0"
-			set shadowsocks-libev.hi.local_address="::"
 		EOF
+		config_load shadowsocks-libev
+		config_foreach set_shadowsocks_address ss_redir "::"
 	fi
 	uci -q batch <<-EOF >/dev/null
 		commit network

From f8f67857cf99c29e64628c7acfe84e81176e8d57 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Thu, 14 May 2020 21:17:12 +0200
Subject: [PATCH 50/88] 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 d36d7d36d..63617d102 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -31,8 +31,8 @@ jobs:
       - run:
           name: cache
           command: |
-            echo "cache 94 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
-            echo "cache 96 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
+            echo "cache 95 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
+            echo "cache 97 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
 
       - restore_cache:
           keys:
@@ -94,8 +94,8 @@ jobs:
       - run:
           name: cache
           command: |
-            echo "cache 94 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
-            echo "cache 96 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
+            echo "cache 95 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
+            echo "cache 97 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
 
       - restore_cache:
           keys:
@@ -155,8 +155,8 @@ jobs:
       - run:
           name: cache
           command: |
-            echo "cache 94 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
-            echo "cache 96 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
+            echo "cache 95 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
+            echo "cache 97 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
 
       - restore_cache:
           keys:
@@ -216,8 +216,8 @@ jobs:
       - run:
           name: cache
           command: |
-            echo "cache 94 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
-            echo "cache 96 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
+            echo "cache 95 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
+            echo "cache 97 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
 
       - restore_cache:
           keys:
@@ -277,8 +277,8 @@ jobs:
       - run:
           name: cache
           command: |
-            echo "cache 94 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
-            echo "cache 96 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
+            echo "cache 95 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
+            echo "cache 97 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
 
       - restore_cache:
           keys:
@@ -338,8 +338,8 @@ jobs:
       - run:
           name: cache
           command: |
-            echo "cache 94 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
-            echo "cache 96 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
+            echo "cache 95 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
+            echo "cache 97 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
 
       - restore_cache:
           keys:
@@ -402,8 +402,8 @@ jobs:
       - run:
           name: cache
           command: |
-            echo "cache 94 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
-            echo "cache 96 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
+            echo "cache 95 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
+            echo "cache 97 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
 
       - restore_cache:
           keys:
@@ -462,8 +462,8 @@ jobs:
       - run:
           name: cache
           command: |
-            echo "cache 94 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
-            echo "cache 96 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
+            echo "cache 95 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
+            echo "cache 97 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
 
       - restore_cache:
           keys:

From 609b173ffaef8be6750730e6b13c5a512ebd9b7f Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Sat, 16 May 2020 20:45:25 +0200
Subject: [PATCH 51/88] Add libwebp package, else it doesn't compile with wrtX

---
 libwebp/Makefile                 | 64 ++++++++++++++++++++++++++++++++
 libwebp/patches/010-mips16.patch | 11 ++++++
 2 files changed, 75 insertions(+)
 create mode 100644 libwebp/Makefile
 create mode 100644 libwebp/patches/010-mips16.patch

diff --git a/libwebp/Makefile b/libwebp/Makefile
new file mode 100644
index 000000000..887b44b5b
--- /dev/null
+++ b/libwebp/Makefile
@@ -0,0 +1,64 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=libwebp
+PKG_VERSION:=1.1.0
+PKG_RELEASE:=3
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://storage.googleapis.com/downloads.webmproject.org/releases/webp
+PKG_HASH:=98a052268cc4d5ece27f76572a7f50293f439c17a98e67c4ea0c7ed6f50ef043
+
+PKG_MAINTAINER:=
+PKG_LICENSE:=BSD-3-Clause
+PKG_LICENSE_FILES:=COPYING
+
+PKG_INSTALL:=1
+PKG_BUILD_PARALLEL:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/libwebp
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=WebP library
+  URL:=https://www.webmproject.org
+endef
+
+define Package/libwebp/description
+  The libwebp package contains a library for the WebP format.
+endef
+
+CONFIGURE_ARGS += \
+	--enable-shared \
+	--disable-static \
+	--disable-neon-rtcd \
+	--disable-gl \
+	--disable-sdl \
+	--disable-gif \
+	--disable-jpeg \
+	--disable-png \
+	--disable-tiff \
+	--disable-wic \
+	--disable-libwebpmux \
+	--disable-libwebpdemux \
+	--disable-libwebpdecoder \
+	--disable-libwebpextras \
+	--without-pic
+
+TARGET_CFLAGS += $(FPIC) -flto
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include/webp
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/webp/* $(1)/usr/include/webp/
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libwebp* $(1)/usr/lib/
+	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libwebp.pc $(1)/usr/lib/pkgconfig/
+endef
+
+define Package/libwebp/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libwebp.s* $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,libwebp))
diff --git a/libwebp/patches/010-mips16.patch b/libwebp/patches/010-mips16.patch
new file mode 100644
index 000000000..3e69770ac
--- /dev/null
+++ b/libwebp/patches/010-mips16.patch
@@ -0,0 +1,11 @@
+--- a/src/dsp/dsp.h
++++ b/src/dsp/dsp.h
+@@ -95,7 +95,7 @@ extern "C" {
+ #define WEBP_USE_INTRINSICS
+ #endif
+ 
+-#if defined(__mips__) && !defined(__mips64) && \
++#if defined(__mips__) && !defined(__mips16) && !defined(__mips64) && \
+     defined(__mips_isa_rev) && (__mips_isa_rev >= 1) && (__mips_isa_rev < 6)
+ #define WEBP_USE_MIPS32
+ #if (__mips_isa_rev >= 2)

From 34e3f74a97551cff925d6f186153534c1ad027f6 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Wed, 20 May 2020 10:00:15 +0200
Subject: [PATCH 52/88] Fix for macvlan

---
 luci-app-macvlan/root/etc/init.d/macvlan | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/luci-app-macvlan/root/etc/init.d/macvlan b/luci-app-macvlan/root/etc/init.d/macvlan
index b82725472..f9a46e2f7 100755
--- a/luci-app-macvlan/root/etc/init.d/macvlan
+++ b/luci-app-macvlan/root/etc/init.d/macvlan
@@ -55,14 +55,16 @@ _create_interface() {
 			commit macvlan
 		EOF
 	}
-	logger -t "MACVLAN" "Create interface $_ifname based on $_masterifname"
-	uci batch <<-EOF
-		set network.$_ifname=interface
-		set network.$_ifname.type=macvlan
-		set network.$_ifname.proto=static
-		set network.$_ifname.masterintf=$_masterifname
-		commit network
-	EOF
+	[ "$(uci -q get network.$_ifname.masterintf)" != "$_masterifname" ] && {
+		logger -t "MACVLAN" "Create interface $_ifname based on $_masterifname"
+		uci batch <<-EOF
+			set network.$_ifname=interface
+			set network.$_ifname.type=macvlan
+			set network.$_ifname.proto=static
+			set network.$_ifname.masterintf=$_masterifname
+			commit network
+		EOF
+	}
 }
 
 # Configuration by interface

From f1cd2644850ce7471ea1270f70f92dcb4c680d81 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Wed, 20 May 2020 10:03:51 +0200
Subject: [PATCH 53/88] Add server tracker for server failover

---
 .../luasrc/model/cbi/omr-tracker.lua          |  31 +++++
 .../luasrc/controller/openmptcprouter.lua     |  56 ++++----
 omr-tracker/files/bin/omr-tracker-server      | 125 ++++++++++++++++++
 omr-tracker/files/etc/init.d/omr-tracker      |  30 +++++
 4 files changed, 212 insertions(+), 30 deletions(-)
 create mode 100755 omr-tracker/files/bin/omr-tracker-server

diff --git a/luci-app-omr-tracker/luasrc/model/cbi/omr-tracker.lua b/luci-app-omr-tracker/luasrc/model/cbi/omr-tracker.lua
index 99dd33fde..00faed5b8 100644
--- a/luci-app-omr-tracker/luasrc/model/cbi/omr-tracker.lua
+++ b/luci-app-omr-tracker/luasrc/model/cbi/omr-tracker.lua
@@ -41,6 +41,37 @@ o.default     = { "bing.com", "google.com" }
 o.rmempty     = false
 
 
+s = m:section(TypedSection, "server", translate("Server tracker Settings"), translate("Detect if Server is down and use defined backup server in this case."))
+s.anonymous   = true
+s.addremove = false
+
+local sdata = m:get('server')
+if not sdata then
+	m:set('server', nil, 'server')
+	m:set('server', 'enabled', "1")
+end
+
+o = s:option(Flag, "enabled", translate("Enable"), translate("When tracker is disabled, server failover is also disabled"))
+o.rmempty     = false
+
+o = s:option(Value, "timeout", translate("Timeout (s)"))
+o.placeholder = "1"
+o.default     = "1"
+o.datatype    = "range(1, 100)"
+o.rmempty     = false
+
+o = s:option(Value, "tries", translate("Tries"))
+o.placeholder = "4"
+o.default     = "4"
+o.datatype    = "range(1, 10)"
+o.rmempty     = false
+
+o = s:option(Value, "interval", translate("Retry interval (s)"))
+o.placeholder = "2"
+o.default     = "2"
+o.datatype    = "range(1, 100)"
+o.rmempty     = false
+
 s = m:section(TypedSection, "defaults", translate("Defaults Settings"), translate("OMR-Tracker detect when a connection is down and execute needed scripts"))
 s.anonymous   = true
 
diff --git a/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua b/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
index 1323f8916..de65ad3c4 100644
--- a/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
+++ b/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
@@ -167,6 +167,8 @@ function wizard_add()
 		ucic:set("sqm","wan" .. i,"verbosity","5")
 		ucic:set("sqm","wan" .. i,"download","0")
 		ucic:set("sqm","wan" .. i,"upload","0")
+		ucic:set("sqm","wan" .. i,"iqdisc_opts","autorate-ingress nat dual-dsthost")
+		ucic:set("sqm","wan" .. i,"eqdisc_opts","nat dual-srchost")
 		ucic:save("sqm")
 		ucic:commit("sqm")
 		
@@ -263,6 +265,8 @@ function wizard_add()
 			ucic:set("sqm",intf,"verbosity","5")
 			ucic:set("sqm",intf,"download","0")
 			ucic:set("sqm",intf,"upload","0")
+			ucic:set("sqm",intf,"iqdisc_opts","autorate-ingress nat dual-dsthost")
+			ucic:set("sqm",intf,"eqdisc_opts","nat dual-srchost")
 		end
 
 		if downloadspeed ~= "0" and uploadspeed ~= "0" and downloadspeed ~= "" and uploadspeed ~= "" then
@@ -281,6 +285,8 @@ function wizard_add()
 			ucic:set("qos",intf,"enabled","0")
 		end
 		if sqmenabled == "1" then
+			ucic:set("sqm",intf,"iqdisc_opts","autorate-ingress nat dual-dsthost")
+			ucic:set("sqm",intf,"eqdisc_opts","nat dual-srchost")
 			ucic:set("sqm",intf,"enabled","1")
 			ucic:set("qos",intf,"enabled","1")
 		else
@@ -395,45 +401,35 @@ function wizard_add()
 			if serversnb > 1 then
 				if master == server then
 					ss_ip=server_ip
-					table.insert(ss_servers_nginx,server_ip .. ":65101 max_fails=2 fail_timeout=20s")
-					table.insert(ss_servers_ha,server_ip .. ":65101 check")
-					if vpn_port ~= "" then
-						table.insert(vpn_servers,server_ip .. ":" .. vpn_port .. " max_fails=2 fail_timeout=20s")
-					end
-				else
-					table.insert(ss_servers_nginx,server_ip .. ":65101 backup")
-					table.insert(ss_servers_ha,server_ip .. ":65101 backup")
-					if vpn_port ~= "" then
-						table.insert(vpn_servers,server_ip .. ":" .. vpn_port .. " backup")
-					end
+					ucic:set("shadowsocks-libev","sss0","server",server_ip)
+					ucic:set("glorytun","vpn","host",server_ip)
+					ucic:set("dsvpn","vpn","host",server_ip)
+					ucic:set("mlvpn","general","host",server_ip)
+					ucic:set("ubond","general","host",server_ip)
+					luci.sys.call("uci -q del openvpn.omr.remote")
+					luci.sys.call("uci -q add_list openvpn.omr.remote=" .. server_ip)
+					ucic:set("qos","serverin","srchost",server_ip)
+					ucic:set("qos","serverout","dsthost",server_ip)
 				end
 				k = k + 1
-				ucic:set("nginx-ha","ShadowSocks","enable","1")
-				ucic:set("nginx-ha","VPN","enable","1")
-				ucic:set("nginx-ha","ShadowSocks","upstreams",ss_servers_nginx)
-				ucic:set("nginx-ha","VPN","upstreams",vpn_servers)
+				ucic:set("nginx-ha","ShadowSocks","enable","0")
+				ucic:set("nginx-ha","VPN","enable","0")
 				ucic:set("haproxy-tcp","general","enable","0")
-				ucic:set("haproxy-tcp","general","upstreams",ss_servers_ha)
 				ucic:set("openmptcprouter","settings","ha","1")
-				server_ip = "127.0.0.1"
-				--ucic:set("shadowsocks-libev","sss0","server",ss_ip)
 			else
 				ucic:set("openmptcprouter","settings","ha","0")
 				ucic:set("nginx-ha","ShadowSocks","enable","0")
 				ucic:set("nginx-ha","VPN","enable","0")
-				--ucic:set("shadowsocks-libev","sss0","server",server_ip)
-				--ucic:set("openmptcprouter","vps","ip",server_ip)
-				--ucic:save("openmptcprouter")
+				ucic:set("shadowsocks-libev","sss0","server",server_ip)
+				ucic:set("glorytun","vpn","host",server_ip)
+				ucic:set("dsvpn","vpn","host",server_ip)
+				ucic:set("mlvpn","general","host",server_ip)
+				ucic:set("ubond","general","host",server_ip)
+				luci.sys.call("uci -q del openvpn.omr.remote")
+				luci.sys.call("uci -q add_list openvpn.omr.remote=" .. server_ip)
+				ucic:set("qos","serverin","srchost",server_ip)
+				ucic:set("qos","serverout","dsthost",server_ip)
 			end
-			ucic:set("shadowsocks-libev","sss0","server",server_ip)
-			ucic:set("glorytun","vpn","host",server_ip)
-			ucic:set("dsvpn","vpn","host",server_ip)
-			ucic:set("mlvpn","general","host",server_ip)
-			ucic:set("ubond","general","host",server_ip)
-			luci.sys.call("uci -q del openvpn.omr.remote")
-			luci.sys.call("uci -q add_list openvpn.omr.remote=" .. server_ip)
-			ucic:set("qos","serverin","srchost",server_ip)
-			ucic:set("qos","serverout","dsthost",server_ip)
 		end
 	end
 
diff --git a/omr-tracker/files/bin/omr-tracker-server b/omr-tracker/files/bin/omr-tracker-server
new file mode 100755
index 000000000..76548c933
--- /dev/null
+++ b/omr-tracker/files/bin/omr-tracker-server
@@ -0,0 +1,125 @@
+#!/bin/sh
+# vim: set noexpandtab tabstop=4 shiftwidth=4 softtabstop=4 :
+
+name=$0
+basename="$(basename $0)"
+
+_log() {
+	logger -p daemon.info -t "${basename}" "$@"
+}
+
+_ping_server() {
+	local host=$1
+	ret=$(ping \
+	    -w "$OMR_TRACKER_TIMEOUT" \
+	    -c 1 \
+	    -q \
+	    "${host}"
+	) && echo "$ret" | grep -sq " 0% packet loss" && {
+		server_ping=true
+	}
+}
+
+_check_server() {
+	local host=$1
+	local port=$2
+	local k=0
+	while [ "$server_ping" = false ] && [ "$k" -le "$retry" ]; do
+		ret=$(curl -4 \
+		    --max-time "$OMR_TRACKER_TIMEOUT" \
+		    -s \
+		    -k \
+		    "https://${host}:${port}/"
+		)
+		[ -n "$ret" ] && server_ping=true
+		k=$((k+1))
+		sleep "${intervaltries}"
+	done
+}
+
+_check_master() {
+	local name=$1
+	config_get master $1 master
+	config_get ip $1 ip
+	config_get port $1 port "65500"
+	[ "$master" = "1" ] && [ -n "$ip" ] && {
+		#_ping_server $ip
+		_check_server $ip $port
+		[ "$server_ping" = true ] && [ "$(uci -q get shadowsocks-libev.sss0.server | tr -d '\n')" != "$ip" ] && {
+			logger -t "OMR-Tracker-Server" "Master server up, set it back"
+			logger -t "OMR-Tracker-Server" "$(uci -q get shadowsocks-libev.sss0.server | tr -d '\n') - $ip"
+			uci -q batch <<-EOF >/dev/null
+				set shadowsocks-libev.sss0.server=$ip
+				commit shadowsocks-libev
+				set glorytun.vpn.host=$ip
+				commit glorytun
+				set dsvpn.vpn.host=$ip
+				commit dsvpn
+				set mlvpn.general.host=$ip
+				commit mlvpn
+				del openvpn.omr.remote
+				add_list openvpn.omr.remote=$ip
+				commit openvpn
+			EOF
+			/etc/init.d/shadowsocks-libev restart >/dev/null 2>/dev/null
+			/etc/init.d/glorytun restart >/dev/null 2>/dev/null
+			/etc/init.d/glorytun-udp restart >/dev/null 2>/dev/null
+			/etc/init.d/mlvpn restart >/dev/null 2>/dev/null
+			/etc/init.d/openvpn restart >/dev/null 2>/dev/null
+			/etc/init.d/dsvpn restart >/dev/null 2>/dev/null
+		}
+		break
+	}
+}
+
+_check_backup() {
+	local name=$1
+	config_get backup $1 backup
+	config_get ip $1 ip
+	config_get port $1 port
+	[ "$backup" = "1" ] && [ -n "$ip" ] && {
+		#_ping_server $ip
+		_check_server $ip $port
+	}
+	[ "$server_ping" = true ] && [ "$(uci -q get shadowsocks-libev.sss0.server | tr -d '\n')" = "$ip" ] && break
+	[ "$server_ping" = true ] && [ "$(uci -q get shadowsocks-libev.sss0.server | tr -d '\n')" != "$ip" ] && {
+		logger -t "OMR-Tracker-Server" "User backup server $1 ($ip)"
+		uci -q batch <<-EOF >/dev/null
+			set shadowsocks-libev.sss0.server=$ip
+			commit shadowsocks-libev
+			set glorytun.vpn.host=$ip
+			commit glorytun
+			set dsvpn.vpn.host=$ip
+			commit dsvpn
+			set mlvpn.general.host=$ip
+			commit mlvpn
+			del openvpn.omr.remote
+			add_list openvpn.omr.remote=$ip
+			commit openvpn
+		EOF
+		/etc/init.d/shadowsocks-libev restart >/dev/null 2>/dev/null
+		/etc/init.d/glorytun restart >/dev/null 2>/dev/null
+		/etc/init.d/glorytun-udp restart >/dev/null 2>/dev/null
+		/etc/init.d/mlvpn restart >/dev/null 2>/dev/null
+		/etc/init.d/openvpn restart >/dev/null 2>/dev/null
+		/etc/init.d/dsvpn restart >/dev/null 2>/dev/null
+		break
+	}
+}
+
+. /lib/functions.sh
+
+timeout=${OMR_TRACKER_TIMEOUT:-5}
+interval=${OMR_TRACKER_INTERVAL:-10}
+intervaltries=${OMR_TRACKER_INTERVAL_TRIES:-2}
+retry=${OMR_TRACKER_TRIES:-4}
+
+while true; do
+	server_ping=false
+	config_load openmptcprouter
+	config_foreach _check_master server
+	[ "$server_ping" = false ] && {
+		config_foreach _check_backup server
+	}
+	sleep "${interval}"
+done
diff --git a/omr-tracker/files/etc/init.d/omr-tracker b/omr-tracker/files/etc/init.d/omr-tracker
index 1b57b15bb..48f4520d5 100755
--- a/omr-tracker/files/etc/init.d/omr-tracker
+++ b/omr-tracker/files/etc/init.d/omr-tracker
@@ -77,6 +77,26 @@ _launch_tracker() {
 	procd_close_instance
 }
 
+_launch_server_tracker() {
+	local hosts timeout tries interval interval_tries options type enabled
+	_validate_section "server" "server"
+
+	[ "${enabled}" = "0" ] && return
+	[ -z "${interval_tries}" ] && interval_tries=1
+
+	procd_open_instance
+	# shellcheck disable=SC2086
+	procd_set_param command /bin/omr-tracker-server "$1" $options
+	procd_append_param env "OMR_TRACKER_TIMEOUT=$timeout"
+	procd_append_param env "OMR_TRACKER_TRIES=$tries"
+	procd_append_param env "OMR_TRACKER_INTERVAL=$interval"
+	procd_append_param env "OMR_TRACKER_INTERVAL_TRIES=$interval_tries"
+	procd_set_param limits nofile="51200 51200"
+	procd_set_param respawn 0 10 0
+	procd_set_param stderr 1
+	procd_close_instance
+}
+
 _initialize_shadowsocks_tracker() {
 	local redir_tcp server tracker_server
 	config_get redir_tcp ss_rules redir_tcp
@@ -146,6 +166,11 @@ _launch_shadowsocks_tracker() {
 	procd_close_instance
 }
 
+_multi_server() {
+	config_get backup $1 backup
+	[ "$backup" = "1" ] && multiserver=true
+}
+
 start_service() {
 	local ss_disabled
 	logger -t "omr-tracker" "Launching..."
@@ -161,6 +186,11 @@ start_service() {
 	else
 		/etc/init.d/shadowsocks-libev rules_down
 	fi
+	
+	multiserver=false
+	config_load openmptcprouter
+	config_foreach _multi_server server
+	[ "$multiserver" = true ] && _launch_server_tracker
 	logger -t "omr-tracker" "Launched"
 }
 

From 2b8e758a6b96e3ef570d54a518d5483b2a5d0a19 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Wed, 20 May 2020 10:04:13 +0200
Subject: [PATCH 54/88] Add in wizard that keys are retrieved from the API

---
 .../luasrc/view/openmptcprouter/wizard.htm    | 20 +++++--------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm
index 85fd5169b..32e8d3776 100644
--- a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm
+++ b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm
@@ -131,16 +131,6 @@ end
 	</fieldset>
 	<fieldset class="cbi-section" id="server_common">
 	    <legend><%:Common server settings%></legend>
-	    <div class="cbi-value">
-		<label class="cbi-value-title"><%:Enable IPv6%></label>
-		<div class="cbi-value-field">
-		    <input class="cbi-input-checkbox" type="checkbox" name="enableipv6" value="0" <% if uci:get("openmptcprouter","settings","disable_ipv6") == "0" then %>checked<% end %> />
-		    <br />
-		    <div class="cbi-value-description">
-		        <%:You should disable IPv6 here if server doesn't provide IPv6.%>
-		    </div>
-		</div>
-	    </div>
 	    <div class="cbi-value">
 		<label class="cbi-value-title"><%:Advanced settings%></label>
 		<div class="cbi-value-field">
@@ -177,7 +167,7 @@ end
 		    <input type="text" name="shadowsocks_key" placeholder="<%:ShadowSocks key%>" class="cbi-input-text" value="<%=uci:get("shadowsocks-libev","sss0","key")%>" />
 		    <br />
 		    <div class="cbi-value-description">
-		        <%:ShadowSocks is used for TCP.%>
+		        <%:Key is retrieved from server API by default. ShadowSocks is used for TCP.%>
 		    </div>
 		</div>
 	    </div>
@@ -223,7 +213,7 @@ end
 		    <input type="text" name="glorytun_key" placeholder="<%:Glorytun key%>" class="cbi-input-text" value="<%=uci:get("glorytun","vpn","key")%>">
 		    <br />
 		    <div class="cbi-value-description">
-		        <%:Glorytun TCP is used by default for UDP and ICMP%>
+		        <%:Key is retrieved from server API by default. Glorytun TCP is used by default for UDP and ICMP%>
 		    </div>
 		</div>
 	    </div>
@@ -235,7 +225,7 @@ end
 		    <input type="text" name="dsvpn_key" placeholder="<%:A Dead Simple VPN key%>" class="cbi-input-text" value="<%=uci:get("dsvpn","vpn","key")%>">
 		    <br />
 		    <div class="cbi-value-description">
-		        <%:A Dead Simple VPN is a TCP VPN that can replace Glorytun TCP%>
+		        <%:Key is retrieved from server API by default. A Dead Simple VPN is a TCP VPN that can replace Glorytun TCP%>
 		    </div>
 		</div>
 	    </div>
@@ -247,7 +237,7 @@ end
 		    <input type="text" name="mlvpn_password" placeholder="<%:MLVPN password%>" class="cbi-input-text" value="<%=uci:get("mlvpn","general","password")%>">
 		    <br />
 		    <div class="cbi-value-description">
-		        <%:MLVPN can replace Glorytun with connections with same latency%>
+		        <%:Key is retrieved from server API by default. MLVPN can replace Glorytun with connections with same latency%>
 		    </div>
 		</div>
 	    </div>
@@ -259,7 +249,7 @@ end
 		    <input type="text" name="ubond_password" placeholder="<%:UBOND password%>" class="cbi-input-text" value="<%=uci:get("ubond","general","password")%>">
 		    <br />
 		    <div class="cbi-value-description">
-		        <%:UBOND can replace Glorytun with connections with same latency%>
+		        <%:Key is retrieved from server API by default. UBOND can replace Glorytun with connections with same latency%>
 		    </div>
 		</div>
 	    </div>

From 3725044c5527a860592a51593d4ba248d07485f5 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Wed, 20 May 2020 10:05:05 +0200
Subject: [PATCH 55/88] Add server tracker default config

---
 omr-tracker/files/etc/config/omr-tracker | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/omr-tracker/files/etc/config/omr-tracker b/omr-tracker/files/etc/config/omr-tracker
index 3134bee3b..1aad7ae7c 100644
--- a/omr-tracker/files/etc/config/omr-tracker
+++ b/omr-tracker/files/etc/config/omr-tracker
@@ -31,4 +31,10 @@ config shadowsocks 'shadowsocks'
 	option timeout '10'
 	option tries '3'
 	option interval_tries '1'
+	option interval '5'
+
+config server 'server'
+	option enabled '1'
+	option tries '3'
+	option timeout '10'
 	option interval '5'
\ No newline at end of file

From 75637bbb9a7719ced24fa0f970f814957fcad9b1 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Wed, 20 May 2020 10:06:03 +0200
Subject: [PATCH 56/88] Refresh IP for MPTCPoverVPN when needed

---
 openmptcprouter/files/etc/init.d/mptcpovervpn     |  1 +
 .../files/etc/init.d/openmptcprouter-vps          | 15 ++++++++++-----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/openmptcprouter/files/etc/init.d/mptcpovervpn b/openmptcprouter/files/etc/init.d/mptcpovervpn
index 365df31ed..83a8a2785 100755
--- a/openmptcprouter/files/etc/init.d/mptcpovervpn
+++ b/openmptcprouter/files/etc/init.d/mptcpovervpn
@@ -59,6 +59,7 @@ mptcp_over_vpn() {
 				set openmptcprouter.ovpn${interface}="interface"
 				set openmptcprouter.ovpn${interface}.multipath="${multipath}"
 				set openmptcprouter.ovpn${interface}.vpn="1"
+				set openmptcprouter.ovpn${interface}.baseintf="${interface}"
 				commit openmptcprouter
 			EOF
 		fi
diff --git a/openmptcprouter/files/etc/init.d/openmptcprouter-vps b/openmptcprouter/files/etc/init.d/openmptcprouter-vps
index 01c37518e..a378c3f32 100755
--- a/openmptcprouter/files/etc/init.d/openmptcprouter-vps
+++ b/openmptcprouter/files/etc/init.d/openmptcprouter-vps
@@ -275,7 +275,7 @@ _get_vps_config() {
 		fi
 	fi
 	vpsip="$(uci -q get openmptcprouter.${servername}.ip)"
-	if [ "$(uci -q get shadowsocks-libev.sss0.server)" != "127.0.0.1" ] && [ "$(uci -q get shadowsocks-libev.sss0.server)" != "$vpsip" ]; then
+	if [ "$(uci -q get shadowsocks-libev.sss0.server)" != "127.0.0.1" ] && [ "$(uci -q get shadowsocks-libev.sss0.server)" != "$vpsip" ] && [ "$(uci -q get openmptcprouter.settings.ha)" != "1" ]; then
 		uci -q batch <<-EOF >/dev/null
 			set shadowsocks-libev.sss0.server="$vpsip"
 			commit shadowsocks-libev
@@ -283,7 +283,7 @@ _get_vps_config() {
 		logger -t "OMR-VPS" "Restart shadowsocks..."
 		/etc/init.d/shadowsocks-libev restart
 	fi
-	if [ "$(uci -q get openvpn.omr.remote)" != "127.0.0.1" ] && [ "$(uci -q get openvpn.omr.remote)" != "$vpsip" ]; then
+	if [ "$(uci -q get openvpn.omr.remote)" != "127.0.0.1" ] && [ "$(uci -q get openvpn.omr.remote)" != "$vpsip" ] && [ "$(uci -q get openmptcprouter.settings.ha)" != "1" ]; then
 		uci -q batch <<-EOF >/dev/null
 			set openvpn.omr.remote="$vpsip"
 			commit openvpn
@@ -294,7 +294,7 @@ _get_vps_config() {
 	port="$(echo "$vps_config" | jsonfilter -q -e '@.dsvpn.port')"
 	localip="$(echo "$vps_config" | jsonfilter -q -e '@.dsvpn.client_ip')"
 	remoteip="$(echo "$vps_config" | jsonfilter -q -e '@.dsvpn.host_ip')"
-	if ([ "$(uci -q get dsvpn.vpn.host)" != "127.0.0.1" ] && [ "$(uci -q get dsvpn.vpn.host)" != "$vpsip" ]) || [ "$(uci -q get dsvpn.vpn.port)" != "$port" ] || [ "$(uci -q get dsvpn.vpn.localip)" != "$localip" ] || [ "$(uci -q get dsvpn.vpn.remoteip)" != "$remoteip" ]; then
+	if ([ "$(uci -q get dsvpn.vpn.host)" != "127.0.0.1" ] && [ "$(uci -q get dsvpn.vpn.host)" != "$vpsip" ] && [ "$(uci -q get openmptcprouter.settings.ha)" != "1" ]) || [ "$(uci -q get dsvpn.vpn.port)" != "$port" ] || [ "$(uci -q get dsvpn.vpn.localip)" != "$localip" ] || [ "$(uci -q get dsvpn.vpn.remoteip)" != "$remoteip" ]; then
 		uci -q batch <<-EOF >/dev/null
 			set dsvpn.vpn.port=$port
 			set dsvpn.vpn.localip=$localip
@@ -306,7 +306,7 @@ _get_vps_config() {
 		/etc/init.d/dsvpn restart
 	fi
 
-	if [ "$(uci -q get mlvpn.general.host)" != "127.0.0.1" ] && [ "$(uci -q get mlvpn.general.host)" != "$vpsip" ] && [ -f /etc/init.d/mlvpn ]; then
+	if [ "$(uci -q get mlvpn.general.host)" != "127.0.0.1" ] && [ "$(uci -q get mlvpn.general.host)" != "$vpsip" ] && [ "$(uci -q get openmptcprouter.settings.ha)" != "1" ] && [ -f /etc/init.d/mlvpn ]; then
 		uci -q batch <<-EOF >/dev/null
 			set mlvpn.general=mlvpn
 			set mlvpn.general.host="$vpsip"
@@ -315,7 +315,7 @@ _get_vps_config() {
 		logger -t "OMR-VPS" "Restart MLVPN..."
 		/etc/init.d/mlvpn restart
 	fi
-	if [ "$(uci -q get glorytun.vpn.host)" != "127.0.0.1" ] && [ "$(uci -q get glorytun.vpn.host)" != "$vpsip" ]; then
+	if [ "$(uci -q get glorytun.vpn.host)" != "127.0.0.1" ] && [ "$(uci -q get glorytun.vpn.host)" != "$vpsip" ] && [ "$(uci -q get openmptcprouter.settings.ha)" != "1" ]; then
 		uci -q batch <<-EOF >/dev/null
 			set glorytun.vpn.host="$vpsip"
 		EOF
@@ -565,6 +565,11 @@ _vps_firewall_redirect_port() {
 	config_get src_dport $1 src_dport
 	config_get family $1 family "ipv4"
 	config_get enabled $1 enabled "1"
+	[ "$(echo $src_dport | cut -d'-' -f2)" -ge "65000" ] && {
+		logger -t "OMR-VPS" "You can't redirect ports >= 65000, they are needed by OpenMPTCProuter Server part"
+		uci -q delete firewall.$1
+		return
+	}
 	[ "$src" = "vpn" ] && [ -n "$proto" ] && [ -n "$src_dport" ] && [ "$enabled" != "0" ] && {
 		if [ "$proto" = "tcp udp" ]; then
 			checkfw=""

From 10fa57001babd10b0308cb7f89c589ebfe52894c Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Wed, 20 May 2020 10:06:51 +0200
Subject: [PATCH 57/88] Refresh MTCPoverVPN ip in post tracking and some fixes

---
 .../share/omr/post-tracking.d/post-tracking   | 57 +++++++++++--------
 1 file changed, 33 insertions(+), 24 deletions(-)

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 e2467a66f..72ea623eb 100755
--- a/mptcp/files/usr/share/omr/post-tracking.d/post-tracking
+++ b/mptcp/files/usr/share/omr/post-tracking.d/post-tracking
@@ -124,8 +124,8 @@ set_server_all_routes() {
 		routesintf=""
 		config_load network
 		config_foreach set_routes_intf interface
-		[ -n "$routesintf" ] && [ "$(echo $routesintf | grep $OMR_TRACKER_DEVICE_GATEWAY)" != "" ] && {
-			_log "Set server $server default route $serverip $routesintf"
+		[ -n "$routesintf" ] && [ "$(echo $routesintf | grep $OMR_TRACKER_DEVICE_GATEWAY | grep $OMR_TRACKER_DEVICE)" != "" ] && {
+			_log "Set server $server ($serverip) default route $serverip $routesintf"
 			ip route replace $serverip scope global $routesintf
 		}
 	fi
@@ -250,6 +250,15 @@ if [ "$OMR_TRACKER_STATUS" = "ERROR" ]; then
 		if [ -n "$OMR_TRACKER_DEVICE_IP" ]; then
 			glorytun-udp path $OMR_TRACKER_DEVICE_IP dev tun0 down > /dev/null 2>&1
 		fi
+		if [ "$(uci -q get openmptcprouter.$OMR_TRACKER_INTERFACE.vpn)" = "1" ]; then
+			VPN_BASE_INTF="$(uci -q get openmptcprouter.$OMR_TRACKER_INTERFACE.baseintf)"
+			VPN_BASE_INTF_IP=$(ubus call network.interface.$VPN_BASE_INTF status | jsonfilter -e '@["ipv4-address"][0].address' | tr -d "\n")
+			uci -q batch <<-EOF >/dev/null
+				set openvpn.$VPN_BASE_INTF.local=$VPN_BASE_INTF_IP
+				commit openvpn
+			EOF
+			/etc/init.d/openvpn restart $VPN_BASE_INTF
+		fi
 		config_load openmptcprouter
 		config_foreach del_server_route server
 		#if [ "$(uci -q get openmptcprouter.settings.master)" = "balancing" ]; then
@@ -473,28 +482,28 @@ if [ "$(uci -q get openmptcprouter.$OMR_TRACKER_INTERFACE.lc)" = "" ] || [ $(($(
 	fi
 	[ -n "$ipaddr" ] && {
 		# Check if we can get a IPv6 address, if yes enable RA else disable
-		local check_ipv6_website="$(uci -q get openmptcprouter.settings.check_ipv6_website)"
-		[ -z "$check_ipv6_website" ] && check_ipv6_website="http://ipv6.openmptcprouter.com/"
-		local ip6addr="$(curl -s -6 -m 2 $check_ipv6_website)"
-		[ -z "$ip6addr" ] && {
-			local ip6addr="$(curl -s -6 -m 2 http://ifconfig.co/)"
-		}
-		if [ "$(uci -q get openmptcprouter.settings.ipv6_disable)" = "0" ]; then
-			if [ -n "$ip6addr" ] && [ "$(uci -q get dhcp.lan.ra_default)" != 1 ]; then
-				_log "Enable IPv6 RA"
-				uci -q set dhcp.lan.ra=server
-				uci -q set dhcp.lan.ra_default=1
-				uci -q set dhcp.lan.dhcpv6=server
-				/etc/init.d/odhcpd start > /dev/null 2>&1
-				/etc/init.d/odhcpd enable > /dev/null 2>&1
-			elif [ -z "$ip6addr" ] && [ "$(uci -q set dhcp.lan.ra_default)" = 1 ]; then
-				_log "Disable IPv6 RA"
-				uci -q delete dhcp.lan.ra
-				uci -q delete dhcp.lan.dhcpv6
-				/etc/init.d/odhcpd start > /dev/null 2>&1
-				/etc/init.d/odhcpd enable > /dev/null 2>&1
-			fi
-		fi
+		#local check_ipv6_website="$(uci -q get openmptcprouter.settings.check_ipv6_website)"
+		#[ -z "$check_ipv6_website" ] && check_ipv6_website="http://ipv6.openmptcprouter.com/"
+		#local ip6addr="$(curl -s -6 -m 2 $check_ipv6_website)"
+		#[ -z "$ip6addr" ] && {
+		#	local ip6addr="$(curl -s -6 -m 2 http://ifconfig.co/)"
+		#}
+		#if [ "$(uci -q get openmptcprouter.settings.ipv6_disable)" = "0" ]; then
+		#	if [ -n "$ip6addr" ] && [ "$(uci -q get dhcp.lan.ra_default)" != 1 ]; then
+		#		_log "Enable IPv6 RA"
+		#		uci -q set dhcp.lan.ra=server
+		#		uci -q set dhcp.lan.ra_default=1
+		#		uci -q set dhcp.lan.dhcpv6=server
+		#		/etc/init.d/odhcpd start > /dev/null 2>&1
+		#		/etc/init.d/odhcpd enable > /dev/null 2>&1
+		#	elif [ -z "$ip6addr" ] && [ "$(uci -q set dhcp.lan.ra_default)" = 1 ]; then
+		#		_log "Disable IPv6 RA"
+		#		uci -q delete dhcp.lan.ra
+		#		uci -q delete dhcp.lan.dhcpv6
+		#		/etc/init.d/odhcpd start > /dev/null 2>&1
+		#		/etc/init.d/odhcpd enable > /dev/null 2>&1
+		#	fi
+		#fi
 		if [ "$(uci -q get openmptcprouter.settings.external_check)" != "0" ]; then
 			local asn="$(wget -4 -qO- -T 4 http://api.iptoasn.com/v1/as/ip/$ipaddr | jsonfilter -q -e '@.as_description')"
 			[ -z "$asn" ] && {

From 5f9b903b351fd67bf609ffa364f122f74a9ed9ee Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Wed, 20 May 2020 10:46:25 +0200
Subject: [PATCH 58/88] Update luci-mod-network

---
 luci-mod-network/Makefile                     |   2 +-
 .../resources/view/network/dhcp.js            |  24 +-
 .../resources/view/network/dhcp.js.orig       | 568 ++++++++++++++++++
 .../resources/view/network/interfaces.js      |   6 +-
 .../resources/view/network/routes.js          |   2 +-
 .../resources/view/network/wireless.js        |  25 +-
 .../share/luci/menu.d/luci-mod-network.json   |  13 +
 .../share/rpcd/acl.d/luci-mod-network.json    |  65 ++
 8 files changed, 686 insertions(+), 19 deletions(-)
 create mode 100644 luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js.orig
 create mode 100644 luci-mod-network/root/usr/share/rpcd/acl.d/luci-mod-network.json

diff --git a/luci-mod-network/Makefile b/luci-mod-network/Makefile
index fef96fea3..ccda38bb2 100644
--- a/luci-mod-network/Makefile
+++ b/luci-mod-network/Makefile
@@ -4,7 +4,7 @@
 #
 # This is free software, licensed under the Apache License, Version 2.0 .
 #
-# From https://github.com/openwrt/luci/commit/1e07e3a52d4d06cc82ab07f2b7fbba0a9a6fb801
+# From https://github.com/openwrt/luci/commit/01d5d5f92963d9596a3c0b669a7e8d87b64132d5
 
 include $(TOPDIR)/rules.mk
 
diff --git a/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js b/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js
index e2eccc72e..0c84ccc91 100644
--- a/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js
+++ b/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js
@@ -66,6 +66,9 @@ CBILease6Status = form.DummyValue.extend({
 });
 
 function validateHostname(sid, s) {
+	if (s == null || s == '')
+		return true;
+
 	if (s.length > 256)
 		return _('Expecting: %s').format(_('valid hostname'));
 
@@ -99,7 +102,7 @@ function validateServerSpec(sid, s) {
 	if (s == null || s == '')
 		return true;
 
-	var m = s.match(/^\/(.+)\/(.*)$/);
+	var m = s.match(/^(?:\/(.+)\/)?(.*)$/);
 	if (!m)
 		return _('Expecting: %s').format(_('valid hostname'));
 
@@ -116,11 +119,20 @@ function validateServerSpec(sid, s) {
 
 	if (!m)
 		return _('Expecting: %s').format(_('valid IP address'));
-	else if (validation.parseIPv4(m[1]) && m[3] != null && !validation.parseIPv4(m[3]))
-		return _('Expecting: %s').format(_('valid IPv4 address'));
-	else if (validation.parseIPv6(m[1]) && m[3] != null && !validation.parseIPv6(m[3]))
-		return _('Expecting: %s').format(_('valid IPv6 address'));
-	else if ((m[2] != null && +m[2] > 65535) || (m[4] != null && +m[4] > 65535))
+
+	if (validation.parseIPv4(m[1])) {
+		if (m[3] != null && !validation.parseIPv4(m[3]))
+			return _('Expecting: %s').format(_('valid IPv4 address'));
+	}
+	else if (validation.parseIPv6(m[1])) {
+		if (m[3] != null && !validation.parseIPv6(m[3]))
+			return _('Expecting: %s').format(_('valid IPv6 address'));
+	}
+	else {
+		return _('Expecting: %s').format(_('valid IP address'));
+	}
+
+	if ((m[2] != null && +m[2] > 65535) || (m[4] != null && +m[4] > 65535))
 		return _('Expecting: %s').format(_('valid port value'));
 
 	return true;
diff --git a/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js.orig b/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js.orig
new file mode 100644
index 000000000..fa991db41
--- /dev/null
+++ b/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js.orig
@@ -0,0 +1,568 @@
+'use strict';
+'require view';
+'require dom';
+'require poll';
+'require rpc';
+'require uci';
+'require form';
+'require validation';
+
+var callHostHints, callDUIDHints, callDHCPLeases, CBILeaseStatus, CBILease6Status;
+
+callHostHints = rpc.declare({
+	object: 'luci-rpc',
+	method: 'getHostHints',
+	expect: { '': {} }
+});
+
+callDUIDHints = rpc.declare({
+	object: 'luci-rpc',
+	method: 'getDUIDHints',
+	expect: { '': {} }
+});
+
+callDHCPLeases = rpc.declare({
+	object: 'luci-rpc',
+	method: 'getDHCPLeases',
+	expect: { '': {} }
+});
+
+CBILeaseStatus = form.DummyValue.extend({
+	renderWidget: function(section_id, option_id, cfgvalue) {
+		return E([
+			E('h4', _('Active DHCP Leases')),
+			E('div', { 'id': 'lease_status_table', 'class': 'table' }, [
+				E('div', { 'class': 'tr table-titles' }, [
+					E('div', { 'class': 'th' }, _('Hostname')),
+					E('div', { 'class': 'th' }, _('IPv4-Address')),
+					E('div', { 'class': 'th' }, _('MAC-Address')),
+					E('div', { 'class': 'th' }, _('Lease time remaining'))
+				]),
+				E('div', { 'class': 'tr placeholder' }, [
+					E('div', { 'class': 'td' }, E('em', _('Collecting data...')))
+				])
+			])
+		]);
+	}
+});
+
+CBILease6Status = form.DummyValue.extend({
+	renderWidget: function(section_id, option_id, cfgvalue) {
+		return E([
+			E('h4', _('Active DHCPv6 Leases')),
+			E('div', { 'id': 'lease6_status_table', 'class': 'table' }, [
+				E('div', { 'class': 'tr table-titles' }, [
+					E('div', { 'class': 'th' }, _('Host')),
+					E('div', { 'class': 'th' }, _('IPv6-Address')),
+					E('div', { 'class': 'th' }, _('DUID')),
+					E('div', { 'class': 'th' }, _('Lease time remaining'))
+				]),
+				E('div', { 'class': 'tr placeholder' }, [
+					E('div', { 'class': 'td' }, E('em', _('Collecting data...')))
+				])
+			])
+		]);
+	}
+});
+
+function validateHostname(sid, s) {
+	if (s == null || s == '')
+		return true;
+
+	if (s.length > 256)
+		return _('Expecting: %s').format(_('valid hostname'));
+
+	var labels = s.replace(/^\.+|\.$/g, '').split(/\./);
+
+	for (var i = 0; i < labels.length; i++)
+		if (!labels[i].match(/^[a-z0-9_](?:[a-z0-9-]{0,61}[a-z0-9])?$/i))
+			return _('Expecting: %s').format(_('valid hostname'));
+
+	return true;
+}
+
+function validateAddressList(sid, s) {
+	if (s == null || s == '')
+		return true;
+
+	var m = s.match(/^\/(.+)\/$/),
+	    names = m ? m[1].split(/\//) : [ s ];
+
+	for (var i = 0; i < names.length; i++) {
+		var res = validateHostname(sid, names[i]);
+
+		if (res !== true)
+			return res;
+	}
+
+	return true;
+}
+
+function validateServerSpec(sid, s) {
+	if (s == null || s == '')
+		return true;
+
+	var m = s.match(/^(?:\/(.+)\/)?(.*)$/);
+	if (!m)
+		return _('Expecting: %s').format(_('valid hostname'));
+
+	var res = validateAddressList(sid, m[1]);
+	if (res !== true)
+		return res;
+
+	if (m[2] == '' || m[2] == '#')
+		return true;
+
+	// ipaddr%scopeid#srvport@source@interface#srcport
+
+	m = m[2].match(/^([0-9a-f:.]+)(?:%[^#@]+)?(?:#(\d+))?(?:@([0-9a-f:.]+)(?:@[^#]+)?(?:#(\d+))?)?$/);
+
+	if (!m)
+		return _('Expecting: %s').format(_('valid IP address'));
+
+	if (validation.parseIPv4(m[1])) {
+		if (m[3] != null && !validation.parseIPv4(m[3]))
+			return _('Expecting: %s').format(_('valid IPv4 address'));
+	}
+	else if (validation.parseIPv6(m[1])) {
+		if (m[3] != null && !validation.parseIPv6(m[3]))
+			return _('Expecting: %s').format(_('valid IPv6 address'));
+	}
+	else {
+		return _('Expecting: %s').format(_('valid IP address'));
+	}
+
+	if ((m[2] != null && +m[2] > 65535) || (m[4] != null && +m[4] > 65535))
+		return _('Expecting: %s').format(_('valid port value'));
+
+	return true;
+}
+
+return view.extend({
+	load: function() {
+		return Promise.all([
+			callHostHints(),
+			callDUIDHints()
+		]);
+	},
+
+	render: function(hosts_duids) {
+		var has_dhcpv6 = L.hasSystemFeature('dnsmasq', 'dhcpv6') || L.hasSystemFeature('odhcpd'),
+		    hosts = hosts_duids[0],
+		    duids = hosts_duids[1],
+		    m, s, o, ss, so;
+
+		m = new form.Map('dhcp', _('DHCP and DNS'), _('Dnsmasq is a combined <abbr title="Dynamic Host Configuration Protocol">DHCP</abbr>-Server and <abbr title="Domain Name System">DNS</abbr>-Forwarder for <abbr title="Network Address Translation">NAT</abbr> firewalls'));
+
+		s = m.section(form.TypedSection, 'dnsmasq', _('Server Settings'));
+		s.anonymous = true;
+		s.addremove = false;
+
+		s.tab('general', _('General Settings'));
+		s.tab('files', _('Resolv and Hosts Files'));
+		s.tab('tftp', _('TFTP Settings'));
+		s.tab('advanced', _('Advanced Settings'));
+		s.tab('leases', _('Static Leases'));
+
+		s.taboption('general', form.Flag, 'domainneeded',
+			_('Domain required'),
+			_('Don\'t forward <abbr title="Domain Name System">DNS</abbr>-Requests without <abbr title="Domain Name System">DNS</abbr>-Name'));
+
+		s.taboption('general', form.Flag, 'authoritative',
+			_('Authoritative'),
+			_('This is the only <abbr title="Dynamic Host Configuration Protocol">DHCP</abbr> in the local network'));
+
+
+		s.taboption('files', form.Flag, 'readethers',
+			_('Use <code>/etc/ethers</code>'),
+			_('Read <code>/etc/ethers</code> to configure the <abbr title="Dynamic Host Configuration Protocol">DHCP</abbr>-Server'));
+
+		s.taboption('files', form.Value, 'leasefile',
+			_('Leasefile'),
+			_('file where given <abbr title="Dynamic Host Configuration Protocol">DHCP</abbr>-leases will be stored'));
+
+		s.taboption('files', form.Flag, 'noresolv',
+			_('Ignore resolve file')).optional = true;
+
+		o = s.taboption('files', form.Value, 'resolvfile',
+			_('Resolve file'),
+			_('local <abbr title="Domain Name System">DNS</abbr> file'));
+
+		o.depends('noresolv', '0');
+		o.placeholder = '/tmp/resolv.conf.d/resolv.conf.auto';
+		o.optional = true;
+
+
+		s.taboption('files', form.Flag, 'nohosts',
+			_('Ignore <code>/etc/hosts</code>')).optional = true;
+
+		s.taboption('files', form.DynamicList, 'addnhosts',
+			_('Additional Hosts files')).optional = true;
+
+		o = s.taboption('advanced', form.Flag, 'quietdhcp',
+			_('Suppress logging'),
+			_('Suppress logging of the routine operation of these protocols'));
+		o.optional = true;
+
+		o = s.taboption('advanced', form.Flag, 'sequential_ip',
+			_('Allocate IP sequentially'),
+			_('Allocate IP addresses sequentially, starting from the lowest available address'));
+		o.optional = true;
+
+		o = s.taboption('advanced', form.Flag, 'boguspriv',
+			_('Filter private'),
+			_('Do not forward reverse lookups for local networks'));
+		o.default = o.enabled;
+
+		s.taboption('advanced', form.Flag, 'filterwin2k',
+			_('Filter useless'),
+			_('Do not forward requests that cannot be answered by public name servers'));
+
+
+		s.taboption('advanced', form.Flag, 'localise_queries',
+			_('Localise queries'),
+			_('Localise hostname depending on the requesting subnet if multiple IPs are available'));
+
+		if (L.hasSystemFeature('dnsmasq', 'dnssec')) {
+			o = s.taboption('advanced', form.Flag, 'dnssec',
+				_('DNSSEC'));
+			o.optional = true;
+
+			o = s.taboption('advanced', form.Flag, 'dnsseccheckunsigned',
+				_('DNSSEC check unsigned'),
+				_('Requires upstream supports DNSSEC; verify unsigned domain responses really come from unsigned domains'));
+			o.default = o.enabled;
+			o.optional = true;
+		}
+
+		s.taboption('general', form.Value, 'local',
+			_('Local server'),
+			_('Local domain specification. Names matching this domain are never forwarded and are resolved from DHCP or hosts files only'));
+
+		s.taboption('general', form.Value, 'domain',
+			_('Local domain'),
+			_('Local domain suffix appended to DHCP names and hosts file entries'));
+
+		s.taboption('advanced', form.Flag, 'expandhosts',
+			_('Expand hosts'),
+			_('Add local domain suffix to names served from hosts files'));
+
+		s.taboption('advanced', form.Flag, 'nonegcache',
+			_('No negative cache'),
+			_('Do not cache negative replies, e.g. for not existing domains'));
+
+		s.taboption('advanced', form.Value, 'serversfile',
+			_('Additional servers file'),
+			_('This file may contain lines like \'server=/domain/1.2.3.4\' or \'server=1.2.3.4\' for domain-specific or full upstream <abbr title="Domain Name System">DNS</abbr> servers.'));
+
+		s.taboption('advanced', form.Flag, 'strictorder',
+			_('Strict order'),
+			_('<abbr title="Domain Name System">DNS</abbr> servers will be queried in the order of the resolvfile')).optional = true;
+
+		s.taboption('advanced', form.Flag, 'allservers',
+			_('All Servers'),
+			_('Query all available upstream <abbr title="Domain Name System">DNS</abbr> servers')).optional = true;
+
+		o = s.taboption('advanced', form.DynamicList, 'bogusnxdomain', _('Bogus NX Domain Override'),
+			_('List of hosts that supply bogus NX domain results'));
+
+		o.optional = true;
+		o.placeholder = '67.215.65.132';
+
+
+		s.taboption('general', form.Flag, 'logqueries',
+			_('Log queries'),
+			_('Write received DNS requests to syslog')).optional = true;
+
+		o = s.taboption('general', form.DynamicList, 'server', _('DNS forwardings'),
+			_('List of <abbr title="Domain Name System">DNS</abbr> servers to forward requests to'));
+
+		o.optional = true;
+		o.placeholder = '/example.org/10.1.2.3';
+		o.validate = validateServerSpec;
+
+
+		o = s.taboption('general', form.Flag, 'rebind_protection',
+			_('Rebind protection'),
+			_('Discard upstream RFC1918 responses'));
+
+		o.rmempty = false;
+
+
+		o = s.taboption('general', form.Flag, 'rebind_localhost',
+			_('Allow localhost'),
+			_('Allow upstream responses in the 127.0.0.0/8 range, e.g. for RBL services'));
+
+		o.depends('rebind_protection', '1');
+
+
+		o = s.taboption('general', form.DynamicList, 'rebind_domain',
+			_('Domain whitelist'),
+			_('List of domains to allow RFC1918 responses for'));
+		o.optional = true;
+
+		o.depends('rebind_protection', '1');
+		o.placeholder = 'ihost.netflix.com';
+		o.validate = validateAddressList;
+
+
+		o = s.taboption('advanced', form.Value, 'port',
+			_('<abbr title="Domain Name System">DNS</abbr> server port'),
+			_('Listening port for inbound DNS queries'));
+
+		o.optional = true;
+		o.datatype = 'port';
+		o.placeholder = 53;
+
+
+		o = s.taboption('advanced', form.Value, 'queryport',
+			_('<abbr title="Domain Name System">DNS</abbr> query port'),
+			_('Fixed source port for outbound DNS queries'));
+
+		o.optional = true;
+		o.datatype = 'port';
+		o.placeholder = _('any');
+
+
+		o = s.taboption('advanced', form.Value, 'dhcpleasemax',
+			_('<abbr title="maximal">Max.</abbr> <abbr title="Dynamic Host Configuration Protocol">DHCP</abbr> leases'),
+			_('Maximum allowed number of active DHCP leases'));
+
+		o.optional = true;
+		o.datatype = 'uinteger';
+		o.placeholder = _('unlimited');
+
+
+		o = s.taboption('advanced', form.Value, 'ednspacket_max',
+			_('<abbr title="maximal">Max.</abbr> <abbr title="Extension Mechanisms for Domain Name System">EDNS0</abbr> packet size'),
+			_('Maximum allowed size of EDNS.0 UDP packets'));
+
+		o.optional = true;
+		o.datatype = 'uinteger';
+		o.placeholder = 1280;
+
+
+		o = s.taboption('advanced', form.Value, 'dnsforwardmax',
+			_('<abbr title="maximal">Max.</abbr> concurrent queries'),
+			_('Maximum allowed number of concurrent DNS queries'));
+
+		o.optional = true;
+		o.datatype = 'uinteger';
+		o.placeholder = 150;
+
+		o = s.taboption('advanced', form.Value, 'cachesize',
+			_('Size of DNS query cache'),
+			_('Number of cached DNS entries (max is 10000, 0 is no caching)'));
+		o.optional = true;
+		o.datatype = 'range(0,10000)';
+		o.placeholder = 150;
+
+		s.taboption('tftp', form.Flag, 'enable_tftp',
+			_('Enable TFTP server')).optional = true;
+
+		o = s.taboption('tftp', form.Value, 'tftp_root',
+			_('TFTP server root'),
+			_('Root directory for files served via TFTP'));
+
+		o.optional = true;
+		o.depends('enable_tftp', '1');
+		o.placeholder = '/';
+
+
+		o = s.taboption('tftp', form.Value, 'dhcp_boot',
+			_('Network boot image'),
+			_('Filename of the boot image advertised to clients'));
+
+		o.optional = true;
+		o.depends('enable_tftp', '1');
+		o.placeholder = 'pxelinux.0';
+
+		o = s.taboption('general', form.Flag, 'localservice',
+			_('Local Service Only'),
+			_('Limit DNS service to subnets interfaces on which we are serving DNS.'));
+		o.optional = false;
+		o.rmempty = false;
+
+		o = s.taboption('general', form.Flag, 'nonwildcard',
+			_('Non-wildcard'),
+			_('Bind dynamically to interfaces rather than wildcard address (recommended as linux default)'));
+		o.default = o.enabled;
+		o.optional = false;
+		o.rmempty = true;
+
+		o = s.taboption('general', form.DynamicList, 'interface',
+			_('Listen Interfaces'),
+			_('Limit listening to these interfaces, and loopback.'));
+		o.optional = true;
+
+		o = s.taboption('general', form.DynamicList, 'notinterface',
+			_('Exclude interfaces'),
+			_('Prevent listening on these interfaces.'));
+		o.optional = true;
+
+		o = s.taboption('leases', form.SectionValue, '__leases__', form.GridSection, 'host', null,
+			_('Static leases are used to assign fixed IP addresses and symbolic hostnames to DHCP clients. They are also required for non-dynamic interface configurations where only hosts with a corresponding lease are served.') + '<br />' +
+			_('Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</em> identifies the host, the <em>IPv4-Address</em> specifies the fixed address to use, and the <em>Hostname</em> is assigned as a symbolic name to the requesting host. The optional <em>Lease time</em> can be used to set non-standard host-specific lease time, e.g. 12h, 3d or infinite.'));
+
+		ss = o.subsection;
+
+		ss.addremove = true;
+		ss.anonymous = true;
+
+		so = ss.option(form.Value, 'name', _('Hostname'));
+		so.validate = validateHostname;
+		so.rmempty  = true;
+		so.write = function(section, value) {
+			uci.set('dhcp', section, 'name', value);
+			uci.set('dhcp', section, 'dns', '1');
+		};
+		so.remove = function(section) {
+			uci.unset('dhcp', section, 'name');
+			uci.unset('dhcp', section, 'dns');
+		};
+
+		so = ss.option(form.Value, 'mac', _('<abbr title="Media Access Control">MAC</abbr>-Address'));
+		so.datatype = 'list(unique(macaddr))';
+		so.rmempty  = true;
+		so.cfgvalue = function(section) {
+			var macs = uci.get('dhcp', section, 'mac'),
+			    result = [];
+
+			if (!Array.isArray(macs))
+				macs = (macs != null && macs != '') ? macs.split(/\ss+/) : [];
+
+			for (var i = 0, mac; (mac = macs[i]) != null; i++)
+				if (/^([0-9a-fA-F]{1,2}):([0-9a-fA-F]{1,2}):([0-9a-fA-F]{1,2}):([0-9a-fA-F]{1,2}):([0-9a-fA-F]{1,2}):([0-9a-fA-F]{1,2})$/.test(mac))
+					result.push('%02X:%02X:%02X:%02X:%02X:%02X'.format(
+						parseInt(RegExp.$1, 16), parseInt(RegExp.$2, 16),
+						parseInt(RegExp.$3, 16), parseInt(RegExp.$4, 16),
+						parseInt(RegExp.$5, 16), parseInt(RegExp.$6, 16)));
+
+			return result.length ? result.join(' ') : null;
+		};
+		so.renderWidget = function(section_id, option_index, cfgvalue) {
+			var node = form.Value.prototype.renderWidget.apply(this, [section_id, option_index, cfgvalue]),
+			    ipopt = this.section.children.filter(function(o) { return o.option == 'ip' })[0];
+
+			node.addEventListener('cbi-dropdown-change', L.bind(function(ipopt, section_id, ev) {
+				var mac = ev.detail.value.value;
+				if (mac == null || mac == '' || !hosts[mac] || !hosts[mac].ipv4)
+					return;
+
+				var ip = ipopt.formvalue(section_id);
+				if (ip != null && ip != '')
+					return;
+
+				var node = ipopt.map.findElement('id', ipopt.cbid(section_id));
+				if (node)
+					dom.callClassMethod(node, 'setValue', hosts[mac].ipv4);
+			}, this, ipopt, section_id));
+
+			return node;
+		};
+		Object.keys(hosts).forEach(function(mac) {
+			var hint = hosts[mac].name || hosts[mac].ipv4;
+			so.value(mac, hint ? '%s (%s)'.format(mac, hint) : mac);
+		});
+
+		so = ss.option(form.Value, 'ip', _('<abbr title="Internet Protocol Version 4">IPv4</abbr>-Address'));
+		so.datatype = 'or(ip4addr,"ignore")';
+		so.validate = function(section, value) {
+			var mac = this.map.lookupOption('mac', section),
+			    name = this.map.lookupOption('name', section),
+			    m = mac ? mac[0].formvalue(section) : null,
+			    n = name ? name[0].formvalue(section) : null;
+
+			if ((m == null || m == '') && (n == null || n == ''))
+				return _('One of hostname or mac address must be specified!');
+
+			return true;
+		};
+		Object.keys(hosts).forEach(function(mac) {
+			if (hosts[mac].ipv4) {
+				var hint = hosts[mac].name;
+				so.value(hosts[mac].ipv4, hint ? '%s (%s)'.format(hosts[mac].ipv4, hint) : hosts[mac].ipv4);
+			}
+		});
+
+		so = ss.option(form.Value, 'leasetime', _('Lease time'));
+		so.rmempty = true;
+
+		so = ss.option(form.Value, 'duid', _('<abbr title="The DHCP Unique Identifier">DUID</abbr>'));
+		so.datatype = 'and(rangelength(20,36),hexstring)';
+		Object.keys(duids).forEach(function(duid) {
+			so.value(duid, '%s (%s)'.format(duid, duids[duid].hostname || duids[duid].macaddr || duids[duid].ip6addr || '?'));
+		});
+
+		so = ss.option(form.Value, 'hostid', _('<abbr title="Internet Protocol Version 6">IPv6</abbr>-Suffix (hex)'));
+
+		o = s.taboption('leases', CBILeaseStatus, '__status__');
+
+		if (has_dhcpv6)
+			o = s.taboption('leases', CBILease6Status, '__status6__');
+
+		return m.render().then(function(mapEl) {
+			poll.add(function() {
+				return callDHCPLeases().then(function(leaseinfo) {
+					var leases = Array.isArray(leaseinfo.dhcp_leases) ? leaseinfo.dhcp_leases : [],
+					    leases6 = Array.isArray(leaseinfo.dhcp6_leases) ? leaseinfo.dhcp6_leases : [];
+
+					cbi_update_table(mapEl.querySelector('#lease_status_table'),
+						leases.map(function(lease) {
+							var exp;
+
+							if (lease.expires === false)
+								exp = E('em', _('unlimited'));
+							else if (lease.expires <= 0)
+								exp = E('em', _('expired'));
+							else
+								exp = '%t'.format(lease.expires);
+
+							return [
+								lease.hostname || '?',
+								lease.ipaddr,
+								lease.macaddr,
+								exp
+							];
+						}),
+						E('em', _('There are no active leases')));
+
+					if (has_dhcpv6) {
+						cbi_update_table(mapEl.querySelector('#lease6_status_table'),
+							leases6.map(function(lease) {
+								var exp;
+
+								if (lease.expires === false)
+									exp = E('em', _('unlimited'));
+								else if (lease.expires <= 0)
+									exp = E('em', _('expired'));
+								else
+									exp = '%t'.format(lease.expires);
+
+								var hint = lease.macaddr ? hosts[lease.macaddr] : null,
+								    name = hint ? (hint.name || hint.ipv4 || hint.ipv6) : null,
+								    host = null;
+
+								if (name && lease.hostname && lease.hostname != name && lease.ip6addr != name)
+									host = '%s (%s)'.format(lease.hostname, name);
+								else if (lease.hostname)
+									host = lease.hostname;
+								else if (name)
+									host = name;
+
+								return [
+									host || '-',
+									lease.ip6addrs ? lease.ip6addrs.join(' ') : lease.ip6addr,
+									lease.duid,
+									exp
+								];
+							}),
+							E('em', _('There are no active leases')));
+					}
+				});
+			});
+
+			return mapEl;
+		});
+	}
+});
diff --git a/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js b/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js
index bd4ce5790..bee575305 100644
--- a/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js
+++ b/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js
@@ -10,6 +10,8 @@
 'require firewall';
 'require tools.widgets as widgets';
 
+var isReadonlyView = !L.hasViewPermission() || null;
+
 function count_changes(section_id) {
 	var changes = ui.changes.changes, n = 0;
 
@@ -281,8 +283,8 @@ return view.extend({
 				]);
 			}
 
-			btn1.disabled = btn1.classList.contains('spinning') || btn2.classList.contains('spinning') || dynamic;
-			btn2.disabled = btn1.classList.contains('spinning') || btn2.classList.contains('spinning') || dynamic || disabled;
+			btn1.disabled = isReadonlyView || btn1.classList.contains('spinning') || btn2.classList.contains('spinning') || dynamic;
+			btn2.disabled = isReadonlyView || btn1.classList.contains('spinning') || btn2.classList.contains('spinning') || dynamic || disabled;
 		}
 
 		return Promise.all([ resolveZone, network.flushCache() ]);
diff --git a/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js b/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js
index 58a151de0..b218daac3 100644
--- a/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js
+++ b/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js
@@ -77,7 +77,7 @@ return view.extend({
 			o.rmempty = true;
 			o.modalonly = true;
 			o.cfgvalue = function(section_id) {
-				var cfgvalue = this.super('cfgvalue', [section_id]);
+				var cfgvalue = this.map.data.get('network', section_id, 'table');
 				return cfgvalue || 'main';
 			};
 
diff --git a/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js b/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js
index 342d2aff2..ca0cdf615 100644
--- a/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js
+++ b/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js
@@ -11,6 +11,8 @@
 'require firewall';
 'require tools.widgets as widgets';
 
+var isReadonlyView = !L.hasViewPermission();
+
 function count_changes(section_id) {
 	var changes = ui.changes.changes, n = 0;
 
@@ -441,7 +443,8 @@ var CBIWifiFrequencyValue = form.Value.extend({
 				E('select', {
 					'class': 'mode',
 					'style': 'width:auto',
-					'change': L.bind(this.toggleWifiMode, this, elem)
+					'change': L.bind(this.toggleWifiMode, this, elem),
+					'disabled': (this.disabled != null) ? this.disabled : this.map.readonly
 				})
 			]),
 			E('label', { 'style': 'float:left; margin-right:3px' }, [
@@ -449,21 +452,24 @@ var CBIWifiFrequencyValue = form.Value.extend({
 				E('select', {
 					'class': 'band',
 					'style': 'width:auto',
-					'change': L.bind(this.toggleWifiBand, this, elem)
+					'change': L.bind(this.toggleWifiBand, this, elem),
+					'disabled': (this.disabled != null) ? this.disabled : this.map.readonly
 				})
 			]),
 			E('label', { 'style': 'float:left; margin-right:3px' }, [
 				_('Channel'), E('br'),
 				E('select', {
 					'class': 'channel',
-					'style': 'width:auto'
+					'style': 'width:auto',
+					'disabled': (this.disabled != null) ? this.disabled : this.map.readonly
 				})
 			]),
 			E('label', { 'style': 'float:left; margin-right:3px' }, [
 				_('Width'), E('br'),
 				E('select', {
 					'class': 'htmode',
-					'style': 'width:auto'
+					'style': 'width:auto',
+					'disabled': (this.disabled != null) ? this.disabled : this.map.readonly
 				})
 			]),
 			E('br', { 'style': 'clear:left' })
@@ -592,9 +598,9 @@ return view.extend({
 			if (stat.hasAttribute('restart'))
 				dom.content(stat, E('em', _('Device is restarting…')));
 
-			btns[0].disabled = busy;
-			btns[1].disabled = busy;
-			btns[2].disabled = busy;
+			btns[0].disabled = isReadonlyView || busy;
+			btns[1].disabled = (isReadonlyView && radioDev) || busy;
+			btns[2].disabled = isReadonlyView || busy;
 		}
 
 		var table = document.querySelector('#wifi_assoclist_table'),
@@ -654,7 +660,8 @@ return view.extend({
 						ev.currentTarget.blur();
 
 						net.disconnectClient(mac, true, 5, 60000);
-					}, this, bss.network, bss.mac)
+					}, this, bss.network, bss.mac),
+					'disabled': isReadonlyView || null
 				}, [ _('Disconnect') ]));
 			}
 			else {
@@ -886,7 +893,7 @@ return view.extend({
 					o.default = o.enabled;
 
 					o = ss.taboption('advanced', form.Value, 'distance', _('Distance Optimization'), _('Distance to farthest network member in meters.'));
-					o.datatype = 'range(0,114750)';
+					o.datatype = 'or(range(0,114750),"auto")';
 					o.placeholder = 'auto';
 
 					o = ss.taboption('advanced', form.Value, 'frag', _('Fragmentation Threshold'));
diff --git a/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json b/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json
index 670f2c1a4..188c695f3 100644
--- a/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json
+++ b/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json
@@ -7,6 +7,7 @@
 			"path": "network/switch"
 		},
 		"depends": {
+			"acl": [ "luci-mod-network-config" ],
 			"fs": { "/sbin/swconfig": "executable" },
 			"uci": { "network": { "@switch": true } }
 		}
@@ -20,6 +21,7 @@
 			"path": "network/wireless"
 		},
 		"depends": {
+			"acl": [ "luci-mod-network-config" ],
 			"uci": { "wireless": { "@wifi-device": true } }
 		}
 	},
@@ -38,6 +40,9 @@
 		"action": {
 			"type": "view",
 			"path": "network/interfaces"
+		},
+		"depends": {
+			"acl": [ "luci-mod-network-config" ]
 		}
 	},
 
@@ -49,6 +54,7 @@
 			"path": "network/dhcp"
 		},
 		"depends": {
+			"acl": [ "luci-mod-network-dhcp" ],
 			"uci": { "dhcp": true }
 		}
 	},
@@ -61,6 +67,7 @@
 			"path": "network/hosts"
 		},
 		"depends": {
+			"acl": [ "luci-mod-network-dhcp" ],
 			"uci": { "dhcp": true }
 		}
 	},
@@ -71,6 +78,9 @@
 		"action": {
 			"type": "view",
 			"path": "network/routes"
+		},
+		"depends": {
+			"acl": [ "luci-mod-network-config" ]
 		}
 	},
 
@@ -80,6 +90,9 @@
 		"action": {
 			"type": "view",
 			"path": "network/diagnostics"
+		},
+		"depends": {
+			"acl": [ "luci-mod-network-diagnostics" ]
 		}
 	}
 }
diff --git a/luci-mod-network/root/usr/share/rpcd/acl.d/luci-mod-network.json b/luci-mod-network/root/usr/share/rpcd/acl.d/luci-mod-network.json
new file mode 100644
index 000000000..d6c84bab2
--- /dev/null
+++ b/luci-mod-network/root/usr/share/rpcd/acl.d/luci-mod-network.json
@@ -0,0 +1,65 @@
+{
+	"luci-mod-network-config": {
+		"description": "Grant access to network configuration",
+		"read": {
+			"cgi-io": [ "exec" ],
+			"file": {
+				"/usr/libexec/luci-peeraddr": [ "exec" ]
+			},
+			"ubus": {
+				"file": [ "exec" ],
+				"iwinfo": [ "assoclist", "countrylist", "freqlist", "txpowerlist" ],
+				"luci": [ "getSwconfigFeatures", "getSwconfigPortState" ]
+			},
+			"uci": [ "dhcp", "firewall", "network", "wireless" ]
+		},
+		"write": {
+			"cgi-io": [ "exec" ],
+			"file": {
+				"/sbin/ifup": [ "exec" ],
+				"/sbin/ifdown": [ "exec" ],
+				"/sbin/wifi": [ "exec" ]
+			},
+			"ubus": {
+				"file": [ "exec" ],
+				"hostapd.*": [ "del_client" ],
+				"iwinfo": [ "scan" ]
+			},
+			"uci": [ "dhcp", "firewall", "network", "wireless" ]
+		}
+	},
+
+	"luci-mod-network-dhcp": {
+		"description": "Grant access to DHCP configuration",
+		"read": {
+			"ubus": {
+				"luci-rpc": [ "getDHCPLeases", "getDUIDHints" ]
+			},
+			"uci": [ "dhcp" ]
+		},
+		"write": {
+			"uci": [ "dhcp" ]
+		}
+	},
+
+	"luci-mod-network-diagnostics": {
+		"description": "Grant access to network diagnostic tools",
+		"read": {
+			"file": {
+				"/bin/ping": [ "exec" ],
+				"/bin/ping6": [ "exec", "list" ],
+				"/bin/traceroute": [ "exec" ],
+				"/bin/traceroute6": [ "exec", "list" ],
+				"/usr/bin/nslookup": [ "exec" ],
+				"/usr/bin/ping": [ "exec" ],
+				"/usr/bin/ping6": [ "exec", "list" ],
+				"/usr/bin/traceroute": [ "exec" ],
+				"/usr/bin/traceroute6": [ "exec", "list" ]
+			},
+			"ubus": {
+				"file": [ "exec", "stat" ]
+			},
+			"uci": [ "luci" ]
+		}
+	}
+}

From 3ee1471b78c1875a46ae2fc045d65e5a1110c93f Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Wed, 20 May 2020 10:46:56 +0200
Subject: [PATCH 59/88] Remove dirty file

---
 .../resources/view/network/dhcp.js.orig       | 568 ------------------
 1 file changed, 568 deletions(-)
 delete mode 100644 luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js.orig

diff --git a/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js.orig b/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js.orig
deleted file mode 100644
index fa991db41..000000000
--- a/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js.orig
+++ /dev/null
@@ -1,568 +0,0 @@
-'use strict';
-'require view';
-'require dom';
-'require poll';
-'require rpc';
-'require uci';
-'require form';
-'require validation';
-
-var callHostHints, callDUIDHints, callDHCPLeases, CBILeaseStatus, CBILease6Status;
-
-callHostHints = rpc.declare({
-	object: 'luci-rpc',
-	method: 'getHostHints',
-	expect: { '': {} }
-});
-
-callDUIDHints = rpc.declare({
-	object: 'luci-rpc',
-	method: 'getDUIDHints',
-	expect: { '': {} }
-});
-
-callDHCPLeases = rpc.declare({
-	object: 'luci-rpc',
-	method: 'getDHCPLeases',
-	expect: { '': {} }
-});
-
-CBILeaseStatus = form.DummyValue.extend({
-	renderWidget: function(section_id, option_id, cfgvalue) {
-		return E([
-			E('h4', _('Active DHCP Leases')),
-			E('div', { 'id': 'lease_status_table', 'class': 'table' }, [
-				E('div', { 'class': 'tr table-titles' }, [
-					E('div', { 'class': 'th' }, _('Hostname')),
-					E('div', { 'class': 'th' }, _('IPv4-Address')),
-					E('div', { 'class': 'th' }, _('MAC-Address')),
-					E('div', { 'class': 'th' }, _('Lease time remaining'))
-				]),
-				E('div', { 'class': 'tr placeholder' }, [
-					E('div', { 'class': 'td' }, E('em', _('Collecting data...')))
-				])
-			])
-		]);
-	}
-});
-
-CBILease6Status = form.DummyValue.extend({
-	renderWidget: function(section_id, option_id, cfgvalue) {
-		return E([
-			E('h4', _('Active DHCPv6 Leases')),
-			E('div', { 'id': 'lease6_status_table', 'class': 'table' }, [
-				E('div', { 'class': 'tr table-titles' }, [
-					E('div', { 'class': 'th' }, _('Host')),
-					E('div', { 'class': 'th' }, _('IPv6-Address')),
-					E('div', { 'class': 'th' }, _('DUID')),
-					E('div', { 'class': 'th' }, _('Lease time remaining'))
-				]),
-				E('div', { 'class': 'tr placeholder' }, [
-					E('div', { 'class': 'td' }, E('em', _('Collecting data...')))
-				])
-			])
-		]);
-	}
-});
-
-function validateHostname(sid, s) {
-	if (s == null || s == '')
-		return true;
-
-	if (s.length > 256)
-		return _('Expecting: %s').format(_('valid hostname'));
-
-	var labels = s.replace(/^\.+|\.$/g, '').split(/\./);
-
-	for (var i = 0; i < labels.length; i++)
-		if (!labels[i].match(/^[a-z0-9_](?:[a-z0-9-]{0,61}[a-z0-9])?$/i))
-			return _('Expecting: %s').format(_('valid hostname'));
-
-	return true;
-}
-
-function validateAddressList(sid, s) {
-	if (s == null || s == '')
-		return true;
-
-	var m = s.match(/^\/(.+)\/$/),
-	    names = m ? m[1].split(/\//) : [ s ];
-
-	for (var i = 0; i < names.length; i++) {
-		var res = validateHostname(sid, names[i]);
-
-		if (res !== true)
-			return res;
-	}
-
-	return true;
-}
-
-function validateServerSpec(sid, s) {
-	if (s == null || s == '')
-		return true;
-
-	var m = s.match(/^(?:\/(.+)\/)?(.*)$/);
-	if (!m)
-		return _('Expecting: %s').format(_('valid hostname'));
-
-	var res = validateAddressList(sid, m[1]);
-	if (res !== true)
-		return res;
-
-	if (m[2] == '' || m[2] == '#')
-		return true;
-
-	// ipaddr%scopeid#srvport@source@interface#srcport
-
-	m = m[2].match(/^([0-9a-f:.]+)(?:%[^#@]+)?(?:#(\d+))?(?:@([0-9a-f:.]+)(?:@[^#]+)?(?:#(\d+))?)?$/);
-
-	if (!m)
-		return _('Expecting: %s').format(_('valid IP address'));
-
-	if (validation.parseIPv4(m[1])) {
-		if (m[3] != null && !validation.parseIPv4(m[3]))
-			return _('Expecting: %s').format(_('valid IPv4 address'));
-	}
-	else if (validation.parseIPv6(m[1])) {
-		if (m[3] != null && !validation.parseIPv6(m[3]))
-			return _('Expecting: %s').format(_('valid IPv6 address'));
-	}
-	else {
-		return _('Expecting: %s').format(_('valid IP address'));
-	}
-
-	if ((m[2] != null && +m[2] > 65535) || (m[4] != null && +m[4] > 65535))
-		return _('Expecting: %s').format(_('valid port value'));
-
-	return true;
-}
-
-return view.extend({
-	load: function() {
-		return Promise.all([
-			callHostHints(),
-			callDUIDHints()
-		]);
-	},
-
-	render: function(hosts_duids) {
-		var has_dhcpv6 = L.hasSystemFeature('dnsmasq', 'dhcpv6') || L.hasSystemFeature('odhcpd'),
-		    hosts = hosts_duids[0],
-		    duids = hosts_duids[1],
-		    m, s, o, ss, so;
-
-		m = new form.Map('dhcp', _('DHCP and DNS'), _('Dnsmasq is a combined <abbr title="Dynamic Host Configuration Protocol">DHCP</abbr>-Server and <abbr title="Domain Name System">DNS</abbr>-Forwarder for <abbr title="Network Address Translation">NAT</abbr> firewalls'));
-
-		s = m.section(form.TypedSection, 'dnsmasq', _('Server Settings'));
-		s.anonymous = true;
-		s.addremove = false;
-
-		s.tab('general', _('General Settings'));
-		s.tab('files', _('Resolv and Hosts Files'));
-		s.tab('tftp', _('TFTP Settings'));
-		s.tab('advanced', _('Advanced Settings'));
-		s.tab('leases', _('Static Leases'));
-
-		s.taboption('general', form.Flag, 'domainneeded',
-			_('Domain required'),
-			_('Don\'t forward <abbr title="Domain Name System">DNS</abbr>-Requests without <abbr title="Domain Name System">DNS</abbr>-Name'));
-
-		s.taboption('general', form.Flag, 'authoritative',
-			_('Authoritative'),
-			_('This is the only <abbr title="Dynamic Host Configuration Protocol">DHCP</abbr> in the local network'));
-
-
-		s.taboption('files', form.Flag, 'readethers',
-			_('Use <code>/etc/ethers</code>'),
-			_('Read <code>/etc/ethers</code> to configure the <abbr title="Dynamic Host Configuration Protocol">DHCP</abbr>-Server'));
-
-		s.taboption('files', form.Value, 'leasefile',
-			_('Leasefile'),
-			_('file where given <abbr title="Dynamic Host Configuration Protocol">DHCP</abbr>-leases will be stored'));
-
-		s.taboption('files', form.Flag, 'noresolv',
-			_('Ignore resolve file')).optional = true;
-
-		o = s.taboption('files', form.Value, 'resolvfile',
-			_('Resolve file'),
-			_('local <abbr title="Domain Name System">DNS</abbr> file'));
-
-		o.depends('noresolv', '0');
-		o.placeholder = '/tmp/resolv.conf.d/resolv.conf.auto';
-		o.optional = true;
-
-
-		s.taboption('files', form.Flag, 'nohosts',
-			_('Ignore <code>/etc/hosts</code>')).optional = true;
-
-		s.taboption('files', form.DynamicList, 'addnhosts',
-			_('Additional Hosts files')).optional = true;
-
-		o = s.taboption('advanced', form.Flag, 'quietdhcp',
-			_('Suppress logging'),
-			_('Suppress logging of the routine operation of these protocols'));
-		o.optional = true;
-
-		o = s.taboption('advanced', form.Flag, 'sequential_ip',
-			_('Allocate IP sequentially'),
-			_('Allocate IP addresses sequentially, starting from the lowest available address'));
-		o.optional = true;
-
-		o = s.taboption('advanced', form.Flag, 'boguspriv',
-			_('Filter private'),
-			_('Do not forward reverse lookups for local networks'));
-		o.default = o.enabled;
-
-		s.taboption('advanced', form.Flag, 'filterwin2k',
-			_('Filter useless'),
-			_('Do not forward requests that cannot be answered by public name servers'));
-
-
-		s.taboption('advanced', form.Flag, 'localise_queries',
-			_('Localise queries'),
-			_('Localise hostname depending on the requesting subnet if multiple IPs are available'));
-
-		if (L.hasSystemFeature('dnsmasq', 'dnssec')) {
-			o = s.taboption('advanced', form.Flag, 'dnssec',
-				_('DNSSEC'));
-			o.optional = true;
-
-			o = s.taboption('advanced', form.Flag, 'dnsseccheckunsigned',
-				_('DNSSEC check unsigned'),
-				_('Requires upstream supports DNSSEC; verify unsigned domain responses really come from unsigned domains'));
-			o.default = o.enabled;
-			o.optional = true;
-		}
-
-		s.taboption('general', form.Value, 'local',
-			_('Local server'),
-			_('Local domain specification. Names matching this domain are never forwarded and are resolved from DHCP or hosts files only'));
-
-		s.taboption('general', form.Value, 'domain',
-			_('Local domain'),
-			_('Local domain suffix appended to DHCP names and hosts file entries'));
-
-		s.taboption('advanced', form.Flag, 'expandhosts',
-			_('Expand hosts'),
-			_('Add local domain suffix to names served from hosts files'));
-
-		s.taboption('advanced', form.Flag, 'nonegcache',
-			_('No negative cache'),
-			_('Do not cache negative replies, e.g. for not existing domains'));
-
-		s.taboption('advanced', form.Value, 'serversfile',
-			_('Additional servers file'),
-			_('This file may contain lines like \'server=/domain/1.2.3.4\' or \'server=1.2.3.4\' for domain-specific or full upstream <abbr title="Domain Name System">DNS</abbr> servers.'));
-
-		s.taboption('advanced', form.Flag, 'strictorder',
-			_('Strict order'),
-			_('<abbr title="Domain Name System">DNS</abbr> servers will be queried in the order of the resolvfile')).optional = true;
-
-		s.taboption('advanced', form.Flag, 'allservers',
-			_('All Servers'),
-			_('Query all available upstream <abbr title="Domain Name System">DNS</abbr> servers')).optional = true;
-
-		o = s.taboption('advanced', form.DynamicList, 'bogusnxdomain', _('Bogus NX Domain Override'),
-			_('List of hosts that supply bogus NX domain results'));
-
-		o.optional = true;
-		o.placeholder = '67.215.65.132';
-
-
-		s.taboption('general', form.Flag, 'logqueries',
-			_('Log queries'),
-			_('Write received DNS requests to syslog')).optional = true;
-
-		o = s.taboption('general', form.DynamicList, 'server', _('DNS forwardings'),
-			_('List of <abbr title="Domain Name System">DNS</abbr> servers to forward requests to'));
-
-		o.optional = true;
-		o.placeholder = '/example.org/10.1.2.3';
-		o.validate = validateServerSpec;
-
-
-		o = s.taboption('general', form.Flag, 'rebind_protection',
-			_('Rebind protection'),
-			_('Discard upstream RFC1918 responses'));
-
-		o.rmempty = false;
-
-
-		o = s.taboption('general', form.Flag, 'rebind_localhost',
-			_('Allow localhost'),
-			_('Allow upstream responses in the 127.0.0.0/8 range, e.g. for RBL services'));
-
-		o.depends('rebind_protection', '1');
-
-
-		o = s.taboption('general', form.DynamicList, 'rebind_domain',
-			_('Domain whitelist'),
-			_('List of domains to allow RFC1918 responses for'));
-		o.optional = true;
-
-		o.depends('rebind_protection', '1');
-		o.placeholder = 'ihost.netflix.com';
-		o.validate = validateAddressList;
-
-
-		o = s.taboption('advanced', form.Value, 'port',
-			_('<abbr title="Domain Name System">DNS</abbr> server port'),
-			_('Listening port for inbound DNS queries'));
-
-		o.optional = true;
-		o.datatype = 'port';
-		o.placeholder = 53;
-
-
-		o = s.taboption('advanced', form.Value, 'queryport',
-			_('<abbr title="Domain Name System">DNS</abbr> query port'),
-			_('Fixed source port for outbound DNS queries'));
-
-		o.optional = true;
-		o.datatype = 'port';
-		o.placeholder = _('any');
-
-
-		o = s.taboption('advanced', form.Value, 'dhcpleasemax',
-			_('<abbr title="maximal">Max.</abbr> <abbr title="Dynamic Host Configuration Protocol">DHCP</abbr> leases'),
-			_('Maximum allowed number of active DHCP leases'));
-
-		o.optional = true;
-		o.datatype = 'uinteger';
-		o.placeholder = _('unlimited');
-
-
-		o = s.taboption('advanced', form.Value, 'ednspacket_max',
-			_('<abbr title="maximal">Max.</abbr> <abbr title="Extension Mechanisms for Domain Name System">EDNS0</abbr> packet size'),
-			_('Maximum allowed size of EDNS.0 UDP packets'));
-
-		o.optional = true;
-		o.datatype = 'uinteger';
-		o.placeholder = 1280;
-
-
-		o = s.taboption('advanced', form.Value, 'dnsforwardmax',
-			_('<abbr title="maximal">Max.</abbr> concurrent queries'),
-			_('Maximum allowed number of concurrent DNS queries'));
-
-		o.optional = true;
-		o.datatype = 'uinteger';
-		o.placeholder = 150;
-
-		o = s.taboption('advanced', form.Value, 'cachesize',
-			_('Size of DNS query cache'),
-			_('Number of cached DNS entries (max is 10000, 0 is no caching)'));
-		o.optional = true;
-		o.datatype = 'range(0,10000)';
-		o.placeholder = 150;
-
-		s.taboption('tftp', form.Flag, 'enable_tftp',
-			_('Enable TFTP server')).optional = true;
-
-		o = s.taboption('tftp', form.Value, 'tftp_root',
-			_('TFTP server root'),
-			_('Root directory for files served via TFTP'));
-
-		o.optional = true;
-		o.depends('enable_tftp', '1');
-		o.placeholder = '/';
-
-
-		o = s.taboption('tftp', form.Value, 'dhcp_boot',
-			_('Network boot image'),
-			_('Filename of the boot image advertised to clients'));
-
-		o.optional = true;
-		o.depends('enable_tftp', '1');
-		o.placeholder = 'pxelinux.0';
-
-		o = s.taboption('general', form.Flag, 'localservice',
-			_('Local Service Only'),
-			_('Limit DNS service to subnets interfaces on which we are serving DNS.'));
-		o.optional = false;
-		o.rmempty = false;
-
-		o = s.taboption('general', form.Flag, 'nonwildcard',
-			_('Non-wildcard'),
-			_('Bind dynamically to interfaces rather than wildcard address (recommended as linux default)'));
-		o.default = o.enabled;
-		o.optional = false;
-		o.rmempty = true;
-
-		o = s.taboption('general', form.DynamicList, 'interface',
-			_('Listen Interfaces'),
-			_('Limit listening to these interfaces, and loopback.'));
-		o.optional = true;
-
-		o = s.taboption('general', form.DynamicList, 'notinterface',
-			_('Exclude interfaces'),
-			_('Prevent listening on these interfaces.'));
-		o.optional = true;
-
-		o = s.taboption('leases', form.SectionValue, '__leases__', form.GridSection, 'host', null,
-			_('Static leases are used to assign fixed IP addresses and symbolic hostnames to DHCP clients. They are also required for non-dynamic interface configurations where only hosts with a corresponding lease are served.') + '<br />' +
-			_('Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</em> identifies the host, the <em>IPv4-Address</em> specifies the fixed address to use, and the <em>Hostname</em> is assigned as a symbolic name to the requesting host. The optional <em>Lease time</em> can be used to set non-standard host-specific lease time, e.g. 12h, 3d or infinite.'));
-
-		ss = o.subsection;
-
-		ss.addremove = true;
-		ss.anonymous = true;
-
-		so = ss.option(form.Value, 'name', _('Hostname'));
-		so.validate = validateHostname;
-		so.rmempty  = true;
-		so.write = function(section, value) {
-			uci.set('dhcp', section, 'name', value);
-			uci.set('dhcp', section, 'dns', '1');
-		};
-		so.remove = function(section) {
-			uci.unset('dhcp', section, 'name');
-			uci.unset('dhcp', section, 'dns');
-		};
-
-		so = ss.option(form.Value, 'mac', _('<abbr title="Media Access Control">MAC</abbr>-Address'));
-		so.datatype = 'list(unique(macaddr))';
-		so.rmempty  = true;
-		so.cfgvalue = function(section) {
-			var macs = uci.get('dhcp', section, 'mac'),
-			    result = [];
-
-			if (!Array.isArray(macs))
-				macs = (macs != null && macs != '') ? macs.split(/\ss+/) : [];
-
-			for (var i = 0, mac; (mac = macs[i]) != null; i++)
-				if (/^([0-9a-fA-F]{1,2}):([0-9a-fA-F]{1,2}):([0-9a-fA-F]{1,2}):([0-9a-fA-F]{1,2}):([0-9a-fA-F]{1,2}):([0-9a-fA-F]{1,2})$/.test(mac))
-					result.push('%02X:%02X:%02X:%02X:%02X:%02X'.format(
-						parseInt(RegExp.$1, 16), parseInt(RegExp.$2, 16),
-						parseInt(RegExp.$3, 16), parseInt(RegExp.$4, 16),
-						parseInt(RegExp.$5, 16), parseInt(RegExp.$6, 16)));
-
-			return result.length ? result.join(' ') : null;
-		};
-		so.renderWidget = function(section_id, option_index, cfgvalue) {
-			var node = form.Value.prototype.renderWidget.apply(this, [section_id, option_index, cfgvalue]),
-			    ipopt = this.section.children.filter(function(o) { return o.option == 'ip' })[0];
-
-			node.addEventListener('cbi-dropdown-change', L.bind(function(ipopt, section_id, ev) {
-				var mac = ev.detail.value.value;
-				if (mac == null || mac == '' || !hosts[mac] || !hosts[mac].ipv4)
-					return;
-
-				var ip = ipopt.formvalue(section_id);
-				if (ip != null && ip != '')
-					return;
-
-				var node = ipopt.map.findElement('id', ipopt.cbid(section_id));
-				if (node)
-					dom.callClassMethod(node, 'setValue', hosts[mac].ipv4);
-			}, this, ipopt, section_id));
-
-			return node;
-		};
-		Object.keys(hosts).forEach(function(mac) {
-			var hint = hosts[mac].name || hosts[mac].ipv4;
-			so.value(mac, hint ? '%s (%s)'.format(mac, hint) : mac);
-		});
-
-		so = ss.option(form.Value, 'ip', _('<abbr title="Internet Protocol Version 4">IPv4</abbr>-Address'));
-		so.datatype = 'or(ip4addr,"ignore")';
-		so.validate = function(section, value) {
-			var mac = this.map.lookupOption('mac', section),
-			    name = this.map.lookupOption('name', section),
-			    m = mac ? mac[0].formvalue(section) : null,
-			    n = name ? name[0].formvalue(section) : null;
-
-			if ((m == null || m == '') && (n == null || n == ''))
-				return _('One of hostname or mac address must be specified!');
-
-			return true;
-		};
-		Object.keys(hosts).forEach(function(mac) {
-			if (hosts[mac].ipv4) {
-				var hint = hosts[mac].name;
-				so.value(hosts[mac].ipv4, hint ? '%s (%s)'.format(hosts[mac].ipv4, hint) : hosts[mac].ipv4);
-			}
-		});
-
-		so = ss.option(form.Value, 'leasetime', _('Lease time'));
-		so.rmempty = true;
-
-		so = ss.option(form.Value, 'duid', _('<abbr title="The DHCP Unique Identifier">DUID</abbr>'));
-		so.datatype = 'and(rangelength(20,36),hexstring)';
-		Object.keys(duids).forEach(function(duid) {
-			so.value(duid, '%s (%s)'.format(duid, duids[duid].hostname || duids[duid].macaddr || duids[duid].ip6addr || '?'));
-		});
-
-		so = ss.option(form.Value, 'hostid', _('<abbr title="Internet Protocol Version 6">IPv6</abbr>-Suffix (hex)'));
-
-		o = s.taboption('leases', CBILeaseStatus, '__status__');
-
-		if (has_dhcpv6)
-			o = s.taboption('leases', CBILease6Status, '__status6__');
-
-		return m.render().then(function(mapEl) {
-			poll.add(function() {
-				return callDHCPLeases().then(function(leaseinfo) {
-					var leases = Array.isArray(leaseinfo.dhcp_leases) ? leaseinfo.dhcp_leases : [],
-					    leases6 = Array.isArray(leaseinfo.dhcp6_leases) ? leaseinfo.dhcp6_leases : [];
-
-					cbi_update_table(mapEl.querySelector('#lease_status_table'),
-						leases.map(function(lease) {
-							var exp;
-
-							if (lease.expires === false)
-								exp = E('em', _('unlimited'));
-							else if (lease.expires <= 0)
-								exp = E('em', _('expired'));
-							else
-								exp = '%t'.format(lease.expires);
-
-							return [
-								lease.hostname || '?',
-								lease.ipaddr,
-								lease.macaddr,
-								exp
-							];
-						}),
-						E('em', _('There are no active leases')));
-
-					if (has_dhcpv6) {
-						cbi_update_table(mapEl.querySelector('#lease6_status_table'),
-							leases6.map(function(lease) {
-								var exp;
-
-								if (lease.expires === false)
-									exp = E('em', _('unlimited'));
-								else if (lease.expires <= 0)
-									exp = E('em', _('expired'));
-								else
-									exp = '%t'.format(lease.expires);
-
-								var hint = lease.macaddr ? hosts[lease.macaddr] : null,
-								    name = hint ? (hint.name || hint.ipv4 || hint.ipv6) : null,
-								    host = null;
-
-								if (name && lease.hostname && lease.hostname != name && lease.ip6addr != name)
-									host = '%s (%s)'.format(lease.hostname, name);
-								else if (lease.hostname)
-									host = lease.hostname;
-								else if (name)
-									host = name;
-
-								return [
-									host || '-',
-									lease.ip6addrs ? lease.ip6addrs.join(' ') : lease.ip6addr,
-									lease.duid,
-									exp
-								];
-							}),
-							E('em', _('There are no active leases')));
-					}
-				});
-			});
-
-			return mapEl;
-		});
-	}
-});

From de5d1a4566fa227fbf713b7673073de8f455e42b Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Wed, 20 May 2020 15:55:15 +0200
Subject: [PATCH 60/88] Fix omr-bypass interface

---
 .../luci-static/resources/view/services/omr-bypass.js     | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/luci-app-omr-bypass/htdocs/luci-static/resources/view/services/omr-bypass.js b/luci-app-omr-bypass/htdocs/luci-static/resources/view/services/omr-bypass.js
index 82edc2a0d..acc194ba5 100644
--- a/luci-app-omr-bypass/htdocs/luci-static/resources/view/services/omr-bypass.js
+++ b/luci-app-omr-bypass/htdocs/luci-static/resources/view/services/omr-bypass.js
@@ -34,7 +34,6 @@ return L.view.extend({
 		o.noaliases = true;
 		o.noinactive = true;
 		o.nocreate    = true;
-		o.ucioption = 'dev';
 
 		o = s.option(form.Value, 'note', _('Note'));
 		o.rmempty = true;
@@ -50,7 +49,6 @@ return L.view.extend({
 		o.noaliases = true;
 		o.noinactive = true;
 		o.nocreate    = true;
-		o.ucioption = 'dev';
 
 		o = s.option(form.Value, 'note', _('Note'));
 		o.rmempty = true;
@@ -73,7 +71,6 @@ return L.view.extend({
 		o.noaliases = true;
 		o.noinactive = true;
 		o.nocreate    = true;
-		o.ucioption = 'dev';
 
 		o = s.option(form.Value, 'note', _('Note'));
 		o.rmempty = true;
@@ -96,7 +93,6 @@ return L.view.extend({
 		o.noaliases = true;
 		o.noinactive = true;
 		o.nocreate    = true;
-		o.ucioption = 'dev';
 
 		o = s.option(form.Value, 'note', _('Note'));
 		o.rmempty = true;
@@ -117,7 +113,6 @@ return L.view.extend({
 		o.noaliases = true;
 		o.noinactive = true;
 		o.nocreate    = true;
-		o.ucioption = 'dev';
 
 		o = s.option(form.Value, 'note', _('Note'));
 		o.rmempty = true;
@@ -140,7 +135,6 @@ return L.view.extend({
 		o.noaliases = true;
 		o.noinactive = true;
 		o.nocreate    = true;
-		o.ucioption = 'dev';
 
 		o = s.option(form.Value, 'note', _('Note'));
 		o.rmempty = true;
@@ -156,7 +150,6 @@ return L.view.extend({
 		o.noaliases = true;
 		o.noinactive = true;
 		o.nocreate    = true;
-		o.ucioption = 'dev';
 
 		o = s.option(form.Value, 'note', _('Note'));
 		o.rmempty = true;
@@ -197,7 +190,6 @@ return L.view.extend({
 		o.noaliases = true;
 		o.noinactive = true;
 		o.nocreate    = true;
-		o.ucioption = 'dev';
 
 		o = s.option(form.Value, 'note', _('Note'));
 		o.rmempty = true;

From 208d8f8c5f8fdece40c23bfea5e3b8f31bb13697 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Wed, 20 May 2020 17:00:12 +0200
Subject: [PATCH 61/88] Remove old eeprom package and update bcm27xx eeprom

---
 bcm27xx-eeprom/Makefile                       | 58 +++++++++++++++++++
 ...1-rpi-eeprom-update-OpenWrt-defaults.patch | 48 +++++++++++++++
 ...rpi-eeprom-config-switch-to-Python-3.patch | 21 +++++++
 ...m-update-change-default-include-path.patch | 44 ++++++++++++++
 rpi-eeprom/Makefile                           | 49 ----------------
 5 files changed, 171 insertions(+), 49 deletions(-)
 create mode 100644 bcm27xx-eeprom/Makefile
 create mode 100644 bcm27xx-eeprom/patches/0001-rpi-eeprom-update-OpenWrt-defaults.patch
 create mode 100644 bcm27xx-eeprom/patches/0002-rpi-eeprom-config-switch-to-Python-3.patch
 create mode 100644 bcm27xx-eeprom/patches/0003-rpi-eeprom-update-change-default-include-path.patch
 delete mode 100644 rpi-eeprom/Makefile

diff --git a/bcm27xx-eeprom/Makefile b/bcm27xx-eeprom/Makefile
new file mode 100644
index 000000000..580ea78c3
--- /dev/null
+++ b/bcm27xx-eeprom/Makefile
@@ -0,0 +1,58 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=bcm27xx-eeprom
+PKG_VERSION:=ad18a5b468f787ed37ab62e0a699dabeaa580e27
+PKG_RELEASE:=2
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://codeload.github.com/raspberrypi/rpi-eeprom/tar.gz/$(PKG_VERSION)?
+PKG_HASH:=2f77ef84d34f77208e4caf90aa65bbbaa6234ee58ffe9c23a819d44c25a631b4
+
+PKG_LICENSE:=BSD-3-Clause Custom
+PKG_LICENSE_FILES:=LICENSE
+
+PKG_MAINTAINER:=Álvaro Fernández Rojas <noltari@gmail.com>
+
+include $(INCLUDE_DIR)/package.mk
+
+TAR_OPTIONS:=--strip-components 1 $(TAR_OPTIONS)
+TAR_CMD=$(HOST_TAR) -C $(1) $(TAR_OPTIONS)
+
+define Package/bcm27xx-eeprom
+  SECTION:=utils
+  CATEGORY:=Utilities
+  DEPENDS:=bcm27xx-userland +blkid +pciutils +python3-light
+  TITLE:=BCM27xx EEPROM tools
+endef
+
+define Package/bcm27xx-eeprom/description
+  BCM27xx EEPROM tools.
+endef
+
+define Build/Compile
+	true
+endef
+
+define Package/bcm27xx-eeprom/conffiles
+/etc/bcm27xx-eeprom.conf
+endef
+
+define Package/bcm27xx-eeprom/install
+	$(INSTALL_DIR) $(1)/etc
+	$(INSTALL_CONF) $(PKG_BUILD_DIR)/rpi-eeprom-update-default $(1)/etc/bcm27xx-eeprom.conf
+
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/rpi-eeprom-config $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/rpi-eeprom-update $(1)/usr/bin
+
+	$(INSTALL_DIR) $(1)/lib/firmware/raspberrypi/bootloader
+	$(CP) $(PKG_BUILD_DIR)/firmware/release-notes.md $(1)/lib/firmware/raspberrypi/bootloader
+
+	$(INSTALL_DIR) $(1)/lib/firmware/raspberrypi/bootloader/critical
+	$(CP) $(PKG_BUILD_DIR)/firmware/critical/ $(1)/lib/firmware/raspberrypi/bootloader/
+
+	$(INSTALL_DIR) $(1)/lib/firmware/raspberrypi/bootloader/stable
+	$(CP) $(PKG_BUILD_DIR)/firmware/stable/ $(1)/lib/firmware/raspberrypi/bootloader/
+endef
+
+$(eval $(call BuildPackage,bcm27xx-eeprom))
diff --git a/bcm27xx-eeprom/patches/0001-rpi-eeprom-update-OpenWrt-defaults.patch b/bcm27xx-eeprom/patches/0001-rpi-eeprom-update-OpenWrt-defaults.patch
new file mode 100644
index 000000000..2f923bc43
--- /dev/null
+++ b/bcm27xx-eeprom/patches/0001-rpi-eeprom-update-OpenWrt-defaults.patch
@@ -0,0 +1,48 @@
+From da37f7b051fe6833e25e78184cc9217dd4379187 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com>
+Date: Mon, 23 Mar 2020 10:10:55 +0100
+Subject: [PATCH] rpi-eeprom-update: OpenWrt defaults
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
+---
+ rpi-eeprom-update         | 6 +++---
+ rpi-eeprom-update-default | 5 +++--
+ 2 files changed, 6 insertions(+), 5 deletions(-)
+
+--- a/rpi-eeprom-update
++++ b/rpi-eeprom-update
+@@ -24,14 +24,14 @@ else
+ fi
+ 
+ # May be used to select beta or stable releases instead of the default critical updates.
+-FIRMWARE_RELEASE_STATUS=${FIRMWARE_RELEASE_STATUS:-critical}
++FIRMWARE_RELEASE_STATUS=${FIRMWARE_RELEASE_STATUS:-stable}
+ FIRMWARE_IMAGE_DIR=${FIRMWARE_IMAGE_DIR:-${FIRMWARE_ROOT}/${FIRMWARE_RELEASE_STATUS}}
+-FIRMWARE_BACKUP_DIR=${FIRMWARE_BACKUP_DIR:-/var/lib/raspberrypi/bootloader/backup}
++FIRMWARE_BACKUP_DIR=${FIRMWARE_BACKUP_DIR:-${FIRMWARE_ROOT}/backup}
+ ENABLE_VL805_UPDATES=${ENABLE_VL805_UPDATES:-1}
+ USE_FLASHROM=${USE_FLASHROM:-0}
+ RECOVERY_BIN=${RECOVERY_BIN:-${FIRMWARE_ROOT}/${FIRMWARE_RELEASE_STATUS}/recovery.bin}
+ BOOTFS=${BOOTFS:-/boot}
+-VCMAILBOX=${VCMAILBOX:-/opt/vc/bin/vcmailbox}
++VCMAILBOX=${VCMAILBOX:-/usr/bin/vcmailbox}
+ 
+ EXIT_SUCCESS=0
+ EXIT_UPDATE_REQUIRED=1
+--- a/rpi-eeprom-update-default
++++ b/rpi-eeprom-update-default
+@@ -1,8 +1,9 @@
+ 
+ FIRMWARE_ROOT=/lib/firmware/raspberrypi/bootloader
+-FIRMWARE_RELEASE_STATUS="critical"
++FIRMWARE_RELEASE_STATUS="stable"
+ FIRMWARE_IMAGE_DIR="${FIRMWARE_ROOT}/${FIRMWARE_RELEASE_STATUS}"
+-FIRMWARE_BACKUP_DIR="/var/lib/raspberrypi/bootloader/backup"
++FIRMWARE_BACKUP_DIR="${FIRMWARE_ROOT}/backup"
+ BOOTFS=/boot
+ USE_FLASHROM=0
+ EEPROM_CONFIG_HOOK=
++VCMAILBOX=/usr/bin/vcmailbox
diff --git a/bcm27xx-eeprom/patches/0002-rpi-eeprom-config-switch-to-Python-3.patch b/bcm27xx-eeprom/patches/0002-rpi-eeprom-config-switch-to-Python-3.patch
new file mode 100644
index 000000000..fc2c894d8
--- /dev/null
+++ b/bcm27xx-eeprom/patches/0002-rpi-eeprom-config-switch-to-Python-3.patch
@@ -0,0 +1,21 @@
+From 869a29ec65a0985670a259f4820df4fafc22c971 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com>
+Date: Wed, 25 Mar 2020 10:14:34 +0100
+Subject: [PATCH] rpi-eeprom-config: switch to Python 3
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
+---
+ rpi-eeprom-config | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/rpi-eeprom-config
++++ b/rpi-eeprom-config
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python3
+ 
+ # rpi-eeprom-config
+ # Utility for reading and writing the configuration file in the
diff --git a/bcm27xx-eeprom/patches/0003-rpi-eeprom-update-change-default-include-path.patch b/bcm27xx-eeprom/patches/0003-rpi-eeprom-update-change-default-include-path.patch
new file mode 100644
index 000000000..63e99ce3d
--- /dev/null
+++ b/bcm27xx-eeprom/patches/0003-rpi-eeprom-update-change-default-include-path.patch
@@ -0,0 +1,44 @@
+From 6674d49dea0104031b3f54df4c7a356dc4307bb2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com>
+Date: Wed, 25 Mar 2020 20:58:35 +0100
+Subject: [PATCH] rpi-eeprom-update: change default include path
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
+---
+ rpi-eeprom-update | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+--- a/rpi-eeprom-update
++++ b/rpi-eeprom-update
+@@ -6,8 +6,8 @@ set -e
+ 
+ script_dir=$(cd "$(dirname "$0")" && pwd)
+ 
+-if [ -f /etc/default/rpi-eeprom-update ]; then
+-   . /etc/default/rpi-eeprom-update
++if [ -f /etc/bcm27xx-eeprom.conf ]; then
++   . /etc/bcm27xx-eeprom.conf
+ fi
+ 
+ LOCAL_MODE=0
+@@ -323,7 +323,7 @@ The system should then boot normally.
+ 
+ If /boot does not correspond to the boot partition on the sd-card and this
+ is not a NOOBS system then the mount point for BOOTFS should be defined
+-in /etc/default/rpi-eeprom-update by defining the BOOTFS variable.
++in /etc/bcm27xx-eeprom.conf by defining the BOOTFS variable.
+ 
+ A backup of the current EEPROM config file is written to ${FIRMWARE_BACKUP_DIR}
+ before applying the update.
+@@ -345,7 +345,7 @@ Options:
+    -u Install the specified VL805 (USB EEPROM) image file.
+ 
+ Environment:
+-Environment variables should be defined in /etc/default/rpi-eeprom-update
++Environment variables should be defined in /etc/bcm27xx-eeprom.conf
+ 
+ EEPROM_CONFIG_HOOK
+ 
diff --git a/rpi-eeprom/Makefile b/rpi-eeprom/Makefile
deleted file mode 100644
index b142ccd99..000000000
--- a/rpi-eeprom/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-# 
-# Copyright (C) 2012 OpenWrt.org
-# Copyright (C) 2018-2019 Ycarus (Yannick Chabanois) <ycarus@zugaina.org> for OpenMPTCProuter
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=rpi-eeprom
-PKG_VERSION:=20200319
-PKG_RELEASE:=1
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/raspberrypi/rpi-eeprom.git
-PKG_SOURCE_VERSION:=a9ca308223c1d0426b9ab320696b95954078c3b4
-
-CMAKE_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/rpi-eeprom
-  SECTION:=rpi
-  CATEGORY:=Raspberry Pi
-  URL:=https://github.com/raspberrypi/rpi-eeprom
-  TITLE:=rpi-eeprom
-  DEPENDS:=+fwtool +pciutils +blkid
-endef
-
-define Package/rpi-eeprom/description
- Update Raspberry PI 4 bootloader EEPROM
-endef
-
-define Build/Compile
-endef
-
-define Package/rpi-eeprom/install
-	$(INSTALL_DIR) $(1)/lib/firmware/raspberrypi/bootloader \
-		$(1)/usr/bin \
-		$(1)/etc/default
-	$(CP) $(PKG_BUILD_DIR)/rpi-eeprom-update $(1)/usr/bin
-	$(CP) $(PKG_BUILD_DIR)/rpi-eeprom-config $(1)/usr/bin
-	$(CP) $(PKG_BUILD_DIR)/rpi-eeprom-update-default $(1)/etc/default/rpi-eeprom-update
-	$(CP) $(PKG_BUILD_DIR)/firmware/vl805 $(1)/usr/bin
-	$(CP) -r $(PKG_BUILD_DIR)/firmware/critical $(1)/lib/firmware/raspberrypi/bootloader/critical
-	$(CP) -r $(PKG_BUILD_DIR)/firmware/beta $(1)/lib/firmware/raspberrypi/bootloader/beta
-endef
-
-$(eval $(call BuildPackage,rpi-eeprom))

From 5cf990dd7d857b67ff0db21d46def24e953edacc Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Wed, 20 May 2020 17:33:07 +0200
Subject: [PATCH 62/88] Keep wifi config

---
 openmptcprouter/files/etc/uci-defaults/2030-omr-wifi | 12 ------------
 1 file changed, 12 deletions(-)
 delete mode 100755 openmptcprouter/files/etc/uci-defaults/2030-omr-wifi

diff --git a/openmptcprouter/files/etc/uci-defaults/2030-omr-wifi b/openmptcprouter/files/etc/uci-defaults/2030-omr-wifi
deleted file mode 100755
index 9ade889b2..000000000
--- a/openmptcprouter/files/etc/uci-defaults/2030-omr-wifi
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-if [ "$(uci -q get openmptcprouter.latest_versions)" = "" ]; then
-	uci -q show wireless.default_radio0 && {
-		uci -q batch <<-EOF >/dev/null
-			delete wireless.default_radio0
-			commit wireless
-		EOF
-	}
-fi
-
-exit 0
\ No newline at end of file

From 95332e8705d2bc25e0a54719894971351751a7b0 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Wed, 20 May 2020 19:01:58 +0200
Subject: [PATCH 63/88] Some SQM optim

---
 openmptcprouter/files/etc/uci-defaults/2040-omr-sqm | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/openmptcprouter/files/etc/uci-defaults/2040-omr-sqm b/openmptcprouter/files/etc/uci-defaults/2040-omr-sqm
index 805fa559b..578747e9c 100755
--- a/openmptcprouter/files/etc/uci-defaults/2040-omr-sqm
+++ b/openmptcprouter/files/etc/uci-defaults/2040-omr-sqm
@@ -16,6 +16,8 @@ if [ "$(uci -q get openmptcprouter.latest_versions)" = "" ]; then
 			set sqm.wan1.upload='0'
 			set sqm.wan1.debug_logging='0'
 			set sqm.wan1.verbosity='5'
+			set sqm.wan1.iqdisc_opts='autorate-ingress nat dual-dsthost'
+			set sqm.wan1.eqdisc_opts='nat dual-srchost'
 			set sqm.wan2=queue
 			set sqm.wan2.qdisc="fq_codel"
 			set sqm.wan2.script="simple.qos"
@@ -27,6 +29,8 @@ if [ "$(uci -q get openmptcprouter.latest_versions)" = "" ]; then
 			set sqm.wan2.upload='0'
 			set sqm.wan2.debug_logging='0'
 			set sqm.wan2.verbosity='5'
+			set sqm.wan2.iqdisc_opts='autorate-ingress nat dual-dsthost'
+			set sqm.wan2.eqdisc_opts='nat dual-srchost'
 			commit sqm
 		EOF
 		if [ "$(uci -q get network.wan3)" != "" ]; then
@@ -43,6 +47,8 @@ if [ "$(uci -q get openmptcprouter.latest_versions)" = "" ]; then
 				set sqm.wan3.upload='0'
 				set sqm.wan3.debug_logging='0'
 				set sqm.wan3.verbosity='5'
+				set sqm.wan3.iqdisc_opts='autorate-ingress nat dual-dsthost'
+				set sqm.wan3.eqdisc_opts='nat dual-srchost'
 				commit sqm
 			EOF
 		fi
@@ -60,6 +66,8 @@ if [ "$(uci -q get openmptcprouter.latest_versions)" = "" ]; then
 				set sqm.wan4.upload='0'
 				set sqm.wan4.debug_logging='0'
 				set sqm.wan4.verbosity='5'
+				set sqm.wan4.iqdisc_opts='autorate-ingress nat dual-dsthost'
+				set sqm.wan4.eqdisc_opts='nat dual-srchost'
 				commit sqm
 			EOF
 		fi
@@ -79,6 +87,8 @@ if [ "$(uci -q get sqm.omrvpn)" = "" ]; then
 		set sqm.omrvpn.upload='0'
 		set sqm.omrvpn.debug_logging='0'
 		set sqm.omrvpn.verbosity='5'
+		set sqm.omrvpn.iqdisc_opts='autorate-ingress nat dual-dsthost'
+		set sqm.omrvpn.eqdisc_opts='nat dual-srchost'
 		commit sqm
 	EOF
 fi

From 1d3db5eee35de514290c215502aea06978537fcc Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Wed, 20 May 2020 19:03:12 +0200
Subject: [PATCH 64/88] Remove nginx-ha depends

---
 openmptcprouter-full/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/openmptcprouter-full/Makefile b/openmptcprouter-full/Makefile
index a4badab0d..d93b43bbc 100644
--- a/openmptcprouter-full/Makefile
+++ b/openmptcprouter-full/Makefile
@@ -36,7 +36,7 @@ MY_DEPENDS := \
     libiwinfo-lua \
     ca-bundle ca-certificates libustream-openssl \
     luci-mod-admin-full luci-app-firewall luci-app-glorytun luci-app-shadowsocks-libev luci-app-unbound luci-theme-openmptcprouter luci-theme-argon luci-base \
-    luci-app-nginx-ha luci-app-omr-tracker luci-app-omr-dscp \
+    luci-app-omr-tracker luci-app-omr-dscp \
     luci-app-sqm sqm-scripts-extra \
     luci-app-vnstat2 omr-quota luci-app-omr-quota \
     luci-app-mptcp luci-app-openmptcprouter luci-app-omr-bypass luci-app-mail luci-app-upnp \
@@ -80,10 +80,10 @@ MY_DEPENDS := \
     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 kmod-zram kmod-swconfig swconfig kmod-ipt-nat kmod-ipt-nat6 luci-app-https-dns-proxy kmod-tcp-nanqinlang iptables-mod-ipopt igmpproxy ss mptcpd iptraf-ng \
-    luci-app-acl block-mount blockd fstools luci-app-shutdown
+    luci-app-acl block-mount blockd fstools luci-app-shutdown libwebp
 #     luci-theme-bootstrap luci-theme-openwrt-2020 luci-theme-openwrt luci-app-status
 #  luci-proto-bonding luci-app-statistics luci-proto-gre
-#    softethervpn5-client softethervpn5-server
+#    softethervpn5-client softethervpn5-server luci-app-nginx-ha
 
 #    luci-app-mlvpn ubond \
 #     kmod-ath9k kmod-ath9k-htc

From 66988799c1bfeb531dc06bbc50947ff0462f963f Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Wed, 20 May 2020 19:03:55 +0200
Subject: [PATCH 65/88] Keep congestion even if it's not bbr

---
 mptcp/files/etc/uci-defaults/mptcp-defaults | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/mptcp/files/etc/uci-defaults/mptcp-defaults b/mptcp/files/etc/uci-defaults/mptcp-defaults
index 324eb9560..0e8aa4bb3 100755
--- a/mptcp/files/etc/uci-defaults/mptcp-defaults
+++ b/mptcp/files/etc/uci-defaults/mptcp-defaults
@@ -11,12 +11,12 @@ if [ "$(uci -q show network.globals | grep mptcp_path_manager)" = "" ]; then
 	commit network
 	EOF
 fi
-if [ "$(uci -q get network.globals.congestion)" != "bbr" ]; then
-	uci -q batch <<-EOF >/dev/null
-	set network.globals.congestion=bbr
-	commit network
-	EOF
-fi
+#if [ "$(uci -q get network.globals.congestion)" != "bbr" ]; then
+#	uci -q batch <<-EOF >/dev/null
+#	set network.globals.congestion=bbr
+#	commit network
+#	EOF
+#fi
 if [ "$(uci -q get network.globals.mptcp_syn_retries)" = "1" ]; then
 	uci -q batch <<-EOF >/dev/null
 	set network.globals.mptcp_syn_retries=2

From a81125fb89dac03647f5316113bba70585e52fa1 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Wed, 20 May 2020 19:04:14 +0200
Subject: [PATCH 66/88] 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 63617d102..d5c9c9016 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -31,8 +31,8 @@ jobs:
       - run:
           name: cache
           command: |
-            echo "cache 95 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
-            echo "cache 97 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
+            echo "cache 96 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
+            echo "cache 98 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
 
       - restore_cache:
           keys:
@@ -94,8 +94,8 @@ jobs:
       - run:
           name: cache
           command: |
-            echo "cache 95 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
-            echo "cache 97 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
+            echo "cache 96 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
+            echo "cache 98 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
 
       - restore_cache:
           keys:
@@ -155,8 +155,8 @@ jobs:
       - run:
           name: cache
           command: |
-            echo "cache 95 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
-            echo "cache 97 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
+            echo "cache 96 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
+            echo "cache 98 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
 
       - restore_cache:
           keys:
@@ -216,8 +216,8 @@ jobs:
       - run:
           name: cache
           command: |
-            echo "cache 95 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
-            echo "cache 97 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
+            echo "cache 96 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
+            echo "cache 98 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
 
       - restore_cache:
           keys:
@@ -277,8 +277,8 @@ jobs:
       - run:
           name: cache
           command: |
-            echo "cache 95 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
-            echo "cache 97 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
+            echo "cache 96 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
+            echo "cache 98 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
 
       - restore_cache:
           keys:
@@ -338,8 +338,8 @@ jobs:
       - run:
           name: cache
           command: |
-            echo "cache 95 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
-            echo "cache 97 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
+            echo "cache 96 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
+            echo "cache 98 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
 
       - restore_cache:
           keys:
@@ -402,8 +402,8 @@ jobs:
       - run:
           name: cache
           command: |
-            echo "cache 95 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
-            echo "cache 97 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
+            echo "cache 96 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
+            echo "cache 98 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
 
       - restore_cache:
           keys:
@@ -462,8 +462,8 @@ jobs:
       - run:
           name: cache
           command: |
-            echo "cache 95 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
-            echo "cache 97 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
+            echo "cache 96 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
+            echo "cache 98 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
 
       - restore_cache:
           keys:

From 20e55280af0ec35c1e402c3a9fdbcfaa047a8ae6 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Thu, 21 May 2020 08:36:11 +0200
Subject: [PATCH 67/88] Fix bcm27cc-eeprom patch

---
 ...3-rpi-eeprom-update-change-default-include-path.patch | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/bcm27xx-eeprom/patches/0003-rpi-eeprom-update-change-default-include-path.patch b/bcm27xx-eeprom/patches/0003-rpi-eeprom-update-change-default-include-path.patch
index 63e99ce3d..6aee93cf2 100644
--- a/bcm27xx-eeprom/patches/0003-rpi-eeprom-update-change-default-include-path.patch
+++ b/bcm27xx-eeprom/patches/0003-rpi-eeprom-update-change-default-include-path.patch
@@ -24,15 +24,6 @@ Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
  fi
  
  LOCAL_MODE=0
-@@ -323,7 +323,7 @@ The system should then boot normally.
- 
- If /boot does not correspond to the boot partition on the sd-card and this
- is not a NOOBS system then the mount point for BOOTFS should be defined
--in /etc/default/rpi-eeprom-update by defining the BOOTFS variable.
-+in /etc/bcm27xx-eeprom.conf by defining the BOOTFS variable.
- 
- A backup of the current EEPROM config file is written to ${FIRMWARE_BACKUP_DIR}
- before applying the update.
 @@ -345,7 +345,7 @@ Options:
     -u Install the specified VL805 (USB EEPROM) image file.
  

From 048e28f0d4e8adb0ee18a8f07aabe5de221f33e3 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Fri, 22 May 2020 17:29:18 +0200
Subject: [PATCH 68/88] Fix DSCP

---
 luci-app-omr-dscp/root/etc/init.d/omr-dscp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/luci-app-omr-dscp/root/etc/init.d/omr-dscp b/luci-app-omr-dscp/root/etc/init.d/omr-dscp
index 70b7bd17b..9ea0d661f 100755
--- a/luci-app-omr-dscp/root/etc/init.d/omr-dscp
+++ b/luci-app-omr-dscp/root/etc/init.d/omr-dscp
@@ -81,8 +81,8 @@ _add_dscp_rules() {
 	direction="" ; config_get direction "$1" direction "upload"
 	comment=""   ; config_get comment "$1" comment "-"
 
-	src_port="$(echo $src_port | sed 's/-/:)"
-	dest_port="$(echo $dest_port | sed 's/-/:)"
+	src_port="$(echo $src_port | sed 's/-/:/g')"
+	dest_port="$(echo $dest_port | sed 's/-/:/g')"
 	case "$direction" in
 		upload|both)
 			# Apply the rule locally

From 48a83ab302fa2567389ef563514aef8bd4f9e76a Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Mon, 25 May 2020 14:01:25 +0200
Subject: [PATCH 69/88] Force CPU speed for RPI

---
 .../root/etc/init.d/openmptcprouter                   | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/luci-app-openmptcprouter/root/etc/init.d/openmptcprouter b/luci-app-openmptcprouter/root/etc/init.d/openmptcprouter
index 438a70b40..7f757cb6b 100755
--- a/luci-app-openmptcprouter/root/etc/init.d/openmptcprouter
+++ b/luci-app-openmptcprouter/root/etc/init.d/openmptcprouter
@@ -7,6 +7,7 @@ START=5
 USE_PROCD=1
 
 omr_intf_del() {
+	[ -z "$1" ] && return
 	uci -q delete openmptcprouter.$1
 }
 
@@ -17,10 +18,6 @@ omr_intf_check() {
 omr_intf_set() {
 	config_get multipath "$1" multipath
 	config_get ifname "$1" ifname
-	[ -n "$(ubus call system board | jsonfilter -e '@.board_name' | grep raspberry)" ] && [ -n "$(echo $ifname | grep usb)" ] && {
-		uci -q set openmptcprouter.settings.scaling_min_freq=800000
-		uci -q set openmptcprouter.settings.scaling_max_freq=800000
-	}
 	[ -z "$multipath" ] || [ "$multipath" = "off" ] && [ "$1" != "omrvpn" ] && [ "$1" != "glorytun" ] && return
 
 	uci -q set openmptcprouter.$1=interface
@@ -41,6 +38,12 @@ start_service() {
 	config_load network
 	config_foreach omr_intf_set interface
 
+	[ -n "$(ubus call system board | jsonfilter -e '@.board_name' | grep raspberry)" ] && {
+		# force CPU speed for RPI
+		uci -q set openmptcprouter.settings.scaling_min_freq=$(cat /sys/devices/system/cpu/cpufreq/policy0/scaling_max_freq | tr -d "\n")
+		uci -q set openmptcprouter.settings.scaling_max_freq=$(cat /sys/devices/system/cpu/cpufreq/policy0/scaling_max_freq | tr -d "\n")
+	}
+
 	config_load openmptcprouter
 	config_get scaling_min_freq settings scaling_min_freq
 	[ -n "$scaling_min_freq" ] && {

From 3ce5605a277905f933e357f45165f9127baf32be Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Mon, 25 May 2020 14:02:35 +0200
Subject: [PATCH 70/88] workaround for RPI3 no network at boot problem

---
 mptcp/files/etc/init.d/mptcp | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/mptcp/files/etc/init.d/mptcp b/mptcp/files/etc/init.d/mptcp
index 4aa582f07..54d5992c8 100755
--- a/mptcp/files/etc/init.d/mptcp
+++ b/mptcp/files/etc/init.d/mptcp
@@ -274,11 +274,11 @@ interface_multipath_settings() {
 			[ "$mode" = "master" ] && {
 				ip -6 route replace default via $gateway6 dev $iface
 			}
-			[ "$mode" = "off" ] && {
-				ifconfig $iface txqueuelen 50 > /dev/null 2>&1
-			} || {
-				ifconfig $iface txqueuelen 100 > /dev/null 2>&1
-			}
+			#[ "$mode" = "off" ] && {
+			#	ifconfig $iface txqueuelen 50 > /dev/null 2>&1
+			#} || {
+			#	ifconfig $iface txqueuelen 100 > /dev/null 2>&1
+			#}
 		fi
 	fi
 }
@@ -355,6 +355,15 @@ start_service() {
 	. /lib/functions.sh
 	. /lib/functions/network.sh
 	global_multipath_settings
+
+	[ -n "$(ubus call system board | jsonfilter -e '@.board_name' | grep '3-model-b')" ] && [ "$(ip link show eth0 | grep UP)" = "" ] && {
+		# RPI 3 workaround no network at boot
+		ethtool eth0 > /dev/null 2>&1
+		ethtool -s eth0 autoneg off > /dev/null 2>&1
+		ip link set eth0 up > /dev/null 2>&1
+		ethtool -s eth0 autoneg on > /dev/null 2>&1
+	}
+
 	mptcpintf=""
 	master=""
 	config_load network
@@ -386,7 +395,7 @@ start_service() {
 	uci -q commit network
 	uci -q commit openmptcprouter
 	[ -n "$(ubus call system board | jsonfilter -e '@.board_name' | grep raspberry)" ] && [ -z "$(ubus call system board | jsonfilter -e '@.board_name' | grep '4-model-b')" ] && {
-		ethtool --offload eth0 rx off tx off
+		ethtool --offload eth0 rx off tx off > /dev/null 2>&1
 	}
 }
 

From a4a0ca68d8da14db4e1879ed0eba70398fbdd4b4 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Mon, 25 May 2020 14:02:59 +0200
Subject: [PATCH 71/88] Fix issue when multiple master defined

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

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 72ea623eb..796975058 100755
--- a/mptcp/files/usr/share/omr/post-tracking.d/post-tracking
+++ b/mptcp/files/usr/share/omr/post-tracking.d/post-tracking
@@ -598,8 +598,8 @@ fi
 	#[ -z "$(uci -q get openmptcprouter.$OMR_TRACKER_INTERFACE.latency_max)" ] && uci -q set openmptcprouter.$OMR_TRACKER_INTERFACE.latency_max="$OMR_TRACKER_LATENCY"
 	#[ "$(uci -q get openmptcprouter.$OMR_TRACKER_INTERFACE.latency_max)" -lt "$OMR_TRACKER_LATENCY" ] && uci -q set openmptcprouter.$OMR_TRACKER_INTERFACE.latency_max="$OMR_TRACKER_LATENCY"
 	if [ "$multipath_config" = "on" ] && [ "$(uci -q get openmptcprouter.$OMR_TRACKER_INTERFACE.multipath)" != "master" ] && ([ "$(uci -q get openmptcprouter.settings.master)" = "dynamic" ] || (([ "$(uci -q get openmptcprouter.settings.master)" = "change" ] || [ "$(uci -q get openmptcprouter.settings.master)" = "" ]) && [ "$(uci -q get openmptcprouter.settings.master_lcintf | grep $OMR_TRACKER_INTERFACE)" = "" ])); then
-		masterintf="$(uci -q show network | grep multipath=\'master\' | cut -d'.' -f2)"
-		[ -z "$masterintf" ] && masterintf="$(uci -q show openmptcprouter | grep multipath=\'master\' | cut -d'.' -f2)"
+		masterintf="$(uci -q show openmptcprouter | grep -m 1 multipath=\'master\' | cut -d'.' -f2)"
+		[ -z "$masterintf" ] && masterintf="$(uci -q show network | grep -m 1 multipath=\'master\' | cut -d'.' -f2)"
 		masterlatency="$(uci -q get openmptcprouter.$masterintf.latency | tr -d '\n')"
 		if [ -z "$masterlatency" ] || [ "$(uci -q get openmptcprouter.$masterintf.state)" = "down" ]; then
 			masterlatency=1000

From 34f21576ce9d4269834b5d347e621216699ea6f3 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Mon, 25 May 2020 14:03:45 +0200
Subject: [PATCH 72/88] Send ULA to VPS if not already done

---
 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 a378c3f32..aecfe056c 100755
--- a/openmptcprouter/files/etc/init.d/openmptcprouter-vps
+++ b/openmptcprouter/files/etc/init.d/openmptcprouter-vps
@@ -522,7 +522,8 @@ _set_vpn_ip() {
 	[ -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")
 	ula="$(uci -q get network.globals.ula_prefix)"
-	if [ "$vpnip_remote" != "" ] && [ "$vpnip_local" != "" ] && ([ "$vpnip_remote" != "$vpnip_remote_current" ] || [ "$vpnip_local" != "$vpnip_local_current" ]); then
+	ula_current="$(echo "$vps_config" | jsonfilter -q -e '@.6in4.ula')"
+	if [ "$vpnip_remote" != "" ] && [ "$vpnip_local" != "" ] && ([ "$vpnip_remote" != "$vpnip_remote_current" ] || [ "$vpnip_local" != "$vpnip_local_current" ] || [ "$ula" != "$ula_current" ]); then
 		settings='{"remoteip" : "'$vpnip_local'","localip" : "'$vpnip_remote'","ula" : "'$ula'"}'
 		result=$(_set_json "vpnips" "$settings")
 	fi

From 4aee443da6250e389098264543e4d84d29dc33f3 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Mon, 25 May 2020 14:04:17 +0200
Subject: [PATCH 73/88] Fix 6in4

---
 omr-6in4/files/bin/omr-6in4                   | 4 ++--
 omr-6in4/files/etc/init.d/omr-6in4            | 2 +-
 omr-6in4/files/etc/uci-defaults/9010-omr-6in4 | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/omr-6in4/files/bin/omr-6in4 b/omr-6in4/files/bin/omr-6in4
index 34a02a3e5..da620379e 100755
--- a/omr-6in4/files/bin/omr-6in4
+++ b/omr-6in4/files/bin/omr-6in4
@@ -39,8 +39,8 @@ while true; do
 				ipv6_addr=$(ubus call network.interface.omr6in4 status | jsonfilter -q -l 1 -e '@["ipv6-address"][0].address' | tr -d "\n")
 				ip -6 addr add $ipv6_addr dev 6in4-omr6in4 > /dev/null 2>&1
 				ipv6_gw=$(ubus call network.interface.omr6in4 status | jsonfilter -q -l 1 -e '@.route[@.target="::"].nexthop' | tr -d "\n")
-				[ "$ipv6_gw" = "::" ] && ipv6_gw='fd80::a00:1'
-				[ -z "$ipv6_gw" ] && ipv6_gw='fd80::a00:1'
+				[ "$ipv6_gw" = "::" ] && ipv6_gw='fe80::a00:1'
+				[ -z "$ipv6_gw" ] && ipv6_gw='fe80::a00:1'
 				#[ -z "$ipv6_gw" ] && ipv6_gw='fe80::aff:ff01'
 				ip -6 route add ${ipv6_gw} dev 6in4-omr6in4
 				ip -6 route replace default via ${ipv6_gw} dev 6in4-omr6in4 > /dev/null 2>&1
diff --git a/omr-6in4/files/etc/init.d/omr-6in4 b/omr-6in4/files/etc/init.d/omr-6in4
index f467994c0..853bb30ca 100755
--- a/omr-6in4/files/etc/init.d/omr-6in4
+++ b/omr-6in4/files/etc/init.d/omr-6in4
@@ -11,7 +11,7 @@
 }
 
 set_shadowsocks_address() {
-	config_set "$1" local_address "$2"
+	uci -q set shadowsocks-libev.$1.local_address="$2"
 }
 
 set_ipv6_state() {
diff --git a/omr-6in4/files/etc/uci-defaults/9010-omr-6in4 b/omr-6in4/files/etc/uci-defaults/9010-omr-6in4
index 3247a243d..56ca8b282 100755
--- a/omr-6in4/files/etc/uci-defaults/9010-omr-6in4
+++ b/omr-6in4/files/etc/uci-defaults/9010-omr-6in4
@@ -10,8 +10,8 @@ if [ "$(uci -q show network | grep omr6in4)" = "" ]; then
 	set network.omr6in4.multipath=off
 	set network.omr6in4.ipaddr=10.255.255.2
 	set network.omr6in4.peeraddr=10.255.255.1
-	set network.omr6in4.gateway=fd80::a00:1
-	set network.omr6in4.ip6addr='fd80::a00:2/128'
+	set network.omr6in4.gateway=fe80::a00:1
+	set network.omr6in4.ip6addr='fe80::a00:2/128'
 	set network.omr6in4.auto='0'
 	commit network
 	EOF
@@ -27,7 +27,7 @@ fi
 
 if [ "$(uci -q get network.omr6in4.ip6addr)" = "" ]; then
 	uci -q batch <<-EOF >/dev/null
-	set network.omr6in4.ip6addr=fd80::a00:2
+	set network.omr6in4.ip6addr=fe80::a00:2
 	commit network
 	EOF
 fi

From 65a9d5e055a7b15751929f708b0945395fcea3b6 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Tue, 26 May 2020 07:57:36 +0200
Subject: [PATCH 74/88] Allow to exec a script when interface up or down

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

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 796975058..317b94836 100755
--- a/mptcp/files/usr/share/omr/post-tracking.d/post-tracking
+++ b/mptcp/files/usr/share/omr/post-tracking.d/post-tracking
@@ -280,6 +280,8 @@ if [ "$OMR_TRACKER_STATUS" = "ERROR" ]; then
 			echo -e "Subject: $OMR_SYSNAME: $OMR_TRACKER_INTERFACE ($OMR_TRACKER_DEVICE) is down\n\nConnection failure of $OMR_TRACKER_INTERFACE ($OMR_TRACKER_DEVICE) detected. The reason is \"$OMR_TRACKER_STATUS_MSG\"." | sendmail $(uci -q get mail.default.to)
 		fi
 	}
+	script_alert_down="$(uci -q get omr-tracker.$OMR_TRACKER_INTERFACE.script_alert_down)"
+	[ -n "$script_alert_down" ] && eval $script_alert_down
 
 	if [ "$OMR_TRACKER_INTERFACE" = "glorytun" ] || [ "$OMR_TRACKER_INTERFACE" = "omrvpn" ]; then
 		if [ "$OMR_TRACKER_STATUS_MSG" = "" ]; then
@@ -391,6 +393,9 @@ if [ "$OMR_TRACKER_PREV_STATUS" != "" ] && [ "$OMR_TRACKER_PREV_STATUS" != "$OMR
 		OMR_SYSNAME="$(uci -q get system.@system[0].hostname)"
 		echo -e "Subject: $OMR_SYSNAME: $OMR_TRACKER_INTERFACE ($OMR_TRACKER_DEVICE) is up\n\nDetected that connection $OMR_TRACKER_INTERFACE ($OMR_TRACKER_DEVICE) is up again." | sendmail $(uci -q get mail.default.to)
 	}
+	script_alert_up="$(uci -q get omr-tracker.$OMR_TRACKER_INTERFACE.script_alert_up)"
+	[ -n "$script_alert_up" ] && eval $script_alert_up
+
 	uci -q set openmptcprouter.$OMR_TRACKER_INTERFACE.state='up'
 	uci -q commit openmptcprouter
 	dns_flush

From fdbdcfe3b0c5f83d0b7e1b1939cc4426a6fe9293 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Tue, 26 May 2020 07:58:16 +0200
Subject: [PATCH 75/88] Update mptcpd

---
 mptcpd/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mptcpd/Makefile b/mptcpd/Makefile
index d3c8cb0b8..34242071d 100644
--- a/mptcpd/Makefile
+++ b/mptcpd/Makefile
@@ -8,10 +8,10 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mptcpd
-PKG_VERSION:=0.3
+PKG_VERSION:=0.4
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://github.com/intel/mptcpd/releases/download/v0.3
-PKG_HASH:=c2e1711e01b11f16a0c91dc0f3815b6460e603f52a31225d3a4d4012e858c967
+PKG_SOURCE_URL:=https://github.com/intel/mptcpd/releases/download/v$(PKG_VERSION)
+PKG_HASH:=459c45ba86ea574f1ad7a062a9914474ca650229b97375017bd46d0732f985ba
 PKG_RELEASE:=1
 PKG_MAINTAINER:=Ycarus (Yannick Chabanois) <ycarus@zugaina.org>
 

From a60922f03276c103a95ec706ba4fe1c6719401cb Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Tue, 26 May 2020 07:58:48 +0200
Subject: [PATCH 76/88] Fix 6in4 from VPS

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

diff --git a/openmptcprouter/files/etc/init.d/openmptcprouter-vps b/openmptcprouter/files/etc/init.d/openmptcprouter-vps
index aecfe056c..217bcd0a0 100755
--- a/openmptcprouter/files/etc/init.d/openmptcprouter-vps
+++ b/openmptcprouter/files/etc/init.d/openmptcprouter-vps
@@ -522,7 +522,7 @@ _set_vpn_ip() {
 	[ -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")
 	ula="$(uci -q get network.globals.ula_prefix)"
-	ula_current="$(echo "$vps_config" | jsonfilter -q -e '@.6in4.ula')"
+	ula_current="$(echo "$vps_config" | jsonfilter -q -e '@.ip6in4.ula')"
 	if [ "$vpnip_remote" != "" ] && [ "$vpnip_local" != "" ] && ([ "$vpnip_remote" != "$vpnip_remote_current" ] || [ "$vpnip_local" != "$vpnip_local_current" ] || [ "$ula" != "$ula_current" ]); then
 		settings='{"remoteip" : "'$vpnip_local'","localip" : "'$vpnip_remote'","ula" : "'$ula'"}'
 		result=$(_set_json "vpnips" "$settings")
@@ -724,7 +724,7 @@ _set_config_from_vps() {
 		/etc/init.d/omr-tracker restart
 	fi
 
-	ula="$(echo "$vps_config" | jsonfilter -q -e '@.6in4.ula')"
+	ula="$(echo "$vps_config" | jsonfilter -q -e '@.ip6in4.ula')"
 	if [ -n "$ula" ]; then
 			uci -q batch <<-EOF >/dev/null
 			set network.globals.ula_prefix=$ula
@@ -976,14 +976,17 @@ _set_config_from_vps() {
 		EOF
 	fi
 
-	omr6in4_vps_localip="$(echo "$vps_config" | jsonfilter -q -e '@.6in4.localip')"
-	omr6in4_vps_remoteip="$(echo "$vps_config" | jsonfilter -q -e '@.6in4.remoteip')"
+	omr6in4_vps_localip="$(echo "$vps_config" | jsonfilter -q -e '@.ip6in4.localip')"
+	omr6in4_vps_remoteip="$(echo "$vps_config" | jsonfilter -q -e '@.ip6in4.remoteip')"
 	if ([ -n "$omr6in4_vps_localip" ] && [ "$omr6in4_vps_localip" != "$(uci -q get network.omr6in4.gateway)" ]) || ([ -n "$omr6in4_vps_remoteip" ] && [ "$omr6in4_vps_remoteip" != "$(uci -q get network.omr6in4.ip6addr)" ]); then
+		logger -t "OMR-VPS" "Set omr6in4 ip address and gateway"
 		uci -q batch <<-EOF >/dev/null
-			set network.omr6in4.ip6addr=$omr6in4_vps_remoteip
-			set network.omr6in4.gateway=$omr6in4_vps_localip
+			set network.omr6in4.ip6addr="$omr6in4_vps_remoteip"
+			set network.omr6in4.gateway="$omr6in4_vps_localip"
 			commit network
 		EOF
+		/etc/init.d/network restart
+		sleep 6
 	fi
 
 	# Get VPS iperf config

From b30a46b0cd6f1234644c0e82aa76db81c42becc1 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Tue, 26 May 2020 07:58:56 +0200
Subject: [PATCH 77/88] 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 d5c9c9016..fc0b34266 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -31,8 +31,8 @@ jobs:
       - run:
           name: cache
           command: |
-            echo "cache 96 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
-            echo "cache 98 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
+            echo "cache 97 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
+            echo "cache 99 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
 
       - restore_cache:
           keys:
@@ -94,8 +94,8 @@ jobs:
       - run:
           name: cache
           command: |
-            echo "cache 96 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
-            echo "cache 98 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
+            echo "cache 97 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
+            echo "cache 99 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
 
       - restore_cache:
           keys:
@@ -155,8 +155,8 @@ jobs:
       - run:
           name: cache
           command: |
-            echo "cache 96 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
-            echo "cache 98 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
+            echo "cache 97 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
+            echo "cache 99 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
 
       - restore_cache:
           keys:
@@ -216,8 +216,8 @@ jobs:
       - run:
           name: cache
           command: |
-            echo "cache 96 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
-            echo "cache 98 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
+            echo "cache 97 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
+            echo "cache 99 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
 
       - restore_cache:
           keys:
@@ -277,8 +277,8 @@ jobs:
       - run:
           name: cache
           command: |
-            echo "cache 96 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
-            echo "cache 98 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
+            echo "cache 97 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
+            echo "cache 99 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
 
       - restore_cache:
           keys:
@@ -338,8 +338,8 @@ jobs:
       - run:
           name: cache
           command: |
-            echo "cache 96 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
-            echo "cache 98 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
+            echo "cache 97 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
+            echo "cache 99 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
 
       - restore_cache:
           keys:
@@ -402,8 +402,8 @@ jobs:
       - run:
           name: cache
           command: |
-            echo "cache 96 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
-            echo "cache 98 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
+            echo "cache 97 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
+            echo "cache 99 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
 
       - restore_cache:
           keys:
@@ -462,8 +462,8 @@ jobs:
       - run:
           name: cache
           command: |
-            echo "cache 96 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
-            echo "cache 98 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
+            echo "cache 97 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
+            echo "cache 99 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
 
       - restore_cache:
           keys:

From 8f1e17591f28896cb0d9f19b00d350c23afdec2c Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Wed, 27 May 2020 18:08:48 +0200
Subject: [PATCH 78/88] Fix low latency

---
 luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua b/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
index de65ad3c4..702120b09 100644
--- a/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
+++ b/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
@@ -719,7 +719,7 @@ function settings_add()
 	end)
 
 	-- Enable/disable no delay
-	local nodelay = luci.http.formvalue("enablenodelay") or "1"
+	local nodelay = luci.http.formvalue("enablenodelay") or "0"
 	ucic:set("openmptcprouter","settings","enable_nodelay",nodelay)
 	luci.sys.exec("sysctl -w net.ipv4.tcp_low_latency=%s" % nodelay)
 	luci.sys.exec("sed -i 's:^net.ipv4.tcp_low_latency=[0-9]*:net.ipv4.tcp_low_latency=%s:' /etc/sysctl.d/zzz_openmptcprouter.conf" % nodelay)

From 3371e3e5c977d7b9454c83a169bbdc4f008086c0 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Wed, 27 May 2020 18:09:16 +0200
Subject: [PATCH 79/88] Add a description for IPv6 ULA

---
 .../luasrc/view/openmptcprouter/wizard.htm                  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm
index 32e8d3776..ac9601d44 100644
--- a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm
+++ b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm
@@ -154,7 +154,11 @@ end
 	    <div class="cbi-value">
 		<label class="cbi-value-title"><%:IPv6 ULA-Prefix%></label>
 		<div class="cbi-value-field">
-		    <input type="text" name="ula" class="cbi-input-text" value="<%=uci:get("network","globals","ula_prefix")%>" />
+		    <input type="text" name="ula" class="cbi-input-text" value="<%=uci:get("network","globals","ula_prefix")%>" data-type="ula_prefix" />
+		    <br />
+		    <div class="cbi-value-description">
+		        <%:You can set a public IPv6 prefix only if you set only one server.%>
+		    </div>
 		</div>
 	    </div>
 	</fieldset>

From e2b71447679c93444af0e9212a7b937f3a50d11c Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Wed, 27 May 2020 18:09:41 +0200
Subject: [PATCH 80/88] No more log for sysctl in omr-6in4

---
 omr-6in4/files/etc/init.d/omr-6in4 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/omr-6in4/files/etc/init.d/omr-6in4 b/omr-6in4/files/etc/init.d/omr-6in4
index 853bb30ca..a7f1f8792 100755
--- a/omr-6in4/files/etc/init.d/omr-6in4
+++ b/omr-6in4/files/etc/init.d/omr-6in4
@@ -17,7 +17,7 @@ set_shadowsocks_address() {
 set_ipv6_state() {
 	local disable_ipv6="$(uci -q get openmptcprouter.settings.disable_ipv6)"
 	[ -z "$disable_ipv6" ] && disable_ipv6="1"
-	sysctl -w net.ipv6.conf.all.disable_ipv6=$disable_ipv6
+	sysctl -qw net.ipv6.conf.all.disable_ipv6=$disable_ipv6
 	sed -i "s:^net.ipv6.conf.all.disable_ipv6=[0-9]*:net.ipv6.conf.all.disable_ipv6=$disable_ipv6:" /etc/sysctl.d/zzz_openmptcprouter.conf
 
 	uci -q batch <<-EOF >/dev/null

From 090f9a35a4aeec04c20e26ff69896315b40ec1e9 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Thu, 28 May 2020 10:09:22 +0200
Subject: [PATCH 81/88] Update maintainer

---
 tracebox/Makefile | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/tracebox/Makefile b/tracebox/Makefile
index 792d9659c..59778d4bd 100644
--- a/tracebox/Makefile
+++ b/tracebox/Makefile
@@ -1,3 +1,11 @@
+#
+# Copyright (C) 2018-2020 Ycarus (Yannick Chabanois) <ycarus@zugaina.org> for OpenMPTCProuter project
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=tracebox
@@ -7,7 +15,7 @@ PKG_RELEASE:=2
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE_URL:=https://github.com/tracebox/tracebox.git
-PKG_MAINTAINER:=Gregory Detal <gregory.detal@uclouvain.be>
+PKG_MAINTAINER:=Ycarus <ycarus@zugaina.org>
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_VERSION:=v0.4.4

From d7a7ec3e36defbc7dd54b6dec5231baae7e21f39 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Thu, 28 May 2020 10:09:47 +0200
Subject: [PATCH 82/88] Fix multipath setting

---
 mptcp/files/etc/init.d/mptcp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mptcp/files/etc/init.d/mptcp b/mptcp/files/etc/init.d/mptcp
index 54d5992c8..53279a243 100755
--- a/mptcp/files/etc/init.d/mptcp
+++ b/mptcp/files/etc/init.d/mptcp
@@ -74,10 +74,10 @@ interface_multipath_settings() {
 		uci -q set network.${config}.peerdns=0
 	}
 	[ "$mode" = "master" ] && {
-		mode="on"
 		# Force that only one interface is master
 		if [ "$master" != "" ]; then
 			logger -t "MPTCP" "Multipath master already set, disable master for $config"
+			mode="on"
 			config_set "$config" multipath "on"
 			uci -q set network.${config}.multipath="on"
 			uci -q set openmptcprouter.${config}.multipath="on"

From 67c295dbd71956a55183f27f3ce3379d2226cd1f Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Thu, 28 May 2020 18:51:40 +0200
Subject: [PATCH 83/88] Restart services only when needed

---
 .../files/etc/init.d/openmptcprouter-vps      | 54 +++++++++++--------
 1 file changed, 33 insertions(+), 21 deletions(-)

diff --git a/openmptcprouter/files/etc/init.d/openmptcprouter-vps b/openmptcprouter/files/etc/init.d/openmptcprouter-vps
index 217bcd0a0..353760cc7 100755
--- a/openmptcprouter/files/etc/init.d/openmptcprouter-vps
+++ b/openmptcprouter/files/etc/init.d/openmptcprouter-vps
@@ -280,16 +280,20 @@ _get_vps_config() {
 			set shadowsocks-libev.sss0.server="$vpsip"
 			commit shadowsocks-libev
 		EOF
-		logger -t "OMR-VPS" "Restart shadowsocks..."
-		/etc/init.d/shadowsocks-libev restart
+		if [ "$(uci -q get shadowsocks-libev.sss0.disabled)" = "0" ]; then
+			logger -t "OMR-VPS" "Restart shadowsocks..."
+			/etc/init.d/shadowsocks-libev restart
+		fi
 	fi
 	if [ "$(uci -q get openvpn.omr.remote)" != "127.0.0.1" ] && [ "$(uci -q get openvpn.omr.remote)" != "$vpsip" ] && [ "$(uci -q get openmptcprouter.settings.ha)" != "1" ]; then
 		uci -q batch <<-EOF >/dev/null
 			set openvpn.omr.remote="$vpsip"
 			commit openvpn
 		EOF
-		logger -t "OMR-VPS" "Restart OpenVPN..."
-		/etc/init.d/openvpn restart
+		if [ "$(uci -q get openvpn.omr.enabled)" = "1" ]; then
+			logger -t "OMR-VPS" "Restart OpenVPN..."
+			/etc/init.d/openvpn restart
+		fi
 	fi
 	port="$(echo "$vps_config" | jsonfilter -q -e '@.dsvpn.port')"
 	localip="$(echo "$vps_config" | jsonfilter -q -e '@.dsvpn.client_ip')"
@@ -302,8 +306,10 @@ _get_vps_config() {
 			set dsvpn.vpn.host="$vpsip"
 			commit dsvpn
 		EOF
-		logger -t "OMR-VPS" "Restart DSVPN..."
-		/etc/init.d/dsvpn restart
+		if [ "$(uci -q get dsvpn.vpn.enable)" = "1" ]; then
+			logger -t "OMR-VPS" "Restart DSVPN..."
+			/etc/init.d/dsvpn restart
+		fi
 	fi
 
 	if [ "$(uci -q get mlvpn.general.host)" != "127.0.0.1" ] && [ "$(uci -q get mlvpn.general.host)" != "$vpsip" ] && [ "$(uci -q get openmptcprouter.settings.ha)" != "1" ] && [ -f /etc/init.d/mlvpn ]; then
@@ -312,8 +318,10 @@ _get_vps_config() {
 			set mlvpn.general.host="$vpsip"
 			commit mlvpn
 		EOF
-		logger -t "OMR-VPS" "Restart MLVPN..."
-		/etc/init.d/mlvpn restart
+		if [ "$(uci -q get mlvpn.general.enable)" = "1" ]; then
+			logger -t "OMR-VPS" "Restart MLVPN..."
+			/etc/init.d/mlvpn restart
+		fi
 	fi
 	if [ "$(uci -q get glorytun.vpn.host)" != "127.0.0.1" ] && [ "$(uci -q get glorytun.vpn.host)" != "$vpsip" ] && [ "$(uci -q get openmptcprouter.settings.ha)" != "1" ]; then
 		uci -q batch <<-EOF >/dev/null
@@ -323,12 +331,14 @@ _get_vps_config() {
 	fi
 
 	if [ "$glorytun_change" != "0" ]; then
-		logger -t "OMR-VPS" "Restart glorytun..."
 		uci -q batch <<-EOF >/dev/null
 			commit glorytun
 		EOF
-		/etc/init.d/glorytun restart >/dev/null 2>&1
-		/etc/init.d/glorytun-udp restart >/dev/null 2>&1
+		if [ "$(uci -q get glorytun.vpn.enable)" = "1" ]; then
+			logger -t "OMR-VPS" "Restart glorytun..."
+			/etc/init.d/glorytun restart >/dev/null 2>&1
+			/etc/init.d/glorytun-udp restart >/dev/null 2>&1
+		fi
 	fi
 }
 
@@ -524,7 +534,7 @@ _set_vpn_ip() {
 	ula="$(uci -q get network.globals.ula_prefix)"
 	ula_current="$(echo "$vps_config" | jsonfilter -q -e '@.ip6in4.ula')"
 	if [ "$vpnip_remote" != "" ] && [ "$vpnip_local" != "" ] && ([ "$vpnip_remote" != "$vpnip_remote_current" ] || [ "$vpnip_local" != "$vpnip_local_current" ] || [ "$ula" != "$ula_current" ]); then
-		settings='{"remoteip" : "'$vpnip_local'","localip" : "'$vpnip_remote'","ula" : "'$ula'"}'
+		settings='{"remoteip" : "'$vpnip_local'","localip" : "'$vpnip_remote'","ula" : ["'$ula'"]}'
 		result=$(_set_json "vpnips" "$settings")
 	fi
 }
@@ -708,7 +718,7 @@ _set_config_from_vps() {
 	[ -z "$vps_config" ] && return
 
 	logger -t "OMR-VPS" "Get config from VPS..."
-
+	noerror=1
 	# get VPS ip
 	vpsip="$(uci -q get openmptcprouter.${servername}.ip)"
 	vps_lastchange="$(echo "$vps_config" | jsonfilter -q -e '@.vps.lastchange')"
@@ -725,10 +735,10 @@ _set_config_from_vps() {
 	fi
 
 	ula="$(echo "$vps_config" | jsonfilter -q -e '@.ip6in4.ula')"
-	if [ -n "$ula" ]; then
-			uci -q batch <<-EOF >/dev/null
-			set network.globals.ula_prefix=$ula
-			EOF
+	if [ -n "$ula" ] && [[ "$ula" != *" "* ]]; then
+		uci -q batch <<-EOF >/dev/null
+		set network.globals.ula_prefix=$ula
+		EOF
 	fi
 
 	# Set current VPN
@@ -1032,10 +1042,12 @@ _set_config_from_vps() {
 			done
 		fi
 	fi
-	uci -q batch <<-EOF >/dev/null
-		set openmptcprouter.${servername}.get_config=0
-		commit openmptcprouter
-	EOF
+	if [ "$noerror" = "1" ]; then
+		uci -q batch <<-EOF >/dev/null
+			set openmptcprouter.${servername}.get_config=0
+			commit openmptcprouter
+		EOF
+	fi
 }
 
 _backup_send() {

From fe607e3d482819f842e5d50f1aa0186923969bce Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Thu, 28 May 2020 18:52:16 +0200
Subject: [PATCH 84/88] Simplify default MPTCP config

---
 mptcp/files/etc/uci-defaults/mptcp-defaults | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mptcp/files/etc/uci-defaults/mptcp-defaults b/mptcp/files/etc/uci-defaults/mptcp-defaults
index 0e8aa4bb3..ba9d2e812 100755
--- a/mptcp/files/etc/uci-defaults/mptcp-defaults
+++ b/mptcp/files/etc/uci-defaults/mptcp-defaults
@@ -1,5 +1,5 @@
 #!/bin/sh
-if [ "$(uci -q show network.globals | grep mptcp_path_manager)" = "" ]; then
+if [ "$(uci -q get network.globals.mptcp_path_manager)" = "" ]; then
 	uci -q batch <<-EOF >/dev/null
 	set network.globals.multipath='enable'
 	set network.globals.mptcp_path_manager='fullmesh'

From 90e27a2153b0eb7509a98ef4fa8bcbb5cde0146e Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Thu, 28 May 2020 21:09:42 +0200
Subject: [PATCH 85/88] Add translation reference pot for macvlan, shutdown and
 snmpd app

---
 luci-app-macvlan/po/templates/macvlan.pot   |  23 +++
 luci-app-shutdown/po/templates/shutdown.pot |  27 +++
 luci-app-snmpd/po/templates/snmpd.pot       | 175 ++++++++++++++++++++
 3 files changed, 225 insertions(+)
 create mode 100644 luci-app-macvlan/po/templates/macvlan.pot
 create mode 100644 luci-app-shutdown/po/templates/shutdown.pot
 create mode 100644 luci-app-snmpd/po/templates/snmpd.pot

diff --git a/luci-app-macvlan/po/templates/macvlan.pot b/luci-app-macvlan/po/templates/macvlan.pot
new file mode 100644
index 000000000..f753668e9
--- /dev/null
+++ b/luci-app-macvlan/po/templates/macvlan.pot
@@ -0,0 +1,23 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+#: luci-app-macvlan/root/usr/share/rpcd/acl.d/luci-app-macvlan.json:3
+msgid "Grant UCI access for luci-app-macvlan"
+msgstr ""
+
+#: luci-app-macvlan/htdocs/luci-static/resources/view/network/macvlan.js:30
+msgid "Interface"
+msgstr ""
+
+#: luci-app-macvlan/htdocs/luci-static/resources/view/network/macvlan.js:22
+msgid "Interfaces"
+msgstr ""
+
+#: luci-app-macvlan/htdocs/luci-static/resources/view/network/macvlan.js:20
+#: luci-app-macvlan/root/usr/share/luci/menu.d/luci-app-macvlan.json:3
+msgid "Macvlan"
+msgstr ""
+
+#: luci-app-macvlan/htdocs/luci-static/resources/view/network/macvlan.js:26
+msgid "Name"
+msgstr ""
diff --git a/luci-app-shutdown/po/templates/shutdown.pot b/luci-app-shutdown/po/templates/shutdown.pot
new file mode 100644
index 000000000..d54a44c31
--- /dev/null
+++ b/luci-app-shutdown/po/templates/shutdown.pot
@@ -0,0 +1,27 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+#: luci-app-shutdown/root/usr/share/rpcd/acl.d/luci-app-shutdown.json:3
+msgid "Allow shutdown the device"
+msgstr ""
+
+#: luci-app-shutdown/htdocs/luci-static/resources/view/system/shutdown.js:23
+msgid "Perform shutdown"
+msgstr ""
+
+#: luci-app-shutdown/htdocs/luci-static/resources/view/system/shutdown.js:9
+#: luci-app-shutdown/root/usr/share/luci/menu.d/luci-app-shutdown.json:3
+msgid "Shutdown"
+msgstr ""
+
+#: luci-app-shutdown/htdocs/luci-static/resources/view/system/shutdown.js:10
+msgid "Shutdown the operating system of your device"
+msgstr ""
+
+#: luci-app-shutdown/htdocs/luci-static/resources/view/system/shutdown.js:31
+msgid "The poweroff command failed with code %d"
+msgstr ""
+
+#: luci-app-shutdown/htdocs/luci-static/resources/view/system/shutdown.js:15
+msgid "Warning: There are unsaved changes that will get lost on shutdown!"
+msgstr ""
diff --git a/luci-app-snmpd/po/templates/snmpd.pot b/luci-app-snmpd/po/templates/snmpd.pot
new file mode 100644
index 000000000..9acfaf5cb
--- /dev/null
+++ b/luci-app-snmpd/po/templates/snmpd.pot
@@ -0,0 +1,175 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+#: luci-app-snmpd/luasrc/model/cbi/snmpd.lua:82
+msgid "Access"
+msgstr ""
+
+#: luci-app-snmpd/luasrc/view/snmpd.htm:81
+#: luci-app-snmpd/luasrc/view/snmpd.htm:122
+msgid "Add"
+msgstr ""
+
+#: luci-app-snmpd/luasrc/view/snmpd.htm:66
+#: luci-app-snmpd/luasrc/view/snmpd.htm:116
+msgid "All"
+msgstr ""
+
+#: luci-app-snmpd/luasrc/model/cbi/snmpd.lua:139
+msgid "Arguments"
+msgstr ""
+
+#: luci-app-snmpd/luasrc/model/cbi/snmpd.lua:42
+msgid "Community"
+msgstr ""
+
+#: luci-app-snmpd/luasrc/model/cbi/snmpd.lua:23
+msgid "Contact"
+msgstr ""
+
+#: luci-app-snmpd/luasrc/model/cbi/snmpd.lua:97
+msgid "Context"
+msgstr ""
+
+#: luci-app-snmpd/luasrc/view/snmpd.htm:54
+msgid "Domain, IP or network"
+msgstr ""
+
+#: luci-app-snmpd/luasrc/model/cbi/snmpd.lua:9
+#: luci-app-snmpd/luasrc/view/snmpd.htm:24
+msgid "Enabled"
+msgstr ""
+
+#: luci-app-snmpd/luasrc/model/cbi/snmpd.lua:132
+msgid "Exec"
+msgstr ""
+
+#: luci-app-snmpd/luasrc/model/cbi/snmpd.lua:6
+#: luci-app-snmpd/luasrc/view/snmpd.htm:21
+#: luci-app-snmpd/luasrc/view/snmpd.htm:48
+msgid "General"
+msgstr ""
+
+#: luci-app-snmpd/root/usr/share/rpcd/acl.d/luci-app-snmpd.json:3
+msgid "Grant UCI access for luci-app-snmpd"
+msgstr ""
+
+#: luci-app-snmpd/luasrc/model/cbi/snmpd.lua:63
+#: luci-app-snmpd/luasrc/model/cbi/snmpd.lua:72
+#: luci-app-snmpd/luasrc/model/cbi/snmpd.lua:86
+msgid "Group"
+msgstr ""
+
+#: luci-app-snmpd/luasrc/model/cbi/snmpd.lua:63
+msgid "Groups help define access methods"
+msgstr ""
+
+#: luci-app-snmpd/luasrc/view/snmpd.htm:64
+#: luci-app-snmpd/luasrc/view/snmpd.htm:114
+msgid "Interface"
+msgstr ""
+
+#: luci-app-snmpd/luasrc/model/cbi/snmpd.lua:101
+msgid "Level"
+msgstr ""
+
+#: luci-app-snmpd/luasrc/model/cbi/snmpd.lua:22
+msgid "Location"
+msgstr ""
+
+#: luci-app-snmpd/luasrc/model/cbi/snmpd.lua:24
+#: luci-app-snmpd/luasrc/model/cbi/snmpd.lua:137
+msgid "Name"
+msgstr ""
+
+#: luci-app-snmpd/luasrc/model/cbi/snmpd.lua:12
+msgid "Networks"
+msgstr ""
+
+#: luci-app-snmpd/luasrc/model/cbi/snmpd.lua:116
+msgid "Notify"
+msgstr ""
+
+#: luci-app-snmpd/luasrc/model/cbi/snmpd.lua:136
+msgid "ObjectID"
+msgstr ""
+
+#: luci-app-snmpd/luasrc/view/snmpd.htm:55
+#: luci-app-snmpd/luasrc/view/snmpd.htm:90
+msgid "Output interface"
+msgstr ""
+
+#: luci-app-snmpd/luasrc/model/cbi/snmpd.lua:138
+msgid "Program"
+msgstr ""
+
+#: luci-app-snmpd/luasrc/view/snmpd.htm:85
+#: luci-app-snmpd/luasrc/view/snmpd.htm:89
+msgid "Protocols"
+msgstr ""
+
+#: luci-app-snmpd/luasrc/model/cbi/snmpd.lua:106
+msgid "Read"
+msgstr ""
+
+#: luci-app-snmpd/luasrc/model/cbi/snmpd.lua:34
+#: luci-app-snmpd/luasrc/model/cbi/snmpd.lua:69
+msgid "Read-only"
+msgstr ""
+
+#: luci-app-snmpd/luasrc/model/cbi/snmpd.lua:35
+#: luci-app-snmpd/luasrc/model/cbi/snmpd.lua:70
+msgid "Read-write"
+msgstr ""
+
+#: luci-app-snmpd/luasrc/controller/snmpd.lua:6
+#: luci-app-snmpd/luasrc/model/cbi/snmpd.lua:4
+#: luci-app-snmpd/luasrc/view/snmpd.htm:19
+#: luci-app-snmpd/root/usr/share/luci/menu.d/luci-app-snmpd.json:3
+msgid "SNMPd"
+msgstr ""
+
+#: luci-app-snmpd/luasrc/model/cbi/snmpd.lua:4
+msgid "SNMPd settings interface (Beta)"
+msgstr ""
+
+#: luci-app-snmpd/luasrc/model/cbi/snmpd.lua:32
+msgid "Server"
+msgstr ""
+
+#: luci-app-snmpd/luasrc/model/cbi/snmpd.lua:37
+msgid "Source"
+msgstr ""
+
+#: luci-app-snmpd/luasrc/model/cbi/snmpd.lua:19
+msgid "System"
+msgstr ""
+
+#: luci-app-snmpd/luasrc/model/cbi/snmpd.lua:111
+msgid "Write"
+msgstr ""
+
+#: luci-app-snmpd/luasrc/model/cbi/snmpd.lua:92
+msgid "any"
+msgstr ""
+
+#: luci-app-snmpd/luasrc/model/cbi/snmpd.lua:104
+msgid "auth"
+msgstr ""
+
+#: luci-app-snmpd/luasrc/model/cbi/snmpd.lua:29
+msgid "com2sec security"
+msgstr ""
+
+#: luci-app-snmpd/luasrc/model/cbi/snmpd.lua:103
+msgid "noauth"
+msgstr ""
+
+#: luci-app-snmpd/luasrc/model/cbi/snmpd.lua:67
+msgid "secname"
+msgstr ""
+
+#: luci-app-snmpd/luasrc/model/cbi/snmpd.lua:76
+#: luci-app-snmpd/luasrc/model/cbi/snmpd.lua:90
+msgid "version"
+msgstr ""

From 50129ad53e40207720934c412914e290c0a4a95c Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Fri, 29 May 2020 22:00:49 +0200
Subject: [PATCH 86/88] Fix when interface down

---
 omr-tracker/files/bin/omr-tracker | 214 +++++++++++++++---------------
 1 file changed, 109 insertions(+), 105 deletions(-)

diff --git a/omr-tracker/files/bin/omr-tracker b/omr-tracker/files/bin/omr-tracker
index e667ae8e1..967430139 100755
--- a/omr-tracker/files/bin/omr-tracker
+++ b/omr-tracker/files/bin/omr-tracker
@@ -177,119 +177,123 @@ while true; do
 	OMR_TRACKER_DEVICE_GATEWAY=
 	serverip_ping=false
 
-	if [ -d "/sys/class/net/$OMR_TRACKER_DEVICE" ] && [ -n "$(ip link show $OMR_TRACKER_DEVICE | grep UP)" ]; then
-		# retrieve iface ip and gateway
-		OMR_TRACKER_DEVICE_IP=$(ip -4 -br addr ls dev "$OMR_TRACKER_DEVICE" | awk -F'[ /]+' '{print $3}')
-		if [ -z "$OMR_TRACKER_DEVICE_IP" ]; then
-			OMR_TRACKER_DEVICE_IP=$(ip -4 addr show dev "$OMR_TRACKER_DEVICE" | grep -m 1 inet | awk '{print $2}' | cut -d'/' -s -f1)
-		fi
-		#OMR_TRACKER_DEVICE_IP=$(ubus call network.interface.$OMR_TRACKER_INTERFACE status | jsonfilter -e '@["ipv4-address"][0].address' | tr -d "\n")
-		#if [ -z "$OMR_TRACKER_DEVICE_GATEWAY" ]; then
-		#	OMR_TRACKER_DEVICE_GATEWAY=$(ip -4 r list dev "$OMR_TRACKER_DEVICE" | grep -v default | awk '/proto static/ {print $1}' | tr -d "\n")
-		#fi
-		if [ -z "$OMR_TRACKER_DEVICE_GATEWAY" ]; then
-			OMR_TRACKER_DEVICE_GATEWAY=$(uci -q get "network.$OMR_TRACKER_INTERFACE.gateway")
-		fi
-		if [ -z "$OMR_TRACKER_DEVICE_GATEWAY" ] || [ "$OMR_TRACKER_DEVICE_GATEWAY" = "0.0.0.0" ]; then
-			OMR_TRACKER_DEVICE_GATEWAY=$(ubus call network.interface.$OMR_TRACKER_INTERFACE status | jsonfilter -q -l 1 -e '@.inactive.route[@.target="0.0.0.0"].nexthop' | tr -d "\n")
-		fi
-		if [ -z "$OMR_TRACKER_DEVICE_GATEWAY" ] || [ "$OMR_TRACKER_DEVICE_GATEWAY" = "0.0.0.0" ]; then
-			OMR_TRACKER_DEVICE_GATEWAY=$(ubus call network.interface.$OMR_TRACKER_INTERFACE status | jsonfilter -q -l 1 -e '@.route[@.target="0.0.0.0"].nexthop' | tr -d "\n")
-		fi
-		if [ -z "$OMR_TRACKER_DEVICE_GATEWAY" ] || [ "$OMR_TRACKER_DEVICE_GATEWAY" = "0.0.0.0" ]; then
-			OMR_TRACKER_DEVICE_GATEWAY=$(ubus call network.interface.${OMR_TRACKER_INTERFACE}_4 status 2>/dev/null | jsonfilter -q -l 1 -e '@.inactive.route[@.target="0.0.0.0"].nexthop' | tr -d "\n")
-		fi
-		if [ -z "$OMR_TRACKER_DEVICE_GATEWAY" ] || [ "$OMR_TRACKER_DEVICE_GATEWAY" = "0.0.0.0" ]; then
-			if [ "$OMR_TRACKER_INTERFACE" = "omrvpn" ] && [ "$(uci -q get glorytun.vpn.enable)" = "1" ]; then
-				OMR_TRACKER_DEVICE_GATEWAY=$(uci -q get glorytun.vpn.remoteip)
-			else
-				OMR_TRACKER_DEVICE_GATEWAY=""
+	if [ -d "/sys/class/net/$OMR_TRACKER_DEVICE" ]; then
+		if [ -n "$(ip link show $OMR_TRACKER_DEVICE | grep UP)" ]; then
+			# retrieve iface ip and gateway
+			OMR_TRACKER_DEVICE_IP=$(ip -4 -br addr ls dev "$OMR_TRACKER_DEVICE" | awk -F'[ /]+' '{print $3}')
+			if [ -z "$OMR_TRACKER_DEVICE_IP" ]; then
+				OMR_TRACKER_DEVICE_IP=$(ip -4 addr show dev "$OMR_TRACKER_DEVICE" | grep -m 1 inet | awk '{print $2}' | cut -d'/' -s -f1)
 			fi
-		fi
-		if [ -z "$OMR_TRACKER_DEVICE_GATEWAY" ]; then
-			OMR_TRACKER_DEVICE_ROUTE=$(ip -4 r list dev "$OMR_TRACKER_DEVICE" | grep via | grep -v default | grep -v metric | grep -v / | awk '{print $1; exit}' | tr -d "\n")
-		fi
-		if [ -z "$OMR_TRACKER_DEVICE_GATEWAY" ]; then
-			OMR_TRACKER_DEVICE_GATEWAY=$(ip -4 r list dev "$OMR_TRACKER_DEVICE" | grep kernel | awk '/proto kernel/ {print $1}' | tr -d "\n")
-		fi
-
-		# execute specific tracker
-		if [ -n "$OMR_TRACKER_DEVICE_IP" ] && [ -n "$OMR_TRACKER_DEVICE_GATEWAY" ]; then
-			# setup loop variable
-			tries="$OMR_TRACKER_TRIES"
-			# loop until tries attempts have been reached
-			while [ "$tries" -gt 0 ]; do
-				if [ -n "$OMR_TRACKER_DEVICE_ROUTE" ]; then
-					_ping "$OMR_TRACKER_DEVICE_ROUTE" "$OMR_TRACKER_DEVICE" "no"
-					status=$?
+			#OMR_TRACKER_DEVICE_IP=$(ubus call network.interface.$OMR_TRACKER_INTERFACE status | jsonfilter -e '@["ipv4-address"][0].address' | tr -d "\n")
+			#if [ -z "$OMR_TRACKER_DEVICE_GATEWAY" ]; then
+			#	OMR_TRACKER_DEVICE_GATEWAY=$(ip -4 r list dev "$OMR_TRACKER_DEVICE" | grep -v default | awk '/proto static/ {print $1}' | tr -d "\n")
+			#fi
+			if [ -z "$OMR_TRACKER_DEVICE_GATEWAY" ]; then
+				OMR_TRACKER_DEVICE_GATEWAY=$(uci -q get "network.$OMR_TRACKER_INTERFACE.gateway")
+			fi
+			if [ -z "$OMR_TRACKER_DEVICE_GATEWAY" ] || [ "$OMR_TRACKER_DEVICE_GATEWAY" = "0.0.0.0" ]; then
+				OMR_TRACKER_DEVICE_GATEWAY=$(ubus call network.interface.$OMR_TRACKER_INTERFACE status | jsonfilter -q -l 1 -e '@.inactive.route[@.target="0.0.0.0"].nexthop' | tr -d "\n")
+			fi
+			if [ -z "$OMR_TRACKER_DEVICE_GATEWAY" ] || [ "$OMR_TRACKER_DEVICE_GATEWAY" = "0.0.0.0" ]; then
+				OMR_TRACKER_DEVICE_GATEWAY=$(ubus call network.interface.$OMR_TRACKER_INTERFACE status | jsonfilter -q -l 1 -e '@.route[@.target="0.0.0.0"].nexthop' | tr -d "\n")
+			fi
+			if [ -z "$OMR_TRACKER_DEVICE_GATEWAY" ] || [ "$OMR_TRACKER_DEVICE_GATEWAY" = "0.0.0.0" ]; then
+				OMR_TRACKER_DEVICE_GATEWAY=$(ubus call network.interface.${OMR_TRACKER_INTERFACE}_4 status 2>/dev/null | jsonfilter -q -l 1 -e '@.inactive.route[@.target="0.0.0.0"].nexthop' | tr -d "\n")
+			fi
+			if [ -z "$OMR_TRACKER_DEVICE_GATEWAY" ] || [ "$OMR_TRACKER_DEVICE_GATEWAY" = "0.0.0.0" ]; then
+				if [ "$OMR_TRACKER_INTERFACE" = "omrvpn" ] && [ "$(uci -q get glorytun.vpn.enable)" = "1" ]; then
+					OMR_TRACKER_DEVICE_GATEWAY=$(uci -q get glorytun.vpn.remoteip)
 				else
-					_ping "$OMR_TRACKER_DEVICE_GATEWAY" "$OMR_TRACKER_DEVICE" "no"
-					status=$?
+					OMR_TRACKER_DEVICE_GATEWAY=""
 				fi
-				if $(exit $status) && [ "$OMR_TRACKER_TYPE" = "none" ]; then
-					OMR_TRACKER_STATUS_MSG=""
-					OMR_TRACKER_STATUS="OK"
-					break
-				elif [ "$OMR_TRACKER_TYPE" != "none" ]; then
-					if ! $(exit $status); then
-						OMR_TRACKER_STATUS_MSG="gateway down"
-					fi
-					serverip_ping=false
-					if [ "$OMR_TRACKER_TYPE" = "ping" ]; then
-						config_load openmptcprouter
-						config_foreach _ping_server server $OMR_TRACKER_DEVICE
-					fi
-					if [ "$serverip_ping" = false ] && [ -n "$OMR_TRACKER_HOST" ]; then
-						OMR_TRACKER_HOST=$(resolveip -4 $OMR_TRACKER_HOST | tr -d "\n")
-						if [ "$(uci -q get network.$OMR_TRACKER_INTERFACE.proto)" = "3g" ] || [ "$(uci -q get network.$OMR_TRACKER_INTERFACE.proto)" = "qmi" ] || [ "$(uci -q get network.$OMR_TRACKER_INTERFACE.proto)" = "ncm" ]; then
-							# Check if route is not used
-							while ! ip route add $OMR_TRACKER_HOST via $OMR_TRACKER_DEVICE_GATEWAY dev $OMR_TRACKER_DEVICE src $OMR_TRACKER_DEVICE_IP > /dev/null 2>&1
-							do
-								logger -t "omr-tracker" "Can't create route to $OMR_TRACKER_HOST via $OMR_TRACKER_DEVICE_GATEWAY dev $OMR_TRACKER_DEVICE src $OMR_TRACKER_DEVICE_IP. waiting..."
-								sleep 2
-								ip route del "$OMR_TRACKER_HOST" via "$OMR_TRACKER_DEVICE_GATEWAY" dev "$OMR_TRACKER_DEVICE" src "$OMR_TRACKER_DEVICE_IP" > /dev/null 2>&1
-								_restart
-							done
-						fi
-						if [ "$OMR_TRACKER_TYPE" = "ping" ]; then
-							_ping "$OMR_TRACKER_HOST" "$OMR_TRACKER_DEVICE" "yes"
-							statusb=$?
-						elif [ "$OMR_TRACKER_TYPE" = "httping" ]; then
-							_httping "$OMR_TRACKER_HOST" "$OMR_TRACKER_DEVICE_IP" "yes"
-							statusb=$?
-						elif [ "$OMR_TRACKER_TYPE" = "dns" ]; then
-							_dns "$OMR_TRACKER_HOST" "$OMR_TRACKER_DEVICE_IP" "yes"
-							statusb=$?
-						fi
-						ip route del "$OMR_TRACKER_HOST" via "$OMR_TRACKER_DEVICE_GATEWAY" dev "$OMR_TRACKER_DEVICE" src "$OMR_TRACKER_DEVICE_IP" > /dev/null 2>&1
-						if $(exit $statusb); then
-							OMR_TRACKER_STATUS_MSG=""
-							OMR_TRACKER_STATUS="OK"
-							break
-						else
-							if [ "$OMR_TRACKER_LIST_HOSTS" = "" ]; then
-								OMR_TRACKER_LIST_HOSTS="$OMR_TRACKER_HOST"
-							else
-								OMR_TRACKER_LIST_HOSTS="$OMR_TRACKER_LIST_HOSTS,$OMR_TRACKER_HOST"
-							fi
-						fi
+			fi
+			if [ -z "$OMR_TRACKER_DEVICE_GATEWAY" ]; then
+				OMR_TRACKER_DEVICE_ROUTE=$(ip -4 r list dev "$OMR_TRACKER_DEVICE" | grep via | grep -v default | grep -v metric | grep -v / | awk '{print $1; exit}' | tr -d "\n")
+			fi
+			if [ -z "$OMR_TRACKER_DEVICE_GATEWAY" ]; then
+				OMR_TRACKER_DEVICE_GATEWAY=$(ip -4 r list dev "$OMR_TRACKER_DEVICE" | grep kernel | awk '/proto kernel/ {print $1}' | tr -d "\n")
+			fi
+
+			# execute specific tracker
+			if [ -n "$OMR_TRACKER_DEVICE_IP" ] && [ -n "$OMR_TRACKER_DEVICE_GATEWAY" ]; then
+				# setup loop variable
+				tries="$OMR_TRACKER_TRIES"
+				# loop until tries attempts have been reached
+				while [ "$tries" -gt 0 ]; do
+					if [ -n "$OMR_TRACKER_DEVICE_ROUTE" ]; then
+						_ping "$OMR_TRACKER_DEVICE_ROUTE" "$OMR_TRACKER_DEVICE" "no"
+						status=$?
 					else
+						_ping "$OMR_TRACKER_DEVICE_GATEWAY" "$OMR_TRACKER_DEVICE" "no"
+						status=$?
+					fi
+					if $(exit $status) && [ "$OMR_TRACKER_TYPE" = "none" ]; then
 						OMR_TRACKER_STATUS_MSG=""
 						OMR_TRACKER_STATUS="OK"
 						break
+					elif [ "$OMR_TRACKER_TYPE" != "none" ]; then
+						if ! $(exit $status); then
+							OMR_TRACKER_STATUS_MSG="gateway down"
+						fi
+						serverip_ping=false
+						if [ "$OMR_TRACKER_TYPE" = "ping" ]; then
+							config_load openmptcprouter
+							config_foreach _ping_server server $OMR_TRACKER_DEVICE
+						fi
+						if [ "$serverip_ping" = false ] && [ -n "$OMR_TRACKER_HOST" ]; then
+							OMR_TRACKER_HOST=$(resolveip -4 $OMR_TRACKER_HOST | tr -d "\n")
+							if [ "$(uci -q get network.$OMR_TRACKER_INTERFACE.proto)" = "3g" ] || [ "$(uci -q get network.$OMR_TRACKER_INTERFACE.proto)" = "qmi" ] || [ "$(uci -q get network.$OMR_TRACKER_INTERFACE.proto)" = "ncm" ]; then
+								# Check if route is not used
+								while ! ip route add $OMR_TRACKER_HOST via $OMR_TRACKER_DEVICE_GATEWAY dev $OMR_TRACKER_DEVICE src $OMR_TRACKER_DEVICE_IP > /dev/null 2>&1
+								do
+									logger -t "omr-tracker" "Can't create route to $OMR_TRACKER_HOST via $OMR_TRACKER_DEVICE_GATEWAY dev $OMR_TRACKER_DEVICE src $OMR_TRACKER_DEVICE_IP. waiting..."
+									sleep 2
+									ip route del "$OMR_TRACKER_HOST" via "$OMR_TRACKER_DEVICE_GATEWAY" dev "$OMR_TRACKER_DEVICE" src "$OMR_TRACKER_DEVICE_IP" > /dev/null 2>&1
+									_restart
+								done
+							fi
+							if [ "$OMR_TRACKER_TYPE" = "ping" ]; then
+								_ping "$OMR_TRACKER_HOST" "$OMR_TRACKER_DEVICE" "yes"
+								statusb=$?
+							elif [ "$OMR_TRACKER_TYPE" = "httping" ]; then
+								_httping "$OMR_TRACKER_HOST" "$OMR_TRACKER_DEVICE_IP" "yes"
+								statusb=$?
+							elif [ "$OMR_TRACKER_TYPE" = "dns" ]; then
+								_dns "$OMR_TRACKER_HOST" "$OMR_TRACKER_DEVICE_IP" "yes"
+								statusb=$?
+							fi
+							ip route del "$OMR_TRACKER_HOST" via "$OMR_TRACKER_DEVICE_GATEWAY" dev "$OMR_TRACKER_DEVICE" src "$OMR_TRACKER_DEVICE_IP" > /dev/null 2>&1
+							if $(exit $statusb); then
+								OMR_TRACKER_STATUS_MSG=""
+								OMR_TRACKER_STATUS="OK"
+								break
+							else
+								if [ "$OMR_TRACKER_LIST_HOSTS" = "" ]; then
+									OMR_TRACKER_LIST_HOSTS="$OMR_TRACKER_HOST"
+								else
+									OMR_TRACKER_LIST_HOSTS="$OMR_TRACKER_LIST_HOSTS,$OMR_TRACKER_HOST"
+								fi
+							fi
+						else
+							OMR_TRACKER_STATUS_MSG=""
+							OMR_TRACKER_STATUS="OK"
+							break
+						fi
+					elif ! $(exit $status); then
+						OMR_TRACKER_STATUS_MSG="gateway down"
 					fi
-				elif ! $(exit $status); then
-					OMR_TRACKER_STATUS_MSG="gateway down"
-				fi
-				tries=$((tries - 1))
-				#_restart
-				OMR_TRACKER_HOST="${OMR_TRACKER_HOSTS%% *}"
-				[ "$OMR_TRACKER_HOST" = "$OMR_TRACKER_HOSTS" ] || {
-					OMR_TRACKER_HOSTS="${OMR_TRACKER_HOSTS#* } $OMR_TRACKER_HOST"
-				}
-				#OMR_TRACKER_TIMEOUT=$((OMR_TRACKER_TIMEOUT * 2))
-				sleep "$OMR_TRACKER_INTERVAL_TRIES"
-			done
+					tries=$((tries - 1))
+					#_restart
+					OMR_TRACKER_HOST="${OMR_TRACKER_HOSTS%% *}"
+					[ "$OMR_TRACKER_HOST" = "$OMR_TRACKER_HOSTS" ] || {
+						OMR_TRACKER_HOSTS="${OMR_TRACKER_HOSTS#* } $OMR_TRACKER_HOST"
+					}
+					#OMR_TRACKER_TIMEOUT=$((OMR_TRACKER_TIMEOUT * 2))
+					sleep "$OMR_TRACKER_INTERVAL_TRIES"
+				done
+			fi
+		else
+			OMR_TRACKER_STATUS_MSG="link down"
 		fi
 	fi
 

From 049e8812d489bbbce0c674937ec9284450886cf9 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Fri, 29 May 2020 22:01:29 +0200
Subject: [PATCH 87/88] Changes for balancing

---
 .../share/omr/post-tracking.d/post-tracking   | 54 +++++++++++++++----
 1 file changed, 45 insertions(+), 9 deletions(-)

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 317b94836..fcebb92e7 100755
--- a/mptcp/files/usr/share/omr/post-tracking.d/post-tracking
+++ b/mptcp/files/usr/share/omr/post-tracking.d/post-tracking
@@ -59,6 +59,7 @@ delete_server_default_route() {
 set_routes_intf() {
 	local multipath_config_route
 	local INTERFACE=$1
+	nbintf=$((nbintf+1))
 	multipath_config_route=$(uci -q get openmptcprouter.$INTERFACE.multipath)
 	[ -z "$multipath_config_route" ] && multipath_config_route=$(uci -q get network.$INTERFACE.multipath || echo "off")
 	interface_if=$(ifstatus "$INTERFACE" 2>/dev/null | jsonfilter -q -e '@["l3_device"]')
@@ -79,7 +80,16 @@ set_routes_intf() {
 		fi
 		#if [ "$interface_gw" != "" ] && [ "$interface_if" != "" ] && [ "$(ip route show $serverip | grep $interface_if)" = "" ]; then
 		if [ "$interface_gw" != "" ] && [ "$interface_if" != "" ]; then
-			routesintf="$routesintf nexthop via $interface_gw dev $interface_if weight 1"
+			if [ "$multipath_config_route" = "master" ]; then
+				weight=10
+			else
+				weight=1
+			fi
+			if [ "$multipath_config_route" = "backup" ]; then
+				routesintfbackup="$routesintf nexthop via $interface_gw dev $interface_if weight $weight"
+			else
+				routesintf="$routesintf nexthop via $interface_gw dev $interface_if weight $weight"
+			fi
 		fi
 	fi
 }
@@ -87,6 +97,7 @@ set_routes_intf() {
 set_route_balancing() {
 	local multipath_config_route interface_gw interface_if
 	INTERFACE=$1
+	nbintf=$((nbintf+1))
 	multipath_config_route=$(uci -q get openmptcprouter.$INTERFACE.multipath)
 	[ -z "$multipath_config_route" ] && multipath_config_route=$(uci -q get network.$INTERFACE.multipath || echo "off")
 	interface_if=$(ifstatus "$INTERFACE" 2>/dev/null | jsonfilter -q -e '@["l3_device"]')
@@ -105,7 +116,20 @@ set_route_balancing() {
 			interface_gw=$(ubus call network.interface.${INTERFACE}_4 status 2>/dev/null | jsonfilter -q -l 1 -e '@.inactive.route[@.target="0.0.0.0"].nexthop' | tr -d "\n")
 		fi
 		if [ "$interface_gw" != "" ] && [ "$interface_if" != "" ]; then
-			routesbalancing="$routesbalancing nexthop via $interface_gw dev $interface_if weight 1"
+			if [ "$(uci -q get network.$INTERFACE.weight)" != "" ]; then
+				weight=$(uci -q get network.$INTERFACE.weight)
+			elif [ "$(uci -q get openmtpcprouter.$INTERFACE.weight)" != "" ]; then
+				weight=$(uci -q get openmtpcprouter.$INTERFACE.weight)
+			elif [ "$multipath_config_route" = "master" ]; then
+				weight=2
+			else
+				weight=1
+			fi
+			if [ "$multipath_config_route" = "backup" ]; then
+				routesbalancingbackup="$routesbalancingbackup nexthop via $interface_gw dev $interface_if weight $weight"
+			else
+				routesbalancing="$routesbalancing nexthop via $interface_gw dev $interface_if weight $weight"
+			fi
 		fi
 	fi
 }
@@ -120,14 +144,20 @@ set_server_all_routes() {
 	[ -z "$interface_if" ] && interface_if=$(ifstatus "$OMR_TRACKER_INTERFACE" 2>/dev/null | jsonfilter -q -e '@["l3_device"]')
 	[ -z "$interface_if" ] && interface_if=$(ifstatus "${OMR_TRACKER_INTERFACE}_4" 2>/dev/null | jsonfilter -q -e '@["l3_device"]')
 	multipath_config_route=$(uci -q get openmptcprouter.$OMR_TRACKER_INTERFACE.multipath || echo "off")
-	if [ "$serverip" != "" ] && [ "$OMR_TRACKER_DEVICE_GATEWAY" != "" ] && [ "$(ip route show $serverip | grep nexthop | grep $OMR_TRACKER_DEVICE_GATEWAY | grep $OMR_TRACKER_DEVICE)" = "" ] && [ "$multipath_config_route" != "off" ]; then
+	if [ "$serverip" != "" ] && [ "$OMR_TRACKER_DEVICE_GATEWAY" != "" ] && [ "$multipath_config_route" != "off" ]; then
 		routesintf=""
+		routesintfbackup=""
+		nbintf=0
 		config_load network
 		config_foreach set_routes_intf interface
-		[ -n "$routesintf" ] && [ "$(echo $routesintf | grep $OMR_TRACKER_DEVICE_GATEWAY | grep $OMR_TRACKER_DEVICE)" != "" ] && {
+		[ -n "$routesintf" ] && ([ "$nbintf" -gt "1" ] && [ "$(ip r show $serverip | tr -d '\t' | tr -d '\n')" != "$serverip $routesintf " ]) || ([ "$nbintf" = "1" ] && [ "$(ip r show $serverip | grep $OMR_TRACKER_INTERFACE)" = "" ]) && {
 			_log "Set server $server ($serverip) default route $serverip $routesintf"
 			ip route replace $serverip scope global $routesintf
 		}
+		[ -n "$routesintfbackup" ] && ([ "$nbintf" -gt "1" ] && [ "$(ip r show $serverip | tr -d '\t' | tr -d '\n')" != "$serverip $routesintfbackup " ]) || ([ "$nbintf" = "1" ] && [ "$(ip r show $serverip | grep $OMR_TRACKER_INTERFACE)" = "" ]) && {
+			_log "Set server $server ($serverip) default route $serverip $routesintf"
+			ip route replace $serverip scope global metric 999 $routesintf
+		}
 	fi
 }
 
@@ -261,9 +291,9 @@ if [ "$OMR_TRACKER_STATUS" = "ERROR" ]; then
 		fi
 		config_load openmptcprouter
 		config_foreach del_server_route server
-		#if [ "$(uci -q get openmptcprouter.settings.master)" = "balancing" ]; then
-		#	config_foreach set_server_all_routes server
-		#fi
+		if [ "$(uci -q get openmptcprouter.settings.master)" = "balancing" ]; then
+			config_foreach set_server_all_routes server
+		fi
 	}
 
 	if ([ "$default_gw" = "$OMR_TRACKER_DEVICE_GATEWAY" ] || [ "$default_gw" = "" ]) && [ "$(uci -q get openmptcprouter.settings.defaultgw)" != "0" ]; then
@@ -395,7 +425,8 @@ if [ "$OMR_TRACKER_PREV_STATUS" != "" ] && [ "$OMR_TRACKER_PREV_STATUS" != "$OMR
 	}
 	script_alert_up="$(uci -q get omr-tracker.$OMR_TRACKER_INTERFACE.script_alert_up)"
 	[ -n "$script_alert_up" ] && eval $script_alert_up
-
+fi
+if [ "$(uci -q get openmptcprouter.$OMR_TRACKER_INTERFACE.state)" != "up" ]; then
 	uci -q set openmptcprouter.$OMR_TRACKER_INTERFACE.state='up'
 	uci -q commit openmptcprouter
 	dns_flush
@@ -423,12 +454,17 @@ if [ "$multipath_config" = "master" ]; then
 		if [ -n "$omrvpn_intf" ] && [ "$(ip route show default | awk '/default/ {print $5}' | grep $omrvpn_intf)" = "" ]; then
 			ip route replace default via $OMR_TRACKER_DEVICE_GATEWAY dev $OMR_TRACKER_DEVICE table 991337
 			routesbalancing=""
+			routesbalancingbackup=""
 			config_load network
 			config_foreach set_route_balancing interface
-			[ -n "$routesbalancing" ] && {
+			[ -n "$routesbalancing" ] && ([ "$nbintf" -gt "1" ] && [ "$(ip r show default metric 0 | tr -d '\t' | tr -d '\n')" != "default via $routesbalancing " ]) || ([ "$nbintf" = "1" ] && [ "$(ip r show default metric 0 | grep $OMR_TRACKER_INTERFACE)" = "" ]) && {
 				_log "Set ip route replace default scope global $routesbalancing"
 				ip route replace default scope global $routesbalancing
 			}
+			[ -n "$routesbalancingbackup" ] && ([ "$nbintf" -gt "1" ] && [ "$(ip r show default metric 999 | tr -d '\t' | tr -d '\n')" != "default via $routesbalancingbackup " ]) || ([ "$nbintf" = "1" ] && [ "$(ip r show default metric 999 | grep $OMR_TRACKER_INTERFACE)" = "" ]) && {
+				_log "Set ip route replace default scope global $routesbalancingbackup"
+				ip route replace default scope global metric 999 $routesbalancingbackup
+			}
 		fi
 	fi
 	if [ "$(uci -q get openmptcprouter.$OMR_TRACKER_INTERFACE.lc)" = "" ] || [ $(($(date +"%s") + $((10 + RANDOM % 31)) - $(uci -q get openmptcprouter.$OMR_TRACKER_INTERFACE.lc))) -gt 3600 ] || [ "$(uci -q show openmptcprouter | grep get_config=\'1\')" != "" ] || [ "$(uci -q show openmptcprouter | grep admin_error=\'1\')" != "" ]; then

From bcc1ac313a47d11ca690d086612e048f4f2d10aa Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Sat, 30 May 2020 07:46:46 +0200
Subject: [PATCH 88/88] 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 fc0b34266..9f019a532 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -31,8 +31,8 @@ jobs:
       - run:
           name: cache
           command: |
-            echo "cache 97 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
-            echo "cache 99 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
+            echo "cache 98 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
+            echo "cache 100 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
 
       - restore_cache:
           keys:
@@ -94,8 +94,8 @@ jobs:
       - run:
           name: cache
           command: |
-            echo "cache 97 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
-            echo "cache 99 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
+            echo "cache 98 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
+            echo "cache 100 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
 
       - restore_cache:
           keys:
@@ -155,8 +155,8 @@ jobs:
       - run:
           name: cache
           command: |
-            echo "cache 97 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
-            echo "cache 99 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
+            echo "cache 98 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
+            echo "cache 100 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
 
       - restore_cache:
           keys:
@@ -216,8 +216,8 @@ jobs:
       - run:
           name: cache
           command: |
-            echo "cache 97 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
-            echo "cache 99 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
+            echo "cache 98 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
+            echo "cache 100 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
 
       - restore_cache:
           keys:
@@ -277,8 +277,8 @@ jobs:
       - run:
           name: cache
           command: |
-            echo "cache 97 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
-            echo "cache 99 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
+            echo "cache 98 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
+            echo "cache 100 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
 
       - restore_cache:
           keys:
@@ -338,8 +338,8 @@ jobs:
       - run:
           name: cache
           command: |
-            echo "cache 97 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
-            echo "cache 99 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
+            echo "cache 98 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
+            echo "cache 100 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
 
       - restore_cache:
           keys:
@@ -402,8 +402,8 @@ jobs:
       - run:
           name: cache
           command: |
-            echo "cache 97 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
-            echo "cache 99 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
+            echo "cache 98 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
+            echo "cache 100 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
 
       - restore_cache:
           keys:
@@ -462,8 +462,8 @@ jobs:
       - run:
           name: cache
           command: |
-            echo "cache 97 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
-            echo "cache 99 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
+            echo "cache 98 $OMR_KERNEL $OMR_TARGET" > /tmp/cache-target
+            echo "cache 100 $OMR_KERNEL $OMR_TARGET $OMR_VERSION" > /tmp/cache-version
 
       - restore_cache:
           keys: