From: Martin Willi <martin@strongswan.org>
Date: Fri, 6 Jan 2017 12:01:34 +0000 (+0100)
Subject: swanctl: List CHILD_SA marks, if set
X-Git-Tag: 5.5.2dr5~19
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=72547830fbf583aafdaf7bc045c9a818e90c93eb;p=thirdparty%2Fstrongswan.git

swanctl: List CHILD_SA marks, if set
---

diff --git a/src/swanctl/commands/list_sas.c b/src/swanctl/commands/list_sas.c
index e5f251d171..4257c83a5b 100644
--- a/src/swanctl/commands/list_sas.c
+++ b/src/swanctl/commands/list_sas.c
@@ -165,6 +165,15 @@ CALLBACK(child_sas, int,
 		printf("    in  %s%s%s", child->get(child, "spi-in"),
 			child->get(child, "cpi-in") ? "/" : "",
 			child->get(child, "cpi-in") ?: "");
+		if (child->get(child, "mark-in"))
+		{
+			printf(" (0x%s", child->get(child, "mark-in"));
+			if (child->get(child, "mark-mask-in"))
+			{
+				printf("/0x%s", child->get(child, "mark-mask-in"));
+			}
+			printf(")");
+		}
 		printf(", %6s bytes, %5s packets",
 			child->get(child, "bytes-in"), child->get(child, "packets-in"));
 		if (child->get(child, "use-in"))
@@ -176,6 +185,15 @@ CALLBACK(child_sas, int,
 		printf("    out %s%s%s", child->get(child, "spi-out"),
 			child->get(child, "cpi-out") ? "/" : "",
 			child->get(child, "cpi-out") ?: "");
+		if (child->get(child, "mark-out"))
+		{
+			printf(" (0x%s", child->get(child, "mark-out"));
+			if (child->get(child, "mark-mask-out"))
+			{
+				printf("/0x%s", child->get(child, "mark-mask-out"));
+			}
+			printf(")");
+		}
 		printf(", %6s bytes, %5s packets",
 			child->get(child, "bytes-out"), child->get(child, "packets-out"));
 		if (child->get(child, "use-out"))