summaryrefslogtreecommitdiff
path: root/src/op_mode
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2019-01-06 10:58:06 +0100
committerChristian Poessinger <christian@poessinger.com>2019-01-06 10:58:06 +0100
commit89884d572bdf50c7d0c81e0f9f69855056f6f416 (patch)
treee863c55a4e5f09de27674f7471797221289d2eac /src/op_mode
parentbdf528272a0d7e40dc46ada08ccad75bd8debae9 (diff)
parent60a8793aef2c1af95d7a992bfc0a381e1a8a61cd (diff)
downloadvyos-1x-89884d572bdf50c7d0c81e0f9f69855056f6f416.tar.gz
vyos-1x-89884d572bdf50c7d0c81e0f9f69855056f6f416.zip
Merge branch 'current' into crux
* current: T1129: replace quotes when dealing with 'subnet/global-parameters' T1129: fix handling of raw DHCP 'subnet-parameters' T1159: correct handling of SAs without PFS in "show vpn ipsec sa". T1147: Fix SNMP config file generation on newly installed systems Initial implementation of declarative config dict retrieval library. T1119: 'show vpn ipsec sa' shows tunnel twice in 1.2.0-RC11
Diffstat (limited to 'src/op_mode')
-rwxr-xr-xsrc/op_mode/show_ipsec_sa.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/op_mode/show_ipsec_sa.py b/src/op_mode/show_ipsec_sa.py
index 568a5daeb..4c39aba66 100755
--- a/src/op_mode/show_ipsec_sa.py
+++ b/src/op_mode/show_ipsec_sa.py
@@ -32,7 +32,7 @@ def parse_ike_line(s):
# Get a list of all configured connections
with open('/etc/ipsec.conf', 'r') as f:
config = f.read()
- connections = re.findall(r'conn\s([^\s]+)\s*\n', config)
+ connections = set(re.findall(r'conn\s([^\s]+)\s*\n', config))
connections = list(filter(lambda s: s != '%default', connections))
status_data = []