X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/692590f38c7d9f18ccc546798089830ce9f0a52f..1a04b92e365f5ed01ca38619b41bcc4fc9cbd63c:/print-atalk.c

diff --git a/print-atalk.c b/print-atalk.c
index b00c08ff..6ba77d3e 100644
--- a/print-atalk.c
+++ b/print-atalk.c
@@ -17,38 +17,28 @@
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Format and print AppleTalk packets.
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-atalk.c,v 1.64 2000-10-30 06:22:14 guy Exp $ (LBL)";
-#endif
+/* \summary: AppleTalk printer */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/socket.h>
-
-#include <netinet/in.h>
+#include <netdissect-stdinc.h>
 
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
-#include <netdb.h>		/* for MAXHOSTNAMELEN on some platforms */
 
-#include "interface.h"
+#include "netdissect.h"
 #include "addrtoname.h"
 #include "ethertype.h"
-#include "extract.h"			/* must come after interface.h */
+#include "extract.h"
 #include "appletalk.h"
-#include "savestr.h"
 
-static struct tok type2str[] = {
+static const char tstr[] = "[|atalk]";
+
+static const struct tok type2str[] = {
 	{ ddpRTMP,		"rtmp" },
 	{ ddpRTMPrequest,	"rtmpReq" },
 	{ ddpECHO,		"echo" },
@@ -59,76 +49,111 @@ static struct tok type2str[] = {
 };
 
 struct aarp {
-	u_int16_t	htype, ptype;
-	u_int8_t	halen, palen;
-	u_int16_t	op;
-	u_int8_t	hsaddr[6];
-	u_int8_t	psaddr[4];
-	u_int8_t	hdaddr[6];
-	u_int8_t	pdaddr[4];
+	nd_uint16_t	htype, ptype;
+	nd_uint8_t	halen, palen;
+	nd_uint16_t	op;
+	uint8_t		hsaddr[6];
+	uint8_t		psaddr[4];
+	uint8_t		hdaddr[6];
+	uint8_t		pdaddr[4];
 };
 
-static char tstr[] = "[|atalk]";
-
-static void atp_print(const struct atATP *, u_int);
-static void atp_bitmap_print(u_char);
-static void nbp_print(const struct atNBP *, u_int, u_short, u_char, u_char);
-static const char *print_cstring(const char *, const u_char *);
-static const struct atNBPtuple *nbp_tuple_print(const struct atNBPtuple *,
+static void atp_print(netdissect_options *, const struct atATP *, u_int);
+static void atp_bitmap_print(netdissect_options *, u_char);
+static void nbp_print(netdissect_options *, const struct atNBP *, u_int, u_short, u_char, u_char);
+static const struct atNBPtuple *nbp_tuple_print(netdissect_options *ndo, const struct atNBPtuple *,
 						const u_char *,
 						u_short, u_char, u_char);
-static const struct atNBPtuple *nbp_name_print(const struct atNBPtuple *,
+static const struct atNBPtuple *nbp_name_print(netdissect_options *, const struct atNBPtuple *,
 					       const u_char *);
-static const char *ataddr_string(u_short, u_char);
-static void ddp_print(const u_char *, u_int, int, u_short, u_char, u_char);
-static const char *ddpskt_string(int);
+static const char *ataddr_string(netdissect_options *, u_short, u_char);
+static void ddp_print(netdissect_options *, const u_char *, u_int, int, u_short, u_char, u_char);
+static const char *ddpskt_string(netdissect_options *, int);
+
+/*
+ * Print LLAP packets received on a physical LocalTalk interface.
+ */
+u_int
+ltalk_if_print(netdissect_options *ndo,
+               const struct pcap_pkthdr *h, const u_char *p)
+{
+	u_int hdrlen;
+
+	hdrlen = llap_print(ndo, p, h->len);
+	if (hdrlen == 0) {
+		/* Cut short by the snapshot length. */
+		return (h->caplen);
+	}
+	return (hdrlen);
+}
 
 /*
  * Print AppleTalk LLAP packets.
  */
-void
-llap_print(register const u_char *bp, u_int length)
+u_int
+llap_print(netdissect_options *ndo,
+           const u_char *bp, u_int length)
 {
-	register const struct LAP *lp;
-	register const struct atDDP *dp;
-	register const struct atShortDDP *sdp;
+	const struct LAP *lp;
+	const struct atDDP *dp;
+	const struct atShortDDP *sdp;
 	u_short snet;
+	u_int hdrlen;
 
-	lp = (struct LAP *)bp;
+	if (length < sizeof(*lp)) {
+		ND_PRINT((ndo, " [|llap %u]", length));
+		return (length);
+	}
+	if (!ND_TTEST_LEN(bp, sizeof(*lp))) {
+		ND_PRINT((ndo, " [|llap]"));
+		return (0);	/* cut short by the snapshot length */
+	}
+	lp = (const struct LAP *)bp;
 	bp += sizeof(*lp);
 	length -= sizeof(*lp);
-	switch (lp->type) {
+	hdrlen = sizeof(*lp);
+	switch (EXTRACT_U_1(lp->type)) {
 
 	case lapShortDDP:
 		if (length < ddpSSize) {
-			(void)printf(" [|sddp %d]", length);
-			return;
+			ND_PRINT((ndo, " [|sddp %u]", length));
+			return (length);
+		}
+		if (!ND_TTEST_LEN(bp, ddpSSize)) {
+			ND_PRINT((ndo, " [|sddp]"));
+			return (0);	/* cut short by the snapshot length */
 		}
 		sdp = (const struct atShortDDP *)bp;
-		printf("%s.%s",
-		    ataddr_string(0, lp->src), ddpskt_string(sdp->srcSkt));
-		printf(" > %s.%s:",
-		    ataddr_string(0, lp->dst), ddpskt_string(sdp->dstSkt));
+		ND_PRINT((ndo, "%s.%s",
+		    ataddr_string(ndo, 0, EXTRACT_U_1(lp->src)), ddpskt_string(ndo, EXTRACT_U_1(sdp->srcSkt))));
+		ND_PRINT((ndo, " > %s.%s:",
+		    ataddr_string(ndo, 0, EXTRACT_U_1(lp->dst)), ddpskt_string(ndo, EXTRACT_U_1(sdp->dstSkt))));
 		bp += ddpSSize;
 		length -= ddpSSize;
-		ddp_print(bp, length, sdp->type, 0, lp->src, sdp->srcSkt);
+		hdrlen += ddpSSize;
+		ddp_print(ndo, bp, length, EXTRACT_U_1(sdp->type), 0, EXTRACT_U_1(lp->src), EXTRACT_U_1(sdp->srcSkt));
 		break;
 
 	case lapDDP:
 		if (length < ddpSize) {
-			(void)printf(" [|ddp %d]", length);
-			return;
+			ND_PRINT((ndo, " [|ddp %u]", length));
+			return (length);
+		}
+		if (!ND_TTEST_LEN(bp, ddpSize)) {
+			ND_PRINT((ndo, " [|ddp]"));
+			return (0);	/* cut short by the snapshot length */
 		}
 		dp = (const struct atDDP *)bp;
-		snet = EXTRACT_16BITS(&dp->srcNet);
-		printf("%s.%s", ataddr_string(snet, dp->srcNode),
-		    ddpskt_string(dp->srcSkt));
-		printf(" > %s.%s:",
-		    ataddr_string(EXTRACT_16BITS(&dp->dstNet), dp->dstNode),
-		    ddpskt_string(dp->dstSkt));
+		snet = EXTRACT_BE_U_2(dp->srcNet);
+		ND_PRINT((ndo, "%s.%s", ataddr_string(ndo, snet, EXTRACT_U_1(dp->srcNode)),
+		    ddpskt_string(ndo, EXTRACT_U_1(dp->srcSkt))));
+		ND_PRINT((ndo, " > %s.%s:",
+		    ataddr_string(ndo, EXTRACT_BE_U_2(dp->dstNet), EXTRACT_U_1(dp->dstNode)),
+		    ddpskt_string(ndo, EXTRACT_U_1(dp->dstSkt))));
 		bp += ddpSize;
 		length -= ddpSize;
-		ddp_print(bp, length, dp->type, snet, dp->srcNode, dp->srcSkt);
+		hdrlen += ddpSize;
+		ddp_print(ndo, bp, length, EXTRACT_U_1(dp->type), snet, EXTRACT_U_1(dp->srcNode), EXTRACT_U_1(dp->srcSkt));
 		break;
 
 #ifdef notdef
@@ -138,10 +163,11 @@ llap_print(register const u_char *bp, u_int length)
 #endif
 
 	default:
-		printf("%d > %d at-lap#%d %d",
-		    lp->src, lp->dst, lp->type, length);
+		ND_PRINT((ndo, "%u > %u at-lap#%u %u",
+		    EXTRACT_U_1(lp->src), EXTRACT_U_1(lp->dst), EXTRACT_U_1(lp->type), length));
 		break;
 	}
+	return (hdrlen);
 }
 
 /*
@@ -150,182 +176,208 @@ llap_print(register const u_char *bp, u_int length)
  * packets in them).
  */
 void
-atalk_print(register const u_char *bp, u_int length)
+atalk_print(netdissect_options *ndo,
+            const u_char *bp, u_int length)
 {
-	register const struct atDDP *dp;
+	const struct atDDP *dp;
 	u_short snet;
 
+        if(!ndo->ndo_eflag)
+            ND_PRINT((ndo, "AT "));
+
 	if (length < ddpSize) {
-	  (void)printf(" [|ddp %d]", length);
-	  return;
+		ND_PRINT((ndo, " [|ddp %u]", length));
+		return;
+	}
+	if (!ND_TTEST_LEN(bp, ddpSize)) {
+		ND_PRINT((ndo, " [|ddp]"));
+		return;
 	}
 	dp = (const struct atDDP *)bp;
-	snet = EXTRACT_16BITS(&dp->srcNet);
-	printf("%s.%s", ataddr_string(snet, dp->srcNode),
-	       ddpskt_string(dp->srcSkt));
-	printf(" > %s.%s:",
-	       ataddr_string(EXTRACT_16BITS(&dp->dstNet), dp->dstNode),
-	       ddpskt_string(dp->dstSkt));
+	snet = EXTRACT_BE_U_2(dp->srcNet);
+	ND_PRINT((ndo, "%s.%s", ataddr_string(ndo, snet, EXTRACT_U_1(dp->srcNode)),
+	       ddpskt_string(ndo, EXTRACT_U_1(dp->srcSkt))));
+	ND_PRINT((ndo, " > %s.%s: ",
+	       ataddr_string(ndo, EXTRACT_BE_U_2(dp->dstNet), EXTRACT_U_1(dp->dstNode)),
+	       ddpskt_string(ndo, EXTRACT_U_1(dp->dstSkt))));
 	bp += ddpSize;
 	length -= ddpSize;
-	ddp_print(bp, length, dp->type, snet, dp->srcNode, dp->srcSkt);
+	ddp_print(ndo, bp, length, EXTRACT_U_1(dp->type), snet, EXTRACT_U_1(dp->srcNode), EXTRACT_U_1(dp->srcSkt));
 }
 
 /* XXX should probably pass in the snap header and do checks like arp_print() */
 void
-aarp_print(register const u_char *bp, u_int length)
+aarp_print(netdissect_options *ndo,
+           const u_char *bp, u_int length)
 {
-	register const struct aarp *ap;
+	const struct aarp *ap;
 
-#define AT(member) ataddr_string((ap->member[1]<<8)|ap->member[2],ap->member[3])
+#define AT(member) ataddr_string(ndo, (ap->member[1]<<8)|ap->member[2],ap->member[3])
 
-	printf("aarp ");
+	ND_PRINT((ndo, "aarp "));
 	ap = (const struct aarp *)bp;
-	if (ntohs(ap->htype) == 1 && ntohs(ap->ptype) == ETHERTYPE_ATALK &&
-	    ap->halen == 6 && ap->palen == 4 )
-		switch (ntohs(ap->op)) {
+	if (!ND_TTEST(*ap)) {
+		/* Just bail if we don't have the whole chunk. */
+		ND_PRINT((ndo, " [|aarp]"));
+		return;
+	}
+	if (length < sizeof(*ap)) {
+		ND_PRINT((ndo, " [|aarp %u]", length));
+		return;
+	}
+	if (EXTRACT_BE_U_2(ap->htype) == 1 &&
+	    EXTRACT_BE_U_2(ap->ptype) == ETHERTYPE_ATALK &&
+	    EXTRACT_U_1(ap->halen) == 6 && EXTRACT_U_1(ap->palen) == 4 )
+		switch (EXTRACT_BE_U_2(ap->op)) {
 
 		case 1:				/* request */
-			(void)printf("who-has %s tell %s",
-			    AT(pdaddr), AT(psaddr));
+			ND_PRINT((ndo, "who-has %s tell %s", AT(pdaddr), AT(psaddr)));
 			return;
 
 		case 2:				/* response */
-			(void)printf("reply %s is-at %s",
-			    AT(pdaddr), etheraddr_string(ap->hdaddr));
+			ND_PRINT((ndo, "reply %s is-at %s", AT(psaddr), etheraddr_string(ndo, ap->hsaddr)));
 			return;
 
 		case 3:				/* probe (oy!) */
-			(void)printf("probe %s tell %s",
-			    AT(pdaddr), AT(psaddr));
+			ND_PRINT((ndo, "probe %s tell %s", AT(pdaddr), AT(psaddr)));
 			return;
 		}
-	(void)printf("len %u op %u htype %u ptype %#x halen %u palen %u",
-	    length, ntohs(ap->op), ntohs(ap->htype), ntohs(ap->ptype),
-	    ap->halen, ap->palen);
+	ND_PRINT((ndo, "len %u op %u htype %u ptype %#x halen %u palen %u",
+	    length, EXTRACT_BE_U_2(ap->op), EXTRACT_BE_U_2(ap->htype),
+	    EXTRACT_BE_U_2(ap->ptype), EXTRACT_U_1(ap->halen), EXTRACT_U_1(ap->palen)));
 }
 
 /*
  * Print AppleTalk Datagram Delivery Protocol packets.
  */
 static void
-ddp_print(register const u_char *bp, register u_int length, register int t,
-	  register u_short snet, register u_char snode, u_char skt)
+ddp_print(netdissect_options *ndo,
+          const u_char *bp, u_int length, int t,
+          u_short snet, u_char snode, u_char skt)
 {
 
 	switch (t) {
 
 	case ddpNBP:
-		nbp_print((const struct atNBP *)bp, length, snet, snode, skt);
+		nbp_print(ndo, (const struct atNBP *)bp, length, snet, snode, skt);
 		break;
 
 	case ddpATP:
-		atp_print((const struct atATP *)bp, length);
+		atp_print(ndo, (const struct atATP *)bp, length);
+		break;
+
+	case ddpEIGRP:
+		eigrp_print(ndo, bp, length);
 		break;
 
 	default:
-		(void)printf(" at-%s %d", tok2str(type2str, NULL, t), length);
+		ND_PRINT((ndo, " at-%s %d", tok2str(type2str, NULL, t), length));
 		break;
 	}
 }
 
 static void
-atp_print(register const struct atATP *ap, u_int length)
+atp_print(netdissect_options *ndo,
+          const struct atATP *ap, u_int length)
 {
-	char c;
-	u_int32_t data;
+	uint8_t control;
+	uint32_t data;
 
-	if ((const u_char *)(ap + 1) > snapend) {
+	if ((const u_char *)(ap + 1) > ndo->ndo_snapend) {
 		/* Just bail if we don't have the whole chunk. */
-		fputs(tstr, stdout);
+		ND_PRINT((ndo, "%s", tstr));
+		return;
+	}
+	if (length < sizeof(*ap)) {
+		ND_PRINT((ndo, " [|atp %u]", length));
 		return;
 	}
 	length -= sizeof(*ap);
-	switch (ap->control & 0xc0) {
+	control = EXTRACT_U_1(ap->control);
+	switch (control & 0xc0) {
 
 	case atpReqCode:
-		(void)printf(" atp-req%s %d",
-			     ap->control & atpXO? " " : "*",
-			     EXTRACT_16BITS(&ap->transID));
+		ND_PRINT((ndo, " atp-req%s %u",
+			     control & atpXO? " " : "*",
+			     EXTRACT_BE_U_2(ap->transID)));
 
-		atp_bitmap_print(ap->bitmap);
+		atp_bitmap_print(ndo, EXTRACT_U_1(ap->bitmap));
 
 		if (length != 0)
-			(void)printf(" [len=%d]", length);
+			ND_PRINT((ndo, " [len=%u]", length));
 
-		switch (ap->control & (atpEOM|atpSTS)) {
+		switch (control & (atpEOM|atpSTS)) {
 		case atpEOM:
-			(void)printf(" [EOM]");
+			ND_PRINT((ndo, " [EOM]"));
 			break;
 		case atpSTS:
-			(void)printf(" [STS]");
+			ND_PRINT((ndo, " [STS]"));
 			break;
 		case atpEOM|atpSTS:
-			(void)printf(" [EOM,STS]");
+			ND_PRINT((ndo, " [EOM,STS]"));
 			break;
 		}
 		break;
 
 	case atpRspCode:
-		(void)printf(" atp-resp%s%d:%d (%d)",
-			     ap->control & atpEOM? "*" : " ",
-			     EXTRACT_16BITS(&ap->transID), ap->bitmap, length);
-		switch (ap->control & (atpXO|atpSTS)) {
+		ND_PRINT((ndo, " atp-resp%s%d:%u (%u)",
+			     control & atpEOM? "*" : " ",
+			     EXTRACT_BE_U_2(ap->transID), EXTRACT_U_1(ap->bitmap), length));
+		switch (control & (atpXO|atpSTS)) {
 		case atpXO:
-			(void)printf(" [XO]");
+			ND_PRINT((ndo, " [XO]"));
 			break;
 		case atpSTS:
-			(void)printf(" [STS]");
+			ND_PRINT((ndo, " [STS]"));
 			break;
 		case atpXO|atpSTS:
-			(void)printf(" [XO,STS]");
+			ND_PRINT((ndo, " [XO,STS]"));
 			break;
 		}
 		break;
 
 	case atpRelCode:
-		(void)printf(" atp-rel  %d", EXTRACT_16BITS(&ap->transID));
+		ND_PRINT((ndo, " atp-rel  %u", EXTRACT_BE_U_2(ap->transID)));
 
-		atp_bitmap_print(ap->bitmap);
+		atp_bitmap_print(ndo, EXTRACT_U_1(ap->bitmap));
 
 		/* length should be zero */
 		if (length)
-			(void)printf(" [len=%d]", length);
+			ND_PRINT((ndo, " [len=%u]", length));
 
 		/* there shouldn't be any control flags */
-		if (ap->control & (atpXO|atpEOM|atpSTS)) {
-			c = '[';
-			if (ap->control & atpXO) {
-				(void)printf("%cXO", c);
+		if (control & (atpXO|atpEOM|atpSTS)) {
+			char c = '[';
+			if (control & atpXO) {
+				ND_PRINT((ndo, "%cXO", c));
 				c = ',';
 			}
-			if (ap->control & atpEOM) {
-				(void)printf("%cEOM", c);
+			if (control & atpEOM) {
+				ND_PRINT((ndo, "%cEOM", c));
 				c = ',';
 			}
-			if (ap->control & atpSTS) {
-				(void)printf("%cSTS", c);
-				c = ',';
+			if (control & atpSTS) {
+				ND_PRINT((ndo, "%cSTS", c));
 			}
-			(void)printf("]");
+			ND_PRINT((ndo, "]"));
 		}
 		break;
 
 	default:
-		(void)printf(" atp-0x%x  %d (%d)", ap->control,
-			     EXTRACT_16BITS(&ap->transID), length);
+		ND_PRINT((ndo, " atp-0x%x  %d (%u)", control,
+			     EXTRACT_BE_U_2(ap->transID), length));
 		break;
 	}
-	data = EXTRACT_32BITS(&ap->userData);
+	data = EXTRACT_BE_U_4(ap->userData);
 	if (data != 0)
-		(void)printf(" 0x%x", data);
+		ND_PRINT((ndo, " 0x%x", data));
 }
 
 static void
-atp_bitmap_print(register u_char bm)
+atp_bitmap_print(netdissect_options *ndo,
+                 u_char bm)
 {
-	register char c;
-	register int i;
+	int i;
 
 	/*
 	 * The '& 0xff' below is needed for compilers that want to sign
@@ -333,162 +385,175 @@ atp_bitmap_print(register u_char bm)
 	 * (gcc is smart enough to eliminate it, at least on the Sparc).
 	 */
 	if ((bm + 1) & (bm & 0xff)) {
-		c = '<';
+		char c = '<';
 		for (i = 0; bm; ++i) {
 			if (bm & 1) {
-				(void)printf("%c%d", c, i);
+				ND_PRINT((ndo, "%c%d", c, i));
 				c = ',';
 			}
 			bm >>= 1;
 		}
-		(void)printf(">");
+		ND_PRINT((ndo, ">"));
 	} else {
 		for (i = 0; bm; ++i)
 			bm >>= 1;
 		if (i > 1)
-			(void)printf("<0-%d>", i - 1);
+			ND_PRINT((ndo, "<0-%d>", i - 1));
 		else
-			(void)printf("<0>");
+			ND_PRINT((ndo, "<0>"));
 	}
 }
 
 static void
-nbp_print(register const struct atNBP *np, u_int length, register u_short snet,
-	  register u_char snode, register u_char skt)
+nbp_print(netdissect_options *ndo,
+          const struct atNBP *np, u_int length, u_short snet,
+          u_char snode, u_char skt)
 {
-	register const struct atNBPtuple *tp =
-			(struct atNBPtuple *)((u_char *)np + nbpHeaderSize);
+	const struct atNBPtuple *tp =
+		(const struct atNBPtuple *)((const u_char *)np + nbpHeaderSize);
+	uint8_t control;
 	int i;
 	const u_char *ep;
 
+	if (length < nbpHeaderSize) {
+		ND_PRINT((ndo, " truncated-nbp %u", length));
+		return;
+	}
+
 	length -= nbpHeaderSize;
 	if (length < 8) {
 		/* must be room for at least one tuple */
-		(void)printf(" truncated-nbp %d", length + nbpHeaderSize);
+		ND_PRINT((ndo, " truncated-nbp %u", length + nbpHeaderSize));
 		return;
 	}
 	/* ep points to end of available data */
-	ep = snapend;
+	ep = ndo->ndo_snapend;
 	if ((const u_char *)tp > ep) {
-		fputs(tstr, stdout);
+		ND_PRINT((ndo, "%s", tstr));
 		return;
 	}
-	switch (i = np->control & 0xf0) {
+	control = EXTRACT_U_1(np->control);
+	switch (i = (control & 0xf0)) {
 
 	case nbpBrRq:
 	case nbpLkUp:
-		(void)printf(i == nbpLkUp? " nbp-lkup %d:":" nbp-brRq %d:",
-			     np->id);
+		ND_PRINT((ndo, i == nbpLkUp? " nbp-lkup %u:":" nbp-brRq %u:", EXTRACT_U_1(np->id)));
 		if ((const u_char *)(tp + 1) > ep) {
-			fputs(tstr, stdout);
+			ND_PRINT((ndo, "%s", tstr));
 			return;
 		}
-		(void)nbp_name_print(tp, ep);
+		(void)nbp_name_print(ndo, tp, ep);
 		/*
 		 * look for anomalies: the spec says there can only
 		 * be one tuple, the address must match the source
 		 * address and the enumerator should be zero.
 		 */
-		if ((np->control & 0xf) != 1)
-			(void)printf(" [ntup=%d]", np->control & 0xf);
-		if (tp->enumerator)
-			(void)printf(" [enum=%d]", tp->enumerator);
-		if (EXTRACT_16BITS(&tp->net) != snet ||
-		    tp->node != snode || tp->skt != skt)
-			(void)printf(" [addr=%s.%d]",
-			    ataddr_string(EXTRACT_16BITS(&tp->net),
-			    tp->node), tp->skt);
+		if ((control & 0xf) != 1)
+			ND_PRINT((ndo, " [ntup=%u]", control & 0xf));
+		if (EXTRACT_U_1(tp->enumerator))
+			ND_PRINT((ndo, " [enum=%u]", EXTRACT_U_1(tp->enumerator)));
+		if (EXTRACT_BE_U_2(tp->net) != snet ||
+		    EXTRACT_U_1(tp->node) != snode ||
+		    EXTRACT_U_1(tp->skt) != skt)
+			ND_PRINT((ndo, " [addr=%s.%d]",
+			    ataddr_string(ndo, EXTRACT_BE_U_2(tp->net),
+					  EXTRACT_U_1(tp->node)),
+					  EXTRACT_U_1(tp->skt)));
 		break;
 
 	case nbpLkUpReply:
-		(void)printf(" nbp-reply %d:", np->id);
+		ND_PRINT((ndo, " nbp-reply %u:", EXTRACT_U_1(np->id)));
 
 		/* print each of the tuples in the reply */
-		for (i = np->control & 0xf; --i >= 0 && tp; )
-			tp = nbp_tuple_print(tp, ep, snet, snode, skt);
+		for (i = control & 0xf; --i >= 0 && tp; )
+			tp = nbp_tuple_print(ndo, tp, ep, snet, snode, skt);
 		break;
 
 	default:
-		(void)printf(" nbp-0x%x  %d (%d)", np->control, np->id,
-				length);
+		ND_PRINT((ndo, " nbp-0x%x  %u (%u)", control, EXTRACT_U_1(np->id), length));
 		break;
 	}
 }
 
 /* print a counted string */
 static const char *
-print_cstring(register const char *cp, register const u_char *ep)
+print_cstring(netdissect_options *ndo,
+              const char *cp, const u_char *ep)
 {
-	register u_int length;
+	u_int length;
 
 	if (cp >= (const char *)ep) {
-		fputs(tstr, stdout);
+		ND_PRINT((ndo, "%s", tstr));
 		return (0);
 	}
-	length = *cp++;
+	length = EXTRACT_U_1(cp);
+	cp++;
 
 	/* Spec says string can be at most 32 bytes long */
 	if (length > 32) {
-		(void)printf("[len=%u]", length);
+		ND_PRINT((ndo, "[len=%u]", length));
 		return (0);
 	}
-	while ((int)--length >= 0) {
-		if (cp >= (char *)ep) {
-			fputs(tstr, stdout);
+	while (length != 0) {
+		if (cp >= (const char *)ep) {
+			ND_PRINT((ndo, "%s", tstr));
 			return (0);
 		}
-		putchar(*cp++);
+		ND_PRINT((ndo, "%c", EXTRACT_U_1(cp)));
+		cp++;
+		length--;
 	}
 	return (cp);
 }
 
 static const struct atNBPtuple *
-nbp_tuple_print(register const struct atNBPtuple *tp,
-		register const u_char *ep,
-		register u_short snet, register u_char snode,
-		register u_char skt)
+nbp_tuple_print(netdissect_options *ndo,
+                const struct atNBPtuple *tp, const u_char *ep,
+                u_short snet, u_char snode, u_char skt)
 {
-	register const struct atNBPtuple *tpn;
+	const struct atNBPtuple *tpn;
 
 	if ((const u_char *)(tp + 1) > ep) {
-		fputs(tstr, stdout);
+		ND_PRINT((ndo, "%s", tstr));
 		return 0;
 	}
-	tpn = nbp_name_print(tp, ep);
+	tpn = nbp_name_print(ndo, tp, ep);
 
 	/* if the enumerator isn't 1, print it */
-	if (tp->enumerator != 1)
-		(void)printf("(%d)", tp->enumerator);
+	if (EXTRACT_U_1(tp->enumerator) != 1)
+		ND_PRINT((ndo, "(%u)", EXTRACT_U_1(tp->enumerator)));
 
 	/* if the socket doesn't match the src socket, print it */
-	if (tp->skt != skt)
-		(void)printf(" %d", tp->skt);
+	if (EXTRACT_U_1(tp->skt) != skt)
+		ND_PRINT((ndo, " %u", EXTRACT_U_1(tp->skt)));
 
 	/* if the address doesn't match the src address, it's an anomaly */
-	if (EXTRACT_16BITS(&tp->net) != snet || tp->node != snode)
-		(void)printf(" [addr=%s]",
-		    ataddr_string(EXTRACT_16BITS(&tp->net), tp->node));
+	if (EXTRACT_BE_U_2(tp->net) != snet ||
+	    EXTRACT_U_1(tp->node) != snode)
+		ND_PRINT((ndo, " [addr=%s]",
+		    ataddr_string(ndo, EXTRACT_BE_U_2(tp->net), EXTRACT_U_1(tp->node))));
 
 	return (tpn);
 }
 
 static const struct atNBPtuple *
-nbp_name_print(const struct atNBPtuple *tp, register const u_char *ep)
+nbp_name_print(netdissect_options *ndo,
+               const struct atNBPtuple *tp, const u_char *ep)
 {
-	register const char *cp = (const char *)tp + nbpTupleSize;
+	const char *cp = (const char *)tp + nbpTupleSize;
 
-	putchar(' ');
+	ND_PRINT((ndo, " "));
 
 	/* Object */
-	putchar('"');
-	if ((cp = print_cstring(cp, ep)) != NULL) {
+	ND_PRINT((ndo, "\""));
+	if ((cp = print_cstring(ndo, cp, ep)) != NULL) {
 		/* Type */
-		putchar(':');
-		if ((cp = print_cstring(cp, ep)) != NULL) {
+		ND_PRINT((ndo, ":"));
+		if ((cp = print_cstring(ndo, cp, ep)) != NULL) {
 			/* Zone */
-			putchar('@');
-			if ((cp = print_cstring(cp, ep)) != NULL)
-				putchar('"');
+			ND_PRINT((ndo, "@"));
+			if ((cp = print_cstring(ndo, cp, ep)) != NULL)
+				ND_PRINT((ndo, "\""));
 		}
 	}
 	return ((const struct atNBPtuple *)cp);
@@ -506,11 +571,12 @@ struct hnamemem {
 static struct hnamemem hnametable[HASHNAMESIZE];
 
 static const char *
-ataddr_string(u_short atnet, u_char athost)
+ataddr_string(netdissect_options *ndo,
+              u_short atnet, u_char athost)
 {
-	register struct hnamemem *tp, *tp2;
-	register int i = (atnet << 8) | athost;
-	char nambuf[MAXHOSTNAMELEN + 20];
+	struct hnamemem *tp, *tp2;
+	int i = (atnet << 8) | athost;
+	char nambuf[256+1];
 	static int first = 1;
 	FILE *fp;
 
@@ -518,31 +584,32 @@ ataddr_string(u_short atnet, u_char athost)
 	 * if this is the first call, see if there's an AppleTalk
 	 * number to name map file.
 	 */
-	if (first && (first = 0, !nflag)
+	if (first && (first = 0, !ndo->ndo_nflag)
 	    && (fp = fopen("/etc/atalk.names", "r"))) {
 		char line[256];
-		int i1, i2, i3;
+		int i1, i2;
 
 		while (fgets(line, sizeof(line), fp)) {
 			if (line[0] == '\n' || line[0] == 0 || line[0] == '#')
 				continue;
-			if (sscanf(line, "%d.%d.%d %256s", &i1, &i2, &i3,
-				     nambuf) == 4)
+			if (sscanf(line, "%d.%d %256s", &i1, &i2, nambuf) == 3)
 				/* got a hostname. */
-				i3 |= ((i1 << 8) | i2) << 8;
-			else if (sscanf(line, "%d.%d %256s", &i1, &i2,
-					nambuf) == 3)
+				i2 |= (i1 << 8);
+			else if (sscanf(line, "%d %256s", &i1, nambuf) == 2)
 				/* got a net name */
-				i3 = (((i1 << 8) | i2) << 8) | 255;
+				i2 = (i1 << 8) | 255;
 			else
 				continue;
 
-			for (tp = &hnametable[i3 & (HASHNAMESIZE-1)];
+			for (tp = &hnametable[i2 & (HASHNAMESIZE-1)];
 			     tp->nxt; tp = tp->nxt)
 				;
-			tp->addr = i3;
-			tp->nxt = newhnamemem();
-			tp->name = savestr(nambuf);
+			tp->addr = i2;
+			tp->nxt = newhnamemem(ndo);
+			tp->name = strdup(nambuf);
+			if (tp->name == NULL)
+				(*ndo->ndo_error)(ndo,
+						  "ataddr_string: strdup(nambuf)");
 		}
 		fclose(fp);
 	}
@@ -556,27 +623,30 @@ ataddr_string(u_short atnet, u_char athost)
 	for (tp2 = &hnametable[i & (HASHNAMESIZE-1)]; tp2->nxt; tp2 = tp2->nxt)
 		if (tp2->addr == i) {
 			tp->addr = (atnet << 8) | athost;
-			tp->nxt = newhnamemem();
+			tp->nxt = newhnamemem(ndo);
 			(void)snprintf(nambuf, sizeof(nambuf), "%s.%d",
 			    tp2->name, athost);
-			tp->name = savestr(nambuf);
+			tp->name = strdup(nambuf);
+			if (tp->name == NULL)
+				(*ndo->ndo_error)(ndo,
+						  "ataddr_string: strdup(nambuf)");
 			return (tp->name);
 		}
 
 	tp->addr = (atnet << 8) | athost;
-	tp->nxt = newhnamemem();
+	tp->nxt = newhnamemem(ndo);
 	if (athost != 255)
-		(void)snprintf(nambuf, sizeof(nambuf), "%d.%d.%d",
-		    atnet >> 8, atnet & 0xff, athost);
+		(void)snprintf(nambuf, sizeof(nambuf), "%d.%d", atnet, athost);
 	else
-		(void)snprintf(nambuf, sizeof(nambuf), "%d.%d", atnet >> 8,
-		    atnet & 0xff);
-	tp->name = savestr(nambuf);
+		(void)snprintf(nambuf, sizeof(nambuf), "%d", atnet);
+	tp->name = strdup(nambuf);
+	if (tp->name == NULL)
+		(*ndo->ndo_error)(ndo, "ataddr_string: strdup(nambuf)");
 
 	return (tp->name);
 }
 
-static struct tok skt2str[] = {
+static const struct tok skt2str[] = {
 	{ rtmpSkt,	"rtmp" },	/* routing table maintenance */
 	{ nbpSkt,	"nis" },	/* name info socket */
 	{ echoSkt,	"echo" },	/* AppleTalk echo protocol */
@@ -585,11 +655,12 @@ static struct tok skt2str[] = {
 };
 
 static const char *
-ddpskt_string(register int skt)
+ddpskt_string(netdissect_options *ndo,
+              int skt)
 {
 	static char buf[8];
 
-	if (nflag) {
+	if (ndo->ndo_nflag) {
 		(void)snprintf(buf, sizeof(buf), "%d", skt);
 		return (buf);
 	}