summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjules-vyos <vyos@ourhouse.org.uk>2017-07-27 18:33:08 +0100
committerjules-vyos <vyos@ourhouse.org.uk>2017-07-27 18:33:08 +0100
commitc322d07f1d1568ff1ea9a7a85efd825e42cba9d1 (patch)
tree9fe23b78d52b9e53fb5564e1cae69966b11c5356
parent739d1c222a3c69d89bf299365c070f5bf7981232 (diff)
downloadvyatta-op-vpn-c322d07f1d1568ff1ea9a7a85efd825e42cba9d1.tar.gz
vyatta-op-vpn-c322d07f1d1568ff1ea9a7a85efd825e42cba9d1.zip
Formatting of show vpn ike sa modified
... by suggestions from TomJepp
-rw-r--r--lib/OPMode.pm10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/OPMode.pm b/lib/OPMode.pm
index 438b628..0068e96 100644
--- a/lib/OPMode.pm
+++ b/lib/OPMode.pm
@@ -1292,8 +1292,8 @@ EOH
print "\n Description: $desc\n" if (defined($desc));
print <<EOH;
- State Ver Encrypt Hash D-H Grp NAT-T A-Time L-Time
- ----- --- ------- ---- ------- ----- ------ ------
+ State IKEVer Encrypt Hash D-H Group NAT-T A-Time L-Time
+ ----- ------ ------- ---- --------- ----- ------ ------
EOH
for my $tunnel (tunSort(@{$tunhash{$connid}->{_tunnels}})){
(my $tunnum, my $state, my $ver, my $isakmpnum, my $enc,
@@ -1301,11 +1301,11 @@ EOH
$enc = conv_enc($enc);
$hash = conv_hash($hash);
$natt = conv_natt($natt);
- $dhgrp = conv_dh_group($dhgrp);
+ $dhgrp = conv_dh_group($dhgrp)."(".$dhgrp.")";
my $atime = $life - $expire;
$atime = 0 if ($atime == $life);
- printf " %-6s %-4s %-8s %-7s %-8s %-6s %-7s %-7s\n",
- $state, $ver, $enc, $hash, $dhgrp, $natt, $atime, $life;
+ printf " %-6s %-6s %-8s %-7s %-14s %-6s %-7s %-7s\n",
+ $state, "IKEv".$ver, $enc, $hash, $dhgrp, $natt, $atime, $life;
}
print "\n \n";
}