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

Limit dnsmasq and unbound listening interfaces and remove old hidden config files in OMR-Schedule script

Browse source
This commit is contained in:
Ycarus (Yannick Chabanois) 2024-12-10 15:32:18 +01:00
parent c269268e00
commit c289935422
1 changed files with 25 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -158,9 +158,18 @@ set_lan_ips() {
[ -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-libev.ss_rules.ifnames="$device"
uci -q del_list shadowsocks-rust.ss_rules.ifnames="$device" uci -q del_list shadowsocks-rust.ss_rules.ifnames="$device"
uci -q del_list unbound.ub_main.iface_lan="$1"
uci -q del_list unbound.ub_main.iface_wan="$1"
uci -q del_list dhcp.@dnsmasq[0].interface="$1"
uci -q del_list dhcp.@dnsmasq[0].notinterface="$1"
if [ "$multipath" != "on" ] && [ "$multipath" != "master" ] && [ -n "$device" ] && [ -z "$(echo $device | grep @)" ] && ([ "$proto" = "dhcp" ] || [ "$proto" = "static" ]); then if [ "$multipath" != "on" ] && [ "$multipath" != "master" ] && [ -n "$device" ] && [ -z "$(echo $device | grep @)" ] && ([ "$proto" = "dhcp" ] || [ "$proto" = "static" ]); then
uci -q add_list shadowsocks-libev.ss_rules.ifnames="$device" uci -q add_list shadowsocks-libev.ss_rules.ifnames="$device"
uci -q add_list shadowsocks-rust.ss_rules.ifnames="$device" uci -q add_list shadowsocks-rust.ss_rules.ifnames="$device"
uci -q add_list unbound.ub_main.iface_lan="$1"
uci -q add_list dhcp.@dnsmasq[0].interface="$1"
elif [ "$multipath" = "on" ] || [ "$multipath" = "master" ]; then
uci -q add_list unbound.ub_main.iface_wan="$1"
uci -q add_list dhcp.@dnsmasq[0].notinterface="$1"
fi fi
} }
config_load network config_load network
@ -168,15 +177,23 @@ config_foreach restart_omrtracker interface
[ "$(uci -q get openmptcprouter.settings.restrict_to_lan)" = "1" ] && config_foreach set_lan_ips interface [ "$(uci -q get openmptcprouter.settings.restrict_to_lan)" = "1" ] && config_foreach set_lan_ips interface
[ "$(uci -q get openmptcprouter.settings.restrict_to_lan)" = "0" ] && ([ -n "$(uci -q get shadowsocks-libev.ss_rules.ifnames)" ] || [ -n "$(uci -q get shadowsocks-rust.ss_rules.ifnames)" ]) && { [ "$(uci -q get openmptcprouter.settings.restrict_to_lan)" = "0" ] && ([ -n "$(uci -q get shadowsocks-libev.ss_rules.ifnames)" ] || [ -n "$(uci -q get shadowsocks-rust.ss_rules.ifnames)" ]) && {
uci -q batch <<-EOF uci -q batch <<-EOF
delete shadowsocks-libev.ss_rules.ifnames="$device" delete shadowsocks-libev.ss_rules.ifnames
delete shadowsocks-rust.ss_rules.ifnames="$device" delete shadowsocks-rust.ss_rules.ifnames
delete unbound.ub_main.lan
delete unbound.ub_main.wan
delete dhcp.@dnsmasq[0].interface
delete dhcp.@dnsmasq[0].notinterface
EOF EOF
} }
[ -n "$(uci -q changes shadowsocks-libev)" ] && uci -q commit shadowsocks-libev.ss_rules [ -n "$(uci -q changes shadowsocks-libev)" ] && uci -q commit shadowsocks-libev
[ -n "$(uci -q changes shadowsocks-rust)" ] && uci -q commit shadowsocks-rust.ss_rules [ -n "$(uci -q changes shadowsocks-rust)" ] && uci -q commit shadowsocks-rust
[ -n "$(uci -q changes unbound)" ] && uci -q commit unbound
[ -n "$(uci -q changes dhcp)" ] && uci -q commit dhcp
multipath_fix() { multipath_fix() {
config_get multipath "$1" multipath config_get multipath "$1" multipath
[ "$multipath" != "off" ] && return [ "$multipath" != "off" ] && return
config_get device "$1" device
{ "$(echo $device | grep '@')" ] && return
interface="$(ifstatus $1 | jsonfilter -q -e '@.l3_device' | tr -d '\n')" interface="$(ifstatus $1 | jsonfilter -q -e '@.l3_device' | tr -d '\n')"
[ -n "$interface" ] && [ -z "$(multipath $interface | grep deactivated)" ] && { [ -n "$interface" ] && [ -z "$(multipath $interface | grep deactivated)" ] && {
_log "Fix Multipath status on $1 ($interface)" _log "Fix Multipath status on $1 ($interface)"
@ -293,4 +310,7 @@ if [ "$(uci -q get openmptcprouter.latest_versions.lc)" = "" ] || [ $(($(date +"
uci -q set openmptcprouter.latest_versions.lc=$(date +"%s") uci -q set openmptcprouter.latest_versions.lc=$(date +"%s")
uci -q commit openmptcprouter uci -q commit openmptcprouter
} }
fi fi
# Remove old hidden config files
find /etc/config/ -mtime +1 -type f -name '\.*' -exec rm {} +