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

Merge pull request #247 from Ysurac/develop

Browse source 
sync
This commit is contained in:
suyuan 2022-06-20 00:12:45 +08:00 • committed by GitHub
commit f967166429
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
luci-app-sqm-autorate/root/etc/uci-defaults/50-luci-sqm
View file

@ -6,6 +6,11 @@ uci -q batch <<-EOF >/dev/null
set ucitrack.@sqm[-1].init=sqm set ucitrack.@sqm[-1].init=sqm
del_list ucitrack.@firewall[0].affects=sqm del_list ucitrack.@firewall[0].affects=sqm
add_list ucitrack.@firewall[0].affects=sqm add_list ucitrack.@firewall[0].affects=sqm
delete ucitrack.@sqm-autorate[-1]
add ucitrack sqm-autorate
set ucitrack.@sqm-autorate[-1].init=sqm-autorate
del_list ucitrack.@firewall[0].affects=sqm-autorate
add_list ucitrack.@firewall[0].affects=sqm-autorate
commit ucitrack commit ucitrack
EOF EOF

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

@ -1669,8 +1669,15 @@ fi
#if [ "$(uci -q show openmptcprouter | grep server)" != "" ] && [ "$(uci -q show openmptcprouter | grep password)" != "" ] && [ "$(pgrep openmptcprouter-vps)" = "" ] && [ "$(uci -q show openmptcprouter | grep admin_error=\'1\')" = "" ] && ([ "$(uci -q show openmptcprouter | grep set_firewall=\'1\')" != "" ] || [ -z "$(iptables-save | grep omr_dst_bypass_${OMR_TRACKER_DEVICE})" ]); then #if [ "$(uci -q show openmptcprouter | grep server)" != "" ] && [ "$(uci -q show openmptcprouter | grep password)" != "" ] && [ "$(pgrep openmptcprouter-vps)" = "" ] && [ "$(uci -q show openmptcprouter | grep admin_error=\'1\')" = "" ] && ([ "$(uci -q show openmptcprouter | grep set_firewall=\'1\')" != "" ] || [ -z "$(iptables-save | grep omr_dst_bypass_${OMR_TRACKER_DEVICE})" ]); then
if [ "$(pgrep -f set_vps_firewall)" = "" ] && [ "$(uci -q show openmptcprouter | grep server)" != "" ] && [ "$(uci -q show openmptcprouter | grep password)" != "" ] && [ "$(pgrep openmptcprouter-vps)" = "" ] && [ "$(uci -q show openmptcprouter | grep admin_error=\'1\')" = "" ] && [ "$(uci -q show openmptcprouter | grep set_firewall=\'1\')" != "" ]; then if [ "$(pgrep -f set_vps_firewall)" = "" ] && [ "$(uci -q show openmptcprouter | grep server)" != "" ] && [ "$(uci -q show openmptcprouter | grep password)" != "" ] && [ "$(pgrep openmptcprouter-vps)" = "" ] && [ "$(uci -q show openmptcprouter | grep admin_error=\'1\')" = "" ] && [ "$(uci -q show openmptcprouter | grep set_firewall=\'1\')" != "" ]; then
_log "Set firewall on server" check_server_fw() {
/etc/init.d/openmptcprouter-vps set_vps_firewall >/dev/null 2>&1 [ "$(uci -q get openmptcprouter.$1.set_firewall)" = "1" ] && {
_log "Set firewall on server $1"
/etc/init.d/openmptcprouter-vps set_vps_firewall $1 >/dev/null 2>&1
}
}
config_load openmptcprouter
config_foreach check_server_fw server
run_fw_include() { run_fw_include() {
[ -n "$1" ] && [ "$(uci -q get firewall.$1.reload)" = "0" ] && sh $(uci -q get firewall.$1.path) >/dev/null 2>&1 [ -n "$1" ] && [ "$(uci -q get firewall.$1.reload)" = "0" ] && sh $(uci -q get firewall.$1.path) >/dev/null 2>&1

5
openmptcprouter/files/etc/init.d/openmptcprouter-vps
View file

@ -1191,8 +1191,13 @@ _set_vps_firewall() {
} }
set_vps_firewall() { set_vps_firewall() {
local server_opt=$2
if [ -n "$server_opt" ]; then
_set_vps_firewall $server_opt
else
config_load openmptcprouter config_load openmptcprouter
config_foreach _set_vps_firewall server config_foreach _set_vps_firewall server
fi
} }
_set_ss_redir() { _set_ss_redir() {