From b08f320e8873e50a4e5560c718455e134238d2be Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Tue, 8 Feb 2022 08:32:25 +0100 Subject: [PATCH] Check if v2ray is used before getting traffic --- omr-admin.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/omr-admin.py b/omr-admin.py index 2beb1ca..6e0dd6c 100755 --- a/omr-admin.py +++ b/omr-admin.py @@ -1114,6 +1114,10 @@ async def config(userid: Optional[int] = Query(None), serial: Optional[str] = Qu except ValueError as e: omr_config_data = {} LOG.debug('Get config... shadowsocks') + proxy = 'shadowsocks' + if 'proxy' in omr_config_data['users'][0][username]: + proxy = omr_config_data['users'][0][username]['proxy'] + with open('/etc/shadowsocks-libev/manager.json') as f: content = f.read() content = re.sub(",\s*}", "}", content) # pylint: disable=W1401 @@ -1166,7 +1170,7 @@ async def config(userid: Optional[int] = Query(None), serial: Optional[str] = Qu shadowsocks_obfs_plugin = '' shadowsocks_obfs_type = '' shadowsocks_port = current_user.shadowsocks_port - if not shadowsocks_port == None: + if not shadowsocks_port == None and proxy == 'shadowsocks': ss_traffic = get_bytes_ss(current_user.shadowsocks_port) else: ss_traffic = 0 @@ -1377,7 +1381,7 @@ async def config(userid: Optional[int] = Query(None), serial: Optional[str] = Qu modif_config_user(username, {'v2ray': v2ray_conf}) else: v2ray_conf = omr_config_data['users'][0][username]['v2ray'] - if checkIfProcessRunning('v2ray'): + if checkIfProcessRunning('v2ray') and proxy == 'v2ray': v2ray_tx = get_bytes_v2ray('tx',username) v2ray_rx = get_bytes_v2ray('rx',username) @@ -1465,10 +1469,6 @@ async def config(userid: Optional[int] = Query(None), serial: Optional[str] = Qu locaip6 = 'fe80::a00:1' remoteip6 = 'fe80::a00:2' - proxy = 'shadowsocks' - if 'proxy' in omr_config_data['users'][0][username]: - proxy = omr_config_data['users'][0][username]['proxy'] - vpn = 'glorytun_tcp' if 'vpn' in omr_config_data['users'][0][username]: vpn = omr_config_data['users'][0][username]['vpn']