Fix fr_ipaddr boxing macro

diff --git a/src/include/value.h b/src/include/value.h
index 9b4a744741579eadf762ebaabe335a9074b50a36..aa8bc862208f61bf6245e6c53ea3604bc6f5622f 100644 (file)
--- a/src/include/value.h
+++ b/src/include/value.h
@@ -163,11 +163,11 @@ struct value_box {
 
 #define _fr_box(_type, _field, _val) &(fr_value_box_t){ .type = _type, _field = (_val) }
 
-#define fr_box_ipaddr(_val)                    _fr_box(((_val->af == AF_INET) ? \
-                                                       ((_val->prefix == 32) ? FR_TYPE_IPV4_ADDR : \
+#define fr_box_ipaddr(_val)                    _fr_box(((_val.af == AF_INET) ? \
+                                                       ((_val.prefix == 32) ?  FR_TYPE_IPV4_ADDR : \
                                                                                FR_TYPE_IPV4_PREFIX) : \
-                                                       ((_val->prefix == 128) ? FR_TYPE_IPV6_ADDR : \
-                                                                                FR_TYPE_IPV6_PREFIX)), \
+                                                       ((_val.prefix == 128) ? FR_TYPE_IPV6_ADDR : \
+                                                                               FR_TYPE_IPV6_PREFIX)), \
                                                .vb_ip, _val)
 #define fr_box_ipv4addr(_val)                  _fr_box(FR_TYPE_IPV4_ADDR, .vb_ip, _val)
 #define fr_box_ipv4prefix(_val)                        _fr_box(FR_TYPE_IPV4_PREFIX, .vb_ip, _val)

diff --git a/src/modules/rlm_logtee/rlm_logtee.c b/src/modules/rlm_logtee/rlm_logtee.c
index f756692ab62dfe4e989e19b95062faf57d3f5ef9..c99ab2b55e8bad403094891d0dcb5694b5a4ad7b 100644 (file)
--- a/src/modules/rlm_logtee/rlm_logtee.c
+++ b/src/modules/rlm_logtee/rlm_logtee.c
@@ -350,27 +350,21 @@ static fr_conn_state_t _logtee_conn_init(int *fd_out, void *uctx)
 
        switch (inst->log_dst) {
        case LOGTEE_DST_UNIX:
-       /*
                DEBUG2("Opening UNIX socket at \"%s\"", inst->unix_sock.path);
-       */
                fd = fr_socket_client_unix(inst->unix_sock.path, true);
                if (fd < 0) return FR_CONNECTION_STATE_FAILED;
                break;
 
        case LOGTEE_DST_TCP:
-       /*
                DEBUG2("Opening TCP connection to %pV:%u",
-                      fr_box_ipaddr(&inst->tcp.dst_ipaddr), inst->tcp.port);
-       */
+                      fr_box_ipaddr(inst->tcp.dst_ipaddr), inst->tcp.port);
                fd = fr_socket_client_tcp(NULL, &inst->tcp.dst_ipaddr, inst->tcp.port, true);
                if (fd < 0) return FR_CONNECTION_STATE_FAILED;
                break;
 
        case LOGTEE_DST_UDP:
-       /*
                DEBUG2("Opening UDP connection to %pV:%u",
-                      fr_box_ipaddr(&inst->udp.dst_ipaddr), inst->udp.port);
-       */
+                      fr_box_ipaddr(inst->udp.dst_ipaddr), inst->udp.port);
                fd = fr_socket_client_udp(NULL, &inst->udp.dst_ipaddr, inst->udp.port, true);
                if (fd < 0) return FR_CONNECTION_STATE_FAILED;
                break;