diff --git a/luci-app-sqm-autorate/root/usr/share/sqm-autorate/config_template.sh b/luci-app-sqm-autorate/root/usr/share/sqm-autorate/config_template.sh index 0cce4cc1c..ad37f3e6f 100755 --- a/luci-app-sqm-autorate/root/usr/share/sqm-autorate/config_template.sh +++ b/luci-app-sqm-autorate/root/usr/share/sqm-autorate/config_template.sh @@ -56,7 +56,7 @@ pinger_binary=$(uci -q get sqm.${INTERFACE}.pinger || echo 'tsping') # a bad reflector will go to the back of the queue on reflector rotation reflectors=( $(uci -q get omr-tracker.defaults.hosts) ) #reflectors=( -#"1.1.1.1" "1.0.0.1" # Cloudflare +#"223.5.5.5" "1.0.0.1" # Cloudflare #"8.8.8.8" "8.8.4.4" # Google #"9.9.9.9" "9.9.9.10" "9.9.9.11" # Quad9 #"94.140.14.15" "94.140.14.140" "94.140.14.141" "94.140.15.15" "94.140.15.16" # AdGuard @@ -78,7 +78,7 @@ reflector_ping_interval_s=$(uci -q get sqm.${INTERFACE}.reflector_ping_interval_ # these are automatically adjusted based on maximum on the wire packet size # (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 $(($(/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)) || echo "100")) + "0.1" | bc) # (milliseconds) +dl_owd_delta_thr_ms=$(echo $(echo $(uci -q get sqm.${INTERFACE}.delay_thr_ms || echo $(($(/usr/bin/ping -B -w 5 -c 5 -I ${ul_if} 223.5.5.5 | cut -d '/' -s -f6 | tr -d '\n' 2>/dev/null)+30)) || echo "100")) + "0.1" | bc) # (milliseconds) ul_owd_delta_thr_ms=${dl_owd_delta_thr_ms} # average owd delta threshold in ms at which maximum adjust_down_bufferbloat is applied 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 9af1fe48d..2547a69bf 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 @@ -718,7 +718,7 @@ fi #default_gw=$(ip route show default | awk '/default/ {print $3}') #default_gw6=$(ip -6 route show default | awk '/default/ {print $3}') -default_gw=$(ip route get 1.1.1.1 | grep via | awk '{print $3}') +default_gw=$(ip route get 223.5.5.5 | grep via | awk '{print $3}') default_gw6=$(ip -6 route get 2606:4700:4700::1111 | grep via | awk '{print $3}') #current_interface_gw=$(uci -q get "network.$OMR_TRACKER_INTERFACE.gateway") @@ -954,7 +954,7 @@ if [ "$OMR_TRACKER_INTERFACE" = "glorytun" ] || [ "$OMR_TRACKER_INTERFACE" = "om uci -q set openmptcprouter.$OMR_TRACKER_INTERFACE.lc=$(date +"%s") } else - local mtu=$(omr-mtu $OMR_TRACKER_DEVICE_IP 1.1.1.1) + local mtu=$(omr-mtu $OMR_TRACKER_DEVICE_IP 223.5.5.5) [ -n "$mtu" ] && { uci -q set openmptcprouter.$OMR_TRACKER_INTERFACE.mtu=$mtu ip link set dev $OMR_TRACKER_DEVICE mtu $mtu > /dev/null 2>&1 diff --git a/omr-tracker/files/bin/omr-tracker b/omr-tracker/files/bin/omr-tracker index 72decbe1a..2789ba4ca 100755 --- a/omr-tracker/files/bin/omr-tracker +++ b/omr-tracker/files/bin/omr-tracker @@ -216,7 +216,7 @@ _dns() { +time="$OMR_TRACKER_TIMEOUT" \ +tries=1 \ one.one.one.one - ) && echo "$ret" | grep -sq "1.1.1.1" && { + ) && echo "$ret" | grep -sq "223.5.5.5" && { OMR_TRACKER_LATENCY=$(echo "$ret" | awk '/Query time/{print $4}') _update_rto "$OMR_TRACKER_LATENCY" return diff --git a/omr-tracker/files/bin/omr-tracker-v2ray b/omr-tracker/files/bin/omr-tracker-v2ray index d63d8b767..c8e476632 100755 --- a/omr-tracker/files/bin/omr-tracker-v2ray +++ b/omr-tracker/files/bin/omr-tracker-v2ray @@ -59,7 +59,7 @@ timeout=${OMR_TRACKER_TIMEOUT:-5} interval=${OMR_TRACKER_INTERVAL:-10} retry=${OMR_TRACKER_TRIES:-4} proxy=${OMR_TRACKER_PROXY:-127.0.0.1:1111} -hosts=${OMR_TRACKER_HOSTS:-1.1.1.1 1.0.0.1} +hosts=${OMR_TRACKER_HOSTS:-223.5.5.5 1.0.0.1} wait_test=${OMR_TRACKER_WAIT_TEST:-0} nodns=0 diff --git a/openmptcprouter/files/etc/uci-defaults/1940-omr-dns b/openmptcprouter/files/etc/uci-defaults/1940-omr-dns index 6bf0e79e7..4a2eabd66 100755 --- a/openmptcprouter/files/etc/uci-defaults/1940-omr-dns +++ b/openmptcprouter/files/etc/uci-defaults/1940-omr-dns @@ -112,7 +112,7 @@ if [ -z "$(uci -q show unbound.auth_icann)" ]; then set unbound.fwd_cloudflare.tls_index='cloudflare-dns.com' set unbound.fwd_cloudflare.tls_upstream='1' set unbound.fwd_cloudflare.zone_type='forward_zone' - add_list unbound.fwd_cloudflare.server='1.1.1.1' + add_list unbound.fwd_cloudflare.server='223.5.5.5' add_list unbound.fwd_cloudflare.server='1.0.0.1' add_list unbound.fwd_cloudflare.server='2606:4700:4700::1111' add_list unbound.fwd_cloudflare.server='2606:4700:4700::1001'