mptcp/openmptcprouter-vps-admin
1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter-vps-admin.git synced 2025-02-12 10:31:52 +00:00
Code Issues Releases Wiki Activity

Only check data on used proxy

Browse source
This commit is contained in:
Ycarus (Yannick Chabanois) 2022-02-04 09:53:32 +01:00
parent 17ee3d2513
commit 2a8f642f89
2 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
omr-admin-config.json
View file

@ -9,6 +9,7 @@
"disabled": false "disabled": false
}, },
"openmptcprouter": { "openmptcprouter": {
"userid": 0,
"username": "openmptcprouter", "username": "openmptcprouter",
"user_password": "MySecretKey", "user_password": "MySecretKey",
"shadowsocks_port": 65101, "shadowsocks_port": 65101,

26
omr-admin.py
View file

@ -1049,22 +1049,25 @@ async def status(userid: Optional[int] = Query(None), serial: Optional[str] = Qu
mptcp_enabled = os.popen('sysctl -qn net.mptcp.mptcp_enabled').read().rstrip() mptcp_enabled = os.popen('sysctl -qn net.mptcp.mptcp_enabled').read().rstrip()
elif path.exists("/proc/sys/net/mptcp/enabled"): elif path.exists("/proc/sys/net/mptcp/enabled"):
mptcp_enabled = os.popen('sysctl -qn net.mptcp.enabled').read().rstrip() mptcp_enabled = os.popen('sysctl -qn net.mptcp.enabled').read().rstrip()
shadowsocks_port = current_user.shadowsocks_port
if not shadowsocks_port == None:
ss_traffic = get_bytes_ss(current_user.shadowsocks_port)
else:
ss_traffic = 0
v2ray_tx = 0
v2ray_rx = 0
if os.path.isfile('/etc/v2ray/v2ray-server.json') and checkIfProcessRunning('v2ray'):
v2ray_tx = get_bytes_v2ray('tx',username)
v2ray_rx = get_bytes_v2ray('rx',username)
vpn = 'glorytun_tcp'
with open('/etc/openmptcprouter-vps-admin/omr-admin-config.json') as f: with open('/etc/openmptcprouter-vps-admin/omr-admin-config.json') as f:
try: try:
omr_config_data = json.load(f) omr_config_data = json.load(f)
except ValueError as e: except ValueError as e:
omr_config_data = {} omr_config_data = {}
proxy = 'shadowsocks'
if 'proxy' in omr_config_data['users'][0][username]:
proxy = omr_config_data['users'][0][username]['proxy']
shadowsocks_port = current_user.shadowsocks_port
if not shadowsocks_port == None and proxy == 'shadowsocks':
ss_traffic = get_bytes_ss(current_user.shadowsocks_port)
else:
ss_traffic = 0
v2ray_tx = 0
v2ray_rx = 0
if os.path.isfile('/etc/v2ray/v2ray-server.json') and proxy == 'v2ray' and checkIfProcessRunning('v2ray'):
v2ray_tx = get_bytes_v2ray('tx',username)
v2ray_rx = get_bytes_v2ray('rx',username)
vpn = 'glorytun_tcp'
if 'vpn' in omr_config_data['users'][0][username]: if 'vpn' in omr_config_data['users'][0][username]:
vpn = omr_config_data['users'][0][username]['vpn'] vpn = omr_config_data['users'][0][username]['vpn']
vpn_traffic_rx = 0 vpn_traffic_rx = 0
@ -2566,3 +2569,4 @@ if __name__ == '__main__':
parser.add_argument("--host", type=str, help="Listening host", default=omrhost) parser.add_argument("--host", type=str, help="Listening host", default=omrhost)
args = parser.parse_args() args = parser.parse_args()
main(args.port, args.host) main(args.port, args.host)
#uvicorn.run("__main__:app", host=omrhost, port=omrport, log_level='error', ssl_certfile='/etc/openmptcprouter-vps-admin/cert.pem', ssl_keyfile='/etc/openmptcprouter-vps-admin/key.pem', ssl_version=5, workers=6)