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

Fix inconsistency reported in https://github.com/Ysurac/openmptcprouter/issues/3192#issuecomment-1981675868

Browse source
This commit is contained in:
Ycarus (Yannick Chabanois) 2024-03-06 21:11:04 +01:00
parent 201d976ecb
commit c4c2eeb3d3
1 changed files with 47 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -164,10 +164,17 @@ _bypass_mac() {
[ -z "$intf" ] && intf="all" [ -z "$intf" ] && intf="all"
[ -z "$mac" ] && return [ -z "$mac" ] && return
uci -q batch <<-EOF if [ "$disableipv6" = "0" ]; then
add_list firewall.omr_dst_bypass_$intf_mac.src_mac="$mac" protocol="4 6"
set firewall.omr_dst_bypass_$intf_mac.enabled='1' else
EOF protocol="4"
fi
for ipv46 in $protocol; do
uci -q batch <<-EOF
add_list firewall.omr_dst_bypass_${intf}_mac_${ipv46}.src_mac="$mac"
set firewall.omr_dst_bypass_${intf}_mac_${ipv46}.enabled='1'
EOF
done
} }
_bypass_lan_ip() { _bypass_lan_ip() {
@ -217,17 +224,27 @@ _bypass_dest_port() {
[ -z "$dport" ] && return [ -z "$dport" ] && return
dport="$(echo $dport | sed 's/:/-/')" dport="$(echo $dport | sed 's/:/-/')"
[ -z "$proto" ] && return [ -z "$proto" ] && return
if [ "$disableipv6" = "0" ]; then
protocol="4 6"
else
protocol="4"
fi
if [ "$proto" = "tcp" ] || [ "$proto" = "tcp udp" ]; then if [ "$proto" = "tcp" ] || [ "$proto" = "tcp udp" ]; then
uci -q batch <<-EOF for ipv46 in $protocol; do
add_list firewall.omr_dst_bypass_${intf}_dstport_tcp.dest_port="$dport" uci -q batch <<-EOF
set firewall.omr_dst_bypass_${intf}_dstport_tcp.enabled='1' add_list firewall.omr_dst_bypass_${intf}_dstport_tcp_${ipv46}.dest_port="$dport"
EOF set firewall.omr_dst_bypass_${intf}_dstport_tcp_${ipv46}.enabled='1'
EOF
done
fi fi
if [ "$proto" = "udp" ] || [ "$proto" = "tcp udp" ]; then if [ "$proto" = "udp" ] || [ "$proto" = "tcp udp" ]; then
uci -q batch <<-EOF for ipv46 in $protocol; do
add_list firewall.omr_dst_bypass_${intf}_dstport_udp.dest_port="$dport" uci -q batch <<-EOF
set firewall.omr_dst_bypass_${intf}_dstport_udp.enabled='1' add_list firewall.omr_dst_bypass_${intf}_dstport_udp_${ipv46}.dest_port="$dport"
EOF set firewall.omr_dst_bypass_${intf}_dstport_udp_${ipv46}.enabled='1'
EOF
done
fi fi
} }
@ -249,17 +266,27 @@ _bypass_src_port() {
[ -z "$sport" ] && return [ -z "$sport" ] && return
sport="$(echo $sport | sed 's/:/-/')" sport="$(echo $sport | sed 's/:/-/')"
[ -z "$proto" ] && return [ -z "$proto" ] && return
if [ "$disableipv6" = "0" ]; then
protocol="4 6"
else
protocol="4"
fi
if [ "$proto" = "tcp" ] || [ "$proto" = "tcp udp" ]; then if [ "$proto" = "tcp" ] || [ "$proto" = "tcp udp" ]; then
uci -q batch <<-EOF for ipv46 in $protocol; do
add_list firewall.omr_dst_bypass_${intf}_srcport_tcp.src_port="$sport" uci -q batch <<-EOF
set firewall.omr_dst_bypass_${intf}_srcport_tcp.enabled='1' add_list firewall.omr_dst_bypass_${intf}_srcport_tcp_${ipv46}.src_port="$sport"
EOF set firewall.omr_dst_bypass_${intf}_srcport_tcp_${ipv46}.enabled='1'
EOF
done
fi fi
if [ "$proto" = "udp" ] || [ "$proto" = "tcp udp" ]; then if [ "$proto" = "udp" ] || [ "$proto" = "tcp udp" ]; then
uci -q batch <<-EOF for ipv46 in $protocol; do
add_list firewall.omr_dst_bypass_${intf}_srcport_udp.src_port="$sport" uci -q batch <<-EOF
set firewall.omr_dst_bypass_${intf}_srcport_udp.enabled='1' add_list firewall.omr_dst_bypass_${intf}_srcport_udp_${ipv46}.src_port="$sport"
EOF set firewall.omr_dst_bypass_${intf}_srcport_udp_${ipv46}.enabled='1'
EOF
done
fi fi
} }