X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/1a84a1e1142f2c60dc045c2557ed4d484b576d8b..a15e52bb2722f9c9719cd9909d70c03a10e170c4:/print-decnet.c

diff --git a/print-decnet.c b/print-decnet.c
index 18e991a4..f90ca6a0 100644
--- a/print-decnet.c
+++ b/print-decnet.c
@@ -19,54 +19,68 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#define NETDISSECT_REWORKED
+/* \summary: DECnet printer */
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include <tcpdump-stdinc.h>
+#include "netdissect-stdinc.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 struct mbuf;
 struct rtentry;
 
-#ifdef HAVE_NETDNET_DNETDB_H
-#include <netdnet/dnetdb.h>
+#ifdef HAVE_DNET_HTOA
+  #ifdef HAVE_NETDNET_DN_H
+    #include <netdnet/dn.h>
+  #endif
+  #ifndef HAVE_STRUCT_DN_NADDR
+#define DN_MAXADDL	20		/* max size of DECnet address */
+struct dn_naddr {
+	unsigned short	a_len;		/* length of address */
+	unsigned char	a_addr[DN_MAXADDL]; /* address as bytes */
+};
+  #endif /* HAVE_STRUCT_DN_NADDR */
+  #ifdef HAVE_NETDNET_DNETDB_H
+    #include <netdnet/dnetdb.h>
+  #endif
+  #ifndef NETDNET_DNETDB_H_DECLARES_DNET_HTOA
+    extern char *dnet_htoa(struct dn_naddr *);
+  #endif
 #endif
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
+#include "netdissect.h"
 #include "extract.h"
-#include "interface.h"
 #include "addrtoname.h"
 
 static const char tstr[] = "[|decnet]";
 
-#ifndef WIN32
-typedef uint8_t byte[1];		/* single byte field */
+#ifndef _WIN32
+typedef nd_uint8_t byte;		/* single byte field */
 #else
 /*
  * the keyword 'byte' generates conflicts in Windows
  */
-typedef unsigned char Byte[1];		/* single byte field */
+typedef nd_uint8_t Byte;		/* single byte field */
 #define byte Byte
-#endif /* WIN32 */
-typedef uint8_t word[2];		/* 2 byte field */
-typedef uint8_t longword[4];		/* 4 bytes field */
+#endif /* _WIN32 */
+typedef nd_uint16_t word;		/* 2 byte field */
+typedef nd_uint32_t longword;		/* 4 bytes field */
 
 /*
  * Definitions for DECNET Phase IV protocol headers
  */
-union etheraddress {
-	uint8_t   dne_addr[6];		/* full ethernet address */
+typedef union {
+	nd_byte   dne_addr[6];		/* full ethernet address */
 	struct {
-		uint8_t dne_hiord[4];	/* DECnet HIORD prefix */
-		uint8_t dne_nodeaddr[2]; /* DECnet node address */
+		nd_byte dne_hiord[4];	/* DECnet HIORD prefix */
+		nd_byte dne_nodeaddr[2]; /* DECnet node address */
 	} dne_remote;
-};
-
-typedef union etheraddress etheraddr;	/* Ethernet address */
+} etheraddr;	/* Ethernet address */
 
 #define HIORD 0x000400aa		/* high 32-bits of address (swapped) */
 
@@ -74,12 +88,6 @@ typedef union etheraddress etheraddr;	/* Ethernet address */
 #define	AREASHIFT	10		/* bit-offset for area field */
 #define NODEMASK	01777		/* mask for node address field */
 
-#define DN_MAXADDL	20		/* max size of DECnet address */
-struct dn_naddr {
-	uint16_t	a_len;		/* length of address */
-	uint8_t a_addr[DN_MAXADDL]; /* address as bytes */
-};
-
 /*
  * Define long and short header formats.
  */
@@ -325,7 +333,6 @@ union controlmsg
 #define COS_NONE 0			/* no flow control */
 #define COS_SEGMENT 04			/* segment flow control */
 #define COS_MESSAGE 010			/* message flow control */
-#define COS_CRYPTSER 020		/* cryptographic services requested */
 #define COS_DEFAULT 1			/* default value for field */
 
 #define COI_MASK 3			/* mask for version field */
@@ -484,72 +491,66 @@ struct dcmsg				/* disconnect confirm message */
 
 /* Forwards */
 static int print_decnet_ctlmsg(netdissect_options *, const union routehdr *, u_int, u_int);
-static void print_t_info(netdissect_options *, int);
+static void print_t_info(netdissect_options *, u_int);
 static int print_l1_routes(netdissect_options *, const char *, u_int);
 static int print_l2_routes(netdissect_options *, const char *, u_int);
-static void print_i_info(netdissect_options *, int);
+static void print_i_info(netdissect_options *, u_int);
 static int print_elist(const char *, u_int);
 static int print_nsp(netdissect_options *, const u_char *, u_int);
