mptcp/openmptcprouter-feeds
1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter-feeds.git synced 2025-02-15 03:51:51 +00:00
Code Issues Releases Wiki Activity

sync (#465)

Browse source
This commit is contained in:
suyuan 2024-04-07 18:31:50 +08:00 committed by GitHub
commit 0adc40ad22
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
omr-bypass/files/etc/init.d/omr-bypass-nft
View file

@ -536,12 +536,16 @@ _bypass_proto_without_ndpi() {
_intf_rule_ss_rules() { _intf_rule_ss_rules() {
cat >> /etc/firewall.omr-bypass <<-EOF cat >> /etc/firewall.omr-bypass <<-EOF
nft insert rule inet fw4 ss_rules_pre_tcp ip daddr @omr_dst_bypass_${intf}_4 accept nft insert rule inet fw4 ss_rules_pre_tcp ip daddr @omr_dst_bypass_${intf}_4 accept
nft insert rule inet fw4 ss_rules_pre_tcp meta mark 0x4539${count} accept
nft insert rule inet fw4 ss_rules_local_out ip daddr @omr_dst_bypass_${intf}_4 accept nft insert rule inet fw4 ss_rules_local_out ip daddr @omr_dst_bypass_${intf}_4 accept
nft insert rule inet fw4 ss_rules_local_out meta mark 0x4539${count} accept
EOF EOF
if [ "$disableipv6" = "0" ]; then if [ "$disableipv6" = "0" ]; then
cat >> /etc/firewall.omr-bypass <<-EOF cat >> /etc/firewall.omr-bypass <<-EOF
nft insert rule inet fw4 ss_rules_pre_tcp ip6 daddr @omr_dst_bypass_${intf}_6 accept nft insert rule inet fw4 ss_rules_pre_tcp ip6 daddr @omr_dst_bypass_${intf}_6 accept
nft insert rule inet fw4 ss_rules_pre_tcp meta mark 0x6539${count} accept
nft insert rule inet fw4 ss_rules_local_out ip6 daddr @omr_dst_bypass_${intf}_6 accept nft insert rule inet fw4 ss_rules_local_out ip6 daddr @omr_dst_bypass_${intf}_6 accept
nft insert rule inet fw4 ss_rules_local_out meta mark 0x6539${count} accept
EOF EOF
fi fi
} }
@ -549,12 +553,16 @@ _intf_rule_ss_rules() {
_intf_rule_v2ray_rules() { _intf_rule_v2ray_rules() {
cat >> /etc/firewall.omr-bypass <<-EOF cat >> /etc/firewall.omr-bypass <<-EOF
nft insert rule inet fw4 v2r_rules_pre_tcp ip daddr @omr_dst_bypass_${intf}_4 accept nft insert rule inet fw4 v2r_rules_pre_tcp ip daddr @omr_dst_bypass_${intf}_4 accept
nft insert rule inet fw4 v2r_rules_pre_tcp meta mark 0x4539${count} accept
nft insert rule inet fw4 v2r_rules_local_out ip daddr @omr_dst_bypass_${intf}_4 accept nft insert rule inet fw4 v2r_rules_local_out ip daddr @omr_dst_bypass_${intf}_4 accept
nft insert rule inet fw4 v2r_rules_local_out meta mark 0x4539${count} accept
EOF EOF
if [ "$disableipv6" = "0" ]; then if [ "$disableipv6" = "0" ]; then
cat >> /etc/firewall.omr-bypass <<-EOF cat >> /etc/firewall.omr-bypass <<-EOF
nft insert rule inet fw4 v2r_rules_pre_tcp ip6 daddr @omr_dst_bypass_${intf}_6 accept nft insert rule inet fw4 v2r_rules_pre_tcp ip6 daddr @omr_dst_bypass_${intf}_6 accept
nft insert rule inet fw4 v2r_rules_pre_tcp meta mark 0x6539${count} accept
nft insert rule inet fw4 v2r_rules_local_out ip6 daddr @omr_dst_bypass_${intf}_6 accept nft insert rule inet fw4 v2r_rules_local_out ip6 daddr @omr_dst_bypass_${intf}_6 accept
nft insert rule inet fw4 v2r_rules_local_out meta mark 0x6539${count} accept
EOF EOF
fi fi
} }
@ -562,12 +570,16 @@ _intf_rule_v2ray_rules() {
_intf_rule_xray_rules() { _intf_rule_xray_rules() {
cat >> /etc/firewall.omr-bypass <<-EOF cat >> /etc/firewall.omr-bypass <<-EOF
nft insert rule inet fw4 xr_rules_pre_tcp ip daddr @omr_dst_bypass_${intf}_4 accept nft insert rule inet fw4 xr_rules_pre_tcp ip daddr @omr_dst_bypass_${intf}_4 accept
nft insert rule inet fw4 xr_rules_pre_tcp meta mark 0x4539${count} accept
nft insert rule inet fw4 xr_rules_local_out ip daddr @omr_dst_bypass_${intf}_4 accept nft insert rule inet fw4 xr_rules_local_out ip daddr @omr_dst_bypass_${intf}_4 accept
nft insert rule inet fw4 xr_rules_local_out meta mark 0x4539${count} accept
EOF EOF
if [ "$disableipv6" = "0" ]; then if [ "$disableipv6" = "0" ]; then
cat >> /etc/firewall.omr-bypass <<-EOF cat >> /etc/firewall.omr-bypass <<-EOF
nft insert rule inet fw4 xr_rules_pre_tcp ip6 daddr @omr_dst_bypass_${intf}_6 accept nft insert rule inet fw4 xr_rules_pre_tcp ip6 daddr @omr_dst_bypass_${intf}_6 accept
nft insert rule inet fw4 xr_rules_pre_tcp meta mark 0x6539${count} accept
nft insert rule inet fw4 xr_rules_local_out ip6 daddr @omr_dst_bypass_${intf}_6 accept nft insert rule inet fw4 xr_rules_local_out ip6 daddr @omr_dst_bypass_${intf}_6 accept
nft insert rule inet fw4 xr_rules_local_out meta mark 0x6539${count} accept
EOF EOF
fi fi
} }
@ -714,11 +726,13 @@ _intf_rule() {
EOF EOF
if [ "$(uci -q get openmptcprouter.settings.proxy)" = "shadowsocks" ] && [ "$(uci -q get shadowsocks-libev.sss0.disabled)" != "1" ]; then if [ "$(uci -q get openmptcprouter.settings.proxy)" = "shadowsocks" ] && [ "$(uci -q get shadowsocks-libev.sss0.disabled)" != "1" ]; then
config_load shadowsocks-libev #config_load shadowsocks-libev
config_foreach _intf_rule_ss_rules ss_rules #config_foreach _intf_rule_ss_rules ss_rules
_intf_rule_ss_rules
elif [ "$(uci -q get openmptcprouter.settings.proxy)" = "shadowsocks-rust" ] && [ "$(uci -q get shadowsocks-rust.sss0.disabled)" != "1" ]; then elif [ "$(uci -q get openmptcprouter.settings.proxy)" = "shadowsocks-rust" ] && [ "$(uci -q get shadowsocks-rust.sss0.disabled)" != "1" ]; then
config_load shadowsocks-rust #config_load shadowsocks-rust
config_foreach _intf_rule_ss_rules ss_rules #config_foreach _intf_rule_ss_rules ss_rules
_intf_rule_ss_rules
elif [ "$(uci -q get openmptcprouter.settings.proxy)" = "v2ray" ] && [ "$(uci -q get v2ray.main.enabled)" = "1" ]; then elif [ "$(uci -q get openmptcprouter.settings.proxy)" = "v2ray" ] && [ "$(uci -q get v2ray.main.enabled)" = "1" ]; then
_intf_rule_v2ray_rules _intf_rule_v2ray_rules
elif [ "$(uci -q get openmptcprouter.settings.proxy)" = "xray" ] && [ "$(uci -q get xray.main.enabled)" = "1" ]; then elif [ "$(uci -q get openmptcprouter.settings.proxy)" = "xray" ] && [ "$(uci -q get xray.main.enabled)" = "1" ]; then

2
sqm-autorate/files/usr/share/sqm-autorate/config_template.sh
View file

@ -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) # (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'))" #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_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_ms=$(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.0")
ul_owd_delta_thr_ms=${dl_owd_delta_thr_ms} ul_owd_delta_thr_ms=${dl_owd_delta_thr_ms}
# average owd delta threshold in ms at which maximum adjust_down_bufferbloat is applied # average owd delta threshold in ms at which maximum adjust_down_bufferbloat is applied