vici: Report interface IDs

diff --git a/src/libcharon/plugins/vici/README.md b/src/libcharon/plugins/vici/README.md
index 5bd8c172721bb2a9c98d1ff43cdc7ac1a96c60f0..2b0b7c2d5c7662bafe1e8d5fca1d45140d750beb 100644 (file)
--- a/src/libcharon/plugins/vici/README.md
+++ b/src/libcharon/plugins/vici/README.md
@@ -813,6 +813,8 @@ command.
                                        mark-mask-in = <hex encoded inbound Netfilter mark mask>
                                        mark-out = <hex encoded outbound Netfilter mark value>
                                        mark-mask-out = <hex encoded outbound Netfilter mark mask>
+                                       if-id-in = <hex encoded inbound XFRM interface ID>
+                                       if-id-out = <hex encoded outbound XFRM interface ID>
                                        encr-alg = <ESP encryption algorithm name, if any>
                                        encr-keysize = <ESP encryption key size, if applicable>
                                        integ-alg = <ESP or AH integrity algorithm name, if any>

diff --git a/src/libcharon/plugins/vici/vici_query.c b/src/libcharon/plugins/vici/vici_query.c
index d7b61ca72f2901913e99ea8804d96c6a52611dbf..e00c1d87d513f8eddbb5ac6803269fa92dbe26ad 100644 (file)
--- a/src/libcharon/plugins/vici/vici_query.c
+++ b/src/libcharon/plugins/vici/vici_query.c
@@ -155,6 +155,7 @@ static void list_child(private_vici_query_t *this, vici_builder_t *b,
 {
        time_t t;
        uint64_t bytes, packets;
+       uint32_t if_id;
        uint16_t alg, ks;
        proposal_t *proposal;
        enumerator_t *enumerator;
@@ -185,6 +186,16 @@ static void list_child(private_vici_query_t *this, vici_builder_t *b,
                }
                add_mark(b, child->get_mark(child, TRUE), "mark-in", "mark-mask-in");
                add_mark(b, child->get_mark(child, FALSE), "mark-out", "mark-mask-out");
+               if_id = child->get_if_id(child, TRUE);
+               if (if_id)
+               {
+                       b->add_kv(b, "if-id-in", "%.8x", if_id);
+               }
+               if_id = child->get_if_id(child, FALSE);
+               if (if_id)
+               {
+                       b->add_kv(b, "if-id-out", "%.8x", if_id);
+               }
                proposal = child->get_proposal(child);
                if (proposal)
                {