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 proxy restrict listen to LAN with VLAN

Browse source
This commit is contained in:
Ycarus (Yannick Chabanois) 2024-10-03 10:58:26 +02:00
parent ca8c295c3c
commit ca25b1c23c
1 changed files with 6 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

17
omr-schedule/files/usr/share/omr/schedule.d/010-services
View file

@ -155,16 +155,11 @@ set_lan_ips() {
config_get proto "$1" proto config_get proto "$1" proto
# No restrict for interfaces with strong name # No restrict for interfaces with strong name
[ -n "$(echo $device | grep -)" ] && uci -q set openmptcprouter.settings.restrict_to_lan="0" && uci commit openmptcprouter [ -n "$(echo $device | grep -)" ] && uci -q set openmptcprouter.settings.restrict_to_lan="0" && uci commit openmptcprouter
uci -q del_list shadowsocks-libev.ss_rules.ifnames="$device"
uci -q del_list shadowsocks-rust.ss_rules.ifnames="$device"
if [ "$ip4table" != "wan" ] && [ "$ip4table" != "vpn" ] && [ -n "$ip4table" ] && [ -n "$device" ] && ([ "$proto" = "dhcp" ] || [ "$proto" = "static" ]); then if [ "$ip4table" != "wan" ] && [ "$ip4table" != "vpn" ] && [ -n "$ip4table" ] && [ -n "$device" ] && ([ "$proto" = "dhcp" ] || [ "$proto" = "static" ]); then
# No restrict when vlan uci -q add_list shadowsocks-libev.ss_rules.ifnames="$device"
[ -n "$(echo $device | grep '\.')" ] && uci -q set openmptcprouter.settings.restrict_to_lan="0" && uci commit openmptcprouter uci -q add_list shadowsocks-rust.ss_rules.ifnames="$device"
[ -z "$(uci -q get shadowsocks-libev.ss_rules.ifnames | grep $device)" ] && [ -z "$(uci -q get shadowsocks-rust.ss_rules.ifnames | grep $device)" ] && {
uci -q add_list shadowsocks-libev.ss_rules.ifnames="$device"
uci -q add_list shadowsocks-rust.ss_rules.ifnames="$device"
}
elif [ -n "$device" ] && [ -n "$(uci -q get shadowsocks-libev.ss_rules.ifnames | grep $device)" ]; then
uci -q del_list shadowsocks-libev.ss_rules.ifnames="$device"
uci -q del_list shadowsocks-rust.ss_rules.ifnames="$device"
fi fi
} }
config_load network config_load network
@ -176,8 +171,8 @@ config_foreach restart_omrtracker interface
delete shadowsocks-rust.ss_rules.ifnames="$device" delete shadowsocks-rust.ss_rules.ifnames="$device"
EOF EOF
} }
uci -q commit shadowsocks-libev.ss_rules [ -n "$(uci -q changes shadowsocks-libev)" ] && uci -q commit shadowsocks-libev.ss_rules
uci -q commit shadowsocks-rust.ss_rules [ -n "$(uci -q changes shadowsocks-rust)" ] && uci -q commit shadowsocks-rust.ss_rules
multipath_fix() { multipath_fix() {
config_get multipath "$1" multipath config_get multipath "$1" multipath
[ "$multipath" != "off" ] && return [ "$multipath" != "off" ] && return