X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/64677b0d78ff168d98c3035e894c4910c021136e..8030a66cdcbf81c88cbb7c38ef7a334e9f1941cd:/print-dhcp6.c

diff --git a/print-dhcp6.c b/print-dhcp6.c
index cc47a2ec..5c8f1516 100644
--- a/print-dhcp6.c
+++ b/print-dhcp6.c
@@ -44,10 +44,10 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
-#include <netdissect-stdinc.h>
+#include "netdissect-stdinc.h"
 
 #include <stdio.h>
 #include <string.h>
@@ -105,13 +105,11 @@ static const struct tok dh6_msgtype_str[] = {
 /* DHCP6 base packet format */
 struct dhcp6 {
 	union {
-		nd_uint8_t m;
-		nd_uint32_t x;
+		nd_uint8_t msgtype;
+		nd_uint32_t xid;
 	} dh6_msgtypexid;
 	/* options follow */
 };
-#define dh6_msgtype	dh6_msgtypexid.m
-#define dh6_xid		dh6_msgtypexid.x
 #define DH6_XIDMASK	0x00ffffff
 
 /* DHCPv6 relay messages */
@@ -746,7 +744,7 @@ dhcp6opt_print(netdissect_options *ndo,
 				label_len = EXTRACT_U_1(tp);
 				tp++;
 				if (label_len < remain_len - 1) {
-					(void)fn_printn(ndo, tp, label_len, NULL);
+					(void)nd_printn(ndo, tp, label_len, NULL);
 					tp += label_len;
 					remain_len -= (label_len + 1);
 					if(EXTRACT_U_1(tp)) ND_PRINT(".");
@@ -766,7 +764,7 @@ dhcp6opt_print(netdissect_options *ndo,
 			}
 			tp = (const u_char *)(dh6o + 1);
 			ND_PRINT("=");
-			(void)fn_printn(ndo, tp, (u_int)optlen, NULL);
+			(void)nd_printn(ndo, tp, (u_int)optlen, NULL);
 			ND_PRINT(")");
 			break;
 
@@ -780,7 +778,7 @@ dhcp6opt_print(netdissect_options *ndo,
 	return;
 
 trunc:
-	ND_PRINT("[|dhcp6ext]");
+	nd_print_trunc(ndo);
 }
 
 /*
@@ -797,16 +795,17 @@ dhcp6_print(netdissect_options *ndo,
 	const u_char *extp;
 	const char *name;
 
+	ndo->ndo_protocol = "dhcp6";
 	ND_PRINT("dhcp6");
 
-	ep = (const u_char *)ndo->ndo_snapend;
+	ep = ndo->ndo_snapend;
 	if (cp + length < ep)
 		ep = cp + length;
 
 	dh6 = (const struct dhcp6 *)cp;
 	dh6relay = (const struct dhcp6_relay *)cp;
-	ND_TCHECK(dh6->dh6_xid);
-	msgtype = EXTRACT_U_1(dh6->dh6_msgtype);
+	ND_TCHECK_4(dh6->dh6_msgtypexid.xid);
+	msgtype = EXTRACT_U_1(dh6->dh6_msgtypexid.msgtype);
 	name = tok2str(dh6_msgtype_str, "msgtype-%u", msgtype);
 
 	if (!ndo->ndo_vflag) {
@@ -818,19 +817,16 @@ dhcp6_print(netdissect_options *ndo,
 
 	ND_PRINT(" %s (", name);	/*)*/
 	if (msgtype != DH6_RELAY_FORW && msgtype != DH6_RELAY_REPLY) {
-		ND_PRINT("xid=%x", EXTRACT_BE_U_4(dh6->dh6_xid) & DH6_XIDMASK);
+		ND_PRINT("xid=%x",
+			 EXTRACT_BE_U_4(dh6->dh6_msgtypexid.xid) & DH6_XIDMASK);
 		extp = (const u_char *)(dh6 + 1);
 		dhcp6opt_print(ndo, extp, ep);
 	} else {		/* relay messages */
-		struct in6_addr addr6;
+		ND_TCHECK_16(dh6relay->dh6relay_peeraddr);
 
-		ND_TCHECK(dh6relay->dh6relay_peeraddr);
+		ND_PRINT("linkaddr=%s", ip6addr_string(ndo, dh6relay->dh6relay_linkaddr));
 
-		memcpy(&addr6, &dh6relay->dh6relay_linkaddr, sizeof (addr6));
-		ND_PRINT("linkaddr=%s", ip6addr_string(ndo, &addr6));
-
-		memcpy(&addr6, &dh6relay->dh6relay_peeraddr, sizeof (addr6));
-		ND_PRINT(" peeraddr=%s", ip6addr_string(ndo, &addr6));
+		ND_PRINT(" peeraddr=%s", ip6addr_string(ndo, dh6relay->dh6relay_peeraddr));
 
 		dhcp6opt_print(ndo, (const u_char *)(dh6relay + 1), ep);
 	}
@@ -839,5 +835,5 @@ dhcp6_print(netdissect_options *ndo,
 	return;
 
 trunc:
-	ND_PRINT("[|dhcp6]");
+	nd_print_trunc(ndo);
 }