diff --git a/luci-app-mptcp/luasrc/controller/mptcp.lua b/luci-app-mptcp/luasrc/controller/mptcp.lua index eb84bc718..53ead344f 100644 --- a/luci-app-mptcp/luasrc/controller/mptcp.lua +++ b/luci-app-mptcp/luasrc/controller/mptcp.lua @@ -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 + res[key][i][j]= tonumber(res[key][i][j]) + res["total"][i][j]= tonumber(res["total"][i][j]) if j ==1 then if res[key][i][j] ~= nil then res["total"][i][j] = res[key][i][j] diff --git a/luci-app-openmptcprouter/root/bin/anonymous_config.sh b/luci-app-openmptcprouter/root/bin/anonymous_config.sh index 80e67487c..b15183dae 100755 --- a/luci-app-openmptcprouter/root/bin/anonymous_config.sh +++ b/luci-app-openmptcprouter/root/bin/anonymous_config.sh @@ -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/" \ No newline at end of file + 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'/" \ No newline at end of file diff --git a/openmptcprouter/files/etc/init.d/openmptcprouter-vps b/openmptcprouter/files/etc/init.d/openmptcprouter-vps index f218d2d81..51cfe728c 100755 --- a/openmptcprouter/files/etc/init.d/openmptcprouter-vps +++ b/openmptcprouter/files/etc/init.d/openmptcprouter-vps @@ -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 diff --git a/shadowsocks-libev/files/shadowsocks-libev.init b/shadowsocks-libev/files/shadowsocks-libev.init index fa1b1602d..3a453da4b 100644 --- a/shadowsocks-libev/files/shadowsocks-libev.init +++ b/shadowsocks-libev/files/shadowsocks-libev.init @@ -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' }