From: Alan T. DeKok <aland@freeradius.org>
Date: Tue, 3 Mar 2020 18:25:31 +0000 (-0500)
Subject: convert API to take explicit ctx and destination vps list
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=da94c4e09c3e99779fc2d908dc4ccc125537dc83;p=thirdparty%2Ffreeradius-server.git

convert API to take explicit ctx and destination vps list

in preparation for moving to FR_TYPE_GROUP
---

diff --git a/src/modules/proto_vmps/proto_vmps.c b/src/modules/proto_vmps/proto_vmps.c
index f393576b29a..00f4f066782 100644
--- a/src/modules/proto_vmps/proto_vmps.c
+++ b/src/modules/proto_vmps/proto_vmps.c
@@ -229,6 +229,7 @@ static int mod_decode(void const *instance, REQUEST *request, uint8_t *const dat
 	fr_io_track_t const *track = talloc_get_type_abort_const(request->async->packet_ctx, fr_io_track_t);
 	fr_io_address_t *address = track->address;
 	RADCLIENT const *client;
+	RADIUS_PACKET *packet = request->packet;
 
 	rad_assert(data[0] < FR_RADIUS_MAX_PACKET_CODE);
 
@@ -259,7 +260,7 @@ static int mod_decode(void const *instance, REQUEST *request, uint8_t *const dat
 	 *	That MUST be set and checked in the underlying
 	 *	transport, via a call to fr_vmps_ok().
 	 */
-	if (vqp_decode(request->packet) < 0) {
+	if (fr_vqp_decode(packet, packet->data, packet->data_len, &packet->vps, &packet->code) < 0) {
 		RPEDEBUG("Failed decoding packet");
 		return -1;
 	}
diff --git a/src/protocols/vqp/vqp.c b/src/protocols/vqp/vqp.c
index 43cb359883a..9219ec324ad 100644
--- a/src/protocols/vqp/vqp.c
+++ b/src/protocols/vqp/vqp.c
@@ -271,47 +271,48 @@ int vqp_send(RADIUS_PACKET *packet)
 }
 
 
-int vqp_decode(RADIUS_PACKET *packet)
+int fr_vqp_decode(TALLOC_CTX *ctx, uint8_t const *data, size_t data_len, VALUE_PAIR **vps, unsigned int *code)
 {
-	uint8_t		*ptr, *end;
+	uint8_t const  	*ptr, *end;
 	int		attr;
 	size_t		attr_len;
 	fr_cursor_t	cursor;
 	VALUE_PAIR	*vp;
 
-	if (!packet || !packet->data) return -1;
+	if (data_len < VQP_HDR_LEN) return -1;
 
-	if (packet->data_len < VQP_HDR_LEN) return -1;
+	fr_cursor_init(&cursor, vps);
 
-	fr_cursor_init(&cursor, &packet->vps);
-
-	vp = fr_pair_afrom_da(packet, attr_packet_type);
+	vp = fr_pair_afrom_da(ctx, attr_packet_type);
 	if (!vp) {
 	oom:
 		fr_strerror_printf("Out of Memory");
 		return -1;
 	}
-	vp->vp_uint32 = packet->data[1];
+	vp->vp_uint32 = data[1];
+	if (code) *code = data[1];
 	vp->vp_tainted = true;
 	DEBUG2("&%pP", vp);
 	fr_cursor_append(&cursor, vp);
 
-	vp = fr_pair_afrom_da(packet, attr_error_code);
+	vp = fr_pair_afrom_da(ctx, attr_error_code);
 	if (!vp) goto oom;
-	vp->vp_uint32 = packet->data[2];
+	vp->vp_uint32 = data[2];
 	vp->vp_tainted = true;
 	DEBUG2("&%pP", vp);
 	fr_cursor_append(&cursor, vp);
 
-	vp = fr_pair_afrom_da(packet, attr_sequence_number);
+	vp = fr_pair_afrom_da(ctx, attr_sequence_number);
 	if (!vp) goto oom;
-	vp->vp_uint32 = packet->id; /* already set by vqp_recv */
+
+	memcpy(&vp->vp_uint32, data + 4, 4);
+	vp->vp_uint32 = ntohl(vp->vp_uint32);
 	vp->vp_tainted = true;
 	DEBUG2("&%pP", vp);
 	fr_cursor_append(&cursor, vp);
 
-	ptr = packet->data + VQP_HDR_LEN;
-	end = packet->data + packet->data_len;
+	ptr = data + VQP_HDR_LEN;
+	end = data + data_len;
 
 	/*
 	 *	Note that vqp_recv() MUST ensure that the packet is
@@ -335,12 +336,12 @@ int vqp_decode(RADIUS_PACKET *packet)
 		/*
 		 *	Create the VP.
 		 */
-		vp = fr_pair_afrom_child_num(packet, fr_dict_root(dict_vmps), attr);
+		vp = fr_pair_afrom_child_num(ctx, fr_dict_root(dict_vmps), attr);
 		if (!vp) {
 			fr_strerror_printf("No memory");
 
 		error:
-			fr_pair_list_free(&packet->vps);
+			fr_pair_list_free(vps);
 			return -1;
 		}
 
diff --git a/src/protocols/vqp/vqp.h b/src/protocols/vqp/vqp.h
index 7efac653185..026d9b81d6d 100644
--- a/src/protocols/vqp/vqp.h
+++ b/src/protocols/vqp/vqp.h
@@ -39,7 +39,7 @@ bool			fr_vqp_ok(uint8_t const *packet, size_t *packet_len);
 
 int			vqp_send(RADIUS_PACKET *packet);
 
-int			vqp_decode(RADIUS_PACKET *packet);
+int			fr_vqp_decode(TALLOC_CTX *ctx, uint8_t const *data, size_t data_len, VALUE_PAIR **vps, unsigned int *code);
 
 int			vqp_encode(RADIUS_PACKET *packet, RADIUS_PACKET *original);