X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/ac3e9eddebf49c7ce1ab7323a9cced1ad6ac6a4b..77493011a78df00e5ba285d56fa97c816c088ceb:/print-bootp.c

diff --git a/print-bootp.c b/print-bootp.c
index b92a6550..9b163564 100644
--- a/print-bootp.c
+++ b/print-bootp.c
@@ -20,30 +20,26 @@
  *
  * Format and print bootp packets.
  */
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-bootp.c,v 1.83 2007-01-14 21:29:22 guy Exp $ (LBL)";
-#endif
 
+#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include <tcpdump-stdinc.h>
 
-#include <stdio.h>
 #include <string.h>
 
 #include "interface.h"
 #include "addrtoname.h"
 #include "extract.h"
-#include "ether.h"
 #include "bootp.h"
 
-static void rfc1048_print(const u_char *);
-static void cmu_print(const u_char *);
+static const char tstr[] = " [|bootp]";
 
-static char tstr[] = " [|bootp]";
+static void rfc1048_print(netdissect_options *, const u_char *);
+static void cmu_print(netdissect_options *, const u_char *);
+static char *client_fqdn_flags(u_int flags);
 
 static const struct tok bootp_flag_values[] = {
     { 0x8000,                   "Broadcast" },
@@ -60,117 +56,118 @@ static const struct tok bootp_op_values[] = {
  * Print bootp requests
  */
 void
-bootp_print(register const u_char *cp, u_int length)
+bootp_print(netdissect_options *ndo,
+            register const u_char *cp, u_int length)
 {
 	register const struct bootp *bp;
 	static const u_char vm_cmu[4] = VM_CMU;
 	static const u_char vm_rfc1048[4] = VM_RFC1048;
 
 	bp = (const struct bootp *)cp;
-	TCHECK(bp->bp_op);
+	ND_TCHECK(bp->bp_op);
 
-        printf("BOOTP/DHCP, %s",
-	       tok2str(bootp_op_values, "unknown (0x%02x)", bp->bp_op));
+	ND_PRINT((ndo, "BOOTP/DHCP, %s",
+	          tok2str(bootp_op_values, "unknown (0x%02x)", bp->bp_op)));
 
 	if (bp->bp_htype == 1 && bp->bp_hlen == 6 && bp->bp_op == BOOTPREQUEST) {
-		TCHECK2(bp->bp_chaddr[0], 6);
-		printf(" from %s", etheraddr_string(bp->bp_chaddr));
+		ND_TCHECK2(bp->bp_chaddr[0], 6);
+		ND_PRINT((ndo, " from %s", etheraddr_string(bp->bp_chaddr)));
 	}
 
-        printf(", length %u", length);
+	ND_PRINT((ndo, ", length %u", length));
 
-        if (!vflag)
-            return;
+	if (!ndo->ndo_vflag)
+		return;
 
-	TCHECK(bp->bp_secs);
+	ND_TCHECK(bp->bp_secs);
 
 	/* The usual hardware address type is 1 (10Mb Ethernet) */
 	if (bp->bp_htype != 1)
-		printf(", htype %d", bp->bp_htype);
+		ND_PRINT((ndo, ", htype %d", bp->bp_htype));
 
 	/* The usual length for 10Mb Ethernet address is 6 bytes */
 	if (bp->bp_htype != 1 || bp->bp_hlen != 6)
-		printf(", hlen %d", bp->bp_hlen);
+		ND_PRINT((ndo, ", hlen %d", bp->bp_hlen));
 
 	/* Only print interesting fields */
 	if (bp->bp_hops)
-		printf(", hops %d", bp->bp_hops);
-	if (bp->bp_xid)
-		printf(", xid 0x%x", EXTRACT_32BITS(&bp->bp_xid));
-	if (bp->bp_secs)
-		printf(", secs %d", EXTRACT_16BITS(&bp->bp_secs));
+		ND_PRINT((ndo, ", hops %d", bp->bp_hops));
+	if (EXTRACT_32BITS(&bp->bp_xid))
+		ND_PRINT((ndo, ", xid 0x%x", EXTRACT_32BITS(&bp->bp_xid)));
+	if (EXTRACT_16BITS(&bp->bp_secs))
+		ND_PRINT((ndo, ", secs %d", EXTRACT_16BITS(&bp->bp_secs)));
 
-	printf(", Flags [ %s ]",
-	       bittok2str(bootp_flag_values, "none", EXTRACT_16BITS(&bp->bp_flags)));
-	if (vflag>1)
-	  printf( " (0x%04x)", EXTRACT_16BITS(&bp->bp_flags));
+	ND_PRINT((ndo, ", Flags [%s]",
+		bittok2str(bootp_flag_values, "none", EXTRACT_16BITS(&bp->bp_flags))));
+	if (ndo->ndo_vflag > 1)
+		ND_PRINT((ndo, " (0x%04x)", EXTRACT_16BITS(&bp->bp_flags)));
 
 	/* Client's ip address */
-	TCHECK(bp->bp_ciaddr);
-	if (bp->bp_ciaddr.s_addr)
-		printf("\n\t  Client-IP %s", ipaddr_string(&bp->bp_ciaddr));
+	ND_TCHECK(bp->bp_ciaddr);
+	if (EXTRACT_32BITS(&bp->bp_ciaddr.s_addr))
+		ND_PRINT((ndo, "\n\t  Client-IP %s", ipaddr_string(&bp->bp_ciaddr)));
 
 	/* 'your' ip address (bootp client) */
-	TCHECK(bp->bp_yiaddr);
-	if (bp->bp_yiaddr.s_addr)
-		printf("\n\t  Your-IP %s", ipaddr_string(&bp->bp_yiaddr));
+	ND_TCHECK(bp->bp_yiaddr);
+	if (EXTRACT_32BITS(&bp->bp_yiaddr.s_addr))
+		ND_PRINT((ndo, "\n\t  Your-IP %s", ipaddr_string(&bp->bp_yiaddr)));
 
 	/* Server's ip address */
-	TCHECK(bp->bp_siaddr);
-	if (bp->bp_siaddr.s_addr)
-		printf("\n\t  Server-IP %s", ipaddr_string(&bp->bp_siaddr));
+	ND_TCHECK(bp->bp_siaddr);
+	if (EXTRACT_32BITS(&bp->bp_siaddr.s_addr))
+		ND_PRINT((ndo, "\n\t  Server-IP %s", ipaddr_string(&bp->bp_siaddr)));
 
 	/* Gateway's ip address */
-	TCHECK(bp->bp_giaddr);
-	if (bp->bp_giaddr.s_addr)
-		printf("\n\t  Gateway-IP %s", ipaddr_string(&bp->bp_giaddr));
+	ND_TCHECK(bp->bp_giaddr);
+	if (EXTRACT_32BITS(&bp->bp_giaddr.s_addr))
+		ND_PRINT((ndo, "\n\t  Gateway-IP %s", ipaddr_string(&bp->bp_giaddr)));
 
 	/* Client's Ethernet address */
 	if (bp->bp_htype == 1 && bp->bp_hlen == 6) {
-		TCHECK2(bp->bp_chaddr[0], 6);
-		printf("\n\t  Client-Ethernet-Address %s", etheraddr_string(bp->bp_chaddr));
+		ND_TCHECK2(bp->bp_chaddr[0], 6);
+		ND_PRINT((ndo, "\n\t  Client-Ethernet-Address %s", etheraddr_string(bp->bp_chaddr)));
 	}
 
-	TCHECK2(bp->bp_sname[0], 1);		/* check first char only */
+	ND_TCHECK2(bp->bp_sname[0], 1);		/* check first char only */
 	if (*bp->bp_sname) {
-		printf("\n\t  sname \"");
-		if (fn_print(bp->bp_sname, snapend)) {
-			putchar('"');
-			fputs(tstr + 1, stdout);
+		ND_PRINT((ndo, "\n\t  sname \""));
+		if (fn_print(bp->bp_sname, ndo->ndo_snapend)) {
+			ND_PRINT((ndo, "\""));
+			ND_PRINT((ndo, tstr + 1));
 			return;
 		}
-		putchar('"');
+		ND_PRINT((ndo, "\""));
 	}
-	TCHECK2(bp->bp_file[0], 1);		/* check first char only */
+	ND_TCHECK2(bp->bp_file[0], 1);		/* check first char only */
 	if (*bp->bp_file) {
-		printf("\n\t  file \"");
-		if (fn_print(bp->bp_file, snapend)) {
-			putchar('"');
-			fputs(tstr + 1, stdout);
+		ND_PRINT((ndo, "\n\t  file \""));
+		if (fn_print(bp->bp_file, ndo->ndo_snapend)) {
+			ND_PRINT((ndo, "\""));
+			ND_PRINT((ndo, tstr + 1));
 			return;
 		}
-		putchar('"');
+		ND_PRINT((ndo, "\""));
 	}
 
 	/* Decode the vendor buffer */
-	TCHECK(bp->bp_vend[0]);
+	ND_TCHECK(bp->bp_vend[0]);
 	if (memcmp((const char *)bp->bp_vend, vm_rfc1048,
 		 sizeof(u_int32_t)) == 0)
-		rfc1048_print(bp->bp_vend);
+		rfc1048_print(ndo, bp->bp_vend);
 	else if (memcmp((const char *)bp->bp_vend, vm_cmu,
 		      sizeof(u_int32_t)) == 0)
-		cmu_print(bp->bp_vend);
+		cmu_print(ndo, bp->bp_vend);
 	else {
 		u_int32_t ul;
 
 		ul = EXTRACT_32BITS(&bp->bp_vend);
 		if (ul != 0)
-			printf("\n\t  Vendor-#0x%x", ul);
+			ND_PRINT((ndo, "\n\t  Vendor-#0x%x", ul));
 	}
 
 	return;
 trunc:
-	fputs(tstr, stdout);
+	ND_PRINT((ndo, tstr));
 }
 
 /*
@@ -186,7 +183,7 @@ trunc:
  *     B - on/off (8 bits)
  *     $ - special (explicit code to handle)
  */
-static struct tok tag2str[] = {
+static const struct tok tag2str[] = {
 /* RFC1048 tags */
 	{ TAG_PAD,		" PAD" },
 	{ TAG_SUBNET_MASK,	"iSubnet-Mask" },	/* subnet mask (RFC950) */
@@ -277,6 +274,9 @@ static struct tok tag2str[] = {
 	{ TAG_NS_SEARCH,	"sNSSEARCH" },	/* XXX 's' */
 /* RFC 3011 */
 	{ TAG_IP4_SUBNET_SELECT, "iSUBNET" },
+/* RFC 3442 */
+	{ TAG_CLASSLESS_STATIC_RT, "$Classless-Static-Route" },
+	{ TAG_CLASSLESS_STA_RT_MS, "$Classless-Static-Route-Microsoft" },
 /* http://www.iana.org/assignments/bootp-dhcp-extensions/index.htm */
 	{ TAG_USER_CLASS,	"aCLASS" },
 	{ TAG_SLP_NAMING_AUTH,	"aSLP-NA" },
@@ -304,12 +304,12 @@ static struct tok tag2str[] = {
 	{ 0,			NULL }
 };
 /* 2-byte extended tags */
-static struct tok xtag2str[] = {
+static const struct tok xtag2str[] = {
 	{ 0,			NULL }
 };
 
 /* DHCP "options overload" types */
-static struct tok oo2str[] = {
+static const struct tok oo2str[] = {
 	{ 1,			"file" },
 	{ 2,			"sname" },
 	{ 3,			"file+sname" },
@@ -317,7 +317,7 @@ static struct tok oo2str[] = {
 };
 
 /* NETBIOS over TCP/IP node type options */
-static struct tok nbo2str[] = {
+static const struct tok nbo2str[] = {
 	{ 0x1,			"b-node" },
 	{ 0x2,			"p-node" },
 	{ 0x4,			"m-node" },
@@ -326,7 +326,7 @@ static struct tok nbo2str[] = {
 };
 
 /* ARP Hardware types, for Client-ID option */
-static struct tok arp2str[] = {
+static const struct tok arp2str[] = {
 	{ 0x1,			"ether" },
 	{ 0x6,			"ieee802" },
 	{ 0x7,			"arcnet" },
@@ -336,7 +336,7 @@ static struct tok arp2str[] = {
 	{ 0,			NULL }
 };
 
-static struct tok dhcp_msg_values[] = {
+static const struct tok dhcp_msg_values[] = {
         { DHCPDISCOVER, "Discover" },
         { DHCPOFFER, "Offer" },
         { DHCPREQUEST, "Request" },
@@ -348,18 +348,23 @@ static struct tok dhcp_msg_values[] = {
         { 0,			NULL }
 };
 
-#define AGENT_SUBOPTION_CIRCUIT_ID 1
-static struct tok agent_suboption_values[] = {
+#define AGENT_SUBOPTION_CIRCUIT_ID 	1	/* RFC 3046 */
+#define AGENT_SUBOPTION_REMOTE_ID  	2	/* RFC 3046 */
+#define AGENT_SUBOPTION_SUBSCRIBER_ID 	6	/* RFC 3993 */
+static const struct tok agent_suboption_values[] = {
         { AGENT_SUBOPTION_CIRCUIT_ID, "Circuit-ID" },
+        { AGENT_SUBOPTION_REMOTE_ID, "Remote-ID" },
+        { AGENT_SUBOPTION_SUBSCRIBER_ID, "Subscriber-ID" },
         { 0,			NULL }
 };
 
 
 static void
-rfc1048_print(register const u_char *bp)
+rfc1048_print(netdissect_options *ndo,
+              register const u_char *bp)
 {
 	register u_int16_t tag;
-	register u_int len, size;
+	register u_int len;
 	register const char *cp;
 	register char c;
 	int first, idx;
@@ -367,21 +372,21 @@ rfc1048_print(register const u_char *bp)
 	u_int16_t us;
 	u_int8_t uc, subopt, suboptlen;
 
-	printf("\n\t  Vendor-rfc1048 Extensions");
+	ND_PRINT((ndo, "\n\t  Vendor-rfc1048 Extensions"));
 
 	/* Step over magic cookie */
-        printf("\n\t    Magic Cookie 0x%08x", EXTRACT_32BITS(bp));
+	ND_PRINT((ndo, "\n\t    Magic Cookie 0x%08x", EXTRACT_32BITS(bp)));
 	bp += sizeof(int32_t);
 
 	/* Loop while we there is a tag left in the buffer */
-	while (TTEST2(*bp, 1)) {
+	while (ND_TTEST2(*bp, 1)) {
 		tag = *bp++;
-		if (tag == TAG_PAD && vflag < 3)
+		if (tag == TAG_PAD && ndo->ndo_vflag < 3)
 			continue;
-		if (tag == TAG_END && vflag < 3)
+		if (tag == TAG_END && ndo->ndo_vflag < 3)
 			return;
 		if (tag == TAG_EXTENDED_OPTION) {
-			TCHECK2(*(bp + 1), 2);
+			ND_TCHECK2(*(bp + 1), 2);
 			tag = EXTRACT_16BITS(bp + 1);
 			/* XXX we don't know yet if the IANA will
 			 * preclude overlap of 1-byte and 2-byte spaces.
@@ -396,32 +401,32 @@ rfc1048_print(register const u_char *bp)
 			len = 0;
 		else {
 			/* Get the length; check for truncation */
-			TCHECK2(*bp, 1);
+			ND_TCHECK2(*bp, 1);
 			len = *bp++;
 		}
 
-		printf("\n\t    %s Option %u, length %u%s", cp, tag, len,
-		    len > 0 ? ": " : "");
+		ND_PRINT((ndo, "\n\t    %s Option %u, length %u%s", cp, tag, len,
+		    len > 0 ? ": " : ""));
 
-		if (tag == TAG_PAD && vflag > 2) {
+		if (tag == TAG_PAD && ndo->ndo_vflag > 2) {
 			u_int ntag = 1;
-			while (TTEST2(*bp, 1) && *bp == TAG_PAD) {
+			while (ND_TTEST2(*bp, 1) && *bp == TAG_PAD) {
 				bp++;
 				ntag++;
 			}
 			if (ntag > 1)
-				printf(", occurs %u", ntag);
+				ND_PRINT((ndo, ", occurs %u", ntag));
 		}
 
-		if (!TTEST2(*bp, len)) {
-			printf("[|rfc1048 %u]", len);
+		if (!ND_TTEST2(*bp, len)) {
+			ND_PRINT((ndo, "[|rfc1048 %u]", len));
 			return;
 		}
 
 		if (tag == TAG_DHCP_MESSAGE && len == 1) {
 			uc = *bp++;
-                        printf("%s", tok2str(dhcp_msg_values, "Unknown (%u)", uc));
-                        continue;
+			ND_PRINT((ndo, "%s", tok2str(dhcp_msg_values, "Unknown (%u)", uc)));
+			continue;
 		}
 
 		if (tag == TAG_PARM_REQUEST) {
@@ -430,10 +435,10 @@ rfc1048_print(register const u_char *bp)
 				uc = *bp++;
 				cp = tok2str(tag2str, "?Option %u", uc);
 				if (idx % 4 == 0)
-					printf("\n\t      ");
+					ND_PRINT((ndo, "\n\t      "));
 				else
-					printf(", ");
-				printf("%s", cp + 1);
+					ND_PRINT((ndo, ", "));
+				ND_PRINT((ndo, "%s", cp + 1));
 				idx++;
 			}
 			continue;
@@ -447,20 +452,19 @@ rfc1048_print(register const u_char *bp)
 				bp += 2;
 				cp = tok2str(xtag2str, "?xT%u", us);
 				if (!first)
-					putchar('+');
-				printf("%s", cp + 1);
+					ND_PRINT((ndo, "+"));
+				ND_PRINT((ndo, "%s", cp + 1));
 				first = 0;
 			}
 			continue;
 		}
 
 		/* Print data */
-		size = len;
 		if (c == '?') {
 			/* Base default formats for unknown tags on data size */
-			if (size & 1)
+			if (len & 1)
 				c = 'b';
-			else if (size & 2)
+			else if (len & 2)
 				c = 's';
 			else
 				c = 'l';
@@ -470,84 +474,84 @@ rfc1048_print(register const u_char *bp)
 
 		case 'a':
 			/* ascii strings */
-			putchar('"');
-			if (fn_printn(bp, size, snapend)) {
-				putchar('"');
+			ND_PRINT((ndo, "\""));
+			if (fn_printn(bp, len, ndo->ndo_snapend)) {
+				ND_PRINT((ndo, "\""));
 				goto trunc;
 			}
-			putchar('"');
-			bp += size;
-			size = 0;
+			ND_PRINT((ndo, "\""));
+			bp += len;
+			len = 0;
 			break;
 
 		case 'i':
 		case 'l':
 		case 'L':
 			/* ip addresses/32-bit words */
-			while (size >= sizeof(ul)) {
+			while (len >= sizeof(ul)) {
 				if (!first)
-					putchar(',');
+					ND_PRINT((ndo, ","));
 				ul = EXTRACT_32BITS(bp);
 				if (c == 'i') {
 					ul = htonl(ul);
-					printf("%s", ipaddr_string(&ul));
+					ND_PRINT((ndo, "%s", ipaddr_string(&ul)));
 				} else if (c == 'L')
-					printf("%d", ul);
+					ND_PRINT((ndo, "%d", ul));
 				else
-					printf("%u", ul);
+					ND_PRINT((ndo, "%u", ul));
 				bp += sizeof(ul);
-				size -= sizeof(ul);
+				len -= sizeof(ul);
 				first = 0;
 			}
 			break;
 
 		case 'p':
 			/* IP address pairs */
-			while (size >= 2*sizeof(ul)) {
+			while (len >= 2*sizeof(ul)) {
 				if (!first)
-					putchar(',');
+					ND_PRINT((ndo, ","));
 				memcpy((char *)&ul, (const char *)bp, sizeof(ul));
-				printf("(%s:", ipaddr_string(&ul));
+				ND_PRINT((ndo, "(%s:", ipaddr_string(&ul)));
 				bp += sizeof(ul);
 				memcpy((char *)&ul, (const char *)bp, sizeof(ul));
-				printf("%s)", ipaddr_string(&ul));
+				ND_PRINT((ndo, "%s)", ipaddr_string(&ul)));
 				bp += sizeof(ul);
-				size -= 2*sizeof(ul);
+				len -= 2*sizeof(ul);
 				first = 0;
 			}
 			break;
 
 		case 's':
 			/* shorts */
-			while (size >= sizeof(us)) {
+			while (len >= sizeof(us)) {
 				if (!first)
-					putchar(',');
+					ND_PRINT((ndo, ","));
 				us = EXTRACT_16BITS(bp);
-				printf("%u", us);
+				ND_PRINT((ndo, "%u", us));
 				bp += sizeof(us);
-				size -= sizeof(us);
+				len -= sizeof(us);
 				first = 0;
 			}
 			break;
 
 		case 'B':
 			/* boolean */
-			while (size > 0) {
+			while (len > 0) {
 				if (!first)
-					putchar(',');
+					ND_PRINT((ndo, ","));
 				switch (*bp) {
 				case 0:
-					putchar('N');
+					ND_PRINT((ndo, "N"));
 					break;
 				case 1:
-					putchar('Y');
+					ND_PRINT((ndo, "Y"));
 					break;
 				default:
-					printf("%u?", *bp);
+					ND_PRINT((ndo, "%u?", *bp));
 					break;
 				}
 				++bp;
-				--size;
+				--len;
 				first = 0;
 			}
 			break;
@@ -556,15 +560,15 @@ rfc1048_print(register const u_char *bp)
 		case 'x':
 		default:
 			/* Bytes */
-			while (size > 0) {
+			while (len > 0) {
 				if (!first)
-					putchar(c == 'x' ? ':' : '.');
+					ND_PRINT((ndo, c == 'x' ? ":" : "."));
 				if (c == 'x')
-					printf("%02x", *bp);
+					ND_PRINT((ndo, "%02x", *bp));
 				else
-					printf("%u", *bp);
+					ND_PRINT((ndo, "%u", *bp));
 				++bp;
-				--size;
+				--len;
 				first = 0;
 			}
 			break;
@@ -574,132 +578,216 @@ rfc1048_print(register const u_char *bp)
 			switch (tag) {
 
 			case TAG_NETBIOS_NODE:
+				/* this option should be at least 1 byte long */
+				if (len < 1)  {
+					ND_PRINT((ndo, "ERROR: option %u len %u < 1 bytes",
+					    TAG_NETBIOS_NODE, len));
+					break;
+				}
 				tag = *bp++;
-				--size;
-				fputs(tok2str(nbo2str, NULL, tag), stdout);
+				--len;
+				ND_PRINT((ndo, "%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: option %u len %u < 1 bytes",
+					    TAG_OPT_OVERLOAD, len));
+					break;
+				}
 				tag = *bp++;
-				--size;
-				fputs(tok2str(oo2str, NULL, tag), stdout);
+				--len;
+				ND_PRINT((ndo, "%s", tok2str(oo2str, NULL, tag)));
 				break;
 
 			case TAG_CLIENT_FQDN:
-				/* option 81 should be at least 4 bytes long */
-				if (len < 4)  {
-                                        printf("ERROR: options 81 len %u < 4 bytes", len);
+				/* this option should be at least 3 bytes long */
+				if (len < 3)  {
+					ND_PRINT((ndo, "ERROR: option %u len %u < 3 bytes",
+					    TAG_CLIENT_FQDN, len));
+					bp += len;
+					len = 0;
 					break;
 				}
-				if (*bp++)
-					printf("[svrreg]");
 				if (*bp)
-					printf("%u/%u/", *bp, *(bp+1));
+					ND_PRINT((ndo, "[%s] ", client_fqdn_flags(*bp)));
+				bp++;
+				if (*bp || *(bp+1))
+					ND_PRINT((ndo, "%u/%u ", *bp, *(bp+1)));
 				bp += 2;
-				putchar('"');
-				if (fn_printn(bp, size - 3, snapend)) {
-					putchar('"');
+				ND_PRINT((ndo, "\""));
+				if (fn_printn(bp, len - 3, ndo->ndo_snapend)) {
+					ND_PRINT((ndo, "\""));
 					goto trunc;
 				}
-				putchar('"');
-				bp += size - 3;
-				size = 0;
+				ND_PRINT((ndo, "\""));
+				bp += len - 3;
+				len = 0;
 				break;
 
 			case TAG_CLIENT_ID:
-			    {	int type = *bp++;
-				size--;
+			    {	int type;
+
+				/* this option should be at least 1 byte long */
+				if (len < 1)  {
+					ND_PRINT((ndo, "ERROR: option %u len %u < 1 bytes",
+					    TAG_CLIENT_ID, len));
+					break;
+				}
+				type = *bp++;
+				len--;
 				if (type == 0) {
-					putchar('"');
-					if (fn_printn(bp, size, snapend)) {
-						putchar('"');
+					ND_PRINT((ndo, "\""));
+					if (fn_printn(bp, len, ndo->ndo_snapend)) {
+						ND_PRINT((ndo, "\""));
 						goto trunc;
 					}
-					putchar('"');
-					bp += size;
-					size = 0;
+					ND_PRINT((ndo, "\""));
+					bp += len;
+					len = 0;
 					break;
 				} else {
-					printf("%s ", tok2str(arp2str, "hardware-type %u,", type));
-				}
-				while (size > 0) {
-					if (!first)
-						putchar(':');
-					printf("%02x", *bp);
-					++bp;
-					--size;
-					first = 0;
+					ND_PRINT((ndo, "%s ", tok2str(arp2str, "hardware-type %u,", type)));
+					while (len > 0) {
+						if (!first)
+							ND_PRINT((ndo, ":"));
+						ND_PRINT((ndo, "%02x", *bp));
+						++bp;
+						--len;
+						first = 0;
+					}
 				}
 				break;
 			    }
 
-                        case TAG_AGENT_CIRCUIT:
-                        {
-                            while (size > 0 ) {
-                            subopt = *bp++;
-                            suboptlen = *bp++;
-                            size -= 2;
-                            printf("\n\t      %s SubOption %u, length %u: ",
-                                   tok2str(agent_suboption_values, "Unknown", subopt),
-                                   subopt,
-                                   suboptlen);
-
-                            if (subopt == 0 || suboptlen == 0) {
-                                break;
-                            }
-
-                            switch(subopt) {
-                            case AGENT_SUBOPTION_CIRCUIT_ID:
-                                for (idx = 0; idx < suboptlen; idx++) {
-                                    safeputchar(*(bp+idx));
-                                }
-                                break;
-                            default:
-                                print_unknown_data(bp, "\n\t\t", suboptlen);
-                            }
-
-                            size -= suboptlen;
-                            bp += suboptlen;
-                            }
-                        }
-                            break;
+			case TAG_AGENT_CIRCUIT:
+				while (len >= 2) {
+					subopt = *bp++;
+					suboptlen = *bp++;
+					len -= 2;
+					if (suboptlen > len) {
+						ND_PRINT((ndo, "\n\t      %s SubOption %u, length %u: length goes past end of option",
+						   tok2str(agent_suboption_values, "Unknown", subopt),
+						   subopt,
+						   suboptlen));
+						bp += len;
+						len = 0;
+						break;
+					}
+					ND_PRINT((ndo, "\n\t      %s SubOption %u, length %u: ",
+					   tok2str(agent_suboption_values, "Unknown", subopt),
+					   subopt,
+					   suboptlen));
+					switch (subopt) {
+
+					case AGENT_SUBOPTION_CIRCUIT_ID: /* fall through */
+					case AGENT_SUBOPTION_REMOTE_ID:
+					case AGENT_SUBOPTION_SUBSCRIBER_ID:
+						fn_printn(bp, suboptlen, NULL);
+						break;
+
+					default:
+						print_unknown_data(ndo, bp, "\n\t\t", suboptlen);
+					}
+
+					len -= suboptlen;
+					bp += suboptlen;
+			    }
+			    break;
+
+			case TAG_CLASSLESS_STATIC_RT:
+			case TAG_CLASSLESS_STA_RT_MS:
+			{
+				u_int mask_width, significant_octets, i;
+
+				/* this option should be at least 5 bytes long */
+				if (len < 5)  {
+					ND_PRINT((ndo, "ERROR: option %u len %u < 5 bytes",
+					    TAG_CLASSLESS_STATIC_RT, len));
+					bp += len;
+					len = 0;
+					break;
+				}
+				while (len > 0) {
+					if (!first)
+						ND_PRINT((ndo, ","));
+					mask_width = *bp++;
+					len--;
+					/* mask_width <= 32 */
+					if (mask_width > 32) {
+						ND_PRINT((ndo, "[ERROR: Mask width (%d) > 32]",  mask_width));
+						bp += len;
+						len = 0;
+						break;
+					}
+					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));
+						bp += len;
+						len = 0;
+						break;
+					}
+					ND_PRINT((ndo, "("));
+					if (mask_width == 0)
+						ND_PRINT((ndo, "default"));
+					else {
+						for (i = 0; i < significant_octets ; i++) {
+							if (i > 0)
+								ND_PRINT((ndo, "."));
+							ND_PRINT((ndo, "%d", *bp++));
+						}
+						for (i = significant_octets ; i < 4 ; i++)
+							ND_PRINT((ndo, ".0"));
+						ND_PRINT((ndo, "/%d", mask_width));
+					}
+					memcpy((char *)&ul, (const char *)bp, sizeof(ul));
+					ND_PRINT((ndo, ":%s)", ipaddr_string(&ul)));
+					bp += sizeof(ul);
+					len -= (significant_octets + 4);
+					first = 0;
+				}
+			}
+			break;
 
 			default:
-				printf("[unknown special tag %u, size %u]",
-				    tag, size);
-				bp += size;
-				size = 0;
+				ND_PRINT((ndo, "[unknown special tag %u, size %u]",
+				    tag, len));
+				bp += len;
+				len = 0;
 				break;
 			}
 			break;
 		}
 		/* Data left over? */
-		if (size) {
-			printf("\n\t  trailing data length %u", len);
-			bp += size;
+		if (len) {
+			ND_PRINT((ndo, "\n\t  trailing data length %u", len));
+			bp += len;
 		}
 	}
 	return;
 trunc:
-	printf("|[rfc1048]");
+	ND_PRINT((ndo, "|[rfc1048]"));
 }
 
 static void
-cmu_print(register const u_char *bp)
+cmu_print(netdissect_options *ndo,
+          register const u_char *bp)
 {
 	register const struct cmu_vend *cmu;
 
-#define PRINTCMUADDR(m, s) { TCHECK(cmu->m); \
+#define PRINTCMUADDR(m, s) { ND_TCHECK(cmu->m); \
     if (cmu->m.s_addr != 0) \
-	printf(" %s:%s", s, ipaddr_string(&cmu->m.s_addr)); }
+	ND_PRINT((ndo, " %s:%s", s, ipaddr_string(&cmu->m.s_addr))); }
 
-	printf(" vend-cmu");
+	ND_PRINT((ndo, " vend-cmu"));
 	cmu = (const struct cmu_vend *)bp;
 
 	/* Only print if there are unknown bits */
-	TCHECK(cmu->v_flags);
+	ND_TCHECK(cmu->v_flags);
 	if ((cmu->v_flags & ~(VF_SMASK)) != 0)
-		printf(" F:0x%x", cmu->v_flags);
+		ND_PRINT((ndo, " F:0x%x", cmu->v_flags));
 	PRINTCMUADDR(v_dgate, "DG");
 	PRINTCMUADDR(v_smask, cmu->v_flags & VF_SMASK ? "SM" : "SM*");
 	PRINTCMUADDR(v_dns1, "NS1");
@@ -711,6 +799,25 @@ cmu_print(register const u_char *bp)
 	return;
 
 trunc:
-	fputs(tstr, stdout);
+	ND_PRINT((ndo, tstr));
 #undef PRINTCMUADDR
 }
+
+static char *
+client_fqdn_flags(u_int flags)
+{
+	static char buf[8+1];
+	int i = 0;
+
+	if (flags & CLIENT_FQDN_FLAGS_S)
+		buf[i++] = 'S';
+	if (flags & CLIENT_FQDN_FLAGS_O)
+		buf[i++] = 'O';
+	if (flags & CLIENT_FQDN_FLAGS_E)
+		buf[i++] = 'E';
+	if (flags & CLIENT_FQDN_FLAGS_N)
+		buf[i++] = 'N';
+	buf[i] = '\0';
+
+	return buf;
+}