X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/b751376719cfe1924aa07ab8fd364ec1a55c04b3..c518a9aab149da1a6b83c0cbeddaff5265d05dcb:/print-dhcp6.c

diff --git a/print-dhcp6.c b/print-dhcp6.c
index 0b40af81..dba13e9e 100644
--- a/print-dhcp6.c
+++ b/print-dhcp6.c
@@ -49,9 +49,6 @@
 
 #include "netdissect-stdinc.h"
 
-#include <stdio.h>
-#include <string.h>
-
 #include "netdissect.h"
 #include "addrtoname.h"
 #include "extract.h"
@@ -748,7 +745,7 @@ dhcp6opt_print(netdissect_options *ndo,
 				label_len = GET_U_1(tp);
 				tp++;
 				if (label_len < remain_len - 1) {
-					(void)nd_printn(ndo, tp, label_len, NULL);
+					nd_printjnp(ndo, tp, label_len);
 					tp += label_len;
 					remain_len -= (label_len + 1);
 					if(GET_U_1(tp)) ND_PRINT(".");
@@ -767,8 +764,8 @@ dhcp6opt_print(netdissect_options *ndo,
 				break;
 			}
 			tp = (const u_char *)(dh6o + 1);
-			ND_PRINT("=");
-			(void)nd_printn(ndo, tp, (u_int)optlen, NULL);
+			ND_PRINT(" ");
+			nd_printjnp(ndo, tp, optlen);
 			ND_PRINT(")");
 			break;
 
@@ -826,8 +823,6 @@ dhcp6_print(netdissect_options *ndo,
 		extp = (const u_char *)(dh6 + 1);
 		dhcp6opt_print(ndo, extp, ep);
 	} else {		/* relay messages */
-		ND_TCHECK_16(dh6relay->dh6relay_peeraddr);
-
 		ND_PRINT("linkaddr=%s", GET_IP6ADDR_STRING(dh6relay->dh6relay_linkaddr));
 
 		ND_PRINT(" peeraddr=%s", GET_IP6ADDR_STRING(dh6relay->dh6relay_peeraddr));