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

Browse source 
sync
This commit is contained in:
suyuan 2021-03-16 22:16:25 +08:00 • committed by GitHub
commit 5191014ee7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 51 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

4
luci-app-mptcp/luasrc/controller/mptcp.lua
View file

@ -118,12 +118,8 @@ function multipath_bandwidth()
for i=1,60 do
res[key][i] = string.split(res[key][i], ",")
for j=1,5 do
if "string"== type(res[key][i][j]) then
res[key][i][j]= tonumber(res[key][i][j])
end
if "string"==type(res["total"][i][j]) then
res["total"][i][j]= tonumber(res["total"][i][j])
end
if j ==1 then
if res[key][i][j] ~= nil then
res["total"][i][j] = res[key][i][j]

40
luci-app-openmptcprouter/root/bin/anonymous_config.sh
View file

@ -1,23 +1,23 @@
#!/bin/sh
uci show | \
sed -e "/password=/s/......$/xxxxxx/" \
-e "/detected_public_ipv4=/s/......$/xxxxxx/" \
-e "/detected_ss_ipv4=/s/......$/xxxxxx/" \
-e "/detected_public_ipv6=/s/......$/xxxxxx/" \
-e "/detected_ss_ipv6=/s/......$/xxxxxx/" \
-e "/publicip=/s/......$/xxxxxx/" \
-e "/\.host=/s/......$/xxxxxx/" \
-e "/\.ip=/s/......$/xxxxxx/" \
-e "/\.ipv6=/s/......$/xxxxxx/" \
-e "/user_id=/s/......$/xxxxxx/" \
-e "/openvpn\.omr\.remote=/s/......$/xxxxxx/" \
-e "/shadowsocks-libev\.sss.*\.server=/s/......$/xxxxxx/" \
-e "/shadowsocks-libev\.sss.*\.key=/s/......$/xxxxxx/" \
-e "/external_ip=/s/......$/xxxxxx/" \
-e "/obfs_host=/s/......$/xxxxxx/" \
-e "/vmess_address=/s/......$/xxxxxx/" \
-e "/vless_address=/s/......$/xxxxxx/" \
-e "/vpn\.key=/s/......$/xxxxxx/" \
-e "/vps\.key=/s/......$/xxxxxx/" \
-e "/token=/s/............$/xxxxxx/"
sed -e "/password=/s/......$/xxxxxx'/" \
-e "/detected_public_ipv4=/s/......$/xxxxxx'/" \
-e "/detected_ss_ipv4=/s/......$/xxxxxx'/" \
-e "/detected_public_ipv6=/s/......$/xxxxxx'/" \
-e "/detected_ss_ipv6=/s/......$/xxxxxx'/" \
-e "/publicip=/s/......$/xxxxxx'/" \
-e "/\.host=/s/......$/xxxxxx'/" \
-e "/\.ip=/s/......$/xxxxxx'/" \
-e "/\.ipv6=/s/......$/xxxxxx'/" \
-e "/user_id=/s/......$/xxxxxx'/" \
-e "/openvpn\.omr\.remote=/s/......$/xxxxxx'/" \
-e "/shadowsocks-libev\.sss.*\.server=/s/......$/xxxxxx'/" \
-e "/shadowsocks-libev\.sss.*\.key=/s/......$/xxxxxx'/" \
-e "/external_ip=/s/......$/xxxxxx'/" \
-e "/obfs_host=/s/..........$/xxxxxx'/" \
-e "/vmess_address=/s/......$/xxxxxx'/" \
-e "/vless_address=/s/......$/xxxxxx'/" \
-e "/vpn\.key=/s/......$/xxxxxx'/" \
-e "/vps\.key=/s/......$/xxxxxx'/" \
-e "/token=/s/............$/xxxxxx'/"

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

@ -128,7 +128,7 @@ _set_openvpn_vps() {
current_key="$(echo "$vps_config" | jsonfilter -q -e '@.openvpn.client_key')"
current_port="$(echo "$vps_config" | jsonfilter -q -e '@.openvpn.port')"
current_cipher="$(echo "$vps_config" | jsonfilter -q -e '@.openvpn.cipher')"
if [ "$curent_key" != "$key" ]; then
if [ "$current_key" != "$key" ]; then
uci -q set openmptcprouter.${servername}.get_config="1"
fi
if [ "$current_port" != "$port" ] || [ "$current_cipher" != "$cipher" ]; then
@ -140,6 +140,32 @@ _set_openvpn_vps() {
fi
}
_set_mlvpn_vps() {
local enabled port key
enabled="$(uci -q get mlvpn.general.enable)"
[ "$enabled" != "1" ] && echo "MLVPN disabled" && return
timeout="$(uci -q get mlvpn.general.timeout)"
reorder_buffer_size="$(uci -q get mlvpn.general.reorder_buffer_size)"
loss_tolerence="$(uci -q get mlvpn.general.loss_tolerence)"
password="$(uci -q get mlvpn.general.password)"
cleartext_data="$(uci -q get mlvpn.general.cleartext_data)"
local current_timeout current_reorder_buffer_size current_loss_tolerence current_password current_cleartext_data
[ -z "$vps_config" ] && vps_config=$(_get_json "config")
[ -z "$vps_config" ] && return
current_timeout="$(echo "$vps_config" | jsonfilter -q -e '@.mlvpn.timeout')"
current_reorder_buffer_size="$(echo "$vps_config" | jsonfilter -q -e '@.mlvpn.reorder_buffer_size')"
current_loss_tolerence="$(echo "$vps_config" | jsonfilter -q -e '@.mlvpn.loss_tolerence')"
current_password="$(echo "$vps_config" | jsonfilter -q -e '@.mlvpn.key')"
current_cleartext_data="$(echo "$vps_config" | jsonfilter -q -e '@.mlvpn.cleartext_data')"
if [ "$current_timeout" != "$timeout" ] || [ "$current_reorder_buffer_size" != "$reorder_buffer_size" ] || [ "$current_loss_tolerence" != "$loss_tolerence" ] || [ "$current_password" != "$password" ] || [ "$current_cleartext_data" != "$cleartext_data" ]; then
local settings
settings='{"timeout": '$timeout', "reorder_buffer_size": "'$reorder_buffer_size'", "loss_tolerence": "'$loss_tolerence'", "password": "'$password'", "cleartext_data": "'$cleartext_data'"}'
echo $(_set_json "mlvpn" "$settings")
else
echo 1
fi
}
_set_wireguard_vps() {
local enabled port key
ipskey=""
@ -1729,6 +1755,7 @@ _config_service() {
_set_v2ray_server_vps
[ -z "$(_set_glorytun_vps)" ] && error=1
[ -z "$(_set_openvpn_vps)" ] && error=1
[ -z "$(_set_mlvpn_vps)" ] && error=1
_set_vps_firewall
_set_wireguard_vps
fi

2
shadowsocks-libev/files/shadowsocks-libev.init
View file

@ -412,7 +412,7 @@ validate_common_server_options_() {
'plugin:string' \
'plugin_opts:string' \
'obfs:bool:0' \
'obfs_plugin:or("v2ray","obfs-simple"):v2ray' \
'obfs_plugin:or("v2ray","obfs"):v2ray' \
'obfs_type:or("http","tls"):http'
}