don't print out len if we don't have it

diff --git a/src/modules/proto_dhcpv4/proto_dhcpv4.c b/src/modules/proto_dhcpv4/proto_dhcpv4.c
index 3681523413362d2cc4cec3e3b47d05fd75eb51ff..465a3ea3405f9dd30b8134a2de7a5ea219916bee 100644 (file)
--- a/src/modules/proto_dhcpv4/proto_dhcpv4.c
+++ b/src/modules/proto_dhcpv4/proto_dhcpv4.c
@@ -427,6 +427,7 @@ static ssize_t mod_encode(void const *instance, REQUEST *request, uint8_t *buffe
                fr_dhcpv4_print_hex(fr_log_fp, buffer, data_len);
        }
 
+       request->reply->data_len = data_len;
        return data_len;
 }
 

diff --git a/src/modules/proto_dhcpv4/proto_dhcpv4_base.c b/src/modules/proto_dhcpv4/proto_dhcpv4_base.c
index 5404e887f4974c806821db795eea9a35eedd5085..f3bf0abcf50602cd9c568308ac4e712e6b0e1e0a 100644 (file)
--- a/src/modules/proto_dhcpv4/proto_dhcpv4_base.c
+++ b/src/modules/proto_dhcpv4/proto_dhcpv4_base.c
@@ -93,7 +93,7 @@ static void dhcpv4_packet_debug(REQUEST *request, RADIUS_PACKET *packet, bool re
 #if defined(WITH_UDPFROMTO) && defined(WITH_IFINDEX_NAME_RESOLUTION)
                       "%s%s%s"
 #endif
-                      "length %zu",
+                      "",
                       received ? "Received" : "Sent",
                       dhcp_message_types[packet->code],
                       packet->id,
@@ -104,13 +104,13 @@ static void dhcpv4_packet_debug(REQUEST *request, RADIUS_PACKET *packet, bool re
                       packet->dst_ipaddr.af == AF_INET6 ? "[" : "",
                       fr_inet_ntop(dst_ipaddr, sizeof(dst_ipaddr), &packet->dst_ipaddr),
                       packet->dst_ipaddr.af == AF_INET6 ? "]" : "",
-                      packet->dst_port,
+                      packet->dst_port
 #if defined(WITH_UDPFROMTO) && defined(WITH_IFINDEX_NAME_RESOLUTION)
-                      packet->if_index ? "via " : "",
+                      , packet->if_index ? "via " : "",
                       packet->if_index ? fr_ifname_from_ifindex(if_name, packet->if_index) : "",
-                      packet->if_index ? " " : "",
+                      packet->if_index ? " " : ""
 #endif
-                      packet->data_len);
+                      );
 
        if (received) {
                log_request_pair_list(L_DBG_LVL_1, request, packet->vps, NULL);