diff options
| author | DmitriyEshenko <dmitriy.eshenko@vyos.io> | 2020-12-21 16:39:57 +0000 |
|---|---|---|
| committer | DmitriyEshenko <dmitriy.eshenko@vyos.io> | 2020-12-21 17:23:06 +0000 |
| commit | 1951413f8a3e1681fa8ef5898bd9e31134080a9d (patch) | |
| tree | 791f7570c9c2ab62f8c47125a62d24f4386326ac /src/completion | |
| parent | f8db20706527ab04f3585ab28bc2bed030c7def7 (diff) | |
| download | vyos-1x-1951413f8a3e1681fa8ef5898bd9e31134080a9d.tar.gz vyos-1x-1951413f8a3e1681fa8ef5898bd9e31134080a9d.zip | |
openvpn: T3142: Change the path to tunnel status file
Diffstat (limited to 'src/completion')
| -rwxr-xr-x | src/completion/list_openvpn_clients.py | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/src/completion/list_openvpn_clients.py b/src/completion/list_openvpn_clients.py index 177ac90c9..b443520ea 100755 --- a/src/completion/list_openvpn_clients.py +++ b/src/completion/list_openvpn_clients.py @@ -22,20 +22,23 @@ from vyos.ifconfig import Section def get_client_from_interface(interface): clients = [] - with open('/opt/vyatta/etc/openvpn/status/' + interface + '.status', 'r') as f: - dump = False - for line in f: - if line.startswith("Common Name,"): - dump = True - continue - if line.startswith("ROUTING TABLE"): - dump = False - continue - if dump: - # client entry in this file looks like - # client1,172.18.202.10:47495,2957,2851,Sat Aug 17 00:07:11 2019 - # we are only interested in the client name 'client1' - clients.append(line.split(',')[0]) + try: + with open('/run/openvpn/' + interface + '.status', 'r') as f: + dump = False + for line in f: + if line.startswith("Common Name,"): + dump = True + continue + if line.startswith("ROUTING TABLE"): + dump = False + continue + if dump: + # client entry in this file looks like + # client1,172.18.202.10:47495,2957,2851,Sat Aug 17 00:07:11 2019 + # we are only interested in the client name 'client1' + clients.append(line.split(',')[0]) + except: + pass return clients |