From: Andreas Steffen <andreas.steffen@strongswan.org>
Date: Wed, 23 May 2012 09:12:27 +0000 (+0200)
Subject: list IKEv1 Aggressive Mode in ipsec statusall
X-Git-Tag: 5.0.0~236
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2ac996cb71b13441ac8f313fc3b878f523906761;p=thirdparty%2Fstrongswan.git

list IKEv1 Aggressive Mode in ipsec statusall
---

diff --git a/src/libcharon/plugins/stroke/stroke_list.c b/src/libcharon/plugins/stroke/stroke_list.c
index fc8b3e2ad4..caceab4606 100644
--- a/src/libcharon/plugins/stroke/stroke_list.c
+++ b/src/libcharon/plugins/stroke/stroke_list.c
@@ -426,6 +426,7 @@ METHOD(stroke_list_t, status, void,
 	if (all)
 	{
 		peer_cfg_t *peer_cfg;
+		ike_version_t ike_version;
 		char *pool;
 		host_t *host;
 		u_int32_t dpd;
@@ -500,9 +501,15 @@ METHOD(stroke_list_t, status, void,
 			}
 
 			ike_cfg = peer_cfg->get_ike_cfg(peer_cfg);
-			fprintf(out, "%12s:  %s...%s (%N)", peer_cfg->get_name(peer_cfg),
+			ike_version = peer_cfg->get_ike_version(peer_cfg);
+			fprintf(out, "%12s:  %s...%s  %N", peer_cfg->get_name(peer_cfg),
 				ike_cfg->get_my_addr(ike_cfg), ike_cfg->get_other_addr(ike_cfg),
-				ike_version_names, peer_cfg->get_ike_version(peer_cfg));
+				ike_version_names, ike_version);
+
+			if (ike_version == IKEV1 && peer_cfg->use_aggressive(peer_cfg))
+			{
+				fprintf(out, " Aggressive");
+			}
 
 			dpd = peer_cfg->get_dpd(peer_cfg);
 			if (dpd)