From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Wed, 20 Jan 2021 18:04:43 +0000 (+0000)
Subject: Slightly better way of initialising
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=31f2dc3efc652e507d91dd1ce8e3760af7f068da;p=thirdparty%2Ffreeradius-server.git

Slightly better way of initialising
---

diff --git a/src/bin/unit_test_module.c b/src/bin/unit_test_module.c
index d76bc6e817f..c2d325959b0 100644
--- a/src/bin/unit_test_module.c
+++ b/src/bin/unit_test_module.c
@@ -202,17 +202,31 @@ static request_t *request_from_file(TALLOC_CTX *ctx, FILE *fp, fr_event_list_t *
 	 *	Set the defaults for IPs, etc.
 	 */
 	request->packet->code = access_request;
-
-	request->packet->socket.proto = IPPROTO_UDP;
-	request->packet->socket.inet.src_ipaddr.af = AF_INET;
-	request->packet->socket.inet.src_ipaddr.prefix = 32;
-	request->packet->socket.inet.src_ipaddr.addr.v4.s_addr = htonl(INADDR_LOOPBACK);
-	request->packet->socket.inet.src_port = 18120;
-
-	request->packet->socket.inet.dst_ipaddr.af = AF_INET;
-	request->packet->socket.inet.dst_ipaddr.prefix = 32;
-	request->packet->socket.inet.dst_ipaddr.addr.v4.s_addr = htonl(INADDR_LOOPBACK);
-	request->packet->socket.inet.dst_port = 1812;
+	request->packet->socket = (fr_socket_t){
+		.proto = IPPROTO_UDP,
+		.inet = {
+			.src_ipaddr = {
+				.af = AF_INET,
+				.prefix = 32,
+				.addr = {
+					.v4 = {
+						.s_addr = htonl(INADDR_LOOPBACK)
+					}
+				}
+			},
+			.src_port = 18120,
+			.dst_ipaddr = {
+				.af = AF_INET,
+				.prefix = 32,
+				.addr = {
+					.v4 = {
+						.s_addr = htonl(INADDR_LOOPBACK)
+					}
+				}
+			},
+			.dst_port = 1812
+		}
+	};
 
 	for (vp = fr_cursor_init(&cursor, &request->request_pairs);
 	     vp;