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 branch 'test' into develop

Browse source
This commit is contained in:
suyuan168 2022-04-03 15:40:01 +08:00
commit 25babcb2a2
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1140,9 +1140,11 @@ _set_vps_firewall() {
username="$(uci -q get openmptcprouter.${fwservername}.username)"
settings='{"name" : "redirect router"}'
fw_list=$(_set_json "shorewalllist" "$settings")
[ -z "$fw_list" ] && return
vpsfwlist=$(echo $fw_list | jsonfilter -q -e '@.list[*]' | sed '/^[[:space:]]*$/d')
settings='{"name" : "open router"}'
fw_list=$(_set_json "shorewalllist" "$settings")
[ -z "$fw_list" ] && return
if [ -n "$vpsfwlist" ]; then
vpsfwlist="$vpsfwlist\n$(echo $fw_list | jsonfilter -q -e '@.list[*]' | sed '/^[[:space:]]*$/d')"
else
@ -1150,9 +1152,11 @@ _set_vps_firewall() {
fi
settings='{"name" : "redirect router","ipproto" : "ipv6"}'
fw6_list=$(_set_json "shorewalllist" "$settings")
[ -z "$fw6_list" ] && return
vpsfw6list=$(echo $fw6_list | jsonfilter -q -e '@.list[*]' | sed '/^[[:space:]]*$/d')
settings='{"name" : "open router","ipproto" : "ipv6"}'
fw6_list=$(_set_json "shorewalllist" "$settings")
[ -z "$fw6_list" ] && return
if [ -n "$vpsfw6list" ]; then
vpsfw6list="$vpsfw6list\n$(echo $fw6_list | jsonfilter -q -e '@.list[*]' | sed '/^[[:space:]]*$/d')"
else