mptcp/openmptcprouter-feeds
1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter-feeds.git synced 2025-02-15 03:51:51 +00:00
Code Issues Releases Wiki Activity

Merge pull request #365 from Ysurac/develop

Browse source 
sync
This commit is contained in:
suyuan 2023-10-11 09:36:06 -05:00 committed by GitHub
commit e41507c472
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm
View file

@ -316,6 +316,7 @@
<%:There is no Advanced Encryption Standard (AES) instruction set integrated in the processor, you should use chacha20.%>
<% end %>
<%:Encryption method is used for Shadowsocks, V2Ray/XRay, Glorytun and OpenVPN.%>
<%:Shadowsocks-go, used on server side when Shadowsocks-Rust is used, doesn't support chacha20, AES-256-GCM is used instead.%>
</div>
</div>
</div>

11
luci-app-openmptcprouter/root/usr/libexec/rpcd/openmptcprouter
View file

@ -928,6 +928,15 @@ function interfaces_status()
else
mArray.openmptcprouter["ss_traffic"] = "0"
end
if status and vpsinfo.shadowsocks_go ~= nil then
mArray.openmptcprouter["ss_go_traffic_rx"] = vpsinfo.shadowsocks_go.rx or "0"
mArray.openmptcprouter["ss_go_traffic_tx"] = vpsinfo.shadowsocks_go.tx or "0"
mArray.openmptcprouter["ss_go_traffic"] = mArray.openmptcprouter["ss_go_traffic_tx"] + mArray.openmptcprouter["ss_go_traffic_rx"]
else
mArray.openmptcprouter["ss_go_traffic_rx"] = "0"
mArray.openmptcprouter["ss_go_traffic_tx"] = "0"
mArray.openmptcprouter["ss_go_traffic"] = "0"
end
if status and vpsinfo.v2ray ~= nil then
mArray.openmptcprouter["v2ray_traffic_rx"] = vpsinfo.v2ray.rx or "0"
mArray.openmptcprouter["v2ray_traffic_tx"] = vpsinfo.v2ray.tx or "0"
@ -946,7 +955,7 @@ function interfaces_status()
mArray.openmptcprouter["xray_traffic_tx"] = "0"
mArray.openmptcprouter["xray_traffic"] = "0"
end
mArray.openmptcprouter["proxy_traffic"] = mArray.openmptcprouter["ss_traffic"] + mArray.openmptcprouter["v2ray_traffic"] + mArray.openmptcprouter["xray_traffic"]
mArray.openmptcprouter["proxy_traffic"] = mArray.openmptcprouter["ss_traffic"] + mArray.openmptcprouter["v2ray_traffic"] + mArray.openmptcprouter["xray_traffic"] + mArray.openmptcprouter["ss_go_traffic"]
mArray.openmptcprouter["total_traffic"] = mArray.openmptcprouter["proxy_traffic"] + mArray.openmptcprouter["vpn_traffic"]
else
mArray.openmptcprouter["vps_admin"] = false