vici: Provide ports of local and remote IKE endpoints

diff --git a/src/libcharon/plugins/vici/README.md b/src/libcharon/plugins/vici/README.md
index b40fda9b7603ad3db94c43e180a28fdf0301dc97..773ef1aa5c2ccc8dc3b8012f0c44240a4e70c494 100644 (file)
--- a/src/libcharon/plugins/vici/README.md
+++ b/src/libcharon/plugins/vici/README.md
@@ -609,8 +609,10 @@ command.
                        version = <IKE version, 1 or 2>
                        state = <IKE_SA state name>
                        local-host = <local IKE endpoint address>
+                       local-port = <local IKE endpoint port>
                        local-id = <local IKE identity>
                        remote-host = <remote IKE endpoint address>
+                       remote-port = <remote IKE endpoint port>
                        remote-id = <remote IKE identity>
                        remote-xauth-id = <remote XAuth identity, if XAuth-authenticated>
                        remote-eap-id = <remote EAP identity, if EAP-authenticated>

diff --git a/src/libcharon/plugins/vici/vici_query.c b/src/libcharon/plugins/vici/vici_query.c
index 512c2ba7b343b56b913fd77887452e511ce25f70..cf909a90e88de0397e03425ef8d4c40128fbc388 100644 (file)
--- a/src/libcharon/plugins/vici/vici_query.c
+++ b/src/libcharon/plugins/vici/vici_query.c
@@ -273,15 +273,20 @@ static void list_ike(private_vici_query_t *this, vici_builder_t *b,
        identification_t *eap;
        proposal_t *proposal;
        u_int16_t alg, ks;
+       host_t *host;
 
        b->add_kv(b, "uniqueid", "%u", ike_sa->get_unique_id(ike_sa));
        b->add_kv(b, "version", "%u", ike_sa->get_version(ike_sa));
        b->add_kv(b, "state", "%N", ike_sa_state_names, ike_sa->get_state(ike_sa));
 
-       b->add_kv(b, "local-host", "%H", ike_sa->get_my_host(ike_sa));
+       host = ike_sa->get_my_host(ike_sa);
+       b->add_kv(b, "local-host", "%H", host);
+       b->add_kv(b, "local-port", "%d", host->get_port(host));
        b->add_kv(b, "local-id", "%Y", ike_sa->get_my_id(ike_sa));
 
-       b->add_kv(b, "remote-host", "%H", ike_sa->get_other_host(ike_sa));
+       host = ike_sa->get_other_host(ike_sa);
+       b->add_kv(b, "remote-host", "%H", host);
+       b->add_kv(b, "remote-port", "%d", host->get_port(host));
        b->add_kv(b, "remote-id", "%Y", ike_sa->get_other_id(ike_sa));
 
        eap = ike_sa->get_other_eap_id(ike_sa);