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

Fix for some device name in omr-bypass

Browse source
This commit is contained in:
Ycarus (Yannick Chabanois) 2024-09-18 19:37:35 +02:00
parent ce640fb56c
commit c525e9c9f2
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,5 +1,5 @@
#!/bin/sh /etc/rc.common #!/bin/sh /etc/rc.common
# Copyright (C) 2018-2023 Ycarus (Yannick Chabanois) <ycarus@zugaina.org> for OpenMPTCProuter # Copyright (C) 2018-2024 Ycarus (Yannick Chabanois) <ycarus@zugaina.org> for OpenMPTCProuter
START=98 START=98
STOP=10 STOP=10
@ -124,6 +124,7 @@ _bypass_domain() {
local family=$3 local family=$3
local noipv6=$4 local noipv6=$4
intf=$(echo $intf | sed -e 's/\./_/') intf=$(echo $intf | sed -e 's/\./_/')
intf=$(echo $intf | sed -e 's/-/_/')
[ -z "$intf" ] && intf="all" [ -z "$intf" ] && intf="all"
if [ -n "$domain" ]; then if [ -n "$domain" ]; then
domain=$(echo $domain | sed 's:^\.::') domain=$(echo $domain | sed 's:^\.::')
@ -160,6 +161,7 @@ _bypass_mac() {
config_get enabled $1 enabled config_get enabled $1 enabled
[ "$enabled" = "0" ] && return [ "$enabled" = "0" ] && return
intf=$(echo $intf | sed -e 's/\./_/') intf=$(echo $intf | sed -e 's/\./_/')
intf=$(echo $intf | sed -e 's/-/_/')
local intfid="$(uci -q get omr-bypass.$intf.id)" local intfid="$(uci -q get omr-bypass.$intf.id)"
[ -z "$intf" ] && intf="all" [ -z "$intf" ] && intf="all"
@ -186,6 +188,7 @@ _bypass_lan_ip() {
config_get enabled $1 enabled config_get enabled $1 enabled
[ "$enabled" = "0" ] && return [ "$enabled" = "0" ] && return
intf=$(echo $intf | sed -e 's/\./_/') intf=$(echo $intf | sed -e 's/\./_/')
intf=$(echo $intf | sed -e 's/-/_/')
#[ -n "$intf" ] && [ -z "$(ipset --list | grep omr_dst_bypass_$intf)" ] && return #[ -n "$intf" ] && [ -z "$(ipset --list | grep omr_dst_bypass_$intf)" ] && return
local intfid="$(uci -q get omr-bypass.$intf.id)" local intfid="$(uci -q get omr-bypass.$intf.id)"
@ -217,6 +220,7 @@ _bypass_dest_port() {
config_get enabled $1 enabled config_get enabled $1 enabled
[ "$enabled" = "0" ] && return [ "$enabled" = "0" ] && return
intf=$(echo $intf | sed -e 's/\./_/') intf=$(echo $intf | sed -e 's/\./_/')
intf=$(echo $intf | sed -e 's/-/_/')
#[ -n "$intf" ] && [ -z "$(ipset --list | grep omr_dst_bypass_$intf)" ] && return #[ -n "$intf" ] && [ -z "$(ipset --list | grep omr_dst_bypass_$intf)" ] && return
local intfid="$(uci -q get omr-bypass.$intf.id)" local intfid="$(uci -q get omr-bypass.$intf.id)"
@ -259,6 +263,7 @@ _bypass_src_port() {
config_get enabled $1 enabled config_get enabled $1 enabled
[ "$enabled" = "0" ] && return [ "$enabled" = "0" ] && return
intf=$(echo $intf | sed -e 's/\./_/') intf=$(echo $intf | sed -e 's/\./_/')
intf=$(echo $intf | sed -e 's/-/_/')
#[ -n "$intf" ] && [ -z "$(ipset --list | grep omr_dst_bypass_$intf)" ] && return #[ -n "$intf" ] && [ -z "$(ipset --list | grep omr_dst_bypass_$intf)" ] && return
local intfid="$(uci -q get omr-bypass.$intf.id)" local intfid="$(uci -q get omr-bypass.$intf.id)"
@ -307,6 +312,7 @@ _bypass_proto() {
[ -z "$noipv6" ] && noipv6="0" [ -z "$noipv6" ] && noipv6="0"
[ -z "$family" ] && family="ipv4ipv6" [ -z "$family" ] && family="ipv4ipv6"
intf=$(echo $intf | sed -e 's/\./_/') intf=$(echo $intf | sed -e 's/\./_/')
intf=$(echo $intf | sed -e 's/-/_/')
#[ -n "$intf" ] && [ -z "$(ipset --list | grep omr_dst_bypass_$intf)" ] && return #[ -n "$intf" ] && [ -z "$(ipset --list | grep omr_dst_bypass_$intf)" ] && return
local intfid="$(uci -q get omr-bypass.$intf.id)" local intfid="$(uci -q get omr-bypass.$intf.id)"
@ -406,6 +412,7 @@ _bypass_proto_without_ndpi() {
[ -z "$noipv6" ] && noipv6="0" [ -z "$noipv6" ] && noipv6="0"
[ -z "$family" ] && family="ipv4ipv6" [ -z "$family" ] && family="ipv4ipv6"
intf=$(echo $intf | sed -e 's/\./_/') intf=$(echo $intf | sed -e 's/\./_/')
intf=$(echo $intf | sed -e 's/-/_/')
#[ -n "$intf" ] && [ -z "$(ipset --list | grep omr_dst_bypass_$intf)" ] && return #[ -n "$intf" ] && [ -z "$(ipset --list | grep omr_dst_bypass_$intf)" ] && return
local intfid="$(uci -q get omr-bypass.$intf.id)" local intfid="$(uci -q get omr-bypass.$intf.id)"