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:
suyuan 2022-07-29 23:28:35 +08:00
commit 04f53f9da9
6 changed files with 37 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -271,7 +271,7 @@ _set_ss_server_vps() {
if [ "$current_mptcp" != "$mptcp" ] || [ "$current_obfs_plugin" != "$obfs_plugin" ] || [ "$current_obfs_type" != "$obfs_type" ] || [ "$current_port" != "$port" ] || [ "$current_method" != "$method" ] || [ "$current_key" != "$key" ] || [ "$current_ebpf" != "$ebpf" ] || [ "$current_obfs" != "$obfs" ] || [ "$current_fast_open" != "$fast_open" ] || [ "$current_no_delay" != "$no_delay" ]; then
local settings
settings='{"port": '$port',"method":"'$method'","fast_open":'$fast_open',"reuse_port":true,"no_delay":'$no_delay',"mptcp":'$mptcp',"key":"'$key'","ebpf":'$ebpf',"obfs":'$obfs',"obfs_plugin":"'$obfs_plugin'","obfs_type":"'$obfs_type'"}'
_set_json "shadowsocks" "$settings"
result=$(_set_json "shadowsocks" "$settings")
fi
}
@ -966,7 +966,7 @@ _vps_firewall_redirect_port() {
fi
if [ "$checkfw" = "" ]; then
settings='{"name" : "router '$src_dport'","port" : "'$src_dport'","source_dip" : "'$src_dip'","source_ip" : "'$src_ip'","proto" : "'$protoi'","fwtype" : "'$target'","ipproto" : "'$family'"}'
_set_json "shorewallopen" "$settings"
result=$(_set_json "shorewallopen" "$settings")
fi
if [ "$family" = "ipv4" ]; then
if [ "$src_dip" = "" ] && [ "$src_ip" = "" ]; then
@ -1036,10 +1036,10 @@ _vps_firewall_redirect_port() {
fi
if [ "$checkfw" = "" ]; then
settings='{"name" : "router '$src_dport'","port" : "'$src_dport'","source_dip" : "'$src_dip'","source_ip" : "'$src_ip'","proto" : "'${protoi}'","fwtype" : "ACCEPT","ipproto" : "'$family'","comment" : "V2Ray to '${dest_ip}':'${dest_port}'"}'
_set_json "shorewallopen" "$settings"
result=$(_set_json "shorewallopen" "$settings")
[ -z "$dest_port" ] && dest_port="$src_dport"
settings='{"name" : "router '$src_dport'","port" : "'$src_dport'","destip" : "'$dest_ip'","destport" : "'$dest_port'","proto" : "'${protoi}'"}'
_set_json "v2rayredirect" "$settings"
result=$(_set_json "v2rayredirect" "$settings")
fi
if [ "$family" = "ipv4" ]; then
if [ "$src_dip" = "" ] && [ "$src_ip" = "" ]; then
@ -1087,12 +1087,12 @@ _vps_firewall_close_port() {
else
settings='{"name" : "router '$src_dport'","port" : "'$src_dport'","proto" : "'$proto'","fwtype" : "DNAT","comment" : "'$comment'"}'
fi
_set_json "shorewallclose" "$settings"
result=$(_set_json "shorewallclose" "$settings")
[ "$type" = "ACCEPT" ] && {
destip=$(echo $comment | awk '{print $3}' | awk -F: '{print $1}')
destport=$(echo $comment | awk '{print $3}' | awk -F: '{print $2}')
settings='{"name" : "router '$src_dport'","port" : "'$src_dport'","proto" : "'$proto'","destip" : "'$destip'","destport": "'$destport'"}'
_set_json "v2rayunredirect" "$settings"
result=$(_set_json "v2rayunredirect" "$settings")
}
}
done
@ -1115,10 +1115,10 @@ _vps_firewall_close_port() {
else
settings='{"name" : "router '$src_dport'","port" : "'$src_dport'","proto" : "'$proto'","fwtype" : "DNAT","ipproto" : "ipv6","comment" : "'$comment'"}'
fi
_set_json "shorewallclose" "$settings"
result=$(_set_json "shorewallclose" "$settings")
[ "$type" = "ACCEPT" ] && {
settings='{"name" : "router '$src_dport'","port" : "'$src_dport'","proto" : "'$proto'","comment" : "'$comment'"}'
_set_json "v2rayunredirect" "$settings"
result=$(_set_json "v2rayunredirect" "$settings")
}
}
done
@ -1694,7 +1694,7 @@ _backup_send() {
logger -t "OMR-VPS" "Send backup file to server $servername"
local backupjson
backupjson='{"data": "'$backup_data'","sha256sum": "'$backup_sha256sum'"}'
_set_json "backuppost" "$backupjson"
result=$(_set_json "backuppost" "$backupjson")
uci -q set openmptcprouter.$servername.lastbackup=$(date +%s)
}
}

4
openmptcprouter/files/etc/init.d/vnstat_backup
View file

@ -38,9 +38,7 @@ backup_database() {
}
restore_database() {
if [ ! -f $BACKUP_FILE ]; then
logger -t $LOGGER_TAG -p err "cannot restore, backup file does not exist (yet)"
else
if [ -f $BACKUP_FILE ]; then
logger -t $LOGGER_TAG -p info 'restoring database'
[ ! -d $VNSTAT_DIR ] && mkdir $VNSTAT_DIR
/bin/tar -xzf $BACKUP_FILE -C $VNSTAT_DIR

11
openmptcprouter/files/etc/uci-defaults/2060-omr-system
View file

@ -6,10 +6,11 @@ uci -q batch <<-EOF >/dev/null
set system.ntp.enable_server='1'
set system.ntp.enabled='1'
del system.ntp.server
add_list system.ntp.server='ntp.aliyun.com'
add_list system.ntp.server='time1.cloud.tencent.com'
add_list system.ntp.server='time.ustc.edu.cn'
add_list system.ntp.server='cn.pool.ntp.org'
set system.@system[-1].cronloglevel=9
add_list system.ntp.server='0.pool.ntp.org'
add_list system.ntp.server='1.pool.ntp.org'
add_list system.ntp.server='2.pool.ntp.org'
add_list system.ntp.server='3.pool.ntp.org'
commit system
set rpcd.@rpcd[0].timeout=120
commit rpcd
@ -38,7 +39,7 @@ fi
EOF
}
if [ -n "$(ubus call system board | jsonfilter -e '@.board_name' | grep rutx)" ]; then
if [ -n "$(ubus call system board | jsonfilter -e '@.board_name' | grep rutx)" ] && [ -z "$(uci show system | grep WAN_ETH)" ]; then
uci -q batch <<-EOF >/dev/null
add system led
set system.@led[-1].sysfs='wan_wifi_4'