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

Reload all firewall config less often

Browse source
This commit is contained in:
Ycarus (Yannick Chabanois) 2021-03-23 09:51:21 +01:00
parent 27979c78d3
commit ead533fc4d
6 changed files with 34 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -808,8 +808,7 @@ stop_service() {
}
service_triggers() {
PROCD_RELOAD_DELAY=1000
procd_add_reload_trigger omr-bypass network
procd_add_reload_trigger omr-bypass network firewall
}
reload_service() {

2
luci-app-omr-bypass/root/etc/uci-defaults/41_omr-bypass
View file

@ -60,7 +60,7 @@ if [ "$(uci -q get firewall.omr_bypass)" = "" ]; then
uci -q batch <<-EOF >/dev/null
set firewall.omr_bypass=include
set firewall.omr_bypass.path=/etc/firewall.omr-bypass
set firewall.omr_bypass.reload=1
set firewall.omr_bypass.reload=0
commit firewall
EOF
fi

16
mptcp/files/usr/share/omr/post-tracking.d/post-tracking
View file

@ -1340,4 +1340,20 @@ fi
if [ "$(pgrep openmptcprouter-vps)" = "" ] && ([ "$(uci -q show openmptcprouter | grep get_config=\'1\')" != "" ] || [ "$(uci -q show openmptcprouter | grep admin_error=\'1\')" != "" ]); then
/etc/init.d/openmptcprouter-vps restart >/dev/null 2>&1
sleep 5
fi
if [ "$(pgrep openmptcprouter-vps)" = "" ] && ([ "$(uci -q show openmptcprouter | grep set_firewall=\'1\')" != "" ] || [ -z "$(iptables-save | grep omr_dst_bypass_${OMR_TRACKER_DEVICE})" ]); then
/etc/init.d/openmptcprouter-vps set_vps_firewall >/dev/null 2>&1
run_fw_include() {
[ "$(uci -q get firewall.$1.reload)" = "0" ] && sh $(uci -q get firewall.$1.path) >/dev/null 2>&1
}
config_load firewall
config_foreach run_fw_include include
#/etc/init.d/shadowsocks-libev rules_up >/dev/null 2>&1
#/etc/init.d/v2ray rules_up >/dev/null 2>&1
#/etc/init.d/omr-bypass reload_rules >/dev/null 2>&1
#sh /etc/firewall.gre-tunnel >/dev/null 2>&1
sleep 5
fi

15
openmptcprouter/files/etc/firewall.omr-server
View file

@ -1,2 +1,15 @@
#!/bin/sh
/etc/init.d/openmptcprouter-vps set_vps_firewall
. /lib/functions.sh
_enable_firewall_check() {
server=$1
uci -q batch <<-EOF
set openmptcprouter.${server}.set_firewall=1
EOF
}
config_load openmptcprouter
config_foreach _enable_firewall_check server
uci -q commit firewall
#/etc/init.d/openmptcprouter-vps set_vps_firewall &

2
openmptcprouter/files/etc/uci-defaults/1980-omr-firewall
View file

@ -133,7 +133,7 @@ if [ "$(uci -q get firewall.gre_tunnel)" = "" ]; then
uci -q batch <<-EOF >/dev/null
set firewall.gre_tunnel=include
set firewall.gre_tunnel.path=/etc/firewall.gre-tunnel
set firewall.gre_tunnel.reload=1
set firewall.gre_tunnel.reload=0
commit firewall
EOF
fi

2
v2ray-core/files/etc/uci-defaults/3010-omr-v2ray
View file

@ -94,7 +94,7 @@ if [ "$(uci -q get firewall.v2ray)" = "" ]; then
uci -q batch <<-EOF >/dev/null
set firewall.v2ray=include
set firewall.v2ray.path=/etc/firewall.v2ray-rules
set firewall.v2ray.reload=1
set firewall.v2ray.reload=0
commit firewall
EOF
fi