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

Add v2ray support to status page

Browse source
This commit is contained in:
Ycarus (Yannick Chabanois) 2020-08-19 15:39:45 +02:00
parent 069f6ff91b
commit 10bc6b94da
1 changed files with 27 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -773,7 +773,7 @@ function interfaces_status()
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"]
mArray.openmptcprouter["vpn_traffic"] = mArray.openmptcprouter["vpn_traffic_tx"] + mArray.openmptcprouter["vpn_traffic_rx"]
else
mArray.openmptcprouter["vpn_traffic_rx"] = "0"
mArray.openmptcprouter["vpn_traffic_tx"] = "0"
@ -784,6 +784,15 @@ function interfaces_status()
else
mArray.openmptcprouter["ss_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"
mArray.openmptcprouter["v2ray_traffic"] = mArray.openmptcprouter["v2ray_traffic_tx"] + mArray.openmptcprouter["v2ray_traffic_rx"]
else
mArray.openmptcprouter["v2ray_traffic_rx"] = "0"
mArray.openmptcprouter["v2ray_traffic_tx"] = "0"
mArray.openmptcprouter["v2ray_traffic"] = "0"
end
else
mArray.openmptcprouter["vps_admin"] = false
mArray.openmptcprouter["vps_admin_error_msg"] = "No result"
@ -870,22 +879,32 @@ function interfaces_status()
end
-- check Shadowsocks is running
mArray.openmptcprouter["socks_service"] = false
mArray.openmptcprouter["shadowsocks_service"] = false
if string.find(sys.exec("/usr/bin/pgrep ss-redir"), "%d+") then
mArray.openmptcprouter["socks_service"] = true
mArray.openmptcprouter["shadowsocks_service"] = true
end
mArray.openmptcprouter["socks_service_enabled"] = true
mArray.openmptcprouter["shadowsocks_enabled"] = true
local ss_server = uci:get("shadowsocks-libev","sss0","disabled") or "0"
if ss_server == "1" then
mArray.openmptcprouter["socks_service_enabled"] = false
mArray.openmptcprouter["shadowsocks_enabled"] = false
end
-- check V2Ray is running
mArray.openmptcprouter["v2ray_service"] = false
if string.find(sys.exec("/usr/bin/pgrep v2ray"), "%d+") then
mArray.openmptcprouter["v2ray_service"] = true
end
mArray.openmptcprouter["v2ray_enabled"] = false
local v2ray = uci:get("v2ray","main","enabled") or "0"
if v2ray == "1" then
mArray.openmptcprouter["v2ray_enabled"] = true
end
local ss_key = uci:get("shadowsocks-libev","sss0","key") or ""
mArray.openmptcprouter["socks_service_method"] = uci:get("shadowsocks-libev","sss0","method")
mArray.openmptcprouter["shadowsocks_service_method"] = uci:get("shadowsocks-libev","sss0","method")
if ss_key == "" then
mArray.openmptcprouter["socks_service_key"] = false
mArray.openmptcprouter["shadowsocks_service_key"] = false
else
mArray.openmptcprouter["socks_service_key"] = true
mArray.openmptcprouter["shadowsocks_service_key"] = true
end
-- Add DHCP infos by parsing dnsmasq config file