diff --git a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm index 08f29e1b4..8266af907 100644 --- a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm +++ b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm @@ -47,6 +47,7 @@ return false; } } + function formatBytes(a,b=2){if(0===a)return"0 Bytes";const c=0>b?0:b,d=Math.floor(Math.log(a)/Math.log(1024));return parseFloat((a/Math.pow(1024,d)).toFixed(c))+" "+["Bytes","KiB","MiB","GiB","TiB","PiB","EiB","ZiB","YiB"][d]} XHR.poll(20, '/cgi-bin/luci/admin/system/openmptcprouter/interfaces_status', null, function(x, mArray) { @@ -319,6 +320,21 @@ content += _('IPv6:') + " " + mArray.openmptcprouter.wan_addr6; content += '
'; } + if (mArray.openmptcprouter.socks_service_enabled == true && mArray.openmptcprouter.ss_traffic && mArray.openmptcprouter.ss_traffic != 0) + { + content += _('Shadowsocks traffic:') + " " + formatBytes(mArray.openmptcprouter.ss_traffic); + content += '
'; + } + if (mArray.openmptcprouter.vpn_traffic && mArray.openmptcprouter.vpn_traffic != 0) + { + content += _('VPN traffic:') + " " + formatBytes(mArray.openmptcprouter.vpn_traffic); + content += '
'; + } + if (mArray.openmptcprouter.ss_traffic && mArray.openmptcprouter.vpn_traffic && mArray.openmptcprouter.vpn_traffic != 0) + { + content += _('Total traffic:') + " " + formatBytes(mArray.openmptcprouter.vpn_traffic + mArray.openmptcprouter.vpn_traffic); + content += '
'; + } content += '
'; temp += getNetworkNodeTemplate(equipmentIcon, statusIcon, title, statusMessageClass,statusMessage,content);