X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/6ec714988caac3bf9fedc766ae51a2248896ec80..refs/heads/master:/print-ppp.c

diff --git a/print-ppp.c b/print-ppp.c
index 31b87a24..f7af42a5 100644
--- a/print-ppp.c
+++ b/print-ppp.c
@@ -31,16 +31,9 @@
  * o BAP support
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <netdissect-stdinc.h>
+#include <config.h>
 
-#ifdef __bsdi__
-#include <net/slcompress.h>
-#include <net/if_ppp.h>
-#endif
+#include "netdissect-stdinc.h"
 
 #include <stdlib.h>
 
@@ -51,10 +44,11 @@
 #include "chdlc.h"
 #include "ethertype.h"
 #include "oui.h"
+#include "netdissect-alloc.h"
 
 /*
- * The following constatns are defined by IANA. Please refer to
- *    http://www.isi.edu/in-notes/iana/assignments/ppp-numbers
+ * The following constants are defined by IANA. Please refer to
+ *    https://www.isi.edu/in-notes/iana/assignments/ppp-numbers
  * for the up-to-date information.
  */
 
@@ -195,7 +189,7 @@ static const char *lcpconfopts[] = {
 	"deprecated(12)",	/* used to be a Multi-Link-Procedure*/
 	"Call-Back",		/* (13) */
 	"deprecated(14)",	/* used to be a Connect-Time */
-	"deprecated(15)",	/* used to be a Compund-Frames */
+	"deprecated(15)",	/* used to be a Compound-Frames */
 	"deprecated(16)",	/* used to be a Nominal-Data-Encap */
 	"MRRU",			/* (17) */
 	"12-Bit seq #",		/* (18) */
@@ -213,7 +207,7 @@ static const char *lcpconfopts[] = {
 	"PPP-Muxing",		/* (30) */
 };
 
-#define NUM_LCPOPTS	(sizeof lcpconfopts / sizeof lcpconfopts[0])
+#define NUM_LCPOPTS	(sizeof(lcpconfopts) / sizeof(lcpconfopts[0]))
 
 /* ECP - to be supported */
 
@@ -416,47 +410,46 @@ handle_ctrl_proto(netdissect_options *ndo,
 	const char *typestr;
 	u_int code, len;
 	u_int (*pfunc)(netdissect_options *, const u_char *, u_int);
-	u_int x, j;
+	u_int tlen, advance;
         const u_char *tptr;
 
         tptr=pptr;
 
         typestr = tok2str(ppptype2str, "unknown ctrl-proto (0x%04x)", proto);
-	ND_PRINT((ndo, "%s, ", typestr));
+	ND_PRINT("%s, ", typestr);
 
 	if (length < 4) /* FIXME weak boundary checking */
 		goto trunc;
 	ND_TCHECK_2(tptr);
 
-	code = EXTRACT_U_1(tptr);
+	code = GET_U_1(tptr);
 	tptr++;
 
-	ND_PRINT((ndo, "%s (0x%02x), id %u, length %u",
+	ND_PRINT("%s (0x%02x), id %u, length %u",
 	          tok2str(cpcodes, "Unknown Opcode",code),
 	          code,
-	          EXTRACT_U_1(tptr), /* ID */
-	          length + 2));
+	          GET_U_1(tptr), /* ID */
+	          length + 2);
 	tptr++;
 
 	if (!ndo->ndo_vflag)
 		return;
 
-	ND_TCHECK_2(tptr);
-	len = EXTRACT_BE_U_2(tptr);
+	len = GET_BE_U_2(tptr);
 	tptr += 2;
 
 	if (len < 4) {
-		ND_PRINT((ndo, "\n\tencoded length %u (< 4))", len));
+		ND_PRINT("\n\tencoded length %u (< 4))", len);
 		return;
 	}
 
 	if (len > length) {
-		ND_PRINT((ndo, "\n\tencoded length %u (> packet length %u))", len, length));
+		ND_PRINT("\n\tencoded length %u (> packet length %u))", len, length);
 		return;
 	}
 	length = len;
 
-	ND_PRINT((ndo, "\n\tencoded length %u (=Option(s) length %u)", len, len - 4));
+	ND_PRINT("\n\tencoded length %u (=Option(s) length %u)", len, len - 4);
 
 	if (length == 4)
 		return;    /* there may be a NULL confreq etc. */
@@ -469,20 +462,18 @@ handle_ctrl_proto(netdissect_options *ndo,
 	case CPCODES_VEXT:
 		if (length < 11)
 			break;
-		ND_TCHECK_4(tptr);
-		ND_PRINT((ndo, "\n\t  Magic-Num 0x%08x", EXTRACT_BE_U_4(tptr)));
+		ND_PRINT("\n\t  Magic-Num 0x%08x", GET_BE_U_4(tptr));
 		tptr += 4;
-		ND_TCHECK_3(tptr);
-		ND_PRINT((ndo, " Vendor: %s (%u)",
-                       tok2str(oui_values,"Unknown",EXTRACT_BE_U_3(tptr)),
-                       EXTRACT_BE_U_3(tptr)));
+		ND_PRINT(" Vendor: %s (%u)",
+                       tok2str(oui_values,"Unknown",GET_BE_U_3(tptr)),
+                       GET_BE_U_3(tptr));
 		/* XXX: need to decode Kind and Value(s)? */
 		break;
 	case CPCODES_CONF_REQ:
 	case CPCODES_CONF_ACK:
 	case CPCODES_CONF_NAK:
 	case CPCODES_CONF_REJ:
-		x = len - 4;	/* Code(1), Identifier(1) and Length(2) */
+		tlen = len - 4;	/* Code(1), Identifier(1) and Length(2) */
 		do {
 			switch (proto) {
 			case PPP_LCP:
@@ -512,11 +503,17 @@ handle_ctrl_proto(netdissect_options *ndo,
 			if (pfunc == NULL) /* catch the above null pointer if unknown CP */
 				break;
 
-			if ((j = (*pfunc)(ndo, tptr, len)) == 0)
+			if ((advance = (*pfunc)(ndo, tptr, len)) == 0)
 				break;
-			x -= j;
-			tptr += j;
-		} while (x != 0);
+			if (tlen < advance) {
+				ND_PRINT(" [remaining options length %u < %u]",
+					 tlen, advance);
+				nd_print_invalid(ndo);
+				break;
+			}
+			tlen -= advance;
+			tptr += advance;
+		} while (tlen != 0);
 		break;
 
 	case CPCODES_TERM_REQ:
@@ -529,13 +526,12 @@ handle_ctrl_proto(netdissect_options *ndo,
 	case CPCODES_PROT_REJ:
 		if (length < 6)
 			break;
-		ND_TCHECK_2(tptr);
-		ND_PRINT((ndo, "\n\t  Rejected %s Protocol (0x%04x)",
-		       tok2str(ppptype2str,"unknown", EXTRACT_BE_U_2(tptr)),
-		       EXTRACT_BE_U_2(tptr)));
+		ND_PRINT("\n\t  Rejected %s Protocol (0x%04x)",
+		       tok2str(ppptype2str,"unknown", GET_BE_U_2(tptr)),
+		       GET_BE_U_2(tptr));
 		/* XXX: need to decode Rejected-Information? - hexdump for now */
 		if (len > 6) {
-			ND_PRINT((ndo, "\n\t  Rejected Packet"));
+			ND_PRINT("\n\t  Rejected Packet");
 			print_unknown_data(ndo, tptr + 2, "\n\t    ", len - 2);
 		}
 		break;
@@ -544,11 +540,10 @@ handle_ctrl_proto(netdissect_options *ndo,
 	case CPCODES_DISC_REQ:
 		if (length < 8)
 			break;
-		ND_TCHECK_4(tptr);
-		ND_PRINT((ndo, "\n\t  Magic-Num 0x%08x", EXTRACT_BE_U_4(tptr)));
+		ND_PRINT("\n\t  Magic-Num 0x%08x", GET_BE_U_4(tptr));
 		/* XXX: need to decode Data? - hexdump for now */
 		if (len > 8) {
-			ND_PRINT((ndo, "\n\t  -----trailing data-----"));
+			ND_PRINT("\n\t  -----trailing data-----");
 			ND_TCHECK_LEN(tptr + 4, len - 8);
 			print_unknown_data(ndo, tptr + 4, "\n\t  ", len - 8);
 		}
@@ -556,22 +551,19 @@ handle_ctrl_proto(netdissect_options *ndo,
 	case CPCODES_ID:
 		if (length < 8)
 			break;
-		ND_TCHECK_4(tptr);
-		ND_PRINT((ndo, "\n\t  Magic-Num 0x%08x", EXTRACT_BE_U_4(tptr)));
+		ND_PRINT("\n\t  Magic-Num 0x%08x", GET_BE_U_4(tptr));
 		/* RFC 1661 says this is intended to be human readable */
 		if (len > 8) {
-			ND_PRINT((ndo, "\n\t  Message\n\t    "));
-			if (fn_printn(ndo, tptr + 4, len - 4, ndo->ndo_snapend))
+			ND_PRINT("\n\t  Message\n\t    ");
+			if (nd_printn(ndo, tptr + 4, len - 4, ndo->ndo_snapend))
 				goto trunc;
 		}
 		break;
 	case CPCODES_TIME_REM:
 		if (length < 12)
 			break;
-		ND_TCHECK_4(tptr);
-		ND_PRINT((ndo, "\n\t  Magic-Num 0x%08x", EXTRACT_BE_U_4(tptr)));
-		ND_TCHECK_4(tptr + 4);
-		ND_PRINT((ndo, ", Seconds-Remaining %us", EXTRACT_BE_U_4(tptr + 4)));
+		ND_PRINT("\n\t  Magic-Num 0x%08x", GET_BE_U_4(tptr));
+		ND_PRINT(", Seconds-Remaining %us", GET_BE_U_4(tptr + 4));
 		/* XXX: need to decode Message? */
 		break;
 	default:
@@ -585,7 +577,7 @@ handle_ctrl_proto(netdissect_options *ndo,
 	return;
 
 trunc:
-	ND_PRINT((ndo, "[|%s]", typestr));
+	ND_PRINT("[|%s]", typestr);
 }
 
 /* LCP config options */
@@ -598,73 +590,68 @@ print_lcp_config_options(netdissect_options *ndo,
 	if (length < 2)
 		return 0;
 	ND_TCHECK_2(p);
-	opt = EXTRACT_U_1(p);
-	len = EXTRACT_U_1(p + 1);
+	opt = GET_U_1(p);
+	len = GET_U_1(p + 1);
 	if (length < len)
 		return 0;
 	if (len < 2) {
 		if (opt < NUM_LCPOPTS)
-			ND_PRINT((ndo, "\n\t  %s Option (0x%02x), length %u (length bogus, should be >= 2)",
-			          lcpconfopts[opt], opt, len));
+			ND_PRINT("\n\t  %s Option (0x%02x), length %u (length bogus, should be >= 2)",
+			          lcpconfopts[opt], opt, len);
 		else
-			ND_PRINT((ndo, "\n\tunknown LCP option 0x%02x", opt));
+			ND_PRINT("\n\tunknown LCP option 0x%02x", opt);
 		return 0;
 	}
 	if (opt < NUM_LCPOPTS)
-		ND_PRINT((ndo, "\n\t  %s Option (0x%02x), length %u", lcpconfopts[opt], opt, len));
+		ND_PRINT("\n\t  %s Option (0x%02x), length %u", lcpconfopts[opt], opt, len);
 	else {
-		ND_PRINT((ndo, "\n\tunknown LCP option 0x%02x", opt));
+		ND_PRINT("\n\tunknown LCP option 0x%02x", opt);
 		return len;
 	}
 
 	switch (opt) {
 	case LCPOPT_VEXT:
 		if (len < 6) {
-			ND_PRINT((ndo, " (length bogus, should be >= 6)"));
+			ND_PRINT(" (length bogus, should be >= 6)");
 			return len;
 		}
-		ND_TCHECK_3(p + 2);
-		ND_PRINT((ndo, ": Vendor: %s (%u)",
-			tok2str(oui_values,"Unknown",EXTRACT_BE_U_3(p + 2)),
-			EXTRACT_BE_U_3(p + 2)));
+		ND_PRINT(": Vendor: %s (%u)",
+			tok2str(oui_values,"Unknown",GET_BE_U_3(p + 2)),
+			GET_BE_U_3(p + 2));
 #if 0
-		ND_TCHECK_1(p + 5);
-		ND_PRINT((ndo, ", kind: 0x%02x", EXTRACT_U_1(p + 5)));
-		ND_PRINT((ndo, ", Value: 0x"));
+		ND_PRINT(", kind: 0x%02x", GET_U_1(p + 5));
+		ND_PRINT(", Value: 0x");
 		for (i = 0; i < len - 6; i++) {
-			ND_TCHECK_1(p + 6 + i);
-			ND_PRINT((ndo, "%02x", EXTRACT_U_1(p + 6 + i)));
+			ND_PRINT("%02x", GET_U_1(p + 6 + i));
 		}
 #endif
 		break;
 	case LCPOPT_MRU:
 		if (len != 4) {
-			ND_PRINT((ndo, " (length bogus, should be = 4)"));
+			ND_PRINT(" (length bogus, should be = 4)");
 			return len;
 		}
-		ND_TCHECK_2(p + 2);
-		ND_PRINT((ndo, ": %u", EXTRACT_BE_U_2(p + 2)));
+		ND_PRINT(": %u", GET_BE_U_2(p + 2));
 		break;
 	case LCPOPT_ACCM:
 		if (len != 6) {
-			ND_PRINT((ndo, " (length bogus, should be = 6)"));
+			ND_PRINT(" (length bogus, should be = 6)");
 			return len;
 		}
-		ND_TCHECK_4(p + 2);
-		ND_PRINT((ndo, ": 0x%08x", EXTRACT_BE_U_4(p + 2)));
+		ND_PRINT(": 0x%08x", GET_BE_U_4(p + 2));
 		break;
 	case LCPOPT_AP:
 		if (len < 4) {
-			ND_PRINT((ndo, " (length bogus, should be >= 4)"));
+			ND_PRINT(" (length bogus, should be >= 4)");
 			return len;
 		}
-		ND_TCHECK_2(p + 2);
-		ND_PRINT((ndo, ": %s", tok2str(ppptype2str, "Unknown Auth Proto (0x04x)", EXTRACT_BE_U_2(p + 2))));
+		ND_PRINT(": %s",
+			 tok2str(ppptype2str, "Unknown Auth Proto (0x04x)", GET_BE_U_2(p + 2)));
 
-		switch (EXTRACT_BE_U_2(p + 2)) {
+		switch (GET_BE_U_2(p + 2)) {
 		case PPP_CHAP:
-			ND_TCHECK_1(p + 4);
-			ND_PRINT((ndo, ", %s", tok2str(authalg_values, "Unknown Auth Alg %u", EXTRACT_U_1(p + 4))));
+			ND_PRINT(", %s",
+				 tok2str(authalg_values, "Unknown Auth Alg %u", GET_U_1(p + 4)));
 			break;
 		case PPP_PAP: /* fall through */
 		case PPP_EAP:
@@ -677,22 +664,20 @@ print_lcp_config_options(netdissect_options *ndo,
 		break;
 	case LCPOPT_QP:
 		if (len < 4) {
-			ND_PRINT((ndo, " (length bogus, should be >= 4)"));
+			ND_PRINT(" (length bogus, should be >= 4)");
 			return 0;
 		}
-		ND_TCHECK_2(p + 2);
-		if (EXTRACT_BE_U_2(p + 2) == PPP_LQM)
-			ND_PRINT((ndo, ": LQR"));
+		if (GET_BE_U_2(p + 2) == PPP_LQM)
+			ND_PRINT(": LQR");
 		else
-			ND_PRINT((ndo, ": unknown"));
+			ND_PRINT(": unknown");
 		break;
 	case LCPOPT_MN:
 		if (len != 6) {
-			ND_PRINT((ndo, " (length bogus, should be = 6)"));
+			ND_PRINT(" (length bogus, should be = 6)");
 			return 0;
 		}
-		ND_TCHECK_4(p + 2);
-		ND_PRINT((ndo, ": 0x%08x", EXTRACT_BE_U_4(p + 2)));
+		ND_PRINT(": 0x%08x", GET_BE_U_4(p + 2));
 		break;
 	case LCPOPT_PFC:
 		break;
@@ -700,68 +685,61 @@ print_lcp_config_options(netdissect_options *ndo,
 		break;
 	case LCPOPT_LD:
 		if (len != 4) {
-			ND_PRINT((ndo, " (length bogus, should be = 4)"));
+			ND_PRINT(" (length bogus, should be = 4)");
 			return 0;
 		}
-		ND_TCHECK_2(p + 2);
-		ND_PRINT((ndo, ": 0x%04x", EXTRACT_BE_U_2(p + 2)));
+		ND_PRINT(": 0x%04x", GET_BE_U_2(p + 2));
 		break;
 	case LCPOPT_CBACK:
 		if (len < 3) {
-			ND_PRINT((ndo, " (length bogus, should be >= 3)"));
+			ND_PRINT(" (length bogus, should be >= 3)");
 			return 0;
 		}
-		ND_PRINT((ndo, ": "));
-		ND_TCHECK_1(p + 2);
-		ND_PRINT((ndo, ": Callback Operation %s (%u)",
-                       tok2str(ppp_callback_values, "Unknown", EXTRACT_U_1(p + 2)),
-                       EXTRACT_U_1(p + 2)));
+		ND_PRINT(": Callback Operation %s (%u)",
+                       tok2str(ppp_callback_values, "Unknown", GET_U_1(p + 2)),
+                       GET_U_1(p + 2));
 		break;
 	case LCPOPT_MLMRRU:
 		if (len != 4) {
-			ND_PRINT((ndo, " (length bogus, should be = 4)"));
+			ND_PRINT(" (length bogus, should be = 4)");
 			return 0;
 		}
-		ND_TCHECK_2(p + 2);
-		ND_PRINT((ndo, ": %u", EXTRACT_BE_U_2(p + 2)));
+		ND_PRINT(": %u", GET_BE_U_2(p + 2));
 		break;
 	case LCPOPT_MLED:
 		if (len < 3) {
-			ND_PRINT((ndo, " (length bogus, should be >= 3)"));
+			ND_PRINT(" (length bogus, should be >= 3)");
 			return 0;
 		}
-		ND_TCHECK_1(p + 2);
-		switch (EXTRACT_U_1(p + 2)) {		/* class */
+		switch (GET_U_1(p + 2)) {		/* class */
 		case MEDCLASS_NULL:
-			ND_PRINT((ndo, ": Null"));
+			ND_PRINT(": Null");
 			break;
 		case MEDCLASS_LOCAL:
-			ND_PRINT((ndo, ": Local")); /* XXX */
+			ND_PRINT(": Local"); /* XXX */
 			break;
 		case MEDCLASS_IPV4:
 			if (len != 7) {
-				ND_PRINT((ndo, " (length bogus, should be = 7)"));
+				ND_PRINT(" (length bogus, should be = 7)");
 				return 0;
 			}
-			ND_TCHECK_4(p + 3);
-			ND_PRINT((ndo, ": IPv4 %s", ipaddr_string(ndo, p + 3)));
+			ND_PRINT(": IPv4 %s", GET_IPADDR_STRING(p + 3));
 			break;
 		case MEDCLASS_MAC:
 			if (len != 9) {
-				ND_PRINT((ndo, " (length bogus, should be = 9)"));
+				ND_PRINT(" (length bogus, should be = 9)");
 				return 0;
 			}
-			ND_TCHECK_6(p + 3);
-			ND_PRINT((ndo, ": MAC %s", etheraddr_string(ndo, p + 3)));
+			ND_PRINT(": MAC %s", GET_MAC48_STRING(p + 3));
 			break;
 		case MEDCLASS_MNB:
-			ND_PRINT((ndo, ": Magic-Num-Block")); /* XXX */
+			ND_PRINT(": Magic-Num-Block"); /* XXX */
 			break;
 		case MEDCLASS_PSNDN:
-			ND_PRINT((ndo, ": PSNDN")); /* XXX */
+			ND_PRINT(": PSNDN"); /* XXX */
 			break;
 		default:
-			ND_PRINT((ndo, ": Unknown class %u", EXTRACT_U_1(p + 2)));
+			ND_PRINT(": Unknown class %u", GET_U_1(p + 2));
 			break;
 		}
 		break;
@@ -805,7 +783,7 @@ print_lcp_config_options(netdissect_options *ndo,
 	return len;
 
 trunc:
-	ND_PRINT((ndo, "[|lcp]"));
+	ND_PRINT("[|lcp]");
 	return 0;
 }
 
@@ -821,21 +799,22 @@ handle_mlppp(netdissect_options *ndo,
              const u_char *p, u_int length)
 {
     if (!ndo->ndo_eflag)
-        ND_PRINT((ndo, "MLPPP, "));
+        ND_PRINT("MLPPP, ");
 
     if (length < 2) {
-        ND_PRINT((ndo, "[|mlppp]"));
+        ND_PRINT("[|mlppp]");
         return;
     }
     if (!ND_TTEST_2(p)) {
-        ND_PRINT((ndo, "[|mlppp]"));
+        ND_PRINT("[|mlppp]");
         return;
     }
 
-    ND_PRINT((ndo, "seq 0x%03x, Flags [%s], length %u",
-           (EXTRACT_BE_U_2(p))&0x0fff, /* only support 12-Bit sequence space for now */
-           bittok2str(ppp_ml_flag_values, "none", EXTRACT_U_1(p) & 0xc0),
-           length));
+    ND_PRINT("seq 0x%03x, Flags [%s], length %u",
+           (GET_BE_U_2(p))&0x0fff,
+           /* only support 12-Bit sequence space for now */
+           bittok2str(ppp_ml_flag_values, "none", GET_U_1(p) & 0xc0),
+           length);
 }
 
 /* CHAP */
@@ -850,27 +829,23 @@ handle_chap(netdissect_options *ndo,
 
 	p0 = p;
 	if (length < 1) {
-		ND_PRINT((ndo, "[|chap]"));
+		ND_PRINT("[|chap]");
 		return;
 	} else if (length < 4) {
-		ND_TCHECK_1(p);
-		ND_PRINT((ndo, "[|chap 0x%02x]", EXTRACT_U_1(p)));
+		ND_PRINT("[|chap 0x%02x]", GET_U_1(p));
 		return;
 	}
 
-	ND_TCHECK_1(p);
-	code = EXTRACT_U_1(p);
-	ND_PRINT((ndo, "CHAP, %s (0x%02x)",
+	code = GET_U_1(p);
+	ND_PRINT("CHAP, %s (0x%02x)",
                tok2str(chapcode_values,"unknown",code),
-               code));
+               code);
 	p++;
 
-	ND_TCHECK_1(p);
-	ND_PRINT((ndo, ", id %u", EXTRACT_U_1(p)));	/* ID */
+	ND_PRINT(", id %u", GET_U_1(p));	/* ID */
 	p++;
 
-	ND_TCHECK_2(p);
-	len = EXTRACT_BE_U_2(p);
+	len = GET_BE_U_2(p);
 	p += 2;
 
 	/*
@@ -878,47 +853,33 @@ handle_chap(netdissect_options *ndo,
 	 * don't know which flavor of CHAP (i.e. CHAP-MD5, MS-CHAPv1,
 	 * MS-CHAPv2) is used at this point, we can't decode packet
 	 * specifically to each algorithms. Instead, we simply decode
-	 * the GCD (Gratest Common Denominator) for all algorithms.
+	 * the GCD (Greatest Common Denominator) for all algorithms.
 	 */
 	switch (code) {
 	case CHAP_CHAL:
 	case CHAP_RESP:
 		if (length - (p - p0) < 1)
 			return;
-		ND_TCHECK_1(p);
-		val_size = EXTRACT_U_1(p);	/* value size */
+		val_size = GET_U_1(p);	/* value size */
 		p++;
 		if (length - (p - p0) < val_size)
 			return;
-		ND_PRINT((ndo, ", Value "));
+		ND_PRINT(", Value ");
 		for (i = 0; i < val_size; i++) {
-			ND_TCHECK_1(p);
-			ND_PRINT((ndo, "%02x", EXTRACT_U_1(p)));
-			p++;
-		}
-		name_size = len - (p - p0);
-		ND_PRINT((ndo, ", Name "));
-		for (i = 0; i < name_size; i++) {
-			ND_TCHECK_1(p);
-			safeputchar(ndo, EXTRACT_U_1(p));
+			ND_PRINT("%02x", GET_U_1(p));
 			p++;
 		}
+		name_size = len - (u_int)(p - p0);
+		ND_PRINT(", Name ");
+		nd_printjn(ndo, p, name_size);
 		break;
 	case CHAP_SUCC:
 	case CHAP_FAIL:
-		msg_size = len - (p - p0);
-		ND_PRINT((ndo, ", Msg "));
-		for (i = 0; i< msg_size; i++) {
-			ND_TCHECK_1(p);
-			safeputchar(ndo, EXTRACT_U_1(p));
-			p++;
-		}
+		msg_size = len - (u_int)(p - p0);
+		ND_PRINT(", Msg ");
+		nd_printjn(ndo, p, msg_size);
 		break;
 	}
-	return;
-
-trunc:
-	ND_PRINT((ndo, "[|chap]"));
 }
 
 /* PAP (see RFC 1334) */
@@ -929,40 +890,35 @@ handle_pap(netdissect_options *ndo,
 	u_int code, len;
 	u_int peerid_len, passwd_len, msg_len;
 	const u_char *p0;
-	u_int i;
 
 	p0 = p;
 	if (length < 1) {
-		ND_PRINT((ndo, "[|pap]"));
+		ND_PRINT("[|pap]");
 		return;
 	} else if (length < 4) {
-		ND_TCHECK_1(p);
-		ND_PRINT((ndo, "[|pap 0x%02x]", EXTRACT_U_1(p)));
+		ND_PRINT("[|pap 0x%02x]", GET_U_1(p));
 		return;
 	}
 
-	ND_TCHECK_1(p);
-	code = EXTRACT_U_1(p);
-	ND_PRINT((ndo, "PAP, %s (0x%02x)",
+	code = GET_U_1(p);
+	ND_PRINT("PAP, %s (0x%02x)",
 	          tok2str(papcode_values, "unknown", code),
-	          code));
+	          code);
 	p++;
 
-	ND_TCHECK_1(p);
-	ND_PRINT((ndo, ", id %u", EXTRACT_U_1(p)));	/* ID */
+	ND_PRINT(", id %u", GET_U_1(p));	/* ID */
 	p++;
 
-	ND_TCHECK_2(p);
-	len = EXTRACT_BE_U_2(p);
+	len = GET_BE_U_2(p);
 	p += 2;
 
 	if (len > length) {
-		ND_PRINT((ndo, ", length %u > packet size", len));
+		ND_PRINT(", length %u > packet size", len);
 		return;
 	}
 	length = len;
 	if (length < (size_t)(p - p0)) {
-		ND_PRINT((ndo, ", length %u < PAP header length", length));
+		ND_PRINT(", length %u < PAP header length", length);
 		return;
 	}
 
@@ -973,31 +929,22 @@ handle_pap(netdissect_options *ndo,
 			goto trunc;
 		if (length - (p - p0) < 1)
 			return;
-		ND_TCHECK_1(p);
-		peerid_len = EXTRACT_U_1(p);	/* Peer-ID Length */
+		peerid_len = GET_U_1(p);	/* Peer-ID Length */
 		p++;
 		if (length - (p - p0) < peerid_len)
 			return;
-		ND_PRINT((ndo, ", Peer "));
-		for (i = 0; i < peerid_len; i++) {
-			ND_TCHECK_1(p);
-			safeputchar(ndo, EXTRACT_U_1(p));
-			p++;
-		}
+		ND_PRINT(", Peer ");
+		nd_printjn(ndo, p, peerid_len);
+		p += peerid_len;
 
 		if (length - (p - p0) < 1)
 			return;
-		ND_TCHECK_1(p);
-		passwd_len = EXTRACT_U_1(p);	/* Password Length */
+		passwd_len = GET_U_1(p);	/* Password Length */
 		p++;
 		if (length - (p - p0) < passwd_len)
 			return;
-		ND_PRINT((ndo, ", Name "));
-		for (i = 0; i < passwd_len; i++) {
-			ND_TCHECK_1(p);
-			safeputchar(ndo, EXTRACT_U_1(p));
-			p++;
-		}
+		ND_PRINT(", Name ");
+		nd_printjn(ndo, p, passwd_len);
 		break;
 	case PAP_AACK:
 	case PAP_ANAK:
@@ -1010,23 +957,18 @@ handle_pap(netdissect_options *ndo,
 			goto trunc;
 		if (length - (p - p0) < 1)
 			return;
-		ND_TCHECK_1(p);
-		msg_len = EXTRACT_U_1(p);	/* Msg-Length */
+		msg_len = GET_U_1(p);	/* Msg-Length */
 		p++;
 		if (length - (p - p0) < msg_len)
 			return;
-		ND_PRINT((ndo, ", Msg "));
-		for (i = 0; i< msg_len; i++) {
-			ND_TCHECK_1(p);
-			safeputchar(ndo, EXTRACT_U_1(p));
-			p++;
-		}
+		ND_PRINT(", Msg ");
+		nd_printjn(ndo, p, msg_len);
 		break;
 	}
 	return;
 
 trunc:
-	ND_PRINT((ndo, "[|pap]"));
+	ND_PRINT("[|pap]");
 }
 
 /* BAP */
@@ -1049,45 +991,43 @@ print_ipcp_config_options(netdissect_options *ndo,
 	if (length < 2)
 		return 0;
 	ND_TCHECK_2(p);
-	opt = EXTRACT_U_1(p);
-	len = EXTRACT_U_1(p + 1);
+	opt = GET_U_1(p);
+	len = GET_U_1(p + 1);
 	if (length < len)
 		return 0;
 	if (len < 2) {
-		ND_PRINT((ndo, "\n\t  %s Option (0x%02x), length %u (length bogus, should be >= 2)",
+		ND_PRINT("\n\t  %s Option (0x%02x), length %u (length bogus, should be >= 2)",
 		       tok2str(ipcpopt_values,"unknown",opt),
 		       opt,
-		       len));
+		       len);
 		return 0;
 	}
 
-	ND_PRINT((ndo, "\n\t  %s Option (0x%02x), length %u",
+	ND_PRINT("\n\t  %s Option (0x%02x), length %u",
 	       tok2str(ipcpopt_values,"unknown",opt),
 	       opt,
-	       len));
+	       len);
 
 	switch (opt) {
 	case IPCPOPT_2ADDR:		/* deprecated */
 		if (len != 10) {
-			ND_PRINT((ndo, " (length bogus, should be = 10)"));
+			ND_PRINT(" (length bogus, should be = 10)");
 			return len;
 		}
-		ND_TCHECK_4(p + 6);
-		ND_PRINT((ndo, ": src %s, dst %s",
-		       ipaddr_string(ndo, p + 2),
-		       ipaddr_string(ndo, p + 6)));
+		ND_PRINT(": src %s, dst %s",
+		       GET_IPADDR_STRING(p + 2),
+		       GET_IPADDR_STRING(p + 6));
 		break;
 	case IPCPOPT_IPCOMP:
 		if (len < 4) {
-			ND_PRINT((ndo, " (length bogus, should be >= 4)"));
+			ND_PRINT(" (length bogus, should be >= 4)");
 			return 0;
 		}
-		ND_TCHECK_2(p + 2);
-		compproto = EXTRACT_BE_U_2(p + 2);
+		compproto = GET_BE_U_2(p + 2);
 
-		ND_PRINT((ndo, ": %s (0x%02x):",
+		ND_PRINT(": %s (0x%02x):",
 		          tok2str(ipcpopt_compproto_values, "Unknown", compproto),
-		          compproto));
+		          compproto);
 
 		switch (compproto) {
                 case PPP_VJC:
@@ -1095,31 +1035,31 @@ print_ipcp_config_options(netdissect_options *ndo,
                         break;
                 case IPCPOPT_IPCOMP_HDRCOMP:
                         if (len < IPCPOPT_IPCOMP_MINLEN) {
-                        	ND_PRINT((ndo, " (length bogus, should be >= %u)",
-                        		IPCPOPT_IPCOMP_MINLEN));
-                        	return 0;
+                                ND_PRINT(" (length bogus, should be >= %u)",
+                                         IPCPOPT_IPCOMP_MINLEN);
+                                return 0;
                         }
 
                         ND_TCHECK_LEN(p + 2, IPCPOPT_IPCOMP_MINLEN);
-                        ND_PRINT((ndo, "\n\t    TCP Space %u, non-TCP Space %u" \
+                        ND_PRINT("\n\t    TCP Space %u, non-TCP Space %u"
                                ", maxPeriod %u, maxTime %u, maxHdr %u",
-                               EXTRACT_BE_U_2(p + 4),
-                               EXTRACT_BE_U_2(p + 6),
-                               EXTRACT_BE_U_2(p + 8),
-                               EXTRACT_BE_U_2(p + 10),
-                               EXTRACT_BE_U_2(p + 12)));
+                               GET_BE_U_2(p + 4),
+                               GET_BE_U_2(p + 6),
+                               GET_BE_U_2(p + 8),
+                               GET_BE_U_2(p + 10),
+                               GET_BE_U_2(p + 12));
 
                         /* suboptions present ? */
                         if (len > IPCPOPT_IPCOMP_MINLEN) {
                                 ipcomp_subopttotallen = len - IPCPOPT_IPCOMP_MINLEN;
                                 p += IPCPOPT_IPCOMP_MINLEN;
 
-                                ND_PRINT((ndo, "\n\t      Suboptions, length %u", ipcomp_subopttotallen));
+                                ND_PRINT("\n\t      Suboptions, length %u", ipcomp_subopttotallen);
 
                                 while (ipcomp_subopttotallen >= 2) {
                                         ND_TCHECK_2(p);
-                                        ipcomp_subopt = EXTRACT_U_1(p);
-                                        ipcomp_suboptlen = EXTRACT_U_1(p + 1);
+                                        ipcomp_subopt = GET_U_1(p);
+                                        ipcomp_suboptlen = GET_U_1(p + 1);
 
                                         /* sanity check */
                                         if (ipcomp_subopt == 0 ||
@@ -1127,13 +1067,18 @@ print_ipcp_config_options(netdissect_options *ndo,
                                                 break;
 
                                         /* XXX: just display the suboptions for now */
-                                        ND_PRINT((ndo, "\n\t\t%s Suboption #%u, length %u",
+                                        ND_PRINT("\n\t\t%s Suboption #%u, length %u",
                                                tok2str(ipcpopt_compproto_subopt_values,
                                                        "Unknown",
                                                        ipcomp_subopt),
                                                ipcomp_subopt,
-                                               ipcomp_suboptlen));
-
+                                               ipcomp_suboptlen);
+                                        if (ipcomp_subopttotallen < ipcomp_suboptlen) {
+                                                ND_PRINT(" [remaining suboptions length %u < %u]",
+                                                         ipcomp_subopttotallen, ipcomp_suboptlen);
+                                                nd_print_invalid(ndo);
+                                                break;
+                                        }
                                         ipcomp_subopttotallen -= ipcomp_suboptlen;
                                         p += ipcomp_suboptlen;
                                 }
@@ -1151,11 +1096,10 @@ print_ipcp_config_options(netdissect_options *ndo,
 	case IPCPOPT_SECDNS:
 	case IPCPOPT_SECNBNS:
 		if (len != 6) {
-			ND_PRINT((ndo, " (length bogus, should be = 6)"));
+			ND_PRINT(" (length bogus, should be = 6)");
 			return 0;
 		}
-		ND_TCHECK_4(p + 2);
-		ND_PRINT((ndo, ": %s", ipaddr_string(ndo, p + 2)));
+		ND_PRINT(": %s", GET_IPADDR_STRING(p + 2));
 		break;
 	default:
 		/*
@@ -1166,12 +1110,12 @@ print_ipcp_config_options(netdissect_options *ndo,
 			print_unknown_data(ndo, p + 2, "\n\t    ", len - 2);
 		break;
 	}
-	if (ndo->ndo_vflag > 1)
+	if (ndo->ndo_vflag > 1 && ND_TTEST_LEN(p + 2, len - 2))
 		print_unknown_data(ndo, p + 2, "\n\t    ", len - 2); /* exclude TLV header */
 	return len;
 
 trunc:
-	ND_PRINT((ndo, "[|ipcp]"));
+	ND_PRINT("[|ipcp]");
 	return 0;
 }
 
@@ -1185,35 +1129,35 @@ print_ip6cp_config_options(netdissect_options *ndo,
 	if (length < 2)
 		return 0;
 	ND_TCHECK_2(p);
-	opt = EXTRACT_U_1(p);
-	len = EXTRACT_U_1(p + 1);
+	opt = GET_U_1(p);
+	len = GET_U_1(p + 1);
 	if (length < len)
 		return 0;
 	if (len < 2) {
-		ND_PRINT((ndo, "\n\t  %s Option (0x%02x), length %u (length bogus, should be >= 2)",
+		ND_PRINT("\n\t  %s Option (0x%02x), length %u (length bogus, should be >= 2)",
 		       tok2str(ip6cpopt_values,"unknown",opt),
 		       opt,
-		       len));
+		       len);
 		return 0;
 	}
 
-	ND_PRINT((ndo, "\n\t  %s Option (0x%02x), length %u",
+	ND_PRINT("\n\t  %s Option (0x%02x), length %u",
 	       tok2str(ip6cpopt_values,"unknown",opt),
 	       opt,
-	       len));
+	       len);
 
 	switch (opt) {
 	case IP6CP_IFID:
 		if (len != 10) {
-			ND_PRINT((ndo, " (length bogus, should be = 10)"));
+			ND_PRINT(" (length bogus, should be = 10)");
 			return len;
 		}
 		ND_TCHECK_8(p + 2);
-		ND_PRINT((ndo, ": %04x:%04x:%04x:%04x",
-		       EXTRACT_BE_U_2(p + 2),
-		       EXTRACT_BE_U_2(p + 4),
-		       EXTRACT_BE_U_2(p + 6),
-		       EXTRACT_BE_U_2(p + 8)));
+		ND_PRINT(": %04x:%04x:%04x:%04x",
+		       GET_BE_U_2(p + 2),
+		       GET_BE_U_2(p + 4),
+		       GET_BE_U_2(p + 6),
+		       GET_BE_U_2(p + 8));
 		break;
 	default:
 		/*
@@ -1230,7 +1174,7 @@ print_ip6cp_config_options(netdissect_options *ndo,
 	return len;
 
 trunc:
-	ND_PRINT((ndo, "[|ip6cp]"));
+	ND_PRINT("[|ip6cp]");
 	return 0;
 }
 
@@ -1245,58 +1189,55 @@ print_ccp_config_options(netdissect_options *ndo,
 	if (length < 2)
 		return 0;
 	ND_TCHECK_2(p);
-	opt = EXTRACT_U_1(p);
-	len = EXTRACT_U_1(p + 1);
+	opt = GET_U_1(p);
+	len = GET_U_1(p + 1);
 	if (length < len)
 		return 0;
 	if (len < 2) {
-		ND_PRINT((ndo, "\n\t  %s Option (0x%02x), length %u (length bogus, should be >= 2)",
+		ND_PRINT("\n\t  %s Option (0x%02x), length %u (length bogus, should be >= 2)",
 		          tok2str(ccpconfopts_values, "Unknown", opt),
 		          opt,
-		          len));
+		          len);
 		return 0;
 	}
 
-	ND_PRINT((ndo, "\n\t  %s Option (0x%02x), length %u",
+	ND_PRINT("\n\t  %s Option (0x%02x), length %u",
 	          tok2str(ccpconfopts_values, "Unknown", opt),
 	          opt,
-	          len));
+	          len);
 
 	switch (opt) {
 	case CCPOPT_BSDCOMP:
 		if (len < 3) {
-			ND_PRINT((ndo, " (length bogus, should be >= 3)"));
+			ND_PRINT(" (length bogus, should be >= 3)");
 			return len;
 		}
-		ND_TCHECK_1(p + 2);
-		ND_PRINT((ndo, ": Version: %u, Dictionary Bits: %u",
-			EXTRACT_U_1(p + 2) >> 5,
-			EXTRACT_U_1(p + 2) & 0x1f));
+		ND_PRINT(": Version: %u, Dictionary Bits: %u",
+			GET_U_1(p + 2) >> 5,
+			GET_U_1(p + 2) & 0x1f);
 		break;
 	case CCPOPT_MVRCA:
 		if (len < 4) {
-			ND_PRINT((ndo, " (length bogus, should be >= 4)"));
+			ND_PRINT(" (length bogus, should be >= 4)");
 			return len;
 		}
-		ND_TCHECK_1(p + 3);
-		ND_PRINT((ndo, ": Features: %u, PxP: %s, History: %u, #CTX-ID: %u",
-				(EXTRACT_U_1(p + 2) & 0xc0) >> 6,
-				(EXTRACT_U_1(p + 2) & 0x20) ? "Enabled" : "Disabled",
-				EXTRACT_U_1(p + 2) & 0x1f,
-				EXTRACT_U_1(p + 3)));
+		ND_PRINT(": Features: %u, PxP: %s, History: %u, #CTX-ID: %u",
+				(GET_U_1(p + 2) & 0xc0) >> 6,
+				(GET_U_1(p + 2) & 0x20) ? "Enabled" : "Disabled",
+				GET_U_1(p + 2) & 0x1f,
+				GET_U_1(p + 3));
 		break;
 	case CCPOPT_DEFLATE:
 		if (len < 4) {
-			ND_PRINT((ndo, " (length bogus, should be >= 4)"));
+			ND_PRINT(" (length bogus, should be >= 4)");
 			return len;
 		}
-		ND_TCHECK_1(p + 3);
-		ND_PRINT((ndo, ": Window: %uK, Method: %s (0x%x), MBZ: %u, CHK: %u",
-			(EXTRACT_U_1(p + 2) & 0xf0) >> 4,
-			((EXTRACT_U_1(p + 2) & 0x0f) == 8) ? "zlib" : "unknown",
-			EXTRACT_U_1(p + 2) & 0x0f,
-			(EXTRACT_U_1(p + 3) & 0xfc) >> 2,
-			EXTRACT_U_1(p + 3) & 0x03));
+		ND_PRINT(": Window: %uK, Method: %s (0x%x), MBZ: %u, CHK: %u",
+			(GET_U_1(p + 2) & 0xf0) >> 4,
+			((GET_U_1(p + 2) & 0x0f) == 8) ? "zlib" : "unknown",
+			GET_U_1(p + 2) & 0x0f,
+			(GET_U_1(p + 3) & 0xfc) >> 2,
+			GET_U_1(p + 3) & 0x03);
 		break;
 
 /* XXX: to be supported */
@@ -1330,7 +1271,7 @@ print_ccp_config_options(netdissect_options *ndo,
 	return len;
 
 trunc:
-	ND_PRINT((ndo, "[|ccp]"));
+	ND_PRINT("[|ccp]");
 	return 0;
 }
 
@@ -1344,31 +1285,30 @@ print_bacp_config_options(netdissect_options *ndo,
 	if (length < 2)
 		return 0;
 	ND_TCHECK_2(p);
-	opt = EXTRACT_U_1(p);
-	len = EXTRACT_U_1(p + 1);
+	opt = GET_U_1(p);
+	len = GET_U_1(p + 1);
 	if (length < len)
 		return 0;
 	if (len < 2) {
-		ND_PRINT((ndo, "\n\t  %s Option (0x%02x), length %u (length bogus, should be >= 2)",
+		ND_PRINT("\n\t  %s Option (0x%02x), length %u (length bogus, should be >= 2)",
 		          tok2str(bacconfopts_values, "Unknown", opt),
 		          opt,
-		          len));
+		          len);
 		return 0;
 	}
 
-	ND_PRINT((ndo, "\n\t  %s Option (0x%02x), length %u",
+	ND_PRINT("\n\t  %s Option (0x%02x), length %u",
 	          tok2str(bacconfopts_values, "Unknown", opt),
 	          opt,
-	          len));
+	          len);
 
 	switch (opt) {
 	case BACPOPT_FPEER:
 		if (len != 6) {
-			ND_PRINT((ndo, " (length bogus, should be = 6)"));
+			ND_PRINT(" (length bogus, should be = 6)");
 			return len;
 		}
-		ND_TCHECK_4(p + 2);
-		ND_PRINT((ndo, ": Magic-Num 0x%08x", EXTRACT_BE_U_4(p + 2)));
+		ND_PRINT(": Magic-Num 0x%08x", GET_BE_U_4(p + 2));
 		break;
 	default:
 		/*
@@ -1385,55 +1325,70 @@ print_bacp_config_options(netdissect_options *ndo,
 	return len;
 
 trunc:
-	ND_PRINT((ndo, "[|bacp]"));
+	ND_PRINT("[|bacp]");
 	return 0;
 }
 
+/*
+ * Un-escape RFC 1662 PPP in HDLC-like framing, with octet escapes.
+ * The length argument is the on-the-wire length, not the captured
+ * length; we can only un-escape the captured part.
+ */
 static void
 ppp_hdlc(netdissect_options *ndo,
          const u_char *p, u_int length)
 {
+	u_int caplen = ND_BYTES_AVAILABLE_AFTER(p);
 	u_char *b, *t, c;
 	const u_char *s;
 	u_int i, proto;
-	const void *se;
+
+	if (caplen == 0)
+		return;
 
         if (length == 0)
                 return;
 
-	b = (u_char *)malloc(length);
-	if (b == NULL)
-		return;
+	b = (u_char *)malloc(caplen);
+	if (b == NULL) {
+		(*ndo->ndo_error)(ndo, S_ERR_ND_MEM_ALLOC,
+			"%s: malloc", __func__);
+	}
 
 	/*
 	 * Unescape all the data into a temporary, private, buffer.
-	 * Do this so that we dont overwrite the original packet
+	 * Do this so that we don't overwrite the original packet
 	 * contents.
 	 */
-	for (s = p, t = b, i = length; i != 0 && ND_TTEST_1(s); i--) {
-		c = EXTRACT_U_1(s);
+	for (s = p, t = b, i = caplen; i != 0; i--) {
+		c = GET_U_1(s);
 		s++;
 		if (c == 0x7d) {
-			if (i <= 1 || !ND_TTEST_1(s))
+			if (i <= 1)
 				break;
 			i--;
-			c = EXTRACT_U_1(s) ^ 0x20;
+			c = GET_U_1(s) ^ 0x20;
 			s++;
 		}
 		*t++ = c;
 	}
 
 	/*
-	 * Change the end pointer, so bounds checks work.
+	 * Switch to the output buffer for dissection, and save it
+	 * on the buffer stack so it can be freed; our caller must
+	 * pop it when done.
 	 */
-	se = ndo->ndo_snapend;
-	ndo->ndo_snapend = t;
-	length = t - b;
+	if (!nd_push_buffer(ndo, b, b, (u_int)(t - b))) {
+		free(b);
+		(*ndo->ndo_error)(ndo, S_ERR_ND_MEM_ALLOC,
+			"%s: can't push buffer on buffer stack", __func__);
+	}
+	length = ND_BYTES_AVAILABLE_AFTER(b);
 
         /* now lets guess about the payload codepoint format */
         if (length < 1)
                 goto trunc;
-        proto = EXTRACT_U_1(b); /* start with a one-octet codepoint guess */
+        proto = GET_U_1(b); /* start with a one-octet codepoint guess */
 
         switch (proto) {
         case PPP_IP:
@@ -1448,29 +1403,33 @@ ppp_hdlc(netdissect_options *ndo,
 
         if (length < 2)
                 goto trunc;
-        proto = EXTRACT_BE_U_2(b); /* next guess - load two octets */
+        proto = GET_BE_U_2(b); /* next guess - load two octets */
 
         switch (proto) {
         case (PPP_ADDRESS << 8 | PPP_CONTROL): /* looks like a PPP frame */
             if (length < 4)
                 goto trunc;
-            proto = EXTRACT_BE_U_2(b + 2); /* load the PPP proto-id */
-            handle_ppp(ndo, proto, b + 4, length - 4);
+            proto = GET_BE_U_2(b + 2); /* load the PPP proto-id */
+            if ((proto & 0xff00) == 0x7e00)
+                ND_PRINT("(protocol 0x%04x invalid)", proto);
+            else
+                handle_ppp(ndo, proto, b + 4, length - 4);
             break;
         default: /* last guess - proto must be a PPP proto-id */
-            handle_ppp(ndo, proto, b + 2, length - 2);
+            if ((proto & 0xff00) == 0x7e00)
+                ND_PRINT("(protocol 0x%04x invalid)", proto);
+            else
+                handle_ppp(ndo, proto, b + 2, length - 2);
             break;
         }
 
 cleanup:
-	ndo->ndo_snapend = se;
-	free(b);
+	nd_pop_packet_info(ndo);
         return;
 
 trunc:
-	ndo->ndo_snapend = se;
-	free(b);
-	ND_PRINT((ndo, "[|ppp]"));
+	nd_pop_packet_info(ndo);
+	nd_print_trunc(ndo);
 }
 
 
@@ -1527,10 +1486,10 @@ handle_ppp(netdissect_options *ndo,
 		mpls_print(ndo, p, length);
 		break;
 	case PPP_COMP:
-		ND_PRINT((ndo, "compressed PPP data"));
+		ND_PRINT("compressed PPP data");
 		break;
 	default:
-		ND_PRINT((ndo, "%s ", tok2str(ppptype2str, "unknown PPP protocol (0x%04x)", proto)));
+		ND_PRINT("%s ", tok2str(ppptype2str, "unknown PPP protocol (0x%04x)", proto));
 		print_unknown_data(ndo, p, "\n\t", length);
 		break;
 	}
@@ -1545,24 +1504,24 @@ ppp_print(netdissect_options *ndo,
         u_int olen = length; /* _o_riginal length */
 	u_int hdr_len = 0;
 
+	ndo->ndo_protocol = "ppp";
 	/*
 	 * Here, we assume that p points to the Address and Control
 	 * field (if they present).
 	 */
 	if (length < 2)
 		goto trunc;
-	ND_TCHECK_2(p);
-        ppp_header = EXTRACT_BE_U_2(p);
+        ppp_header = GET_BE_U_2(p);
 
         switch(ppp_header) {
-        case (PPP_WITHDIRECTION_IN  << 8 | PPP_CONTROL):
-            if (ndo->ndo_eflag) ND_PRINT((ndo, "In  "));
+        case (PPP_PPPD_IN  << 8 | PPP_CONTROL):
+            if (ndo->ndo_eflag) ND_PRINT("In  ");
             p += 2;
             length -= 2;
             hdr_len += 2;
             break;
-        case (PPP_WITHDIRECTION_OUT << 8 | PPP_CONTROL):
-            if (ndo->ndo_eflag) ND_PRINT((ndo, "Out "));
+        case (PPP_PPPD_OUT << 8 | PPP_CONTROL):
+            if (ndo->ndo_eflag) ND_PRINT("Out ");
             p += 2;
             length -= 2;
             hdr_len += 2;
@@ -1579,46 +1538,54 @@ ppp_print(netdissect_options *ndo,
 
 	if (length < 2)
 		goto trunc;
-	ND_TCHECK_1(p);
-	if (EXTRACT_U_1(p) % 2) {
-		proto = EXTRACT_U_1(p);	/* PFC is used */
+	if (GET_U_1(p) % 2) {
+		proto = GET_U_1(p);	/* PFC is used */
 		p++;
 		length--;
 		hdr_len++;
 	} else {
-		ND_TCHECK_2(p);
-		proto = EXTRACT_BE_U_2(p);
+		proto = GET_BE_U_2(p);
 		p += 2;
 		length -= 2;
 		hdr_len += 2;
 	}
 
-	if (ndo->ndo_eflag)
-		ND_PRINT((ndo, "%s (0x%04x), length %u: ",
-		          tok2str(ppptype2str, "unknown", proto),
+	if (ndo->ndo_eflag) {
+		const char *typestr;
+		typestr = tok2str(ppptype2str, "unknown", proto);
+		ND_PRINT("%s (0x%04x), length %u",
+		          typestr,
 		          proto,
-		          olen));
+		          olen);
+		if (*typestr == 'u')	/* "unknown" */
+			return hdr_len;
+
+		ND_PRINT(": ");
+	}
 
 	handle_ppp(ndo, proto, p, length);
 	return (hdr_len);
 trunc:
-	ND_PRINT((ndo, "[|ppp]"));
+	nd_print_trunc(ndo);
 	return (0);
 }
 
 
 /* PPP I/F printer */
-u_int
+void
 ppp_if_print(netdissect_options *ndo,
              const struct pcap_pkthdr *h, const u_char *p)
 {
 	u_int length = h->len;
 	u_int caplen = h->caplen;
 
+	ndo->ndo_protocol = "ppp";
 	if (caplen < PPP_HDRLEN) {
-		ND_PRINT((ndo, "[|ppp]"));
-		return (caplen);
+		nd_print_trunc(ndo);
+		ndo->ndo_ll_hdr_len += caplen;
+		return;
 	}
+	ndo->ndo_ll_hdr_len += PPP_HDRLEN;
 
 #if 0
 	/*
@@ -1658,13 +1625,11 @@ ppp_if_print(netdissect_options *ndo,
 	 * BSD/OS, is?)
 	 */
 	if (ndo->ndo_eflag)
-		ND_PRINT((ndo, "%c %4d %02x ", EXTRACT_U_1(p) ? 'O' : 'I',
-		    length, EXTRACT_U_1(p + 1)));
+		ND_PRINT("%c %4d %02x ", GET_U_1(p) ? 'O' : 'I',
+			 length, GET_U_1(p + 1));
 #endif
 
 	ppp_print(ndo, p, length);
-
-	return (0);
 }
 
 /*
@@ -1676,7 +1641,7 @@ ppp_if_print(netdissect_options *ndo,
  *
  * This handles, for example, DLT_PPP_SERIAL in NetBSD.
  */
-u_int
+void
 ppp_hdlc_if_print(netdissect_options *ndo,
                   const struct pcap_pkthdr *h, const u_char *p)
 {
@@ -1685,48 +1650,53 @@ ppp_hdlc_if_print(netdissect_options *ndo,
 	u_int proto;
 	u_int hdrlen = 0;
 
+	ndo->ndo_protocol = "ppp_hdlc";
 	if (caplen < 2) {
-		ND_PRINT((ndo, "[|ppp]"));
-		return (caplen);
+		nd_print_trunc(ndo);
+		ndo->ndo_ll_hdr_len += caplen;
+		return;
 	}
 
-	switch (EXTRACT_U_1(p)) {
+	switch (GET_U_1(p)) {
 
 	case PPP_ADDRESS:
-		if (caplen < 4 || length < 4) {
-			ND_PRINT((ndo, "[|ppp]"));
-			return (caplen);
+		if (caplen < 4) {
+			nd_print_trunc(ndo);
+			ndo->ndo_ll_hdr_len += caplen;
+			return;
 		}
 
 		if (ndo->ndo_eflag)
-			ND_PRINT((ndo, "%02x %02x %u ", EXTRACT_U_1(p),
-			    EXTRACT_U_1(p + 1), length));
+			ND_PRINT("%02x %02x %u ", GET_U_1(p),
+				 GET_U_1(p + 1), length);
 		p += 2;
 		length -= 2;
 		hdrlen += 2;
 
-		proto = EXTRACT_BE_U_2(p);
+		proto = GET_BE_U_2(p);
 		p += 2;
 		length -= 2;
 		hdrlen += 2;
-		ND_PRINT((ndo, "%s: ", tok2str(ppptype2str, "unknown PPP protocol (0x%04x)", proto)));
+		ND_PRINT("%s: ", tok2str(ppptype2str, "unknown PPP protocol (0x%04x)", proto));
 
 		handle_ppp(ndo, proto, p, length);
 		break;
 
 	case CHDLC_UNICAST:
 	case CHDLC_BCAST:
-		return (chdlc_if_print(ndo, h, p));
+		chdlc_if_print(ndo, h, p);
+		return;
 
 	default:
 		if (caplen < 4) {
-			ND_PRINT((ndo, "[|ppp]"));
-			return (caplen);
+			nd_print_trunc(ndo);
+			ndo->ndo_ll_hdr_len += caplen;
+			return;
 		}
 
 		if (ndo->ndo_eflag)
-			ND_PRINT((ndo, "%02x %02x %d ", EXTRACT_U_1(p),
-			    EXTRACT_U_1(p + 1), length));
+			ND_PRINT("%02x %02x %u ", GET_U_1(p),
+				 GET_U_1(p + 1), length);
 		p += 2;
 		hdrlen += 2;
 
@@ -1735,179 +1705,10 @@ ppp_hdlc_if_print(netdissect_options *ndo,
 		 * the next two octets as an Ethernet type; does that
 		 * ever happen?
 		 */
-		ND_PRINT((ndo, "unknown addr %02x; ctrl %02x", EXTRACT_U_1(p),
-		    EXTRACT_U_1(p + 1)));
+		ND_PRINT("unknown addr %02x; ctrl %02x", GET_U_1(p),
+			 GET_U_1(p + 1));
 		break;
 	}
 
-	return (hdrlen);
+	ndo->ndo_ll_hdr_len += hdrlen;
 }
-
-#define PPP_BSDI_HDRLEN 24
-
-/* BSD/OS specific PPP printer */
-u_int
-ppp_bsdos_if_print(netdissect_options *ndo _U_,
-                   const struct pcap_pkthdr *h _U_, const u_char *p _U_)
-{
-	u_int hdrlength;
-#ifdef __bsdi__
-	u_int length = h->len;
-	u_int caplen = h->caplen;
-	uint16_t ptype;
-	uint8_t llhl;
-	const u_char *q;
-	u_int i;
-
-	if (caplen < PPP_BSDI_HDRLEN) {
-		ND_PRINT((ndo, "[|ppp]"));
-		return (caplen)
-	}
-
-	hdrlength = 0;
-
-#if 0
-	if (EXTRACT_U_1(p) == PPP_ADDRESS &&
-	    EXTRACT_U_1(p + 1) == PPP_CONTROL) {
-		if (ndo->ndo_eflag)
-			ND_PRINT((ndo, "%02x %02x ", EXTRACT_U_1(p),
-			    EXTRACT_U_1(p + 1)));
-		p += 2;
-		hdrlength = 2;
-	}
-
-	if (ndo->ndo_eflag)
-		ND_PRINT((ndo, "%d ", length));
-	/* Retrieve the protocol type */
-	if (EXTRACT_U_1(p) & 01) {
-		/* Compressed protocol field */
-		ptype = EXTRACT_U_1(p);
-		if (ndo->ndo_eflag)
-			ND_PRINT((ndo, "%02x ", ptype));
-		p++;
-		hdrlength += 1;
-	} else {
-		/* Un-compressed protocol field */
-		ptype = EXTRACT_BE_U_2(p);
-		if (ndo->ndo_eflag)
-			ND_PRINT((ndo, "%04x ", ptype));
-		p += 2;
-		hdrlength += 2;
-	}
-#else
-	ptype = 0;	/*XXX*/
-	if (ndo->ndo_eflag)
-		ND_PRINT((ndo, "%c ", EXTRACT_U_1(p + SLC_DIR) ? 'O' : 'I'));
-	llhl = EXTRACT_U_1(p + SLC_LLHL);
-	if (llhl) {
-		/* link level header */
-		struct ppp_header *ph;
-
-		q = p + SLC_BPFHDRLEN;
-		ph = (struct ppp_header *)q;
-		if (ph->phdr_addr == PPP_ADDRESS
-		 && ph->phdr_ctl == PPP_CONTROL) {
-			if (ndo->ndo_eflag)
-				ND_PRINT((ndo, "%02x %02x ", EXTRACT_U_1(q),
-				    EXTRACT_U_1(q + 1)));
-			ptype = EXTRACT_BE_U_2(&ph->phdr_type);
-			if (ndo->ndo_eflag && (ptype == PPP_VJC || ptype == PPP_VJNC)) {
-				ND_PRINT((ndo, "%s ", tok2str(ppptype2str,
-						"proto-#%d", ptype)));
-			}
-		} else {
-			if (ndo->ndo_eflag) {
-				ND_PRINT((ndo, "LLH=["));
-				for (i = 0; i < llhl; i++)
-					ND_PRINT((ndo, "%02x", EXTRACT_U_1(q + i)));
-				ND_PRINT((ndo, "] "));
-			}
-		}
-	}
-	if (ndo->ndo_eflag)
-		ND_PRINT((ndo, "%d ", length));
-	if (EXTRACT_U_1(p + SLC_CHL)) {
-		q = p + SLC_BPFHDRLEN + llhl;
-
-		switch (ptype) {
-		case PPP_VJC:
-			ptype = vjc_print(ndo, q, ptype);
-			hdrlength = PPP_BSDI_HDRLEN;
-			p += hdrlength;
-			switch (ptype) {
-			case PPP_IP:
-				ip_print(ndo, p, length);
-				break;
-			case PPP_IPV6:
-				ip6_print(ndo, p, length);
-				break;
-			case PPP_MPLS_UCAST:
-			case PPP_MPLS_MCAST:
-				mpls_print(ndo, p, length);
-				break;
-			}
-			goto printx;
-		case PPP_VJNC:
-			ptype = vjc_print(ndo, q, ptype);
-			hdrlength = PPP_BSDI_HDRLEN;
-			p += hdrlength;
-			switch (ptype) {
-			case PPP_IP:
-				ip_print(ndo, p, length);
-				break;
-			case PPP_IPV6:
-				ip6_print(ndo, p, length);
-				break;
-			case PPP_MPLS_UCAST:
-			case PPP_MPLS_MCAST:
-				mpls_print(ndo, p, length);
-				break;
-			}
-			goto printx;
-		default:
-			if (ndo->ndo_eflag) {
-				ND_PRINT((ndo, "CH=["));
-				for (i = 0; i < llhl; i++)
-					ND_PRINT((ndo, "%02x",
-					    EXTRACT_U_1(q + i)));
-				ND_PRINT((ndo, "] "));
-			}
-			break;
-		}
-	}
-
-	hdrlength = PPP_BSDI_HDRLEN;
-#endif
-
-	length -= hdrlength;
-	p += hdrlength;
-
-	switch (ptype) {
-	case PPP_IP:
-		ip_print(p, length);
-		break;
-	case PPP_IPV6:
-		ip6_print(ndo, p, length);
-		break;
-	case PPP_MPLS_UCAST:
-	case PPP_MPLS_MCAST:
-		mpls_print(ndo, p, length);
-		break;
-	default:
-		ND_PRINT((ndo, "%s ", tok2str(ppptype2str, "unknown PPP protocol (0x%04x)", ptype)));
-	}
-
-printx:
-#else /* __bsdi */
-	hdrlength = 0;
-#endif /* __bsdi__ */
-	return (hdrlength);
-}
-
-
-/*
- * Local Variables:
- * c-style: whitesmith
- * c-basic-offset: 8
- * End:
- */