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 #228 from Ysurac/develop

Browse source 
sync
This commit is contained in:
suyuan 2022-04-03 15:39:37 +08:00 • committed by GitHub
commit 121fc95465
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm
View file

@ -428,7 +428,7 @@
<% <%
for _, iface in ipairs(net:get_networks()) do for _, iface in ipairs(net:get_networks()) do
local ifname = iface:name() local ifname = iface:name()
local firewall_lan = luci.util.trim(luci.sys.exec("uci -q get firewall.zone_lan.network | grep " .. ifname)) local firewall_lan = luci.util.trim(luci.sys.exec("uci -q get firewall.zone_lan.network | grep \'" .. ifname .. "\'"))
if firewall_lan ~= "" then if firewall_lan ~= "" then
%> %>
<h3><%=ifname%></h3> <h3><%=ifname%></h3>
@ -531,7 +531,7 @@
<% <%
for _, iface in ipairs(net:get_networks()) do for _, iface in ipairs(net:get_networks()) do
local ifname = iface:name() local ifname = iface:name()
local firewall_wan = luci.util.trim(luci.sys.exec("uci -q get firewall.zone_wan.network | grep " .. ifname)) local firewall_wan = luci.util.trim(luci.sys.exec("uci -q get firewall.zone_wan.network | grep \'" .. ifname .. "\'"))
if firewall_wan ~= "" then if firewall_wan ~= "" then
-- local multipath = uci:get("network",ifname,"multipath") -- local multipath = uci:get("network",ifname,"multipath")

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

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