From 005844c6740c2b2c78cb5f9de89ae9aa68eeb46a Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Sun, 29 May 2022 20:37:39 +0200 Subject: [PATCH 1/5] Fix for 5.15 multipath --- mptcp/files/usr/bin/multipath | 1 + 1 file changed, 1 insertion(+) diff --git a/mptcp/files/usr/bin/multipath b/mptcp/files/usr/bin/multipath index 42bb1ddff..c616044e4 100755 --- a/mptcp/files/usr/bin/multipath +++ b/mptcp/files/usr/bin/multipath @@ -134,6 +134,7 @@ else ID=$(ip mptcp endpoint show | grep "dev $DEVICE" | awk '{print $3}') IFF=$(ip mptcp endpoint show | grep "dev $DEVICE" | awk '{print $4}') IP=$(ifconfig $DEVICE | sed -En 's/127.0.0.1//;s/.*inet (addr:)?(([0-9]*\.){3}[0-9]*).*/\2/p') + [ -z "$ID" ] && ID=$(ip mptcp endpoint show | grep "$IP" | awk '{print $3}') RMID=$(ip mptcp endpoint show | grep '::ffff' | awk '{ print $3 }') [ -n "$RMID" ] && ip mptcp endpoint delete id $RMID 2>&1 >/dev/null case $TYPE in From cd3b59436f134ee9ad15fda44e8fa6e198d238be Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Sun, 29 May 2022 20:47:47 +0200 Subject: [PATCH 2/5] Set txqueuelen to 20 by default for WANs --- luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua | 1 + openmptcprouter/files/etc/uci-defaults/1920-omr-network | 2 ++ 2 files changed, 3 insertions(+) diff --git a/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua b/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua index fabf6d97a..ec8eeb466 100644 --- a/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua +++ b/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua @@ -167,6 +167,7 @@ function wizard_add() ucic:set("network","wan" .. i .. "_dev","mode","vepa") ucic:set("network","wan" .. i .. "_dev","ifname",defif) ucic:set("network","wan" .. i .. "_dev","name","wan" .. i) + ucic:set("network","wan" .. i .. "_dev","txqueuelen","20") end ucic:set("network","wan" .. i,"ip4table","wan") if multipath_master then diff --git a/openmptcprouter/files/etc/uci-defaults/1920-omr-network b/openmptcprouter/files/etc/uci-defaults/1920-omr-network index a0e15b2f5..8c2e18080 100755 --- a/openmptcprouter/files/etc/uci-defaults/1920-omr-network +++ b/openmptcprouter/files/etc/uci-defaults/1920-omr-network @@ -22,6 +22,7 @@ _setup_macvlan() { set network.$1_dev.type=macvlan set network.$1_dev.ifname=$_ifname set network.$1_dev.mode='vepa' + set network.$1_dev.txqueuelen=20 set network.$1.device=$1 set network.$1.type=macvlan set network.$1.masterintf=$_ifname @@ -64,6 +65,7 @@ _setup_wan_interface() { set network.$1.defaultroute=0 set network.${1}_dev=device set network.${1}_dev.name=$2 + set network.${1}_dev.txqueuelen=20 commit network add_list firewall.@zone[1].network=$1 commit firewall From 864f453fe6b54cf8956f45e03d07e629fa5d2410 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Sun, 29 May 2022 20:48:59 +0200 Subject: [PATCH 3/5] Add quiet to modprobe commands --- luci-app-openmptcprouter/root/etc/init.d/openmptcprouter | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/luci-app-openmptcprouter/root/etc/init.d/openmptcprouter b/luci-app-openmptcprouter/root/etc/init.d/openmptcprouter index 928feb60f..2463d20fa 100755 --- a/luci-app-openmptcprouter/root/etc/init.d/openmptcprouter +++ b/luci-app-openmptcprouter/root/etc/init.d/openmptcprouter @@ -165,7 +165,7 @@ start_service() { fi if [ "$(uci -q get openmptcprouter.settings.sfe_enabled)" = "1" ]; then - [ -z "$(lsmod | grep fast_classifier)" ] && modprobe fast_classifier 2>&1 >/dev/null + [ -z "$(lsmod | grep fast_classifier)" ] && modprobe -q fast_classifier 2>&1 >/dev/null if [ "$(uci -q get openmptcprouter.settings.sfe_bridge)" = "1" ]; then echo 1 >/sys/fast_classifier/skip_to_bridge_ingress else From fdd81a95325fc0b35393be70f77239dabe770b0c Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Sun, 29 May 2022 20:49:43 +0200 Subject: [PATCH 4/5] Change setting text --- .../luasrc/view/openmptcprouter/settings.htm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm index 2db886333..ebd013851 100644 --- a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm +++ b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm @@ -256,7 +256,7 @@ checked<% end %>>
- <%:Disable HTTP test on Server API in status page%> + <%:Disable HTTP test on Server API%>
From 8927d6d2fe87ebfc98d1fed60002a0dea2f88293 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Sun, 29 May 2022 20:50:36 +0200 Subject: [PATCH 5/5] API not responding is not a fatal error for connection --- omr-tracker/files/bin/omr-tracker | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/omr-tracker/files/bin/omr-tracker b/omr-tracker/files/bin/omr-tracker index 910654913..00a6274f4 100755 --- a/omr-tracker/files/bin/omr-tracker +++ b/omr-tracker/files/bin/omr-tracker @@ -392,7 +392,7 @@ while true; do config_load openmptcprouter config_foreach _httping_server server $OMR_TRACKER_DEVICE_IP if [ "$serverip_ping" = false ]; then - OMR_TRACKER_STATUS="ERROR" + #OMR_TRACKER_STATUS="ERROR" OMR_TRACKER_STATUS_MSG="No access to server API" else OMR_TRACKER_STATUS_MSG="" @@ -493,7 +493,7 @@ while true; do config_foreach _httping_server server $OMR_TRACKER_DEVICE_IP if [ "$serverip_ping" = false ]; then OMR_TRACKER_STATUS_MSG="No access to server API" - OMR_TRACKER_STATUS="ERROR" + #OMR_TRACKER_STATUS="ERROR" else OMR_TRACKER_STATUS_MSG="" OMR_TRACKER_STATUS="OK"