From: Alan T. DeKok <aland@freeradius.org>
Date: Wed, 21 Nov 2018 12:57:46 +0000 (-0500)
Subject: don't print out len if we don't have it
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=02f1def2e033af901ae166fd3e002b4d4f64d5b4;p=thirdparty%2Ffreeradius-server.git

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 36815234133..465a3ea3405 100644
--- 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 5404e887f49..f3bf0abcf50 100644
--- 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);