From e801d225ac9ea3d8d55e361188dabaacabf67e32 Mon Sep 17 00:00:00 2001 From: Henning Date: Sun, 17 Mar 2024 19:32:39 +0100 Subject: [PATCH 1/6] fix typo in cake autorate delay threshold (#304) --- sqm-autorate/files/usr/share/sqm-autorate/config_template.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sqm-autorate/files/usr/share/sqm-autorate/config_template.sh b/sqm-autorate/files/usr/share/sqm-autorate/config_template.sh index dcc51c0db..4fe0d2822 100755 --- a/sqm-autorate/files/usr/share/sqm-autorate/config_template.sh +++ b/sqm-autorate/files/usr/share/sqm-autorate/config_template.sh @@ -79,7 +79,7 @@ reflector_ping_interval_s=$(uci -q get sqm.${INTERFACE}.reflector_ping_interval_ # (adjustment significant at sub 12Mbit/s rates, else negligible) #logger -t "sqm-autorate" "ping for ${INTERFACE} (${ul_if}): $(echo $(/sbin/uci -q get sqm.${INTERFACE}.delay_thr_ms || echo '100'))" #dl_owd_delta_thr_ms=$(echo $(echo $(uci -q get sqm.${INTERFACE}.delay_thr_ms || echo $(echo "$(/usr/bin/ping -B -w 5 -c 5 -I ${ul_if} 1.1.1.1 | cut -d '/' -s -f6 | tr -d '\n' 2>/dev/null)+30" | bc) || echo "100")) + "0.1" | bc) # (milliseconds) -dl_owd_delta_thr_mss=$(uci -q get sqm.${INTERFACE}.delay_thr_ms || echo "250") +dl_owd_delta_thr_ms=$(uci -q get sqm.${INTERFACE}.delay_thr_ms || echo "250") ul_owd_delta_thr_ms=${dl_owd_delta_thr_ms} # average owd delta threshold in ms at which maximum adjust_down_bufferbloat is applied From afca835bdc6fddda34415a7ee57fb2d7015d2081 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Fri, 15 Mar 2024 15:14:23 +0100 Subject: [PATCH 2/6] Force reload OpenVPN OMR when errors --- mptcp/files/usr/share/omr/post-tracking.d/001-post-tracking | 1 + 1 file changed, 1 insertion(+) diff --git a/mptcp/files/usr/share/omr/post-tracking.d/001-post-tracking b/mptcp/files/usr/share/omr/post-tracking.d/001-post-tracking index 87d2958f0..45044312b 100755 --- a/mptcp/files/usr/share/omr/post-tracking.d/001-post-tracking +++ b/mptcp/files/usr/share/omr/post-tracking.d/001-post-tracking @@ -812,6 +812,7 @@ if [ "$OMR_TRACKER_STATUS" = "ERROR" ] || ([ "$OMR_TRACKER_INTERFACE" != "omrvpn commit openvpn EOF fi + [ -z "VPN_BASE_INTF" ] && VPN_BASE_INTF="omr" /etc/init.d/openvpn restart $VPN_BASE_INTF 2>&1 >/dev/null fi config_load openmptcprouter From 75c9e1e3171e56f2270d311ba5b6e316c6dfcf52 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Fri, 15 Mar 2024 15:15:02 +0100 Subject: [PATCH 3/6] Faster OMR-Tracker OMRVPN problems detection --- omr-tracker/files/etc/uci-defaults/omr-tracker | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/omr-tracker/files/etc/uci-defaults/omr-tracker b/omr-tracker/files/etc/uci-defaults/omr-tracker index 4bfe538c6..1bc6f73d1 100755 --- a/omr-tracker/files/etc/uci-defaults/omr-tracker +++ b/omr-tracker/files/etc/uci-defaults/omr-tracker @@ -118,8 +118,8 @@ if [ "$(uci -q get omr-tracker.defaults.family)" = "" ]; then set omr-tracker.omrvpn.initial_state='online' set omr-tracker.omrvpn.family='ipv4' set omr-tracker.omrvpn.reliability='1' - set omr-tracker.omrvpn.failure_interval='5' - set omr-tracker.omrvpn.tries_up='5' + set omr-tracker.omrvpn.failure_interval='3' + set omr-tracker.omrvpn.tries_up='3' set omr-tracker.omrvpn.count='1' set omr-tracker.proxy.initial_state='online' set omr-tracker.proxy.family='ipv4ipv6' From 2bc7f78810453e0cb4dba7b0012db2dd5154875a Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Fri, 15 Mar 2024 15:15:56 +0100 Subject: [PATCH 4/6] Remove log when check on non existing interface --- omr-tracker/files/bin/omr-tracker-server | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/omr-tracker/files/bin/omr-tracker-server b/omr-tracker/files/bin/omr-tracker-server index d90cee48c..9792a944a 100755 --- a/omr-tracker/files/bin/omr-tracker-server +++ b/omr-tracker/files/bin/omr-tracker-server @@ -53,7 +53,7 @@ _check_server_intf() { local host=$1 local port=$2 local valid_ip6=$(valid_subnet6 $host) - for intf in $(multipath | awk '/default/ {print $1}'); do + for intf in $(multipath 2>/dev/null | awk '/default/ {print $1}'); do local k=0 while [ "$server_ping" = false ] && [ "$k" -le "$retry" ]; do if [ "$valid_ip6" != "ok" ]; then From ae8236032afa799bd8f4af29e633eb0561269590 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Fri, 15 Mar 2024 15:16:20 +0100 Subject: [PATCH 5/6] Faster OMR-Tracker OMRVPN problems detection --- openmptcprouter/files/etc/uci-defaults/1990-omr-tracker | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openmptcprouter/files/etc/uci-defaults/1990-omr-tracker b/openmptcprouter/files/etc/uci-defaults/1990-omr-tracker index 80f104be9..8db468f60 100755 --- a/openmptcprouter/files/etc/uci-defaults/1990-omr-tracker +++ b/openmptcprouter/files/etc/uci-defaults/1990-omr-tracker @@ -19,8 +19,8 @@ if [ "$(uci -q get omr-tracker.omrvpn)" = "" ]; then set omr-tracker.omrvpn.family='ipv4' set omr-tracker.omrvpn.reliability='1' set omr-tracker.omrvpn.count='1' - set omr-tracker.omrvpn.failure_interval='5' - set omr-tracker.omrvpn.tries_up='5 + set omr-tracker.omrvpn.failure_interval='3' + set omr-tracker.omrvpn.tries_up='3 commit omr-tracker EOF fi From a67815595f2af57e15774ddf68bc3999950f9927 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Mon, 18 Mar 2024 19:41:49 +0100 Subject: [PATCH 6/6] Refresh VPS config shouldn't be need on Master/Backup server switch --- omr-tracker/files/bin/omr-tracker-server | 2 -- 1 file changed, 2 deletions(-) diff --git a/omr-tracker/files/bin/omr-tracker-server b/omr-tracker/files/bin/omr-tracker-server index 9792a944a..53c3ac4dd 100755 --- a/omr-tracker/files/bin/omr-tracker-server +++ b/omr-tracker/files/bin/omr-tracker-server @@ -168,7 +168,6 @@ _check_master() { add_list openvpn.omr.remote=$ip commit openvpn set openmptcprouter.${name}.current='1' - set openmptcprouter.${name}.get_config='1' commit openmptcprouter EOF /etc/init.d/openmptcprouter-vps get_openvpn_key $name >/dev/null 2>/dev/null @@ -319,7 +318,6 @@ _check_backup() { add_list openvpn.omr.remote=$ip commit openvpn set openmptcprouter.${name}.current='1' - set openmptcprouter.${name}.get_config='1' commit openmptcprouter EOF /etc/init.d/openmptcprouter-vps get_openvpn_key $name >/dev/null 2>/dev/null