diff --git a/luci-app-openmptcprouter/root/usr/libexec/rpcd/openmptcprouter b/luci-app-openmptcprouter/root/usr/libexec/rpcd/openmptcprouter index e26859a91..26a41518b 100755 --- a/luci-app-openmptcprouter/root/usr/libexec/rpcd/openmptcprouter +++ b/luci-app-openmptcprouter/root/usr/libexec/rpcd/openmptcprouter @@ -653,7 +653,7 @@ function interfaces_status() mArray.openmptcprouter["hostname"] = uci:get("system",s[".name"],"hostname") or "OpenMPTCProuter" end) - mArray.openmptcprouter["server_mptcp"] = "" + --mArray.openmptcprouter["server_mptcp"] = "" mArray.openmptcprouter["omr_time"] = os.time() -- dns mArray.openmptcprouter["dns"] = false @@ -742,7 +742,7 @@ function interfaces_status() if status and vpsinfo.vps ~= nil then mArray.openmptcprouter["vps_loadavg"] = vpsinfo.vps.loadavg or "" mArray.openmptcprouter["vps_uptime"] = vpsinfo.vps.uptime or "" - mArray.openmptcprouter["vps_mptcp"] = vpsinfo.vps.mptcp or "" + mArray.openmptcprouter["vps_mptcp"] = vpsinfo.vps.mptcp.enabled or "" mArray.openmptcprouter["vps_hostname"] = vpsinfo.vps.hostname or "" mArray.openmptcprouter["vps_time"] = vpsinfo.vps.time or "" if vpsinfo.vps.kernel ~= nil then @@ -751,9 +751,6 @@ function interfaces_status() if vpsinfo.vps.omr_version ~= nil then mArray.openmptcprouter["vps_omr_version"] = vpsinfo.vps.omr_version or "" end - if vpsinfo.shadowsocks.traffic ~= nil then - mArray.openmptcprouter["ss_traffic"] = vpsinfo.shadowsocks.traffic or "" - end if vpsinfo.vps.time ~= "" then if math.abs(os.time() - vpsinfo.vps.time) > 10 then mArray.openmptcprouter["vps_time_accurate"] = false @@ -773,6 +770,20 @@ function interfaces_status() mArray.openmptcprouter["vps_admin"] = false mArray.openmptcprouter["vps_admin_error_msg"] = "Answer error" end + if status and vpsinfo.vpn ~= nil then + mArray.openmptcprouter["vpn_traffic_rx"] = vpsinfo.vpn.rx or "0" + mArray.openmptcprouter["vpn_traffic_tx"] = vpsinfo.vpn.tx or "0" + mArray.openmptcprouter["vpn_traffic"] = mArray.openmptcprouter["vpn_traffic_tx"] + mArray.openmptcprouter["vpn_traffic_tx"] + else + mArray.openmptcprouter["vpn_traffic_rx"] = "0" + mArray.openmptcprouter["vpn_traffic_tx"] = "0" + mArray.openmptcprouter["vpn_traffic"] = "0" + end + if status and vpsinfo.shadowsocks ~= nil then + mArray.openmptcprouter["ss_traffic"] = vpsinfo.shadowsocks.traffic or "0" + else + mArray.openmptcprouter["ss_traffic"] = "0" + end else mArray.openmptcprouter["vps_admin"] = false mArray.openmptcprouter["vps_admin_error_msg"] = "No result"