diff options
| author | Daniil Baturin <daniil@baturin.org> | 2014-12-05 22:25:42 +0600 |
|---|---|---|
| committer | Daniil Baturin <daniil@baturin.org> | 2014-12-05 22:25:42 +0600 |
| commit | 05ff24760a908158a2deb1f545cb75590136044a (patch) | |
| tree | 827c92ef4ac23665614b201ba78759a852872266 /lib | |
| parent | 1e26576c2364c2626dffbc9f2987c955de2bf5fb (diff) | |
| parent | 79fbc6f7c770780507196c2ed2fe34547fc84428 (diff) | |
| download | vyatta-op-vpn-05ff24760a908158a2deb1f545cb75590136044a.tar.gz vyatta-op-vpn-05ff24760a908158a2deb1f545cb75590136044a.zip | |
Merge pull request #6 from jhendryUK/fix_ikev2_ike_info_without_reauth
Bug 396: Fixing output of "show vpn ike sa" when reauth=no
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/OPMode.pm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/OPMode.pm b/lib/OPMode.pm index 4c60179..d9f7526 100644 --- a/lib/OPMode.pm +++ b/lib/OPMode.pm @@ -584,8 +584,8 @@ sub process_tunnels{ $tunnel_hash{$connectid}->{_ikelife} = $ikelife; $tunnel_hash{$connectid}->{_pfsgrp} = $pfs_group; - } elsif ($line =~ /\]:\s+IKE SPIs: .* reauthentication in (.*)/) { - $tunnel_hash{$connectid}->{_ikeexpire} = conv_time($1); + } elsif ($line =~ /\]:\s+IKE SPIs: .* (reauthentication|rekeying) in (.*)/) { + $tunnel_hash{$connectid}->{_ikeexpire} = conv_time($2); my $atime = $tunnel_hash{$connectid}->{_ikelife} - $tunnel_hash{$connectid}->{_ikeexpire}; $tunnel_hash{$connectid}->{_ikestate} = "up" if ($atime >= 0); |