From 4c19132ebd5c9f0872c7f46dbd801397c4c507f9 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Mon, 9 Oct 2023 18:50:00 +0200 Subject: [PATCH 1/2] Add Shadowsocks-go traffic --- .../root/usr/libexec/rpcd/openmptcprouter | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/luci-app-openmptcprouter/root/usr/libexec/rpcd/openmptcprouter b/luci-app-openmptcprouter/root/usr/libexec/rpcd/openmptcprouter index b7af3d727..a73a9c33d 100755 --- a/luci-app-openmptcprouter/root/usr/libexec/rpcd/openmptcprouter +++ b/luci-app-openmptcprouter/root/usr/libexec/rpcd/openmptcprouter @@ -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 From a3fd1e880e796470a0c1c322c8e65c2157671c29 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Mon, 9 Oct 2023 18:50:25 +0200 Subject: [PATCH 2/2] Add info that Shadowsocks-go doesn't support chacha20 --- luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm | 1 + 1 file changed, 1 insertion(+) diff --git a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm index 62f8e04cd..370bfeb2e 100644 --- a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm +++ b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm @@ -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.%>