Fix v6 address printing in from/to messages

FreeRADIUS · Jul 20, 2015 · 0b3678b · 0b3678b
1 parent d2759c5
commit 0b3678b
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 5 deletions.
diff --git a/src/lib/packet.c b/src/lib/packet.c
@@ -698,7 +698,7 @@ bool fr_packet_list_id_alloc(fr_packet_list_t *pl, int proto,
 		 *	socket is link local, and the requested
 		 *	destination is not link local.  Ignore it.
 		 */
-		if (src_any && (ps->src_ipaddr.af == AF_INET) &&	
+		if (src_any && (ps->src_ipaddr.af == AF_INET) &&
 		    (((ps->src_ipaddr.ipaddr.ip4addr.s_addr >> 24) & 0xff) == 127) &&
 		    (((request->dst_ipaddr.ipaddr.ip4addr.s_addr >> 24) & 0xff) != 127)) continue;
 
@@ -954,31 +954,39 @@ void fr_packet_header_print(FILE *fp, RADIUS_PACKET *packet, bool received)
 	 *	This really belongs in a utility library
 	 */
 	if (is_radius_code(packet->code)) {
-		fprintf(fp, "%s %s Id %i from %s:%i to %s:%i length %zu\n",
+		fprintf(fp, "%s %s Id %i from %s%s%s:%i to %s%s%s:%i length %zu\n",
 		        received ? "Received" : "Sent",
 		        fr_packet_codes[packet->code],
 		        packet->id,
+		        packet->src_ipaddr.af == AF_INET6 ? "[" : "",
 		        inet_ntop(packet->src_ipaddr.af,
 				  &packet->src_ipaddr.ipaddr,
 				  src_ipaddr, sizeof(src_ipaddr)),
+			packet->src_ipaddr.af == AF_INET6 ? "]" : "",
 		        packet->src_port,
+		        packet->dst_ipaddr.af == AF_INET6 ? "[" : "",
 		        inet_ntop(packet->dst_ipaddr.af,
 				  &packet->dst_ipaddr.ipaddr,
 				  dst_ipaddr, sizeof(dst_ipaddr)),
+		        packet->dst_ipaddr.af == AF_INET6 ? "]" : "",
 		        packet->dst_port,
 		        packet->data_len);
 	} else {
-		fprintf(fp, "%s code %u Id %i from %s:%i to %s:%i length %zu\n",
+		fprintf(fp, "%s code %u Id %i from %s%s%s:%i to %s%s%s:%i length %zu\n",
 		        received ? "Received" : "Sent",
 		        packet->code,
 		        packet->id,
+		        packet->src_ipaddr.af == AF_INET6 ? "[" : "",
 		        inet_ntop(packet->src_ipaddr.af,
 				  &packet->src_ipaddr.ipaddr,
 				  src_ipaddr, sizeof(src_ipaddr)),
+		        packet->src_ipaddr.af == AF_INET6 ? "]" : "",
 		        packet->src_port,
+		        packet->dst_ipaddr.af == AF_INET6 ? "[" : "",
 		        inet_ntop(packet->dst_ipaddr.af,
 				  &packet->dst_ipaddr.ipaddr,
 				  dst_ipaddr, sizeof(dst_ipaddr)),
+		        packet->dst_ipaddr.af == AF_INET6 ? "]" : "",
 		        packet->dst_port,
 		        packet->data_len);
 	}

diff --git a/src/main/process.c b/src/main/process.c
@@ -416,31 +416,39 @@ static void debug_packet(REQUEST *request, RADIUS_PACKET *packet, bool received)
 	 *	This really belongs in a utility library
 	 */
 	if (is_radius_code(packet->code)) {
-		RDEBUG("%s %s Id %i from %s:%i to %s:%i length %zu",
+		RDEBUG("%s %s Id %i from %s%s%s:%i to %s%s%s:%i length %zu",
 		       received ? "Received" : "Sent",
 		       fr_packet_codes[packet->code],
 		       packet->id,
+		       packet->src_ipaddr.af == AF_INET6 ? "[" : "",
 		       inet_ntop(packet->src_ipaddr.af,
 				 &packet->src_ipaddr.ipaddr,
 				 src_ipaddr, sizeof(src_ipaddr)),
+		       packet->src_ipaddr.af == AF_INET6 ? "]" : "",
 		       packet->src_port,
+		       packet->dst_ipaddr.af == AF_INET6 ? "[" : "",
 		       inet_ntop(packet->dst_ipaddr.af,
 				 &packet->dst_ipaddr.ipaddr,
 				 dst_ipaddr, sizeof(dst_ipaddr)),
+		       packet->dst_ipaddr.af == AF_INET6 ? "]" : "",
 		       packet->dst_port,
 		       packet->data_len);
 	} else {
-		RDEBUG("%s code %i Id %i from %s:%i to %s:%i length %zu",
+		RDEBUG("%s code %u Id %i from %s%s%s:%i to %s%s%s:%i length %zu\n",
 		       received ? "Received" : "Sent",
 		       packet->code,
 		       packet->id,
+		       packet->src_ipaddr.af == AF_INET6 ? "[" : "",
 		       inet_ntop(packet->src_ipaddr.af,
 				 &packet->src_ipaddr.ipaddr,
 				 src_ipaddr, sizeof(src_ipaddr)),
+		       packet->src_ipaddr.af == AF_INET6 ? "]" : "",
 		       packet->src_port,
+		       packet->dst_ipaddr.af == AF_INET6 ? "[" : "",
 		       inet_ntop(packet->dst_ipaddr.af,
 				 &packet->dst_ipaddr.ipaddr,
 				 dst_ipaddr, sizeof(dst_ipaddr)),
+		       packet->dst_ipaddr.af == AF_INET6 ? "]" : "",
 		       packet->dst_port,
 		       packet->data_len);
 	}