X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/9c1556ca28b2fd1173a03513c5958801826b8fda..c5a34f01b4d03a0c24f9abb57f0db45c502aceb5:/print-bootp.c

diff --git a/print-bootp.c b/print-bootp.c
index ba6449bd..2bc8bb6b 100644
--- a/print-bootp.c
+++ b/print-bootp.c
@@ -22,10 +22,10 @@
 /* \summary: BOOTP and IPv4 DHCP printer */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
-#include <netdissect-stdinc.h>
+#include "netdissect-stdinc.h"
 
 #include <string.h>
 
@@ -33,7 +33,6 @@
 #include "addrtoname.h"
 #include "extract.h"
 
-static const char tstr[] = " [|bootp]";
 
 /*
  * Bootstrap Protocol (BOOTP).  RFC951 and RFC1048.
@@ -64,15 +63,15 @@ struct bootp {
 	nd_uint16_t	bp_secs;	/* seconds since boot began */
 	nd_uint16_t	bp_flags;	/* flags - see bootp_flag_values[]
 					   in print-bootp.c */
-	struct in_addr	bp_ciaddr;	/* client IP address */
-	struct in_addr	bp_yiaddr;	/* 'your' IP address */
-	struct in_addr	bp_siaddr;	/* server IP address */
-	struct in_addr	bp_giaddr;	/* gateway IP address */
+	nd_ipv4		bp_ciaddr;	/* client IP address */
+	nd_ipv4		bp_yiaddr;	/* 'your' IP address */
+	nd_ipv4		bp_siaddr;	/* server IP address */
+	nd_ipv4		bp_giaddr;	/* gateway IP address */
 	nd_byte		bp_chaddr[16];	/* client hardware address */
 	nd_byte		bp_sname[64];	/* server host name */
 	nd_byte		bp_file[128];	/* boot file name */
 	nd_byte		bp_vend[64];	/* vendor-specific area */
-} UNALIGNED;
+};
 
 #define BOOTPREPLY	2
 #define BOOTPREQUEST	1
@@ -241,13 +240,13 @@ struct bootp {
 struct cmu_vend {
 	nd_byte		v_magic[4];	/* magic number */
 	nd_uint32_t	v_flags;	/* flags/opcodes, etc. */
-	struct in_addr	v_smask;	/* Subnet mask */
-	struct in_addr	v_dgate;	/* Default gateway */
-	struct in_addr	v_dns1, v_dns2; /* Domain name servers */
-	struct in_addr	v_ins1, v_ins2; /* IEN-116 name servers */
-	struct in_addr	v_ts1, v_ts2;	/* Time servers */
+	nd_ipv4		v_smask;	/* Subnet mask */
+	nd_ipv4		v_dgate;	/* Default gateway */
+	nd_ipv4		v_dns1, v_dns2; /* Domain name servers */
+	nd_ipv4		v_ins1, v_ins2; /* IEN-116 name servers */
+	nd_ipv4		v_ts1, v_ts2;	/* Time servers */
 	nd_byte		v_unused[24];	/* currently unused */
-} UNALIGNED;
+};
 
 
 /* v_flags values */
