]> git.ipfire.org Git - thirdparty/freeradius-server.git/commitdiff
Slightly better way of initialising
authorArran Cudbard-Bell <a.cudbardb@freeradius.org>
Wed, 20 Jan 2021 18:04:43 +0000 (18:04 +0000)
committerArran Cudbard-Bell <a.cudbardb@freeradius.org>
Wed, 20 Jan 2021 18:04:53 +0000 (18:04 +0000)
src/bin/unit_test_module.c

index d76bc6e817f558cbba4ed79e853a85c322812fe6..c2d325959b03753f6aee94c519d5878f33f0680f 100644 (file)
@@ -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;