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 (#447)

Browse source
This commit is contained in:
suyuan 2024-03-06 18:59:55 +08:00 committed by GitHub
commit b0d48d12c5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mptcp/files/etc/init.d/mptcp
View file

@ -125,7 +125,7 @@ interface_multipath_settings() {
else else
metric="$(uci -q get openmptcprouter.${config}.metric)" metric="$(uci -q get openmptcprouter.${config}.metric)"
fi fi
[ "$metric" -gt 9900 ] && metric=$((metric-9000)) [ "$metric" -gt 1000 ] && metric=$((metric-1000))
if [ "${config}" = "lan" ] || [ "$(uci -q get network.${config}.ip4table)" = "lan" ]; then if [ "${config}" = "lan" ] || [ "$(uci -q get network.${config}.ip4table)" = "lan" ]; then
metric="9999" metric="9999"
fi fi

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

@ -166,6 +166,7 @@ _bypass_mac() {
[ -z "$mac" ] && return [ -z "$mac" ] && return
uci -q batch <<-EOF uci -q batch <<-EOF
add_list firewall.omr_dst_bypass_$intf_mac.src_mac="$mac" add_list firewall.omr_dst_bypass_$intf_mac.src_mac="$mac"
set firewall.omr_dst_bypass_$intf_mac.enabled='1'
EOF EOF
} }
@ -250,14 +251,14 @@ _bypass_src_port() {
[ -z "$proto" ] && return [ -z "$proto" ] && return
if [ "$proto" = "tcp" ] || [ "$proto" = "tcp udp" ]; then if [ "$proto" = "tcp" ] || [ "$proto" = "tcp udp" ]; then
uci -q batch <<-EOF uci -q batch <<-EOF
add_list firewall.omr_dst_bypass_${intf}_dstport_tcp.src_port="$sport" add_list firewall.omr_dst_bypass_${intf}_srcport_tcp.src_port="$sport"
set firewall.omr_dst_bypass_${intf}_dstport_tcp.enabled='1' set firewall.omr_dst_bypass_${intf}_srcport_tcp.enabled='1'
EOF EOF
fi fi
if [ "$proto" = "udp" ] || [ "$proto" = "tcp udp" ]; then if [ "$proto" = "udp" ] || [ "$proto" = "tcp udp" ]; then
uci -q batch <<-EOF uci -q batch <<-EOF
add_list firewall.omr_dst_bypass_${intf}_dstport_udp.src_port="$sport" add_list firewall.omr_dst_bypass_${intf}_srcport_udp.src_port="$sport"
set firewall.omr_dst_bypass_${intf}_dstport_udp.enabled='1' set firewall.omr_dst_bypass_${intf}_srcport_udp.enabled='1'
EOF EOF
fi fi
} }
@ -501,8 +502,8 @@ _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 meta mark set 0x00004539 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_local_out ip daddr @omr_dst_bypass_${intf}_4 meta mark set 0x00004539 accept nft insert rule inet fw4 ss_rules_local_out ip daddr @omr_dst_bypass_${intf}_4 accept
EOF EOF
if [ "$disableipv6" = "0" ]; then if [ "$disableipv6" = "0" ]; then
cat >> /etc/firewall.omr-bypass <<-EOF cat >> /etc/firewall.omr-bypass <<-EOF
@ -639,7 +640,6 @@ _intf_rule() {
set firewall.omr_dst_bypass_${intf}_dstport_udp_${ipv46}.target='MARK' set firewall.omr_dst_bypass_${intf}_dstport_udp_${ipv46}.target='MARK'
set firewall.omr_dst_bypass_${intf}_dstport_udp_${ipv46}.enabled='0' set firewall.omr_dst_bypass_${intf}_dstport_udp_${ipv46}.enabled='0'
set firewall.omr_dst_bypass_${intf}_dstport_udp_${ipv46}.set_xmark="0x${ipv46}539${count}" set firewall.omr_dst_bypass_${intf}_dstport_udp_${ipv46}.set_xmark="0x${ipv46}539${count}"
commit firewall
EOF EOF
done done
if [ "$intf" = "all" ]; then if [ "$intf" = "all" ]; then
@ -654,7 +654,6 @@ _intf_rule() {
set network.${intf}_fw_rule6.priority=1 set network.${intf}_fw_rule6.priority=1
set network.${intf}_fw_rule6.mark=0x6539 set network.${intf}_fw_rule6.mark=0x6539
set network.${intf}_fw_rule6.lookup=6991337 set network.${intf}_fw_rule6.lookup=6991337
commit network
EOF EOF
else else
uci -q batch <<-EOF >/dev/null uci -q batch <<-EOF >/dev/null
@ -668,14 +667,12 @@ _intf_rule() {
set network.${intf}_fw_rule6.priority=1 set network.${intf}_fw_rule6.priority=1
set network.${intf}_fw_rule6.mark=0x6539${count} set network.${intf}_fw_rule6.mark=0x6539${count}
set network.${intf}_fw_rule6.lookup=${count} set network.${intf}_fw_rule6.lookup=${count}
commit network
EOF EOF
fi fi
uci batch <<-EOF uci batch <<-EOF
set dhcp.omr_dst_bypass_$intf=ipset set dhcp.omr_dst_bypass_$intf=ipset
add_list dhcp.omr_dst_bypass_$intf.name="omr_dst_bypass_${intf}_4" add_list dhcp.omr_dst_bypass_$intf.name="omr_dst_bypass_${intf}_4"
add_list dhcp.omr_dst_bypass_$intf.name="omr_dst_bypass_${intf}_6" add_list dhcp.omr_dst_bypass_$intf.name="omr_dst_bypass_${intf}_6"
commit dhcp
EOF EOF
if [ "$(uci -q get openmptcprouter.settings.proxy)" = "shadowsocks" ]; then if [ "$(uci -q get openmptcprouter.settings.proxy)" = "shadowsocks" ]; then
@ -889,6 +886,10 @@ start_service() {
config_load omr-bypass config_load omr-bypass
[ -d /proc/net/xt_ndpi/proto ] && config_foreach _bypass_proto dpis [ -d /proc/net/xt_ndpi/proto ] && config_foreach _bypass_proto dpis
config_foreach _bypass_proto_without_ndpi dpis config_foreach _bypass_proto_without_ndpi dpis
[ -n "$(uci change network)" ] && {
uci -q commit network
/etc/init.d/network reload
}
uci -q commit omr-bypass uci -q commit omr-bypass
uci -q commit dhcp uci -q commit dhcp
uci -q commit firewall uci -q commit firewall