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 omr-bypass with VLAN interfaces

Browse source
This commit is contained in:
Ycarus (Yannick Chabanois) 2021-01-06 17:06:56 +01:00
parent 1fe72710b3
commit 117cb3bf97
1 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

20
luci-app-omr-bypass/root/etc/init.d/omr-bypass
View file

@ -90,7 +90,8 @@ _bypass_mac() {
config_get intf $1 interface
config_get enabled $1 enabled
[ "$enabled" = "0" ] && return
local intfid="$(uci -q get omr-bypass.$intf.id)"
intfuci=$(echo $intf | sed 's/\./_/')
local intfid="$(uci -q get omr-bypass.$intfuci.id)"
[ -z "$intf" ] && intf="all"
[ -z "$mac" ] && return
@ -131,7 +132,8 @@ _bypass_lan_ip() {
config_get intf $1 interface
config_get enabled $1 enabled
[ "$enabled" = "0" ] && return
local intfid="$(uci -q get omr-bypass.$intf.id)"
intfuci=$(echo $intf | sed 's/\./_/')
local intfid="$(uci -q get omr-bypass.$intfuci.id)"
[ -z "$intf" ] && intf="all"
[ -z "$ip" ] && return
@ -188,7 +190,8 @@ _bypass_dest_port() {
config_get intf $1 interface
config_get enabled $1 enabled
[ "$enabled" = "0" ] && return
local intfid="$(uci -q get omr-bypass.$intf.id)"
intfuci=$(echo $intf | sed 's/\./_/')
local intfid="$(uci -q get omr-bypass.$intfuci.id)"
[ -z "$intf" ] && intf="all"
[ -z "$dport" ] && return
@ -243,7 +246,8 @@ _bypass_src_port() {
config_get intf $1 interface
config_get enabled $1 enabled
[ "$enabled" = "0" ] && return
local intfid="$(uci -q get omr-bypass.$intf.id)"
intfuci=$(echo $intf | sed 's/\./_/')
local intfid="$(uci -q get omr-bypass.$intfuci.id)"
[ -z "$intf" ] && intf="all"
[ -z "$sport" ] && return
@ -296,7 +300,8 @@ _bypass_proto() {
config_get intf $1 interface
config_get enabled $1 enabled
[ "$enabled" = "0" ] && return
local intfid="$(uci -q get omr-bypass.$intf.id)"
intfuci=$(echo $intf | sed 's/\./_/')
local intfid="$(uci -q get omr-bypass.$intfuci.id)"
[ -z "$intf" ] && intf="all"
[ -z "$proto" ] && return
@ -493,8 +498,9 @@ _intf_rule() {
config_foreach _intf_rule_ss_rules ss_rules
_intf_rule_v2ray_rules
uci -q set omr-bypass.$intf=interface
uci -q set omr-bypass.$intf.id=$count
intfuci=$(echo $intf | sed 's/\./_/')
uci -q set omr-bypass.$intfuci=interface
uci -q set omr-bypass.$intfuci.id=$count
}
_bypass_ip_set() {