-static void print_reason(netdissect_options *, int);
-#ifdef	PRINT_NSPDATA
-static void pdata(netdissect_options *, u_char *, u_int);
-#endif
-
-#ifndef HAVE_NETDNET_DNETDB_H_DNET_HTOA
-extern char *dnet_htoa(struct dn_naddr *);
-#endif
+static void print_reason(netdissect_options *, u_int);
 
 void
 decnet_print(netdissect_options *ndo,
-             register const u_char *ap, register u_int length,
-             register u_int caplen)
+             const u_char *ap, u_int length,
+             u_int caplen)
 {
-	register const union routehdr *rhp;
-	register int mflags;
-	int dst, src, hops;
+	const union routehdr *rhp;
+	u_int mflags;
+	u_int dst, src, hops;
 	u_int nsplen, pktlen;
 	const u_char *nspp;
 
 	if (length < sizeof(struct shorthdr)) {
-		ND_PRINT((ndo, "%s", tstr));
+		ND_PRINT("%s", tstr);
 		return;
 	}
 
-	ND_TCHECK2(*ap, sizeof(short));
-	pktlen = EXTRACT_LE_16BITS(ap);
+	ND_TCHECK_LEN(ap, sizeof(short));
+	pktlen = EXTRACT_LE_U_2(ap);
 	if (pktlen < sizeof(struct shorthdr)) {
-		ND_PRINT((ndo, "%s", tstr));
+		ND_PRINT("%s", tstr);
 		return;
 	}
 	if (pktlen > length) {
-		ND_PRINT((ndo, "%s", tstr));
+		ND_PRINT("%s", tstr);
 		return;
 	}
 	length = pktlen;
 
-	rhp = (const union routehdr *)&(ap[sizeof(short)]);
+	rhp = (const union routehdr *)(ap + sizeof(short));
 	ND_TCHECK(rhp->rh_short.sh_flags);
-	mflags = EXTRACT_LE_8BITS(rhp->rh_short.sh_flags);
+	mflags = EXTRACT_U_1(rhp->rh_short.sh_flags);
 
 	if (mflags & RMF_PAD) {
 	    /* pad bytes of some sort in front of message */
 	    u_int padlen = mflags & RMF_PADMASK;
 	    if (ndo->ndo_vflag)
-		ND_PRINT((ndo, "[pad:%d] ", padlen));
+		ND_PRINT("[pad:%u] ", padlen);
 	    if (length < padlen + 2) {
-		ND_PRINT((ndo, "%s", tstr));
+		ND_PRINT("%s", tstr);
 		return;
 	    }
-	    ND_TCHECK2(ap[sizeof(short)], padlen);
+	    ND_TCHECK_LEN(ap + sizeof(short), padlen);
 	    ap += padlen;
 	    length -= padlen;
 	    caplen -= padlen;
-	    rhp = (const union routehdr *)&(ap[sizeof(short)]);
-	    mflags = EXTRACT_LE_8BITS(rhp->rh_short.sh_flags);
+	    rhp = (const union routehdr *)(ap + sizeof(short));
+	    ND_TCHECK(rhp->rh_short.sh_flags);
+	    mflags = EXTRACT_U_1(rhp->rh_short.sh_flags);
 	}
 
 	if (mflags & RMF_FVER) {
-		ND_PRINT((ndo, "future-version-decnet"));
+		ND_PRINT("future-version-decnet");
 		ND_DEFAULTPRINT(ap, min(length, caplen));
 		return;
 	}
@@ -564,42 +565,42 @@ decnet_print(netdissect_options *ndo,
 	switch (mflags & RMF_MASK) {
 	case RMF_LONG:
 	    if (length < sizeof(struct longhdr)) {
-		ND_PRINT((ndo, "%s", tstr));
+		ND_PRINT("%s", tstr);
 		return;
 	    }
 	    ND_TCHECK(rhp->rh_long);
 	    dst =
-		EXTRACT_LE_16BITS(rhp->rh_long.lg_dst.dne_remote.dne_nodeaddr);
+		EXTRACT_LE_U_2(rhp->rh_long.lg_dst.dne_remote.dne_nodeaddr);
 	    src =
-		EXTRACT_LE_16BITS(rhp->rh_long.lg_src.dne_remote.dne_nodeaddr);
-	    hops = EXTRACT_LE_8BITS(rhp->rh_long.lg_visits);
-	    nspp = &(ap[sizeof(short) + sizeof(struct longhdr)]);
+		EXTRACT_LE_U_2(rhp->rh_long.lg_src.dne_remote.dne_nodeaddr);
+	    hops = EXTRACT_U_1(rhp->rh_long.lg_visits);
+	    nspp = ap + sizeof(short) + sizeof(struct longhdr);
 	    nsplen = length - sizeof(struct longhdr);
 	    break;
 	case RMF_SHORT:
 	    ND_TCHECK(rhp->rh_short);
-	    dst = EXTRACT_LE_16BITS(rhp->rh_short.sh_dst);
-	    src = EXTRACT_LE_16BITS(rhp->rh_short.sh_src);
-	    hops = (EXTRACT_LE_8BITS(rhp->rh_short.sh_visits) & VIS_MASK)+1;
-	    nspp = &(ap[sizeof(short) + sizeof(struct shorthdr)]);
+	    dst = EXTRACT_LE_U_2(rhp->rh_short.sh_dst);
+	    src = EXTRACT_LE_U_2(rhp->rh_short.sh_src);
+	    hops = (EXTRACT_U_1(rhp->rh_short.sh_visits) & VIS_MASK)+1;
+	    nspp = ap + sizeof(short) + sizeof(struct shorthdr);
 	    nsplen = length - sizeof(struct shorthdr);
 	    break;
 	default:
-	    ND_PRINT((ndo, "unknown message flags under mask"));
-	    ND_DEFAULTPRINT((u_char *)ap, min(length, caplen));
+	    ND_PRINT("unknown message flags under mask");
+	    ND_DEFAULTPRINT((const u_char *)ap, min(length, caplen));
 	    return;
 	}
 
-	ND_PRINT((ndo, "%s > %s %d ",
-			dnaddr_string(ndo, src), dnaddr_string(ndo, dst), pktlen));
+	ND_PRINT("%s > %s %u ",
+			dnaddr_string(ndo, src), dnaddr_string(ndo, dst), pktlen);
 	if (ndo->ndo_vflag) {
 	    if (mflags & RMF_RQR)
-		ND_PRINT((ndo, "RQR "));
+		ND_PRINT("RQR ");
 	    if (mflags & RMF_RTS)
-		ND_PRINT((ndo, "RTS "));
+		ND_PRINT("RTS ");
 	    if (mflags & RMF_IE)
-		ND_PRINT((ndo, "IE "));
-	    ND_PRINT((ndo, "%d hops ", hops));
+		ND_PRINT("IE ");
+	    ND_PRINT("%u hops ", hops);
 	}
 
 	if (!print_nsp(ndo, nspp, nsplen))
@@ -607,136 +608,134 @@ decnet_print(netdissect_options *ndo,
 	return;
 
 trunc:
-	ND_PRINT((ndo, "%s", tstr));
+	ND_PRINT("%s", tstr);
 	return;
 }
 
 static int
 print_decnet_ctlmsg(netdissect_options *ndo,
-                    register const union routehdr *rhp, u_int length,
+                    const union routehdr *rhp, u_int length,
                     u_int caplen)
 {
-	int mflags = EXTRACT_LE_8BITS(rhp->rh_short.sh_flags);
-	register union controlmsg *cmp = (union controlmsg *)rhp;
-	int src, dst, info, blksize, eco, ueco, hello, other, vers;
+	/* Our caller has already checked for mflags */
+	u_int mflags = EXTRACT_U_1(rhp->rh_short.sh_flags);
+	const union controlmsg *cmp = (const union controlmsg *)rhp;
+	u_int src, dst, info, blksize, eco, ueco, hello, other, vers;
 	etheraddr srcea, rtea;
-	int priority;
-	char *rhpx = (char *)rhp;
+	u_int priority;
+	const char *rhpx = (const char *)rhp;
 	int ret;
 
 	switch (mflags & RMF_CTLMASK) {
 	case RMF_INIT:
-	    ND_PRINT((ndo, "init "));
+	    ND_PRINT("init ");
 	    if (length < sizeof(struct initmsg))
 		goto trunc;
 	    ND_TCHECK(cmp->cm_init);
-	    src = EXTRACT_LE_16BITS(cmp->cm_init.in_src);
-	    info = EXTRACT_LE_8BITS(cmp->cm_init.in_info);
-	    blksize = EXTRACT_LE_16BITS(cmp->cm_init.in_blksize);
-	    vers = EXTRACT_LE_8BITS(cmp->cm_init.in_vers);
-	    eco = EXTRACT_LE_8BITS(cmp->cm_init.in_eco);
-	    ueco = EXTRACT_LE_8BITS(cmp->cm_init.in_ueco);
-	    hello = EXTRACT_LE_16BITS(cmp->cm_init.in_hello);
+	    src = EXTRACT_LE_U_2(cmp->cm_init.in_src);
+	    info = EXTRACT_U_1(cmp->cm_init.in_info);
+	    blksize = EXTRACT_LE_U_2(cmp->cm_init.in_blksize);
+	    vers = EXTRACT_U_1(cmp->cm_init.in_vers);
+	    eco = EXTRACT_U_1(cmp->cm_init.in_eco);
+	    ueco = EXTRACT_U_1(cmp->cm_init.in_ueco);
+	    hello = EXTRACT_LE_U_2(cmp->cm_init.in_hello);
 	    print_t_info(ndo, info);
-	    ND_PRINT((ndo,
-		"src %sblksize %d vers %d eco %d ueco %d hello %d",
+	    ND_PRINT("src %sblksize %u vers %u eco %u ueco %u hello %u",
 			dnaddr_string(ndo, src), blksize, vers, eco, ueco,
-			hello));
+			hello);
 	    ret = 1;
 	    break;
 	case RMF_VER:
-	    ND_PRINT((ndo, "verification "));
+	    ND_PRINT("verification ");
 	    if (length < sizeof(struct verifmsg))
 		goto trunc;
 	    ND_TCHECK(cmp->cm_ver);
-	    src = EXTRACT_LE_16BITS(cmp->cm_ver.ve_src);
-	    other = EXTRACT_LE_8BITS(cmp->cm_ver.ve_fcnval);
-	    ND_PRINT((ndo, "src %s fcnval %o", dnaddr_string(ndo, src), other));
+	    src = EXTRACT_LE_U_2(cmp->cm_ver.ve_src);
+	    other = EXTRACT_U_1(cmp->cm_ver.ve_fcnval);
+	    ND_PRINT("src %s fcnval %o", dnaddr_string(ndo, src), other);
 	    ret = 1;
 	    break;
 	case RMF_TEST:
-	    ND_PRINT((ndo, "test "));
+	    ND_PRINT("test ");
 	    if (length < sizeof(struct testmsg))
 		goto trunc;
 	    ND_TCHECK(cmp->cm_test);
-	    src = EXTRACT_LE_16BITS(cmp->cm_test.te_src);
-	    other = EXTRACT_LE_8BITS(cmp->cm_test.te_data);
-	    ND_PRINT((ndo, "src %s data %o", dnaddr_string(ndo, src), other));
+	    src = EXTRACT_LE_U_2(cmp->cm_test.te_src);
+	    other = EXTRACT_U_1(cmp->cm_test.te_data);
+	    ND_PRINT("src %s data %o", dnaddr_string(ndo, src), other);
 	    ret = 1;
 	    break;
 	case RMF_L1ROUT:
-	    ND_PRINT((ndo, "lev-1-routing "));
+	    ND_PRINT("lev-1-routing ");
 	    if (length < sizeof(struct l1rout))
 		goto trunc;
 	    ND_TCHECK(cmp->cm_l1rou);
-	    src = EXTRACT_LE_16BITS(cmp->cm_l1rou.r1_src);
-	    ND_PRINT((ndo, "src %s ", dnaddr_string(ndo, src)));
+	    src = EXTRACT_LE_U_2(cmp->cm_l1rou.r1_src);
+	    ND_PRINT("src %s ", dnaddr_string(ndo, src));
 	    ret = print_l1_routes(ndo, &(rhpx[sizeof(struct l1rout)]),
 				length - sizeof(struct l1rout));
 	    break;
 	case RMF_L2ROUT:
-	    ND_PRINT((ndo, "lev-2-routing "));
+	    ND_PRINT("lev-2-routing ");
 	    if (length < sizeof(struct l2rout))
 		goto trunc;
 	    ND_TCHECK(cmp->cm_l2rout);
-	    src = EXTRACT_LE_16BITS(cmp->cm_l2rout.r2_src);
-	    ND_PRINT((ndo, "src %s ", dnaddr_string(ndo, src)));
+	    src = EXTRACT_LE_U_2(cmp->cm_l2rout.r2_src);
+	    ND_PRINT("src %s ", dnaddr_string(ndo, src));
 	    ret = print_l2_routes(ndo, &(rhpx[sizeof(struct l2rout)]),
 				length - sizeof(struct l2rout));
 	    break;
 	case RMF_RHELLO:
-	    ND_PRINT((ndo, "router-hello "));
+	    ND_PRINT("router-hello ");
 	    if (length < sizeof(struct rhellomsg))
 		goto trunc;
 	    ND_TCHECK(cmp->cm_rhello);
-	    vers = EXTRACT_LE_8BITS(cmp->cm_rhello.rh_vers);
-	    eco = EXTRACT_LE_8BITS(cmp->cm_rhello.rh_eco);
-	    ueco = EXTRACT_LE_8BITS(cmp->cm_rhello.rh_ueco);
-	    memcpy((char *)&srcea, (char *)&(cmp->cm_rhello.rh_src),
+	    vers = EXTRACT_U_1(cmp->cm_rhello.rh_vers);
+	    eco = EXTRACT_U_1(cmp->cm_rhello.rh_eco);
+	    ueco = EXTRACT_U_1(cmp->cm_rhello.rh_ueco);
+	    memcpy((char *)&srcea, (const char *)&(cmp->cm_rhello.rh_src),
 		sizeof(srcea));
-	    src = EXTRACT_LE_16BITS(srcea.dne_remote.dne_nodeaddr);
-	    info = EXTRACT_LE_8BITS(cmp->cm_rhello.rh_info);
-	    blksize = EXTRACT_LE_16BITS(cmp->cm_rhello.rh_blksize);
-	    priority = EXTRACT_LE_8BITS(cmp->cm_rhello.rh_priority);
-	    hello = EXTRACT_LE_16BITS(cmp->cm_rhello.rh_hello);
+	    src = EXTRACT_LE_U_2(srcea.dne_remote.dne_nodeaddr);
+	    info = EXTRACT_U_1(cmp->cm_rhello.rh_info);
+	    blksize = EXTRACT_LE_U_2(cmp->cm_rhello.rh_blksize);
+	    priority = EXTRACT_U_1(cmp->cm_rhello.rh_priority);
+	    hello = EXTRACT_LE_U_2(cmp->cm_rhello.rh_hello);
 	    print_i_info(ndo, info);
-	    ND_PRINT((ndo,
-	    "vers %d eco %d ueco %d src %s blksize %d pri %d hello %d",
+	    ND_PRINT("vers %u eco %u ueco %u src %s blksize %u pri %u hello %u",
 			vers, eco, ueco, dnaddr_string(ndo, src),
-			blksize, priority, hello));
+			blksize, priority, hello);
 	    ret = print_elist(&(rhpx[sizeof(struct rhellomsg)]),
 				length - sizeof(struct rhellomsg));
 	    break;
 	case RMF_EHELLO:
-	    ND_PRINT((ndo, "endnode-hello "));
+	    ND_PRINT("endnode-hello ");
 	    if (length < sizeof(struct ehellomsg))
 		goto trunc;
 	    ND_TCHECK(cmp->cm_ehello);
-	    vers = EXTRACT_LE_8BITS(cmp->cm_ehello.eh_vers);
-	    eco = EXTRACT_LE_8BITS(cmp->cm_ehello.eh_eco);
-	    ueco = EXTRACT_LE_8BITS(cmp->cm_ehello.eh_ueco);
-	    memcpy((char *)&srcea, (char *)&(cmp->cm_ehello.eh_src),
+	    vers = EXTRACT_U_1(cmp->cm_ehello.eh_vers);
+	    eco = EXTRACT_U_1(cmp->cm_ehello.eh_eco);
+	    ueco = EXTRACT_U_1(cmp->cm_ehello.eh_ueco);
+	    memcpy((char *)&srcea, (const char *)&(cmp->cm_ehello.eh_src),
 		sizeof(srcea));
-	    src = EXTRACT_LE_16BITS(srcea.dne_remote.dne_nodeaddr);
-	    info = EXTRACT_LE_8BITS(cmp->cm_ehello.eh_info);
-	    blksize = EXTRACT_LE_16BITS(cmp->cm_ehello.eh_blksize);
+	    src = EXTRACT_LE_U_2(srcea.dne_remote.dne_nodeaddr);
+	    info = EXTRACT_U_1(cmp->cm_ehello.eh_info);
+	    blksize = EXTRACT_LE_U_2(cmp->cm_ehello.eh_blksize);
 	    /*seed*/
-	    memcpy((char *)&rtea, (char *)&(cmp->cm_ehello.eh_router),
+	    memcpy((char *)&rtea, (const char *)&(cmp->cm_ehello.eh_router),
 		sizeof(rtea));
-	    dst = EXTRACT_LE_16BITS(rtea.dne_remote.dne_nodeaddr);
-	    hello = EXTRACT_LE_16BITS(cmp->cm_ehello.eh_hello);
-	    other = EXTRACT_LE_8BITS(cmp->cm_ehello.eh_data);
+	    dst = EXTRACT_LE_U_2(rtea.dne_remote.dne_nodeaddr);
+	    hello = EXTRACT_LE_U_2(cmp->cm_ehello.eh_hello);
+	    other = EXTRACT_U_1(cmp->cm_ehello.eh_data);
 	    print_i_info(ndo, info);
-	    ND_PRINT((ndo,
-	"vers %d eco %d ueco %d src %s blksize %d rtr %s hello %d data %o",
+	    ND_PRINT("vers %u eco %u ueco %u src %s blksize %u rtr %s hello %u data %o",
 			vers, eco, ueco, dnaddr_string(ndo, src),
-			blksize, dnaddr_string(ndo, dst), hello, other));
+			blksize, dnaddr_string(ndo, dst), hello, other);
 	    ret = 1;
 	    break;
 
 	default:
-	    ND_PRINT((ndo, "unknown control message"));
-	    ND_DEFAULTPRINT((u_char *)rhp, min(length, caplen));
+	    ND_PRINT("unknown control message");
+	    ND_DEFAULTPRINT((const u_char *)rhp, min(length, caplen));
 	    ret = 1;
 	    break;
 	}
@@ -748,45 +747,45 @@ trunc:
 
 static void
 print_t_info(netdissect_options *ndo,
-             int info)
+             u_int info)
 {
-	int ntype = info & 3;
+	u_int ntype = info & 3;
 	switch (ntype) {
-	case 0: ND_PRINT((ndo, "reserved-ntype? ")); break;
-	case TI_L2ROUT: ND_PRINT((ndo, "l2rout ")); break;
-	case TI_L1ROUT: ND_PRINT((ndo, "l1rout ")); break;
-	case TI_ENDNODE: ND_PRINT((ndo, "endnode ")); break;
+	case 0: ND_PRINT("reserved-ntype? "); break;
+	case TI_L2ROUT: ND_PRINT("l2rout "); break;
+	case TI_L1ROUT: ND_PRINT("l1rout "); break;
+	case TI_ENDNODE: ND_PRINT("endnode "); break;
 	}
 	if (info & TI_VERIF)
-	    ND_PRINT((ndo, "verif "));
+	    ND_PRINT("verif ");
 	if (info & TI_BLOCK)
-	    ND_PRINT((ndo, "blo "));
+	    ND_PRINT("blo ");
 }
 
 static int
 print_l1_routes(netdissect_options *ndo,
                 const char *rp, u_int len)
 {
-	int count;
-	int id;
-	int info;
+	u_int count;
+	u_int id;
+	u_int info;
 
 	/* The last short is a checksum */
 	while (len > (3 * sizeof(short))) {
-	    ND_TCHECK2(*rp, 3 * sizeof(short));
-	    count = EXTRACT_LE_16BITS(rp);
+	    ND_TCHECK_LEN(rp, 3 * sizeof(short));
+	    count = EXTRACT_LE_U_2(rp);
 	    if (count > 1024)
 		return (1);	/* seems to be bogus from here on */
 	    rp += sizeof(short);
 	    len -= sizeof(short);
-	    id = EXTRACT_LE_16BITS(rp);
+	    id = EXTRACT_LE_U_2(rp);
 	    rp += sizeof(short);
 	    len -= sizeof(short);
-	    info = EXTRACT_LE_16BITS(rp);
+	    info = EXTRACT_LE_U_2(rp);
 	    rp += sizeof(short);
 	    len -= sizeof(short);
-	    ND_PRINT((ndo, "{ids %d-%d cost %d hops %d} ", id, id + count,
-			    RI_COST(info), RI_HOPS(info)));
+	    ND_PRINT("{ids %u-%u cost %u hops %u} ", id, id + count,
+			    RI_COST(info), RI_HOPS(info));
 	}
 	return (1);
 
@@ -798,26 +797,26 @@ static int
 print_l2_routes(netdissect_options *ndo,
                 const char *rp, u_int len)
 {
-	int count;
-	int area;
-	int info;
+	u_int count;
+	u_int area;
+	u_int info;
 
 	/* The last short is a checksum */
 	while (len > (3 * sizeof(short))) {
-	    ND_TCHECK2(*rp, 3 * sizeof(short));
-	    count = EXTRACT_LE_16BITS(rp);
+	    ND_TCHECK_LEN(rp, 3 * sizeof(short));
+	    count = EXTRACT_LE_U_2(rp);
 	    if (count > 1024)
 		return (1);	/* seems to be bogus from here on */
 	    rp += sizeof(short);
 	    len -= sizeof(short);
-	    area = EXTRACT_LE_16BITS(rp);
+	    area = EXTRACT_LE_U_2(rp);
 	    rp += sizeof(short);
 	    len -= sizeof(short);
-	    info = EXTRACT_LE_16BITS(rp);
+	    info = EXTRACT_LE_U_2(rp);
 	    rp += sizeof(short);
 	    len -= sizeof(short);
-	    ND_PRINT((ndo, "{areas %d-%d cost %d hops %d} ", area, area + count,
-			    RI_COST(info), RI_HOPS(info)));
+	    ND_PRINT("{areas %u-%u cost %u hops %u} ", area, area + count,
+			    RI_COST(info), RI_HOPS(info));
 	}
 	return (1);
 
@@ -827,21 +826,21 @@ trunc:
 
 static void
 print_i_info(netdissect_options *ndo,
-             int info)
+             u_int info)
 {
-	int ntype = info & II_TYPEMASK;
+	u_int ntype = info & II_TYPEMASK;
 	switch (ntype) {
-	case 0: ND_PRINT((ndo, "reserved-ntype? ")); break;
-	case II_L2ROUT: ND_PRINT((ndo, "l2rout ")); break;
-	case II_L1ROUT: ND_PRINT((ndo, "l1rout ")); break;
-	case II_ENDNODE: ND_PRINT((ndo, "endnode ")); break;
+	case 0: ND_PRINT("reserved-ntype? "); break;
+	case II_L2ROUT: ND_PRINT("l2rout "); break;
+	case II_L1ROUT: ND_PRINT("l1rout "); break;
+	case II_ENDNODE: ND_PRINT("endnode "); break;
 	}
 	if (info & II_VERIF)
-	    ND_PRINT((ndo, "verif "));
+	    ND_PRINT("verif ");
 	if (info & II_NOMCAST)
-	    ND_PRINT((ndo, "nomcast "));
+	    ND_PRINT("nomcast ");
 	if (info & II_BLOCK)
-	    ND_PRINT((ndo, "blo "));
+	    ND_PRINT("blo ");
 }
 
 static int
@@ -855,15 +854,15 @@ static int
 print_nsp(netdissect_options *ndo,
           const u_char *nspp, u_int nsplen)
 {
-	const struct nsphdr *nsphp = (struct nsphdr *)nspp;
-	int dst, src, flags;
+	const struct nsphdr *nsphp = (const struct nsphdr *)nspp;
+	u_int dst, src, flags;
 
 	if (nsplen < sizeof(struct nsphdr))
 		goto trunc;
-	ND_TCHECK(*nsphp);
-	flags = EXTRACT_LE_8BITS(nsphp->nh_flags);
-	dst = EXTRACT_LE_16BITS(nsphp->nh_dst);
-	src = EXTRACT_LE_16BITS(nsphp->nh_src);
+	ND_TCHECK_SIZE(nsphp);
+	flags = EXTRACT_U_1(nsphp->nh_flags);
+	dst = EXTRACT_LE_U_2(nsphp->nh_dst);
+	src = EXTRACT_LE_U_2(nsphp->nh_src);
 
 	switch (flags & NSP_TYPEMASK) {
 	case MFT_DATA:
@@ -872,219 +871,199 @@ print_nsp(netdissect_options *ndo,
 	    case MFS_MOM:
 	    case MFS_EOM:
 	    case MFS_BOM+MFS_EOM:
-		ND_PRINT((ndo, "data %d>%d ", src, dst));
+		ND_PRINT("data %u>%u ", src, dst);
 		{
-		    struct seghdr *shp = (struct seghdr *)nspp;
-		    int ack;
-#ifdef	PRINT_NSPDATA
-		    u_char *dp;
-#endif
+		    const struct seghdr *shp = (const struct seghdr *)nspp;
+		    u_int ack;
 		    u_int data_off = sizeof(struct minseghdr);
 
 		    if (nsplen < data_off)
 			goto trunc;
 		    ND_TCHECK(shp->sh_seq[0]);
-		    ack = EXTRACT_LE_16BITS(shp->sh_seq[0]);
+		    ack = EXTRACT_LE_U_2(shp->sh_seq[0]);
 		    if (ack & SGQ_ACK) {	/* acknum field */
 			if ((ack & SGQ_NAK) == SGQ_NAK)
-			    ND_PRINT((ndo, "nak %d ", ack & SGQ_MASK));
+			    ND_PRINT("nak %u ", ack & SGQ_MASK);
 			else
-			    ND_PRINT((ndo, "ack %d ", ack & SGQ_MASK));
+			    ND_PRINT("ack %u ", ack & SGQ_MASK);
 			data_off += sizeof(short);
 			if (nsplen < data_off)
 			    goto trunc;
 			ND_TCHECK(shp->sh_seq[1]);
-		        ack = EXTRACT_LE_16BITS(shp->sh_seq[1]);
+		        ack = EXTRACT_LE_U_2(shp->sh_seq[1]);
 			if (ack & SGQ_OACK) {	/* ackoth field */
 			    if ((ack & SGQ_ONAK) == SGQ_ONAK)
-				ND_PRINT((ndo, "onak %d ", ack & SGQ_MASK));
+				ND_PRINT("onak %u ", ack & SGQ_MASK);
 			    else
-				ND_PRINT((ndo, "oack %d ", ack & SGQ_MASK));
+				ND_PRINT("oack %u ", ack & SGQ_MASK);
 			    data_off += sizeof(short);
 			    if (nsplen < data_off)
 				goto trunc;
 			    ND_TCHECK(shp->sh_seq[2]);
-			    ack = EXTRACT_LE_16BITS(shp->sh_seq[2]);
+			    ack = EXTRACT_LE_U_2(shp->sh_seq[2]);
 			}
 		    }
-		    ND_PRINT((ndo, "seg %d ", ack & SGQ_MASK));
-#ifdef	PRINT_NSPDATA
-		    if (nsplen > data_off) {
-			dp = &(nspp[data_off]);
-			ND_TCHECK2(*dp, nsplen - data_off);
-			pdata(ndo, dp, nsplen - data_off);
-		    }
-#endif
+		    ND_PRINT("seg %u ", ack & SGQ_MASK);
 		}
 		break;
 	    case MFS_ILS+MFS_INT:
-		ND_PRINT((ndo, "intr "));
+		ND_PRINT("intr ");
 		{
-		    struct seghdr *shp = (struct seghdr *)nspp;
-		    int ack;
-#ifdef	PRINT_NSPDATA
-		    u_char *dp;
-#endif
+		    const struct seghdr *shp = (const struct seghdr *)nspp;
+		    u_int ack;
 		    u_int data_off = sizeof(struct minseghdr);
 
 		    if (nsplen < data_off)
 			goto trunc;
 		    ND_TCHECK(shp->sh_seq[0]);
-		    ack = EXTRACT_LE_16BITS(shp->sh_seq[0]);
+		    ack = EXTRACT_LE_U_2(shp->sh_seq[0]);
 		    if (ack & SGQ_ACK) {	/* acknum field */
 			if ((ack & SGQ_NAK) == SGQ_NAK)
-			    ND_PRINT((ndo, "nak %d ", ack & SGQ_MASK));
+			    ND_PRINT("nak %u ", ack & SGQ_MASK);
 			else
-			    ND_PRINT((ndo, "ack %d ", ack & SGQ_MASK));
+			    ND_PRINT("ack %u ", ack & SGQ_MASK);
 			data_off += sizeof(short);
 			if (nsplen < data_off)
 			    goto trunc;
 			ND_TCHECK(shp->sh_seq[1]);
-		        ack = EXTRACT_LE_16BITS(shp->sh_seq[1]);
+		        ack = EXTRACT_LE_U_2(shp->sh_seq[1]);
 			if (ack & SGQ_OACK) {	/* ackdat field */
 			    if ((ack & SGQ_ONAK) == SGQ_ONAK)
-				ND_PRINT((ndo, "nakdat %d ", ack & SGQ_MASK));
+				ND_PRINT("nakdat %u ", ack & SGQ_MASK);
 			    else
-				ND_PRINT((ndo, "ackdat %d ", ack & SGQ_MASK));
+				ND_PRINT("ackdat %u ", ack & SGQ_MASK);
 			    data_off += sizeof(short);
 			    if (nsplen < data_off)
 				goto trunc;
 			    ND_TCHECK(shp->sh_seq[2]);
-			    ack = EXTRACT_LE_16BITS(shp->sh_seq[2]);
+			    ack = EXTRACT_LE_U_2(shp->sh_seq[2]);
 			}
 		    }
-		    ND_PRINT((ndo, "seg %d ", ack & SGQ_MASK));
-#ifdef	PRINT_NSPDATA
-		    if (nsplen > data_off) {
-			dp = &(nspp[data_off]);
-			ND_TCHECK2(*dp, nsplen - data_off);
-			pdata(ndo, dp, nsplen - data_off);
-		    }
-#endif
+		    ND_PRINT("seg %u ", ack & SGQ_MASK);
 		}
 		break;
 	    case MFS_ILS:
-		ND_PRINT((ndo, "link-service %d>%d ", src, dst));
+		ND_PRINT("link-service %u>%u ", src, dst);
 		{
-		    struct seghdr *shp = (struct seghdr *)nspp;
-		    struct lsmsg *lsmp =
-			(struct lsmsg *)&(nspp[sizeof(struct seghdr)]);
-		    int ack;
-		    int lsflags, fcval;
+		    const struct seghdr *shp = (const struct seghdr *)nspp;
+		    const struct lsmsg *lsmp =
+			(const struct lsmsg *)(nspp + sizeof(struct seghdr));
+		    u_int ack;
+		    u_int lsflags, fcval;
 
 		    if (nsplen < sizeof(struct seghdr) + sizeof(struct lsmsg))
 			goto trunc;
 		    ND_TCHECK(shp->sh_seq[0]);
-		    ack = EXTRACT_LE_16BITS(shp->sh_seq[0]);
+		    ack = EXTRACT_LE_U_2(shp->sh_seq[0]);
 		    if (ack & SGQ_ACK) {	/* acknum field */
 			if ((ack & SGQ_NAK) == SGQ_NAK)
-			    ND_PRINT((ndo, "nak %d ", ack & SGQ_MASK));
+			    ND_PRINT("nak %u ", ack & SGQ_MASK);
 			else
-			    ND_PRINT((ndo, "ack %d ", ack & SGQ_MASK));
+			    ND_PRINT("ack %u ", ack & SGQ_MASK);
 			ND_TCHECK(shp->sh_seq[1]);
-		        ack = EXTRACT_LE_16BITS(shp->sh_seq[1]);
+		        ack = EXTRACT_LE_U_2(shp->sh_seq[1]);
 			if (ack & SGQ_OACK) {	/* ackdat field */
 			    if ((ack & SGQ_ONAK) == SGQ_ONAK)
-				ND_PRINT((ndo, "nakdat %d ", ack & SGQ_MASK));
+				ND_PRINT("nakdat %u ", ack & SGQ_MASK);
 			    else
-				ND_PRINT((ndo, "ackdat %d ", ack & SGQ_MASK));
+				ND_PRINT("ackdat %u ", ack & SGQ_MASK);
 			    ND_TCHECK(shp->sh_seq[2]);
-			    ack = EXTRACT_LE_16BITS(shp->sh_seq[2]);
+			    ack = EXTRACT_LE_U_2(shp->sh_seq[2]);
 			}
 		    }
-		    ND_PRINT((ndo, "seg %d ", ack & SGQ_MASK));
-		    ND_TCHECK(*lsmp);
-		    lsflags = EXTRACT_LE_8BITS(lsmp->ls_lsflags);
-		    fcval = EXTRACT_LE_8BITS(lsmp->ls_fcval);
+		    ND_PRINT("seg %u ", ack & SGQ_MASK);
+		    ND_TCHECK_SIZE(lsmp);
+		    lsflags = EXTRACT_U_1(lsmp->ls_lsflags);
+		    fcval = EXTRACT_U_1(lsmp->ls_fcval);
 		    switch (lsflags & LSI_MASK) {
 		    case LSI_DATA:
-			ND_PRINT((ndo, "dat seg count %d ", fcval));
+			ND_PRINT("dat seg count %u ", fcval);
 			switch (lsflags & LSM_MASK) {
 			case LSM_NOCHANGE:
 			    break;
 			case LSM_DONOTSEND:
-			    ND_PRINT((ndo, "donotsend-data "));
+			    ND_PRINT("donotsend-data ");
 			    break;
 			case LSM_SEND:
-			    ND_PRINT((ndo, "send-data "));
+			    ND_PRINT("send-data ");
 			    break;
 			default:
-			    ND_PRINT((ndo, "reserved-fcmod? %x", lsflags));
+			    ND_PRINT("reserved-fcmod? %x", lsflags);
 			    break;
 			}
 			break;
 		    case LSI_INTR:
-			ND_PRINT((ndo, "intr req count %d ", fcval));
+			ND_PRINT("intr req count %u ", fcval);
 			break;
 		    default:
-			ND_PRINT((ndo, "reserved-fcval-int? %x", lsflags));
+			ND_PRINT("reserved-fcval-int? %x", lsflags);
 			break;
 		    }
 		}
 		break;
 	    default:
-		ND_PRINT((ndo, "reserved-subtype? %x %d > %d", flags, src, dst));
+		ND_PRINT("reserved-subtype? %x %u > %u", flags, src, dst);
 		break;
 	    }
 	    break;
 	case MFT_ACK:
 	    switch (flags & NSP_SUBMASK) {
 	    case MFS_DACK:
-		ND_PRINT((ndo, "data-ack %d>%d ", src, dst));
+		ND_PRINT("data-ack %u>%u ", src, dst);
 		{
-		    struct ackmsg *amp = (struct ackmsg *)nspp;
-		    int ack;
+		    const struct ackmsg *amp = (const struct ackmsg *)nspp;
+		    u_int ack;
 
 		    if (nsplen < sizeof(struct ackmsg))
 			goto trunc;
-		    ND_TCHECK(*amp);
-		    ack = EXTRACT_LE_16BITS(amp->ak_acknum[0]);
+		    ND_TCHECK_SIZE(amp);
+		    ack = EXTRACT_LE_U_2(amp->ak_acknum[0]);
 		    if (ack & SGQ_ACK) {	/* acknum field */
 			if ((ack & SGQ_NAK) == SGQ_NAK)
-			    ND_PRINT((ndo, "nak %d ", ack & SGQ_MASK));
+			    ND_PRINT("nak %u ", ack & SGQ_MASK);
 			else
-			    ND_PRINT((ndo, "ack %d ", ack & SGQ_MASK));
-		        ack = EXTRACT_LE_16BITS(amp->ak_acknum[1]);
+			    ND_PRINT("ack %u ", ack & SGQ_MASK);
+		        ack = EXTRACT_LE_U_2(amp->ak_acknum[1]);
 			if (ack & SGQ_OACK) {	/* ackoth field */
 			    if ((ack & SGQ_ONAK) == SGQ_ONAK)
-				ND_PRINT((ndo, "onak %d ", ack & SGQ_MASK));
+				ND_PRINT("onak %u ", ack & SGQ_MASK);
 			    else
-				ND_PRINT((ndo, "oack %d ", ack & SGQ_MASK));
+				ND_PRINT("oack %u ", ack & SGQ_MASK);
 			}
 		    }
 		}
 		break;
 	    case MFS_IACK:
-		ND_PRINT((ndo, "ils-ack %d>%d ", src, dst));
+		ND_PRINT("ils-ack %u>%u ", src, dst);
 		{
-		    struct ackmsg *amp = (struct ackmsg *)nspp;
-		    int ack;
+		    const struct ackmsg *amp = (const struct ackmsg *)nspp;
+		    u_int ack;
 
 		    if (nsplen < sizeof(struct ackmsg))
 			goto trunc;
-		    ND_TCHECK(*amp);
-		    ack = EXTRACT_LE_16BITS(amp->ak_acknum[0]);
+		    ND_TCHECK_SIZE(amp);
+		    ack = EXTRACT_LE_U_2(amp->ak_acknum[0]);
 		    if (ack & SGQ_ACK) {	/* acknum field */
 			if ((ack & SGQ_NAK) == SGQ_NAK)
-			    ND_PRINT((ndo, "nak %d ", ack & SGQ_MASK));
+			    ND_PRINT("nak %u ", ack & SGQ_MASK);
 			else
-			    ND_PRINT((ndo, "ack %d ", ack & SGQ_MASK));
+			    ND_PRINT("ack %u ", ack & SGQ_MASK);
 			ND_TCHECK(amp->ak_acknum[1]);
-		        ack = EXTRACT_LE_16BITS(amp->ak_acknum[1]);
+		        ack = EXTRACT_LE_U_2(amp->ak_acknum[1]);
 			if (ack & SGQ_OACK) {	/* ackdat field */
 			    if ((ack & SGQ_ONAK) == SGQ_ONAK)
-				ND_PRINT((ndo, "nakdat %d ", ack & SGQ_MASK));
+				ND_PRINT("nakdat %u ", ack & SGQ_MASK);
 			    else
-				ND_PRINT((ndo, "ackdat %d ", ack & SGQ_MASK));
+				ND_PRINT("ackdat %u ", ack & SGQ_MASK);
 			}
 		    }
 		}
 		break;
 	    case MFS_CACK:
-		ND_PRINT((ndo, "conn-ack %d", dst));
+		ND_PRINT("conn-ack %u", dst);
 		break;
 	    default:
-		ND_PRINT((ndo, "reserved-acktype? %x %d > %d", flags, src, dst));
+		ND_PRINT("reserved-acktype? %x %u > %u", flags, src, dst);
 		break;
 	    }
 	    break;
@@ -1093,167 +1072,131 @@ print_nsp(netdissect_options *ndo,
 	    case MFS_CI:
 	    case MFS_RCI:
 		if ((flags & NSP_SUBMASK) == MFS_CI)
-		    ND_PRINT((ndo, "conn-initiate "));
+		    ND_PRINT("conn-initiate ");
 		else
-		    ND_PRINT((ndo, "retrans-conn-initiate "));
-		ND_PRINT((ndo, "%d>%d ", src, dst));
+		    ND_PRINT("retrans-conn-initiate ");
+		ND_PRINT("%u>%u ", src, dst);
 		{
-		    struct cimsg *cimp = (struct cimsg *)nspp;
-		    int services, info, segsize;
-#ifdef	PRINT_NSPDATA
-		    u_char *dp;
-#endif
+		    const struct cimsg *cimp = (const struct cimsg *)nspp;
+		    u_int services, info, segsize;
 
 		    if (nsplen < sizeof(struct cimsg))
 			goto trunc;
-		    ND_TCHECK(*cimp);
-		    services = EXTRACT_LE_8BITS(cimp->ci_services);
-		    info = EXTRACT_LE_8BITS(cimp->ci_info);
-		    segsize = EXTRACT_LE_16BITS(cimp->ci_segsize);
+		    ND_TCHECK_SIZE(cimp);
+		    services = EXTRACT_U_1(cimp->ci_services);
+		    info = EXTRACT_U_1(cimp->ci_info);
+		    segsize = EXTRACT_LE_U_2(cimp->ci_segsize);
 
 		    switch (services & COS_MASK) {
 		    case COS_NONE:
 			break;
 		    case COS_SEGMENT:
-			ND_PRINT((ndo, "seg "));
+			ND_PRINT("seg ");
 			break;
 		    case COS_MESSAGE:
-			ND_PRINT((ndo, "msg "));
-			break;
-		    case COS_CRYPTSER:
-			ND_PRINT((ndo, "crypt "));
+			ND_PRINT("msg ");
 			break;
 		    }
 		    switch (info & COI_MASK) {
 		    case COI_32:
-			ND_PRINT((ndo, "ver 3.2 "));
+			ND_PRINT("ver 3.2 ");
 			break;
 		    case COI_31:
-			ND_PRINT((ndo, "ver 3.1 "));
+			ND_PRINT("ver 3.1 ");
 			break;
 		    case COI_40:
-			ND_PRINT((ndo, "ver 4.0 "));
+			ND_PRINT("ver 4.0 ");
 			break;
 		    case COI_41:
-			ND_PRINT((ndo, "ver 4.1 "));
+			ND_PRINT("ver 4.1 ");
 			break;
 		    }
-		    ND_PRINT((ndo, "segsize %d ", segsize));
-#ifdef	PRINT_NSPDATA
-		    if (nsplen > sizeof(struct cimsg)) {
-			dp = &(nspp[sizeof(struct cimsg)]);
-			ND_TCHECK2(*dp, nsplen - sizeof(struct cimsg));
-			pdata(ndo, dp, nsplen - sizeof(struct cimsg));
-		    }
-#endif
+		    ND_PRINT("segsize %u ", segsize);
 		}
 		break;
 	    case MFS_CC:
-		ND_PRINT((ndo, "conn-confirm %d>%d ", src, dst));
+		ND_PRINT("conn-confirm %u>%u ", src, dst);
 		{
-		    struct ccmsg *ccmp = (struct ccmsg *)nspp;
-		    int services, info;
+		    const struct ccmsg *ccmp = (const struct ccmsg *)nspp;
+		    u_int services, info;
 		    u_int segsize, optlen;
-#ifdef	PRINT_NSPDATA
-		    u_char *dp;
-#endif
 
 		    if (nsplen < sizeof(struct ccmsg))
 			goto trunc;
-		    ND_TCHECK(*ccmp);
-		    services = EXTRACT_LE_8BITS(ccmp->cc_services);
-		    info = EXTRACT_LE_8BITS(ccmp->cc_info);
-		    segsize = EXTRACT_LE_16BITS(ccmp->cc_segsize);
-		    optlen = EXTRACT_LE_8BITS(ccmp->cc_optlen);
+		    ND_TCHECK_SIZE(ccmp);
+		    services = EXTRACT_U_1(ccmp->cc_services);
+		    info = EXTRACT_U_1(ccmp->cc_info);
+		    segsize = EXTRACT_LE_U_2(ccmp->cc_segsize);
+		    optlen = EXTRACT_U_1(ccmp->cc_optlen);
 
 		    switch (services & COS_MASK) {
 		    case COS_NONE:
 			break;
 		    case COS_SEGMENT:
-			ND_PRINT((ndo, "seg "));
+			ND_PRINT("seg ");
 			break;
 		    case COS_MESSAGE:
-			ND_PRINT((ndo, "msg "));
-			break;
-		    case COS_CRYPTSER:
-			ND_PRINT((ndo, "crypt "));
+			ND_PRINT("msg ");
 			break;
 		    }
 		    switch (info & COI_MASK) {
 		    case COI_32:
-			ND_PRINT((ndo, "ver 3.2 "));
+			ND_PRINT("ver 3.2 ");
 			break;
 		    case COI_31:
-			ND_PRINT((ndo, "ver 3.1 "));
+			ND_PRINT("ver 3.1 ");
 			break;
 		    case COI_40:
-			ND_PRINT((ndo, "ver 4.0 "));
+			ND_PRINT("ver 4.0 ");
 			break;
 		    case COI_41:
-			ND_PRINT((ndo, "ver 4.1 "));
+			ND_PRINT("ver 4.1 ");
 			break;
 		    }
-		    ND_PRINT((ndo, "segsize %d ", segsize));
+		    ND_PRINT("segsize %u ", segsize);
 		    if (optlen) {
-			ND_PRINT((ndo, "optlen %d ", optlen));
-#ifdef	PRINT_NSPDATA
-			if (optlen > nsplen - sizeof(struct ccmsg))
-			    goto trunc;
-			dp = &(nspp[sizeof(struct ccmsg)]);
-			ND_TCHECK2(*dp, optlen);
-			pdata(ndo, dp, optlen);
-#endif
+			ND_PRINT("optlen %u ", optlen);
 		    }
 		}
 		break;
 	    case MFS_DI:
-		ND_PRINT((ndo, "disconn-initiate %d>%d ", src, dst));
+		ND_PRINT("disconn-initiate %u>%u ", src, dst);
 		{
-		    struct dimsg *dimp = (struct dimsg *)nspp;
-		    int reason;
+		    const struct dimsg *dimp = (const struct dimsg *)nspp;
+		    u_int reason;
 		    u_int optlen;
-#ifdef	PRINT_NSPDATA
-		    u_char *dp;
-#endif
 
 		    if (nsplen < sizeof(struct dimsg))
 			goto trunc;
-		    ND_TCHECK(*dimp);
-		    reason = EXTRACT_LE_16BITS(dimp->di_reason);
-		    optlen = EXTRACT_LE_8BITS(dimp->di_optlen);
+		    ND_TCHECK_SIZE(dimp);
+		    reason = EXTRACT_LE_U_2(dimp->di_reason);
+		    optlen = EXTRACT_U_1(dimp->di_optlen);
 
 		    print_reason(ndo, reason);
 		    if (optlen) {
-			ND_PRINT((ndo, "optlen %d ", optlen));
-#ifdef	PRINT_NSPDATA
-			if (optlen > nsplen - sizeof(struct dimsg))
-			    goto trunc;
-			dp = &(nspp[sizeof(struct dimsg)]);
-			ND_TCHECK2(*dp, optlen);
-			pdata(ndo, dp, optlen);
-#endif
+			ND_PRINT("optlen %u ", optlen);
 		    }
 		}
 		break;
 	    case MFS_DC:
-		ND_PRINT((ndo, "disconn-confirm %d>%d ", src, dst));
+		ND_PRINT("disconn-confirm %u>%u ", src, dst);
 		{
-		    struct dcmsg *dcmp = (struct dcmsg *)nspp;
-		    int reason;
+		    const struct dcmsg *dcmp = (const struct dcmsg *)nspp;
+		    u_int reason;
 
-		    ND_TCHECK(*dcmp);
-		    reason = EXTRACT_LE_16BITS(dcmp->dc_reason);
+		    ND_TCHECK_SIZE(dcmp);
+		    reason = EXTRACT_LE_U_2(dcmp->dc_reason);
 
 		    print_reason(ndo, reason);
 		}
 		break;
 	    default:
-		ND_PRINT((ndo, "reserved-ctltype? %x %d > %d", flags, src, dst));
+		ND_PRINT("reserved-ctltype? %x %u > %u", flags, src, dst);
 		break;
 	    }
 	    break;
 	default:
-	    ND_PRINT((ndo, "reserved-type? %x %d > %d", flags, src, dst));
+	    ND_PRINT("reserved-type? %x %u > %u", flags, src, dst);
 	    break;
 	}
 	return (1);
@@ -1290,51 +1233,41 @@ static const struct tok reason2str[] = {
 
 static void
 print_reason(netdissect_options *ndo,
-             register int reason)
+             u_int reason)
 {
-	ND_PRINT((ndo, "%s ", tok2str(reason2str, "reason-%d", reason)));
+	ND_PRINT("%s ", tok2str(reason2str, "reason-%u", reason));
 }
 
 const char *
-dnnum_string(u_short dnaddr)
+dnnum_string(netdissect_options *ndo, u_short dnaddr)
 {
 	char *str;
 	size_t siz;
-	int area = (u_short)(dnaddr & AREAMASK) >> AREASHIFT;
-	int node = dnaddr & NODEMASK;
+	u_int area = (u_short)(dnaddr & AREAMASK) >> AREASHIFT;
+	u_int node = dnaddr & NODEMASK;
 
 	str = (char *)malloc(siz = sizeof("00.0000"));
 	if (str == NULL)
-		error("dnnum_string: malloc");
-	snprintf(str, siz, "%d.%d", area, node);
+		(*ndo->ndo_error)(ndo, "dnnum_string: malloc");
+	snprintf(str, siz, "%u.%u", area, node);
 	return(str);
 }
 
 const char *
-dnname_string(u_short dnaddr)
+dnname_string(netdissect_options *ndo, u_short dnaddr)
 {
 #ifdef HAVE_DNET_HTOA
 	struct dn_naddr dna;
+	char *dnname;
 
 	dna.a_len = sizeof(short);
 	memcpy((char *)dna.a_addr, (char *)&dnaddr, sizeof(short));
-	return (strdup(dnet_htoa(&dna)));
+	dnname = dnet_htoa(&dna);
+	if(dnname != NULL)
+		return (strdup(dnname));
+	else
+		return(dnnum_string(ndo, dnaddr));
 #else
-	return(dnnum_string(dnaddr));	/* punt */
+	return(dnnum_string(ndo, dnaddr));	/* punt */
 #endif
 }
-
-#ifdef	PRINT_NSPDATA
-static void
-pdata(netdissect_options *ndo,
-      u_char *dp, u_int maxlen)
-{
-	char c;
-	u_int x = maxlen;
-
-	while (x-- > 0) {
-	    c = *dp++;
-	    safeputchar(ndo, c);
-	}
-}
-#endif