From: Alan T. DeKok <aland@freeradius.org>
Date: Tue, 12 Feb 2013 15:10:21 +0000 (-0500)
Subject: Actually print out encoded options in debug mode.
X-Git-Tag: release_2_2_1~177
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=94263b5027520da91958878b2ad83a4ff4f64c06;p=thirdparty%2Ffreeradius-server.git

Actually print out encoded options in debug mode.
---

diff --git a/src/lib/dhcp.c b/src/lib/dhcp.c
index 5799f969b0e..1803ad6792f 100644
--- a/src/lib/dhcp.c
+++ b/src/lib/dhcp.c
@@ -670,7 +670,7 @@ ssize_t fr_dhcp_decode_options(uint8_t *data, size_t len, VALUE_PAIR **head)
 
 int fr_dhcp_decode(RADIUS_PACKET *packet)
 {
-	unsigned int i;
+	ssize_t i;
 	uint8_t *p;
 	uint32_t giaddr;
 	VALUE_PAIR *head, *vp, **tail;
@@ -682,7 +682,7 @@ int fr_dhcp_decode(RADIUS_PACKET *packet)
 
 	if ((fr_debug_flag > 2) && fr_log_fp) {
 		for (i = 0; i < packet->data_len; i++) {
-			if ((i & 0x0f) == 0x00) fr_strerror_printf("%d: ", i);
+			if ((i & 0x0f) == 0x00) fprintf(fr_log_fp, "%d: ", (int) i);
 			fprintf(fr_log_fp, "%02x ", packet->data[i]);
 			if ((i & 0x0f) == 0x0f) fprintf(fr_log_fp, "\n");
 		}
@@ -1006,12 +1006,11 @@ static VALUE_PAIR *fr_dhcp_vp2suboption(VALUE_PAIR *vps)
 
 int fr_dhcp_encode(RADIUS_PACKET *packet)
 {
-	unsigned int i, num_vps;
+	int i, num_vps;
 	uint8_t *p;
 	VALUE_PAIR *vp;
 	uint32_t lvalue, mms;
 	size_t dhcp_size, length;
-	char buffer[1024];
 
 	if (packet->data) free(packet->data);
 
@@ -1083,7 +1082,7 @@ int fr_dhcp_encode(RADIUS_PACKET *packet)
 			}
 		} else {	/* we don't support this type! */
 			fr_strerror_printf("DHCP-Authentication %d unsupported",
-			    vp->vp_octets[0]);
+					   vp->vp_octets[0]);
 		}
 	}
 
@@ -1281,8 +1280,7 @@ int fr_dhcp_encode(RADIUS_PACKET *packet)
 
 			p += dhcp_header_sizes[i];
 
-			vp_prints(buffer, sizeof(buffer), vp);
-			fr_strerror_printf("\t%s", buffer);
+			debug_pair(vp);
 			pairfree(&vp);
 		}
 
@@ -1374,10 +1372,7 @@ int fr_dhcp_encode(RADIUS_PACKET *packet)
 		*(p++) = 0;	/* header isn't included in attr length */
 
 		for (i = 0; i < num_entries; i++) {
-			if (fr_debug_flag > 1) {
-				vp_prints(buffer, sizeof(buffer), vp);
-				fr_strerror_printf("\t%s", buffer);
-			}
+			debug_pair(vp);
 
 			if (vp->flags.is_tlv) {
 				VALUE_PAIR *tlv;