@@ -288,100 +287,101 @@ bootp_print(netdissect_options *ndo,
 	static const u_char vm_rfc1048[4] = VM_RFC1048;
 	uint8_t bp_op, bp_htype, bp_hlen;
 
+	ndo->ndo_protocol = "bootp";
 	bp = (const struct bootp *)cp;
-	ND_TCHECK(bp->bp_op);
-	bp_op = EXTRACT_U_1(bp->bp_op);
-	ND_PRINT((ndo, "BOOTP/DHCP, %s",
-		  tok2str(bootp_op_values, "unknown (0x%02x)", bp_op)));
-
-	ND_TCHECK(bp->bp_hlen);
-	bp_htype = EXTRACT_U_1(bp->bp_htype);
-	bp_hlen = EXTRACT_U_1(bp->bp_hlen);
+	ND_TCHECK_1(bp->bp_op);
+	bp_op = GET_U_1(bp->bp_op);
+	ND_PRINT("BOOTP/DHCP, %s",
+		  tok2str(bootp_op_values, "unknown (0x%02x)", bp_op));
+
+	ND_TCHECK_1(bp->bp_hlen);
+	bp_htype = GET_U_1(bp->bp_htype);
+	bp_hlen = GET_U_1(bp->bp_hlen);
 	if (bp_htype == 1 && bp_hlen == 6 && bp_op == BOOTPREQUEST) {
-		ND_TCHECK_LEN(bp->bp_chaddr, 6);
-		ND_PRINT((ndo, " from %s", etheraddr_string(ndo, bp->bp_chaddr)));
+		ND_TCHECK_6(bp->bp_chaddr);
+		ND_PRINT(" from %s", etheraddr_string(ndo, bp->bp_chaddr));
 	}
 
-	ND_PRINT((ndo, ", length %u", length));
+	ND_PRINT(", length %u", length);
 
 	if (!ndo->ndo_vflag)
 		return;
 
-	ND_TCHECK(bp->bp_secs);
+	ND_TCHECK_2(bp->bp_secs);
 
 	/* The usual hardware address type is 1 (10Mb Ethernet) */
 	if (bp_htype != 1)
-		ND_PRINT((ndo, ", htype %d", bp_htype));
+		ND_PRINT(", htype %u", bp_htype);
 
 	/* The usual length for 10Mb Ethernet address is 6 bytes */
 	if (bp_htype != 1 || bp_hlen != 6)
-		ND_PRINT((ndo, ", hlen %d", bp_hlen));
+		ND_PRINT(", hlen %u", bp_hlen);
 
 	/* Only print interesting fields */
-	if (EXTRACT_U_1(bp->bp_hops))
-		ND_PRINT((ndo, ", hops %d", EXTRACT_U_1(bp->bp_hops)));
-	if (EXTRACT_BE_U_4(bp->bp_xid))
-		ND_PRINT((ndo, ", xid 0x%x", EXTRACT_BE_U_4(bp->bp_xid)));
-	if (EXTRACT_BE_U_2(bp->bp_secs))
-		ND_PRINT((ndo, ", secs %d", EXTRACT_BE_U_2(bp->bp_secs)));
-
-	ND_TCHECK(bp->bp_flags);
-	ND_PRINT((ndo, ", Flags [%s]",
-		  bittok2str(bootp_flag_values, "none", EXTRACT_BE_U_2(bp->bp_flags))));
+	if (GET_U_1(bp->bp_hops))
+		ND_PRINT(", hops %u", GET_U_1(bp->bp_hops));
+	if (GET_BE_U_4(bp->bp_xid))
+		ND_PRINT(", xid 0x%x", GET_BE_U_4(bp->bp_xid));
+	if (GET_BE_U_2(bp->bp_secs))
+		ND_PRINT(", secs %u", GET_BE_U_2(bp->bp_secs));
+
+	ND_TCHECK_2(bp->bp_flags);
+	ND_PRINT(", Flags [%s]",
+		  bittok2str(bootp_flag_values, "none", GET_BE_U_2(bp->bp_flags)));
 	if (ndo->ndo_vflag > 1)
-		ND_PRINT((ndo, " (0x%04x)", EXTRACT_BE_U_2(bp->bp_flags)));
+		ND_PRINT(" (0x%04x)", GET_BE_U_2(bp->bp_flags));
 
 	/* Client's ip address */
-	ND_TCHECK(bp->bp_ciaddr);
-	if (EXTRACT_IPV4_TO_HOST_ORDER(&bp->bp_ciaddr.s_addr))
-		ND_PRINT((ndo, "\n\t  Client-IP %s", ipaddr_string(ndo, &bp->bp_ciaddr)));
+	ND_TCHECK_4(bp->bp_ciaddr);
+	if (GET_IPV4_TO_NETWORK_ORDER(bp->bp_ciaddr))
+		ND_PRINT("\n\t  Client-IP %s", ipaddr_string(ndo, bp->bp_ciaddr));
 
 	/* 'your' ip address (bootp client) */
-	ND_TCHECK(bp->bp_yiaddr);
-	if (EXTRACT_IPV4_TO_HOST_ORDER(&bp->bp_yiaddr.s_addr))
-		ND_PRINT((ndo, "\n\t  Your-IP %s", ipaddr_string(ndo, &bp->bp_yiaddr)));
+	ND_TCHECK_4(bp->bp_yiaddr);
+	if (GET_IPV4_TO_NETWORK_ORDER(bp->bp_yiaddr))
+		ND_PRINT("\n\t  Your-IP %s", ipaddr_string(ndo, bp->bp_yiaddr));
 
 	/* Server's ip address */
-	ND_TCHECK(bp->bp_siaddr);
-	if (EXTRACT_IPV4_TO_HOST_ORDER(&bp->bp_siaddr.s_addr))
-		ND_PRINT((ndo, "\n\t  Server-IP %s", ipaddr_string(ndo, &bp->bp_siaddr)));
+	ND_TCHECK_4(bp->bp_siaddr);
+	if (GET_IPV4_TO_NETWORK_ORDER(bp->bp_siaddr))
+		ND_PRINT("\n\t  Server-IP %s", ipaddr_string(ndo, bp->bp_siaddr));
 
 	/* Gateway's ip address */
-	ND_TCHECK(bp->bp_giaddr);
-	if (EXTRACT_IPV4_TO_HOST_ORDER(&bp->bp_giaddr.s_addr))
-		ND_PRINT((ndo, "\n\t  Gateway-IP %s", ipaddr_string(ndo, &bp->bp_giaddr)));
+	ND_TCHECK_4(bp->bp_giaddr);
+	if (GET_IPV4_TO_NETWORK_ORDER(bp->bp_giaddr))
+		ND_PRINT("\n\t  Gateway-IP %s", ipaddr_string(ndo, bp->bp_giaddr));
 
 	/* Client's Ethernet address */
 	if (bp_htype == 1 && bp_hlen == 6) {
-		ND_TCHECK_LEN(bp->bp_chaddr, 6);
-		ND_PRINT((ndo, "\n\t  Client-Ethernet-Address %s", etheraddr_string(ndo, bp->bp_chaddr)));
+		ND_TCHECK_6(bp->bp_chaddr);
+		ND_PRINT("\n\t  Client-Ethernet-Address %s", etheraddr_string(ndo, bp->bp_chaddr));
 	}
 
 	ND_TCHECK_1(bp->bp_sname);		/* check first char only */
-	if (EXTRACT_U_1(bp->bp_sname)) {
-		ND_PRINT((ndo, "\n\t  sname \""));
-		if (fn_printztn(ndo, bp->bp_sname, (u_int)sizeof bp->bp_sname,
-		    ndo->ndo_snapend)) {
-			ND_PRINT((ndo, "\""));
-			ND_PRINT((ndo, "%s", tstr + 1));
+	if (GET_U_1(bp->bp_sname)) {
+		ND_PRINT("\n\t  sname \"");
+		if (nd_printztn(ndo, bp->bp_sname, (u_int)sizeof(bp->bp_sname),
+				ndo->ndo_snapend) == 0) {
+			ND_PRINT("\"");
+			nd_print_trunc(ndo);
 			return;
 		}
-		ND_PRINT((ndo, "\""));
+		ND_PRINT("\"");
 	}
 	ND_TCHECK_1(bp->bp_file);		/* check first char only */
-	if (EXTRACT_U_1(bp->bp_file)) {
-		ND_PRINT((ndo, "\n\t  file \""));
-		if (fn_printztn(ndo, bp->bp_file, (u_int)sizeof bp->bp_file,
-		    ndo->ndo_snapend)) {
-			ND_PRINT((ndo, "\""));
-			ND_PRINT((ndo, "%s", tstr + 1));
+	if (GET_U_1(bp->bp_file)) {
+		ND_PRINT("\n\t  file \"");
+		if (nd_printztn(ndo, bp->bp_file, (u_int)sizeof(bp->bp_file),
+				ndo->ndo_snapend) == 0) {
+			ND_PRINT("\"");
+			nd_print_trunc(ndo);
 			return;
 		}
-		ND_PRINT((ndo, "\""));
+		ND_PRINT("\"");
 	}
 
 	/* Decode the vendor buffer */
-	ND_TCHECK_LEN(bp->bp_vend, 4);
+	ND_TCHECK_4(bp->bp_vend);
 	if (memcmp((const char *)bp->bp_vend, vm_rfc1048,
 		    sizeof(uint32_t)) == 0)
 		rfc1048_print(ndo, bp->bp_vend);
@@ -391,14 +391,14 @@ bootp_print(netdissect_options *ndo,
 	else {
 		uint32_t ul;
 
-		ul = EXTRACT_BE_U_4(bp->bp_vend);
+		ul = GET_BE_U_4(bp->bp_vend);
 		if (ul != 0)
-			ND_PRINT((ndo, "\n\t  Vendor-#0x%x", ul));
+			ND_PRINT("\n\t  Vendor-#0x%x", ul);
 	}
 
 	return;
 trunc:
-	ND_PRINT((ndo, "%s", tstr));
+	nd_print_trunc(ndo);
 }
 
 /*
@@ -408,8 +408,8 @@ trunc:
  *     l - long (32 bits)
  *     L - unsigned long (32 bits)
  *     s - short (16 bits)
- *     b - period-seperated decimal bytes (variable length)
- *     x - colon-seperated hex bytes (variable length)
+ *     b - period-separated decimal bytes (variable length)
+ *     x - colon-separated hex bytes (variable length)
  *     a - ASCII string (variable length)
  *     B - on/off (8 bits)
  *     $ - special (explicit code to handle)
@@ -512,7 +512,7 @@ static const struct tok tag2str[] = {
 	{ TAG_CLASSLESS_STA_RT_MS, "$Classless-Static-Route-Microsoft" },
 /* RFC 5859 - TFTP Server Address Option for DHCPv4 */
 	{ TAG_TFTP_SERVER_ADDRESS, "iTFTP-Server-Address" },
-/* http://www.iana.org/assignments/bootp-dhcp-extensions/index.htm */
+/* https://www.iana.org/assignments/bootp-dhcp-parameters/bootp-dhcp-parameters.xhtml#options */
 	{ TAG_SLP_NAMING_AUTH,	"aSLP-NA" },
 	{ TAG_CLIENT_FQDN,	"$FQDN" },
 	{ TAG_AGENT_CIRCUIT,	"$Agent-Information" },
@@ -603,19 +603,17 @@ rfc1048_print(netdissect_options *ndo,
 	const char *cp;
 	char c;
 	int first, idx;
-	uint32_t ul;
-	uint16_t us;
-	uint8_t uc, subopt, suboptlen;
+	uint8_t subopt, suboptlen;
 
-	ND_PRINT((ndo, "\n\t  Vendor-rfc1048 Extensions"));
+	ND_PRINT("\n\t  Vendor-rfc1048 Extensions");
 
 	/* Step over magic cookie */
-	ND_PRINT((ndo, "\n\t    Magic Cookie 0x%08x", EXTRACT_BE_U_4(bp)));
+	ND_PRINT("\n\t    Magic Cookie 0x%08x", GET_BE_U_4(bp));
 	bp += sizeof(int32_t);
 
 	/* Loop while we there is a tag left in the buffer */
 	while (ND_TTEST_1(bp)) {
-		tag = EXTRACT_U_1(bp);
+		tag = GET_U_1(bp);
 		bp++;
 		if (tag == TAG_PAD && ndo->ndo_vflag < 3)
 			continue;
@@ -623,7 +621,7 @@ rfc1048_print(netdissect_options *ndo,
 			return;
 		if (tag == TAG_EXTENDED_OPTION) {
 			ND_TCHECK_2(bp + 1);
-			tag = EXTRACT_BE_U_2(bp + 1);
+			tag = GET_BE_U_2(bp + 1);
 			/* XXX we don't know yet if the IANA will
 			 * preclude overlap of 1-byte and 2-byte spaces.
 			 * If not, we need to offset tag after this step.
@@ -638,47 +636,45 @@ rfc1048_print(netdissect_options *ndo,
 		else {
 			/* Get the length; check for truncation */
 			ND_TCHECK_1(bp);
-			len = EXTRACT_U_1(bp);
+			len = GET_U_1(bp);
 			bp++;
 		}
 
-		ND_PRINT((ndo, "\n\t    %s Option %u, length %u%s", cp, tag, len,
-			  len > 0 ? ": " : ""));
+		ND_PRINT("\n\t    %s Option %u, length %u%s", cp, tag, len,
+			  len > 0 ? ": " : "");
 
 		if (tag == TAG_PAD && ndo->ndo_vflag > 2) {
 			u_int ntag = 1;
 			while (ND_TTEST_1(bp) &&
-			       EXTRACT_U_1(bp) == TAG_PAD) {
+			       GET_U_1(bp) == TAG_PAD) {
 				bp++;
 				ntag++;
 			}
 			if (ntag > 1)
-				ND_PRINT((ndo, ", occurs %u", ntag));
+				ND_PRINT(", occurs %u", ntag);
 		}
 
-		if (!ND_TTEST_LEN(bp, len)) {
-			ND_PRINT((ndo, "[|rfc1048 %u]", len));
-			return;
-		}
+		ND_TCHECK_LEN(bp, len);
 
 		if (tag == TAG_DHCP_MESSAGE && len == 1) {
-			uc = EXTRACT_U_1(bp);
+			ND_PRINT("%s",
+				 tok2str(dhcp_msg_values, "Unknown (%u)", GET_U_1(bp)));
 			bp++;
-			ND_PRINT((ndo, "%s", tok2str(dhcp_msg_values, "Unknown (%u)", uc)));
 			continue;
 		}
 
 		if (tag == TAG_PARM_REQUEST) {
 			idx = 0;
-			while (len-- > 0) {
-				uc = EXTRACT_U_1(bp);
+			while (len > 0) {
+				cp = tok2str(tag2str, "?Option %u",
+					     GET_U_1(bp));
 				bp++;
-				cp = tok2str(tag2str, "?Option %u", uc);
+				len--;
 				if (idx % 4 == 0)
-					ND_PRINT((ndo, "\n\t      "));
+					ND_PRINT("\n\t      ");
 				else
-					ND_PRINT((ndo, ", "));
-				ND_PRINT((ndo, "%s", cp + 1));
+					ND_PRINT(", ");
+				ND_PRINT("%s", cp + 1);
 				idx++;
 			}
 			continue;
@@ -687,13 +683,13 @@ rfc1048_print(netdissect_options *ndo,
 		if (tag == TAG_EXTENDED_REQUEST) {
 			first = 1;
 			while (len > 1) {
-				len -= 2;
-				us = EXTRACT_BE_U_2(bp);
+				cp = tok2str(xtag2str, "?xT%u",
+					     GET_BE_U_2(bp));
 				bp += 2;
-				cp = tok2str(xtag2str, "?xT%u", us);
+				len -= 2;
 				if (!first)
-					ND_PRINT((ndo, "+"));
-				ND_PRINT((ndo, "%s", cp + 1));
+					ND_PRINT("+");
+				ND_PRINT("%s", cp + 1);
 				first = 0;
 			}
 			continue;
@@ -714,12 +710,12 @@ rfc1048_print(netdissect_options *ndo,
 
 		case 'a':
 			/* ASCII strings */
-			ND_PRINT((ndo, "\""));
-			if (fn_printn(ndo, bp, len, ndo->ndo_snapend)) {
-				ND_PRINT((ndo, "\""));
+			ND_PRINT("\"");
+			if (nd_printn(ndo, bp, len, ndo->ndo_snapend)) {
+				ND_PRINT("\"");
 				goto trunc;
 			}
-			ND_PRINT((ndo, "\""));
+			ND_PRINT("\"");
 			bp += len;
 			len = 0;
 			break;
@@ -728,48 +724,44 @@ rfc1048_print(netdissect_options *ndo,
 		case 'l':
 		case 'L':
 			/* ip addresses/32-bit words */
-			while (len >= sizeof(ul)) {
+			while (len >= 4) {
 				if (!first)
-					ND_PRINT((ndo, ","));
-				ul = EXTRACT_BE_U_4(bp);
-				if (c == 'i') {
-					ul = htonl(ul);
-					ND_PRINT((ndo, "%s", ipaddr_string(ndo, &ul)));
-				} else if (c == 'L')
-					ND_PRINT((ndo, "%d", ul));
+					ND_PRINT(",");
+				if (c == 'i')
+					ND_PRINT("%s", ipaddr_string(ndo, bp));
+				else if (c == 'L')
+					ND_PRINT("%d", GET_BE_S_4(bp));
 				else
-					ND_PRINT((ndo, "%u", ul));
-				bp += sizeof(ul);
-				len -= sizeof(ul);
+					ND_PRINT("%u", GET_BE_U_4(bp));
+				bp += 4;
+				len -= 4;
 				first = 0;
 			}
 			break;
 
 		case 'p':
 			/* IP address pairs */
-			while (len >= 2*sizeof(ul)) {
+			while (len >= 2*4) {
 				if (!first)
-					ND_PRINT((ndo, ","));
-				memcpy((char *)&ul, (const char *)bp, sizeof(ul));
-				ND_PRINT((ndo, "(%s:", ipaddr_string(ndo, &ul)));
-				bp += sizeof(ul);
-				memcpy((char *)&ul, (const char *)bp, sizeof(ul));
-				ND_PRINT((ndo, "%s)", ipaddr_string(ndo, &ul)));
-				bp += sizeof(ul);
-				len -= 2*sizeof(ul);
+					ND_PRINT(",");
+				ND_PRINT("(%s:", ipaddr_string(ndo, bp));
+				bp += 4;
+				len -= 4;
+				ND_PRINT("%s)", ipaddr_string(ndo, bp));
+				bp += 4;
+				len -= 4;
 				first = 0;
 			}
 			break;
 
 		case 's':
 			/* shorts */
-			while (len >= sizeof(us)) {
+			while (len >= 2) {
 				if (!first)
-					ND_PRINT((ndo, ","));
-				us = EXTRACT_BE_U_2(bp);
-				ND_PRINT((ndo, "%u", us));
-				bp += sizeof(us);
-				len -= sizeof(us);
+					ND_PRINT(",");
+				ND_PRINT("%u", GET_BE_U_2(bp));
+				bp += 2;
+				len -= 2;
 				first = 0;
 			}
 			break;
@@ -779,17 +771,17 @@ rfc1048_print(netdissect_options *ndo,
 			while (len > 0) {
 				uint8_t bool_value;
 				if (!first)
-					ND_PRINT((ndo, ","));
-				bool_value = EXTRACT_U_1(bp);
+					ND_PRINT(",");
+				bool_value = GET_U_1(bp);
 				switch (bool_value) {
 				case 0:
-					ND_PRINT((ndo, "N"));
+					ND_PRINT("N");
 					break;
 				case 1:
-					ND_PRINT((ndo, "Y"));
+					ND_PRINT("Y");
 					break;
 				default:
-					ND_PRINT((ndo, "%u?", bool_value));
+					ND_PRINT("%u?", bool_value);
 					break;
 				}
 				++bp;
@@ -805,12 +797,12 @@ rfc1048_print(netdissect_options *ndo,
 			while (len > 0) {
 				uint8_t byte_value;
 				if (!first)
-					ND_PRINT((ndo, c == 'x' ? ":" : "."));
-				byte_value = EXTRACT_U_1(bp);
+					ND_PRINT(c == 'x' ? ":" : ".");
+				byte_value = GET_U_1(bp);
 				if (c == 'x')
-					ND_PRINT((ndo, "%02x", byte_value));
+					ND_PRINT("%02x", byte_value);
 				else
-					ND_PRINT((ndo, "%u", byte_value));
+					ND_PRINT("%u", byte_value);
 				++bp;
 				--len;
 				first = 0;
@@ -824,47 +816,49 @@ rfc1048_print(netdissect_options *ndo,
 			case TAG_NETBIOS_NODE:
 				/* this option should be at least 1 byte long */
 				if (len < 1) {
-					ND_PRINT((ndo, "ERROR: length < 1 bytes"));
+					ND_PRINT("ERROR: length < 1 bytes");
 					break;
 				}
-				tag = EXTRACT_U_1(bp);
+				tag = GET_U_1(bp);
 				++bp;
 				--len;
-				ND_PRINT((ndo, "%s", tok2str(nbo2str, NULL, tag)));
+				ND_PRINT("%s", tok2str(nbo2str, NULL, tag));
 				break;
 
 			case TAG_OPT_OVERLOAD:
 				/* this option should be at least 1 byte long */
 				if (len < 1) {
-					ND_PRINT((ndo, "ERROR: length < 1 bytes"));
+					ND_PRINT("ERROR: length < 1 bytes");
 					break;
 				}
-				tag = EXTRACT_U_1(bp);
+				tag = GET_U_1(bp);
 				++bp;
 				--len;
-				ND_PRINT((ndo, "%s", tok2str(oo2str, NULL, tag)));
+				ND_PRINT("%s", tok2str(oo2str, NULL, tag));
 				break;
 
 			case TAG_CLIENT_FQDN:
 				/* this option should be at least 3 bytes long */
 				if (len < 3) {
-					ND_PRINT((ndo, "ERROR: length < 3 bytes"));
+					ND_PRINT("ERROR: length < 3 bytes");
 					bp += len;
 					len = 0;
 					break;
 				}
-				if (EXTRACT_U_1(bp))
-					ND_PRINT((ndo, "[%s] ", client_fqdn_flags(EXTRACT_U_1(bp))));
+				if (GET_U_1(bp))
+					ND_PRINT("[%s] ",
+						 client_fqdn_flags(GET_U_1(bp)));
 				bp++;
-				if (EXTRACT_U_1(bp) || EXTRACT_U_1(bp + 1))
-					ND_PRINT((ndo, "%u/%u ", EXTRACT_U_1(bp), EXTRACT_U_1(bp + 1)));
+				if (GET_U_1(bp) || GET_U_1(bp + 1))
+					ND_PRINT("%u/%u ", GET_U_1(bp),
+						 GET_U_1(bp + 1));
 				bp += 2;
-				ND_PRINT((ndo, "\""));
-				if (fn_printn(ndo, bp, len - 3, ndo->ndo_snapend)) {
-					ND_PRINT((ndo, "\""));
+				ND_PRINT("\"");
+				if (nd_printn(ndo, bp, len - 3, ndo->ndo_snapend)) {
+					ND_PRINT("\"");
 					goto trunc;
 				}
-				ND_PRINT((ndo, "\""));
+				ND_PRINT("\"");
 				bp += len - 3;
 				len = 0;
 				break;
@@ -875,28 +869,28 @@ rfc1048_print(netdissect_options *ndo,
 
 				/* this option should be at least 1 byte long */
 				if (len < 1) {
-					ND_PRINT((ndo, "ERROR: length < 1 bytes"));
+					ND_PRINT("ERROR: length < 1 bytes");
 					break;
 				}
-				type = EXTRACT_U_1(bp);
+				type = GET_U_1(bp);
 				bp++;
 				len--;
 				if (type == 0) {
-					ND_PRINT((ndo, "\""));
-					if (fn_printn(ndo, bp, len, ndo->ndo_snapend)) {
-						ND_PRINT((ndo, "\""));
+					ND_PRINT("\"");
+					if (nd_printn(ndo, bp, len, ndo->ndo_snapend)) {
+						ND_PRINT("\"");
 						goto trunc;
 					}
-					ND_PRINT((ndo, "\""));
+					ND_PRINT("\"");
 					bp += len;
 					len = 0;
 					break;
 				} else {
-					ND_PRINT((ndo, "%s ", tok2str(arp2str, "hardware-type %u,", type)));
+					ND_PRINT("%s ", tok2str(arp2str, "hardware-type %u,", type));
 					while (len > 0) {
 						if (!first)
-							ND_PRINT((ndo, ":"));
-						ND_PRINT((ndo, "%02x", EXTRACT_U_1(bp)));
+							ND_PRINT(":");
+						ND_PRINT("%02x", GET_U_1(bp));
 						++bp;
 						--len;
 						first = 0;
@@ -907,29 +901,29 @@ rfc1048_print(netdissect_options *ndo,
 
 			case TAG_AGENT_CIRCUIT:
 				while (len >= 2) {
-					subopt = EXTRACT_U_1(bp);
-					suboptlen = EXTRACT_U_1(bp + 1);
+					subopt = GET_U_1(bp);
+					suboptlen = GET_U_1(bp + 1);
 					bp += 2;
 					len -= 2;
 					if (suboptlen > len) {
-						ND_PRINT((ndo, "\n\t      %s SubOption %u, length %u: length goes past end of option",
+						ND_PRINT("\n\t      %s SubOption %u, length %u: length goes past end of option",
 							  tok2str(agent_suboption_values, "Unknown", subopt),
 							  subopt,
-							  suboptlen));
+							  suboptlen);
 						bp += len;
 						len = 0;
 						break;
 					}
-					ND_PRINT((ndo, "\n\t      %s SubOption %u, length %u: ",
+					ND_PRINT("\n\t      %s SubOption %u, length %u: ",
 						  tok2str(agent_suboption_values, "Unknown", subopt),
 						  subopt,
-						  suboptlen));
+						  suboptlen);
 					switch (subopt) {
 
 					case AGENT_SUBOPTION_CIRCUIT_ID: /* fall through */
 					case AGENT_SUBOPTION_REMOTE_ID:
 					case AGENT_SUBOPTION_SUBSCRIBER_ID:
-						if (fn_printn(ndo, bp, suboptlen, ndo->ndo_snapend))
+						if (nd_printn(ndo, bp, suboptlen, ndo->ndo_snapend))
 							goto trunc;
 						break;
 
@@ -949,20 +943,20 @@ rfc1048_print(netdissect_options *ndo,
 
 				/* this option should be at least 5 bytes long */
 				if (len < 5) {
-					ND_PRINT((ndo, "ERROR: length < 5 bytes"));
+					ND_PRINT("ERROR: length < 5 bytes");
 					bp += len;
 					len = 0;
 					break;
 				}
 				while (len > 0) {
 					if (!first)
-						ND_PRINT((ndo, ","));
-					mask_width = EXTRACT_U_1(bp);
+						ND_PRINT(",");
+					mask_width = GET_U_1(bp);
 					bp++;
 					len--;
 					/* mask_width <= 32 */
 					if (mask_width > 32) {
-						ND_PRINT((ndo, "[ERROR: Mask width (%d) > 32]", mask_width));
+						ND_PRINT("[ERROR: Mask width (%u) > 32]", mask_width);
 						bp += len;
 						len = 0;
 						break;
@@ -970,28 +964,28 @@ rfc1048_print(netdissect_options *ndo,
 					significant_octets = (mask_width + 7) / 8;
 					/* significant octets + router(4) */
 					if (len < significant_octets + 4) {
-						ND_PRINT((ndo, "[ERROR: Remaining length (%u) < %u bytes]", len, significant_octets + 4));
+						ND_PRINT("[ERROR: Remaining length (%u) < %u bytes]", len, significant_octets + 4);
 						bp += len;
 						len = 0;
 						break;
 					}
-					ND_PRINT((ndo, "("));
+					ND_PRINT("(");
 					if (mask_width == 0)
-						ND_PRINT((ndo, "default"));
+						ND_PRINT("default");
 					else {
 						for (i = 0; i < significant_octets ; i++) {
 							if (i > 0)
-								ND_PRINT((ndo, "."));
-							ND_PRINT((ndo, "%d", EXTRACT_U_1(bp)));
+								ND_PRINT(".");
+							ND_PRINT("%u",
+								 GET_U_1(bp));
 							bp++;
 						}
 						for (i = significant_octets ; i < 4 ; i++)
-							ND_PRINT((ndo, ".0"));
-						ND_PRINT((ndo, "/%d", mask_width));
+							ND_PRINT(".0");
+						ND_PRINT("/%u", mask_width);
 					}
-					memcpy((char *)&ul, (const char *)bp, sizeof(ul));
-					ND_PRINT((ndo, ":%s)", ipaddr_string(ndo, &ul)));
-					bp += sizeof(ul);
+					ND_PRINT(":%s)", ipaddr_string(ndo, bp));
+					bp += 4;
 					len -= (significant_octets + 4);
 					first = 0;
 				}
@@ -1004,36 +998,36 @@ rfc1048_print(netdissect_options *ndo,
 
 				first = 1;
 				if (len < 2) {
-					ND_PRINT((ndo, "ERROR: length < 2 bytes"));
+					ND_PRINT("ERROR: length < 2 bytes");
 					bp += len;
 					len = 0;
 					break;
 				}
 				while (len > 0) {
-					suboptlen = EXTRACT_U_1(bp);
+					suboptlen = GET_U_1(bp);
 					bp++;
 					len--;
-					ND_PRINT((ndo, "\n\t      "));
-					ND_PRINT((ndo, "instance#%u: ", suboptnumber));
+					ND_PRINT("\n\t      ");
+					ND_PRINT("instance#%u: ", suboptnumber);
 					if (suboptlen == 0) {
-						ND_PRINT((ndo, "ERROR: suboption length must be non-zero"));
+						ND_PRINT("ERROR: suboption length must be non-zero");
 						bp += len;
 						len = 0;
 						break;
 					}
 					if (len < suboptlen) {
-						ND_PRINT((ndo, "ERROR: invalid option"));
+						ND_PRINT("ERROR: invalid option");
 						bp += len;
 						len = 0;
 						break;
 					}
-					ND_PRINT((ndo, "\""));
-					if (fn_printn(ndo, bp, suboptlen, ndo->ndo_snapend)) {
-						ND_PRINT((ndo, "\""));
+					ND_PRINT("\"");
+					if (nd_printn(ndo, bp, suboptlen, ndo->ndo_snapend)) {
+						ND_PRINT("\"");
 						goto trunc;
 					}
-					ND_PRINT((ndo, "\""));
-					ND_PRINT((ndo, ", length %d", suboptlen));
+					ND_PRINT("\"");
+					ND_PRINT(", length %u", suboptlen);
 					suboptnumber++;
 					len -= suboptlen;
 					bp += suboptlen;
@@ -1042,8 +1036,8 @@ rfc1048_print(netdissect_options *ndo,
 			    }
 
 			default:
-				ND_PRINT((ndo, "[unknown special tag %u, size %u]",
-					  tag, len));
+				ND_PRINT("[unknown special tag %u, size %u]",
+					  tag, len);
 				bp += len;
 				len = 0;
 				break;
@@ -1052,18 +1046,18 @@ rfc1048_print(netdissect_options *ndo,
 		}
 		/* Data left over? */
 		if (len) {
-			ND_PRINT((ndo, "\n\t  trailing data length %u", len));
+			ND_PRINT("\n\t  trailing data length %u", len);
 			bp += len;
 		}
 	}
 	return;
 trunc:
-	ND_PRINT((ndo, "|[rfc1048]"));
+	nd_print_trunc(ndo);
 }
 
-#define PRINTCMUADDR(m, s) { ND_TCHECK(cmu->m); \
-    if (cmu->m.s_addr != 0) \
-	ND_PRINT((ndo, " %s:%s", s, ipaddr_string(ndo, &cmu->m.s_addr))); }
+#define PRINTCMUADDR(m, s) { ND_TCHECK_4(cmu->m); \
+    if (GET_IPV4_TO_NETWORK_ORDER(cmu->m) != 0) \
+	ND_PRINT(" %s:%s", s, ipaddr_string(ndo, cmu->m)); }
 
 static void
 cmu_print(netdissect_options *ndo,
@@ -1072,14 +1066,14 @@ cmu_print(netdissect_options *ndo,
 	const struct cmu_vend *cmu;
 	uint8_t v_flags;
 
-	ND_PRINT((ndo, " vend-cmu"));
+	ND_PRINT(" vend-cmu");
 	cmu = (const struct cmu_vend *)bp;
 
 	/* Only print if there are unknown bits */
-	ND_TCHECK(cmu->v_flags);
-	v_flags = EXTRACT_U_1(cmu->v_flags);
+	ND_TCHECK_4(cmu->v_flags);
+	v_flags = GET_U_1(cmu->v_flags);
 	if ((v_flags & ~(VF_SMASK)) != 0)
-		ND_PRINT((ndo, " F:0x%x", v_flags));
+		ND_PRINT(" F:0x%x", v_flags);
 	PRINTCMUADDR(v_dgate, "DG");
 	PRINTCMUADDR(v_smask, v_flags & VF_SMASK ? "SM" : "SM*");
 	PRINTCMUADDR(v_dns1, "NS1");
@@ -1091,7 +1085,7 @@ cmu_print(netdissect_options *ndo,
 	return;
 
 trunc:
-	ND_PRINT((ndo, "%s", tstr));
+	nd_print_trunc(ndo);
 }
 
 #undef PRINTCMUADDR