From: Tobias Brunner <tobias@strongswan.org>
Date: Tue, 12 Feb 2019 11:13:41 +0000 (+0100)
Subject: vici: Report interface IDs
X-Git-Tag: 5.8.0rc1~41^2~18
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=aa841dbbfcbeacb1c88bb5768a5060b5b209c596;p=thirdparty%2Fstrongswan.git

vici: Report interface IDs
---

diff --git a/src/libcharon/plugins/vici/README.md b/src/libcharon/plugins/vici/README.md
index 5bd8c17272..2b0b7c2d5c 100644
--- 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 d7b61ca72f..e00c1d87d5 100644
--- 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)
 		{