]> git.ipfire.org Git - thirdparty/freeradius-server.git/commitdiff
The power of C11 compells you
authorArran Cudbard-Bell <a.cudbardb@freeradius.org>
Fri, 17 Nov 2017 17:56:52 +0000 (17:56 +0000)
committerArran Cudbard-Bell <a.cudbardb@freeradius.org>
Fri, 17 Nov 2017 17:56:52 +0000 (17:56 +0000)
src/modules/rlm_detail/rlm_detail.c

index 565ab85f7304d403c764601fae2bce2099b7ba63..42b239ae9b8ff063831a79516b14ef22e883be65 100644 (file)
@@ -263,18 +263,18 @@ static int detail_write(FILE *out, rlm_detail_t const *inst, REQUEST *request, R
                switch (packet->src_ipaddr.af) {
                case AF_INET:
                        src_vp.da = fr_dict_attr_by_num(NULL, 0, FR_PACKET_SRC_IP_ADDRESS);
-                       fr_value_box_ipaddr(&src_vp.data, src_vp.da, &packet->src_ipaddr, true);
+                       fr_value_box_shallow(&src_vp.data, &packet->src_ipaddr, true);
 
                        dst_vp.da = fr_dict_attr_by_num(NULL, 0, FR_PACKET_DST_IP_ADDRESS);
-                       fr_value_box_ipaddr(&dst_vp.data, src_vp.da, &packet->dst_ipaddr, true);
+                       fr_value_box_shallow(&dst_vp.data, &packet->dst_ipaddr, true);
                        break;
 
                case AF_INET6:
                        src_vp.da = fr_dict_attr_by_num(NULL, 0, FR_PACKET_SRC_IPV6_ADDRESS);
-                       fr_value_box_ipaddr(&src_vp.data, src_vp.da, &packet->src_ipaddr, true);
+                       fr_value_box_shallow(&src_vp.data, &packet->src_ipaddr, true);
 
                        dst_vp.da = fr_dict_attr_by_num(NULL, 0, FR_PACKET_DST_IPV6_ADDRESS);
-                       fr_value_box_ipaddr(&dst_vp.data, src_vp.da, &packet->dst_ipaddr, true);
+                       fr_value_box_shallow(&dst_vp.data, &packet->dst_ipaddr, true);
                        break;
 
                default:
@@ -285,12 +285,10 @@ static int detail_write(FILE *out, rlm_detail_t const *inst, REQUEST *request, R
                detail_fr_pair_fprint(request, out, &dst_vp);
 
                src_vp.da = fr_dict_attr_by_num(NULL, 0, FR_PACKET_SRC_PORT);
-               src_vp.data.type = src_vp.da->type;
-               src_vp.vp_uint32 = packet->src_port;
+               fr_value_box_shallow(&dst_vp.data, packet->src_port, true);
 
                dst_vp.da = fr_dict_attr_by_num(NULL, 0, FR_PACKET_DST_PORT);
-               dst_vp.data.type = dst_vp.da->type;
-               dst_vp.vp_uint32 = packet->dst_port;
+               fr_value_box_shallow(&dst_vp.data, packet->dst_port, true);
 
                detail_fr_pair_fprint(request, out, &src_vp);
                detail_fr_pair_fprint(request, out, &dst_vp);