diff options
| author | Jason Hendry <jhendry@mintel.com> | 2014-11-27 16:16:56 +0000 |
|---|---|---|
| committer | Jason Hendry <jhendry@mintel.com> | 2014-11-27 16:16:56 +0000 |
| commit | 59509fd6932087531d683f317f2669acdb56080e (patch) | |
| tree | bd3c49b4dd6fe9fa50da5c4972457a96d214f38e /lib | |
| parent | 928f5e3fe9157b04c90ddba7c64bae54f9ee2b01 (diff) | |
| download | vyatta-op-vpn-59509fd6932087531d683f317f2669acdb56080e.tar.gz vyatta-op-vpn-59509fd6932087531d683f317f2669acdb56080e.zip | |
Fixing detection of IKE SA info with IKEv2
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/OPMode.pm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/OPMode.pm b/lib/OPMode.pm index 8a68cc2..3c84f12 100644 --- a/lib/OPMode.pm +++ b/lib/OPMode.pm @@ -548,13 +548,13 @@ sub process_tunnels{ } $line =~ s/---.*\.\.\./.../g; # remove the next hop router for local-ip 0.0.0.0 case - if ($line =~ /IKE.proposal:(.*?)\/(.*?)\/(.*)/){ + if ($line =~ /\]:\s+IKE.proposal:(.*?)\/(.*?)\/(.*)/){ $tunnel_hash{$connectid}->{_ikeencrypt} = $1; $tunnel_hash{$connectid}->{_ikehash} = $2; $tunnel_hash{$connectid}->{_dhgrp} = $3; } - if ($line =~ /: ESTABLISHED (.*), (.*?)\[(.*?)\]\.\.\.(.*?)\[(.*?)\]/) { + if ($line =~ /:\s+ESTABLISHED (.*), (.*?)\[(.*?)\]\.\.\.(.*?)\[(.*?)\]/) { my $lip = $2; my $lid = $3; my $rip = $4; @@ -588,7 +588,7 @@ sub process_tunnels{ $tunnel_hash{$connectid}->{_ikelife} = $ikelife; $tunnel_hash{$connectid}->{_pfsgrp} = $pfs_group; - } elsif ($line =~ /\]:IKE SPIs: .* reauthentication in (.*)/) { + } elsif ($line =~ /\]:\s+IKE SPIs: .* reauthentication in (.*)/) { $tunnel_hash{$connectid}->{_ikeexpire} = conv_time($1); my $atime = $tunnel_hash{$connectid}->{_ikelife} - $tunnel_hash{$connectid}->{_ikeexpire}; |