summaryrefslogtreecommitdiff
path: root/src/op_mode/vpn_ipsec.py
diff options
context:
space:
mode:
authorKyrylo Yatsenko <hedrok@gmail.com>2025-06-27 10:24:29 +0300
committerKyrylo Yatsenko <hedrok@gmail.com>2025-07-08 17:26:38 +0300
commit12f956e66f6d557425a0071b384ccafa7e1e9a97 (patch)
tree0fb209fe119efbec03110499429d96cb2e558c81 /src/op_mode/vpn_ipsec.py
parentbdb5846987fa21f410204f0aa15670f37339da8c (diff)
downloadvyos-1x-12f956e66f6d557425a0071b384ccafa7e1e9a97.tar.gz
vyos-1x-12f956e66f6d557425a0071b384ccafa7e1e9a97.zip
ipsec: T7545: Fix show vpn debug peer
Fix re for searching of peers in /etc/swanctl/swanctl.conf ``` search = rf'^[\s]*(peer_{peer}_(tunnel_[\d]+|vti)).*' ``` Changed to ``` search = rf'^[\s]*({peer}-(tunnel-[\d]+|vti))[\s]*{{' ``` Added message ``` print(f'\n### {command} ###') ``` so that output is not empty when `/usr/sbin/ipsec statusall` shows nothing
Diffstat (limited to 'src/op_mode/vpn_ipsec.py')
-rwxr-xr-xsrc/op_mode/vpn_ipsec.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/op_mode/vpn_ipsec.py b/src/op_mode/vpn_ipsec.py
index ef89e605f..166f717cf 100755
--- a/src/op_mode/vpn_ipsec.py
+++ b/src/op_mode/vpn_ipsec.py
@@ -23,13 +23,13 @@ SWANCTL_CONF = '/etc/swanctl/swanctl.conf'
def get_peer_connections(peer, tunnel, return_all = False):
- search = rf'^[\s]*(peer_{peer}_(tunnel_[\d]+|vti)).*'
+ search = rf'^[\s]*({peer}-(tunnel-[\d]+|vti))[\s]*{{'
matches = []
with open(SWANCTL_CONF, 'r') as f:
for line in f.readlines():
result = re.match(search, line)
if result:
- suffix = f'tunnel_{tunnel}' if tunnel.isnumeric() else tunnel
+ suffix = f'tunnel-{tunnel}' if tunnel.isnumeric() else tunnel
if return_all or (result[2] == suffix):
matches.append(result[1])
return matches
@@ -66,7 +66,8 @@ def debug_peer(peer, tunnel):
return
for conn in conns:
- call(f'/usr/sbin/ipsec statusall | grep {conn}')
+ command = f'/usr/sbin/ipsec statusall | grep {conn}'
+ call(command)
if __name__ == '__main__':