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 2021-03-13 02:31:22 +08:00
commit 4aae27be27
15 changed files with 2571 additions and 1791 deletions
Download patch file Download diff file Expand all files Collapse all files

8
openmptcprouter/files/etc/init.d/mptcpovervpn
View file

@ -24,6 +24,7 @@ mptcp_over_vpn() {
delete openmptcprouter.${interface}
delete network.ovpn${interface}
delete network.wg${interface}
delete network.@wireguard_wg${interface}[0]
delete openvpn.${interface}
commit openvpn
delete openmptcprouter.${interface}
@ -159,12 +160,13 @@ mptcp_over_vpn() {
commit openmptcprouter
EOF
fi
elif [ "$(uci -q get openmptcprouter.ovpn${interface})" != "" ]; then
elif [ "$(uci -q get openmptcprouter.ovpn${interface})" != "" ] || [ "$(uci -q get network.wg${interface})" != "" ]; then
logger -t "MPTCPoverVPN" "Disable MPTCP over VPN for ${interface}"
multipath=$(uci -q get openmptcprouter.ovpn${interface}.multipath)
[ -z "$multipath" ] && multipath="on"
uci -q batch <<-EOF >/dev/null
delete network.wg${interface}
delete network.@wireguard_wg${interface}[0]
delete network.ovpn${interface}
delete openvpn.${interface}
commit openvpn
@ -185,9 +187,11 @@ mptcp_over_vpn() {
if [ -n "$intf" ] && [ "$intf" != "$interface" ] && [ "$(uci -q get network.${intf})" = "" ]; then
uci -q batch <<-EOF >/dev/null
delete network.${interface}
delete openvpn.${intf}
delete network.@wireguard_${interface}[0]
delete openvpn.ovpn${intf}
commit openvpn
delete openmptcprouter.${intf}
delete openmptcprouter.ovpn${intf}
delete openmptcprouter.${interface}
commit openmptcprouter
commit network

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

@ -1709,6 +1709,7 @@ _config_service() {
vps_aes="$(echo "$vps_config" | jsonfilter -q -e '@.vps.aes')"
if [ "$vps_aes" != "false" ] && [ "$user_permission" != "ro" ]; then
logger -t "OMR-VPS" "CPU support AES, set it by default"
method="$(uci -q get shadowsocks-libev.sss0.method)"
uci -q batch <<-EOF >/dev/null
set glorytun.vpn.chacha20="0"
commit glorytun
@ -1717,6 +1718,7 @@ _config_service() {
EOF
config_foreach _set_ss_server server "method" "aes-256-gcm"
uci -q commit shadowsocks-libev
[ "$method" != "aes-256-gcm" ] && /etc/init.d/shadowsocks-libev restart
fi
}
fi

6
openmptcprouter/files/etc/uci-defaults/1990-omr-tracker
View file

@ -5,9 +5,9 @@ if [ "$(uci -q get omr-tracker.omrvpn)" = "" ]; then
delete omr-tracker.glorytun
set omr-tracker.omrvpn=interface
set omr-tracker.omrvpn.type="none"
set omr-tracker.omrvpn.timeout=6
set omr-tracker.omrvpn.tries=2
set omr-tracker.omrvpn.interval=4
set omr-tracker.omrvpn.timeout=10
set omr-tracker.omrvpn.tries=3
set omr-tracker.omrvpn.interval=5
set omr-tracker.omrvpn.mail_alert=0
set omr-tracker.omrvpn.enabled=1
commit omr-tracker