aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Willi <martin@revosec.ch>2012-06-27 11:40:53 +0200
committerMartin Willi <martin@revosec.ch>2012-06-27 11:42:00 +0200
commitdc6d25963525f412609874f95da4bc27b765c9cf (patch)
tree6ca3ea322c593f8d893be6e456a048e185ffcdc3
parent8122ae8cd86da278b396f9a1e79d17b3f44f08dd (diff)
downloadstrongswan-dc6d25963525f412609874f95da4bc27b765c9cf.tar.bz2
strongswan-dc6d25963525f412609874f95da4bc27b765c9cf.tar.xz
Show remote EAP/XAuth identity in "statusall" on a separate line
-rw-r--r--src/libcharon/plugins/stroke/stroke_list.c13
1 files changed, 12 insertions, 1 deletions
diff --git a/src/libcharon/plugins/stroke/stroke_list.c b/src/libcharon/plugins/stroke/stroke_list.c
index fecb56a14..294e5066b 100644
--- a/src/libcharon/plugins/stroke/stroke_list.c
+++ b/src/libcharon/plugins/stroke/stroke_list.c
@@ -115,11 +115,22 @@ static void log_ike_sa(FILE *out, ike_sa_t *ike_sa, bool all)
fprintf(out, ", %H[%Y]...%H[%Y]\n",
ike_sa->get_my_host(ike_sa), ike_sa->get_my_id(ike_sa),
- ike_sa->get_other_host(ike_sa), ike_sa->get_other_eap_id(ike_sa));
+ ike_sa->get_other_host(ike_sa), ike_sa->get_other_id(ike_sa));
if (all)
{
proposal_t *ike_proposal;
+ identification_t *eap_id;
+
+ eap_id = ike_sa->get_other_eap_id(ike_sa);
+
+ if (!eap_id->equals(eap_id, ike_sa->get_other_id(ike_sa)))
+ {
+ fprintf(out, "%12s[%d]: Remote %s identity: %Y\n",
+ ike_sa->get_name(ike_sa), ike_sa->get_unique_id(ike_sa),
+ ike_sa->get_version(ike_sa) == IKEV1 ? "XAuth" : "EAP",
+ eap_id);
+ }
ike_proposal = ike_sa->get_proposal(ike_sa);