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

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

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

@ -1072,7 +1072,7 @@ _vps_firewall_close_port() {
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")
source_dip=$(echo $line | awk '{print $7}' | tr -d "\n") source_dip=$(echo $line | awk '{print $7}' | tr -d "\n")
[ "$source_dip" = "#" ] && source_sip="" [ "$source_dip" = "#" ] && source_dip=""
source_ip=$(echo $line | awk '{print $2}' | awk -F ":" '{print $2}' | tr -d "\n") source_ip=$(echo $line | awk '{print $2}' | awk -F ":" '{print $2}' | tr -d "\n")
if [ "$source_port" = "-" ]; then if [ "$source_port" = "-" ]; then
settings='{"name" : "router '$src_dport'","port" : "'$src_dport'","proto" : "'$proto'","fwtype" : "DNAT","source_dip": "'$source_dip'","source_ip": "'$source_ip'"}' settings='{"name" : "router '$src_dport'","port" : "'$src_dport'","proto" : "'$proto'","fwtype" : "DNAT","source_dip": "'$source_dip'","source_ip": "'$source_ip'"}'
@ -1097,7 +1097,7 @@ _vps_firewall_close_port() {
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")
source_dip=$(echo $line | awk '{print $7}' | tr -d "\n") source_dip=$(echo $line | awk '{print $7}' | tr -d "\n")
[ "$source_dip" = "#" ] && source_sip="" [ "$source_dip" = "#" ] && source_dip=""
source_ip=$(echo $line | awk '{print $2}' | awk -F ":" '{print $2}' | tr -d "\n") source_ip=$(echo $line | awk '{print $2}' | awk -F ":" '{print $2}' | tr -d "\n")
if [ "$source_port" = "-" ]; then if [ "$source_port" = "-" ]; then
settings='{"name" : "router '$src_dport'","port" : "'$src_dport'","proto" : "'$proto'","fwtype" : "DNAT","ipproto" : "ipv6","source_dip": "'$source_dip'","source_ip": "'$source_ip'"}' settings='{"name" : "router '$src_dport'","port" : "'$src_dport'","proto" : "'$proto'","fwtype" : "DNAT","ipproto" : "ipv6","source_dip": "'$source_dip'","source_ip": "'$source_ip'"}'

4
openmptcprouter/files/etc/uci-defaults/2030-omr-fstab
View file

@ -4,11 +4,11 @@
_set_fsck() { _set_fsck() {
uci -q batch <<-EOF >/dev/null uci -q batch <<-EOF >/dev/null
set "fstab.$1.enabled=1" set "fstab.$1.enabled=1"
set "fstab.$1.enable_fsck=1" set "fstab.$1.enabled_fsck=1"
EOF EOF
} }
/sbin/block detect > /etc/config/fstab [ -z "$(uci show fstab | grep mount)" ] && /sbin/block detect > /etc/config/fstab
uci -q set fstab.@global[0].check_fs='1' uci -q set fstab.@global[0].check_fs='1'
config_load fstab config_load fstab
config_foreach _set_fsck mount config_foreach _set_fsck mount