Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sync #454

Merged
merged 6 commits into from
Mar 19, 2024
Merged

sync #454

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e801d22
fix typo in cake autorate delay threshold (#304)
hensur Mar 17, 2024
afca835
Force reload OpenVPN OMR when errors
Ysurac Mar 15, 2024
75c9e1e
Faster OMR-Tracker OMRVPN problems detection
Ysurac Mar 15, 2024
2bc7f78
Remove log when check on non existing interface
Ysurac Mar 15, 2024
ae82360
Faster OMR-Tracker OMRVPN problems detection
Ysurac Mar 15, 2024
a678155
Refresh VPS config shouldn't be need on Master/Backup server switch
Ysurac Mar 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions mptcp/files/usr/share/omr/post-tracking.d/001-post-tracking
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions omr-tracker/files/bin/omr-tracker-server
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions omr-tracker/files/etc/uci-defaults/omr-tracker
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
4 changes: 2 additions & 2 deletions openmptcprouter/files/etc/uci-defaults/1990-omr-tracker
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion sqm-autorate/files/usr/share/sqm-autorate/config_template.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down