From: Tobias Brunner <tobias@strongswan.org>
Date: Wed, 2 Oct 2024 07:57:14 +0000 (+0200)
Subject: parser: Make debug log for payload substructure rules more clear
X-Git-Tag: 6.0.0rc1~44
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2ec6d50a3ccb28d7f780c2bfa358ea14ef7fee7e;p=thirdparty%2Fstrongswan.git

parser: Make debug log for payload substructure rules more clear

Instead of this

  parsing rule 10 (1258)

we now see this

  parsing rule 10 LIST of PROPOSAL_SUBSTRUCTURE

in the debug log. Particularly useful if the list is empty as there won't
be a message like this following it:

  x bytes left, parsing recursively PROPOSAL_SUBSTRUCTURE
---

diff --git a/src/libcharon/encoding/parser.c b/src/libcharon/encoding/parser.c
index 546d39931e..225d5d19d9 100644
--- a/src/libcharon/encoding/parser.c
+++ b/src/libcharon/encoding/parser.c
@@ -399,8 +399,16 @@ METHOD(parser_t, parse_payload, status_t,
 		header_length = pld->get_header_length(pld);
 
 		rule = &(this->rules[rule_number]);
-		DBG2(DBG_ENC, "  parsing rule %d %N",
-			 rule_number, encoding_type_names, rule->type);
+		if (rule->type < PAYLOAD_LIST)
+		{
+			DBG2(DBG_ENC, "  parsing rule %d %N",
+				 rule_number, encoding_type_names, rule->type);
+		}
+		else
+		{
+			DBG2(DBG_ENC, "  parsing rule %d LIST of %N",
+				 rule_number, payload_type_names, rule->type - PAYLOAD_LIST);
+		}
 		switch ((int)rule->type)
 		{
 			case U_INT_4: