Tests for encoding TLVs in extended attributes

FreeRADIUS · Nov 16, 2015 · 8a26f6c · 8a26f6c
1 parent dd4e399
commit 8a26f6c
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 17 deletions.
diff --git a/src/lib/radius_encode.c b/src/lib/radius_encode.c
@@ -919,24 +919,18 @@ static int encode_extended_hdr(uint8_t *out, size_t outlen,
 		if (outlen < 3) return 0;
 
 		out[1] = 3;
-		out[2] = vp->da->attr & 0xff;
+		out[2] = tlv_stack[depth]->attr & 0xff;
 
 	} else {
 		if (outlen < 4) return 0;
 
 		out[1] = 4;
-		out[2] = vp->da->attr & 0xff;
+		out[2] = tlv_stack[depth]->attr & 0xff;
 		out[3] = 0;	/* flags start off at zero */
 	}
 
-	/*
-	 *	Only "flagged" attributes can be longer than one
-	 *	attribute.  The caller should really take care of
-	 *	this, too.
-	 */
-	if (!vp->da->flags.long_extended && (outlen > 255)) {
-		outlen = 255;
-	}
+	FR_PROTO_STACK_PRINT(tlv_stack, depth);
+	FR_PROTO_HEX_DUMP("Extended header", out, out[1]);
 
 	/*
 	 *	Handle EVS
@@ -947,20 +941,27 @@ static int encode_extended_hdr(uint8_t *out, size_t outlen,
 
 		if (outlen < (size_t) (out[1] + 5)) return 0;
 
-		depth += 2;	/* skip EVS and Vendor */
+		depth++;	/* skip EVS */
 
-		out[2] = 26;
-
-		lvalue = htonl(vp->da->vendor);
+		lvalue = htonl(tlv_stack[depth++]->attr);
 		memcpy(evs, &lvalue, 4);
 
-		evs[4] = vp->da->attr & 0xff;
+		evs[4] = tlv_stack[depth]->attr & 0xff;
 
 		out[1] += 5;
+
+		FR_PROTO_STACK_PRINT(tlv_stack, depth);
+		FR_PROTO_HEX_DUMP("EVS", out, out[1]);
+
 	}
 	hdr_len = out[1];
 
-	len = encode_value(out + out[1], outlen - hdr_len, packet, original, secret, tlv_stack, depth, pvp);
+	if (tlv_stack[depth]->type == PW_TYPE_TLV) {
+		len = encode_tlv_hdr_internal(out + out[1], outlen - hdr_len, packet, original, secret, tlv_stack, depth, pvp);
+
+	} else {
+		len = encode_value(out + out[1], outlen - hdr_len, packet, original, secret, tlv_stack, depth, pvp);
+	}
 	if (len <= 0) return len;
 
 	/*

diff --git a/src/tests/unit/extended.txt b/src/tests/unit/extended.txt
@@ -135,4 +135,7 @@ data Unit-EVS-Integer = 6809
 #  that format instead of guessing.
 #
 encode Unit-TLV-Integer = 1, Unit-TLV-Integer = 2
-data f1 11 01 f3 0e 01 06 00 00 00 01 01 06 00 00 00 02
+data f1 0f f3 01 06 00 00 00 01 01 06 00 00 00 02
+
+decode -
+data Unit-TLV-Integer = 1, Unit-TLV-Integer = 2