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

Browse source 
sync
This commit is contained in:
suyuan 2021-04-08 18:31:57 +08:00 • committed by GitHub
commit 5e1e6caeca
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1011,6 +1011,7 @@ _vps_firewall_close_port() {
[ -n "$vpsfwlist" ] && { [ -n "$vpsfwlist" ] && {
echo "$vpsfwlist" | while read -r line; do echo "$vpsfwlist" | while read -r line; do
[ -n "$line" ] && { [ -n "$line" ] && {
type=$(echo $line | awk '{print $1}' | tr -d "\n")
proto=$(echo $line | awk '{print $4}' | tr -d "\n") proto=$(echo $line | awk '{print $4}' | tr -d "\n")
src_dport=$(echo $line | awk '{print $5}' | tr -d "\n") src_dport=$(echo $line | awk '{print $5}' | tr -d "\n")
source_port=$(echo $line | awk '{print $6}' | tr -d "\n") source_port=$(echo $line | awk '{print $6}' | tr -d "\n")
@ -1024,12 +1025,17 @@ _vps_firewall_close_port() {
settings='{"name" : "router '$src_dport'","port" : "'$src_dport'","proto" : "'$proto'","fwtype" : "DNAT"}' settings='{"name" : "router '$src_dport'","port" : "'$src_dport'","proto" : "'$proto'","fwtype" : "DNAT"}'
fi fi
_set_json "shorewallclose" "$settings" _set_json "shorewallclose" "$settings"
[ "$type" = "ACCEPT" ] && {
settings='{"name" : "router '$src_dport'","port" : "'$src_dport'","proto" : "'$proto'"}'
_set_json "v2rayunredirect" "$settings"
}
} }
done done
} }
[ -n "$vpsfw6list" ] && { [ -n "$vpsfw6list" ] && {
echo "$vpsfw6list" | while read -r line; do echo "$vpsfw6list" | while read -r line; do
[ -n "$line" ] && { [ -n "$line" ] && {
type=$(echo $line | awk '{print $1}' | tr -d "\n")
proto=$(echo $line | awk '{print $4}' | tr -d "\n") proto=$(echo $line | awk '{print $4}' | tr -d "\n")
src_dport=$(echo $line | awk '{print $5}' | tr -d "\n") src_dport=$(echo $line | awk '{print $5}' | tr -d "\n")
source_port=$(echo $line | awk '{print $6}' | tr -d "\n") source_port=$(echo $line | awk '{print $6}' | tr -d "\n")
@ -1043,6 +1049,10 @@ _vps_firewall_close_port() {
settings='{"name" : "router '$src_dport'","port" : "'$src_dport'","proto" : "'$proto'","fwtype" : "DNAT","ipproto" : "ipv6"}' settings='{"name" : "router '$src_dport'","port" : "'$src_dport'","proto" : "'$proto'","fwtype" : "DNAT","ipproto" : "ipv6"}'
fi fi
_set_json "shorewallclose" "$settings" _set_json "shorewallclose" "$settings"
[ "$type" = "ACCEPT" ] && {
settings='{"name" : "router '$src_dport'","port" : "'$src_dport'","proto" : "'$proto'"}'
_set_json "v2rayunredirect" "$settings"
}
} }
done done
} }
@ -1088,9 +1098,15 @@ _set_vps_firewall() {
settings='{"name" : "redirect router"}' settings='{"name" : "redirect router"}'
fw_list=$(_set_json "shorewalllist" "$settings") fw_list=$(_set_json "shorewalllist" "$settings")
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"}'
fw_list=$(_set_json "shorewalllist" "$settings")
vpsfwlist="$vpsfwlist\n$(echo $fw_list | jsonfilter -q -e '@.list[*]' | sed '/^[[:space:]]*$/d')"
settings='{"name" : "redirect router","ipproto" : "ipv6"}' settings='{"name" : "redirect router","ipproto" : "ipv6"}'
fw6_list=$(_set_json "shorewalllist" "$settings") fw6_list=$(_set_json "shorewalllist" "$settings")
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"}'
fw6_list=$(_set_json "shorewalllist" "$settings")
vpsfw6list="$vpsfw6list\n$(echo $fw6_list | jsonfilter -q -e '@.list[*]' | sed '/^[[:space:]]*$/d')"
config_load firewall config_load firewall
config_foreach _vps_firewall_redirect_port redirect config_foreach _vps_firewall_redirect_port redirect
config_foreach _vps_firewall_redirect_port rule config_foreach _vps_firewall_redirect_port rule

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

@ -18,11 +18,22 @@ fi
if [ "$(uci -q get firewall.@zone[1].name)" = "wan" ]; then if [ "$(uci -q get firewall.@zone[1].name)" = "wan" ]; then
uci -q batch <<-EOF >/dev/null uci -q batch <<-EOF >/dev/null
rename firewall.@zone[1]="zone_wan" rename firewall.@zone[1]="zone_wan"
del_list firewall.zone_wan.network="wan" commit firewall
EOF
fi
if [ "$(uci -q show firewall.zone_wan | grep wan6)" != "" ] && [ "$(uci -q get network.wan6)" = "" ]; then
uci -q batch <<-EOF >/dev/null
del_list firewall.zone_wan.network="wan6" del_list firewall.zone_wan.network="wan6"
commit firewall commit firewall
EOF EOF
fi fi
if [ "$(uci -q show firewall.zone_wan | grep wan)" != "" ] && [ "$(uci -q get network.wan)" = "" ]; then
uci -q batch <<-EOF >/dev/null
del_list firewall.zone_wan.network="wan"
commit firewall
EOF
fi
if [ "$(uci -q get firewall.@zone[0].name)" = "lan" ]; then if [ "$(uci -q get firewall.@zone[0].name)" = "lan" ]; then
uci -q batch <<-EOF >/dev/null uci -q batch <<-EOF >/dev/null
rename firewall.@zone[0]="zone_lan" rename firewall.@zone[0]="zone_lan"