From 12f956e66f6d557425a0071b384ccafa7e1e9a97 Mon Sep 17 00:00:00 2001 From: Kyrylo Yatsenko Date: Fri, 27 Jun 2025 10:24:29 +0300 Subject: 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 --- src/op_mode/vpn_ipsec.py | 7 ++++--- 1 file 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__': -- cgit v1.2.3