From: Alan T. DeKok <aland@freeradius.org>
Date: Thu, 11 Oct 2018 18:38:21 +0000 (-0400)
Subject: clean it up to do less work
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=be9e635b69abe634eaee51ebad144bce5f5dbc1b;p=thirdparty%2Ffreeradius-server.git

clean it up to do less work
---

diff --git a/src/protocols/radius/encode.c b/src/protocols/radius/encode.c
index 36d23961d4c..8854e24d007 100644
--- a/src/protocols/radius/encode.c
+++ b/src/protocols/radius/encode.c
@@ -474,24 +474,16 @@ static ssize_t encode_struct(uint8_t *out, size_t outlen,
 		child_num++;
 
 		vp = next_encodable(cursor);
+		fr_proto_tlv_stack_build(tlv_stack, vp ? vp->da : NULL);
 
 		/*
-		 *	Nothing more to do, we're done.
-		 */
-		if (!vp) break;
-
-		/*
-		 *	If the next VP isn't from the same parent, then stop.
+		 *	Nothing more to do, or we've done all of the
+		 *	entries in this structure, stop.
 		 */
-		if (vp->da->parent != da) {
-			break;
-		}
-
-		fr_proto_tlv_stack_build(tlv_stack, vp->da);
-		FR_PROTO_HEX_DUMP("Done STRUCT", out, p - out);
+		if (!vp || (vp->da->parent != da)) break;
 	}
 
-	fr_proto_tlv_stack_build(tlv_stack, NULL);
+	FR_PROTO_HEX_DUMP("Done STRUCT", out, p - out);
 
 	return p - out;
 }
@@ -622,12 +614,7 @@ static ssize_t encode_value(uint8_t *out, size_t outlen,
 	 *	This has special requirements.
 	 */
 	if (da->type == FR_TYPE_STRUCT) {
-		len = encode_struct(out, outlen, tlv_stack, depth, cursor);
-		if (len < 0) return len;
-
-		vp = fr_cursor_current(cursor);
-		fr_proto_tlv_stack_build(tlv_stack, vp ? vp->da : NULL);
-		return len;
+		return encode_struct(out, outlen, tlv_stack, depth, cursor);
 	}
 
 	/*