X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/78bf524046ca7f215c44f4e9f23c5839c246a2dc..refs/pull/433/head:/print-atalk.c?ds=sidebyside

diff --git a/print-atalk.c b/print-atalk.c
index 2b7b7686..61405493 100644
--- a/print-atalk.c
+++ b/print-atalk.c
@@ -21,11 +21,7 @@
  * Format and print AppleTalk packets.
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-atalk.c,v 1.81 2004-05-01 09:41:50 hannes Exp $ (LBL)";
-#endif
-
+#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -33,9 +29,7 @@ static const char rcsid[] _U_ =
 #include <tcpdump-stdinc.h>
 
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
-#include <pcap.h>
 
 #include "interface.h"
 #include "addrtoname.h"
@@ -43,7 +37,9 @@ static const char rcsid[] _U_ =
 #include "extract.h"			/* must come after interface.h */
 #include "appletalk.h"
 
-static struct tok type2str[] = {
+static const char tstr[] = "[|atalk]";
+
+static const struct tok type2str[] = {
 	{ ddpRTMP,		"rtmp" },
 	{ ddpRTMPrequest,	"rtmpReq" },
 	{ ddpECHO,		"echo" },
@@ -54,44 +50,43 @@ 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];
+	uint16_t	htype, ptype;
+	uint8_t		halen, palen;
+	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(const struct pcap_pkthdr *h, const u_char *p)
+ltalk_if_print(netdissect_options *ndo,
+               const struct pcap_pkthdr *h, const u_char *p)
 {
-	return (llap_print(p, h->caplen));
+	return (llap_print(ndo, p, h->caplen));
 }
 
 /*
  * Print AppleTalk LLAP packets.
  */
 u_int
-llap_print(register const u_char *bp, u_int length)
+llap_print(netdissect_options *ndo,
+           register const u_char *bp, u_int length)
 {
 	register const struct LAP *lp;
 	register const struct atDDP *dp;
@@ -100,7 +95,7 @@ llap_print(register const u_char *bp, u_int length)
 	u_int hdrlen;
 
 	if (length < sizeof(*lp)) {
-		(void)printf(" [|llap %u]", length);
+		ND_PRINT((ndo, " [|llap %u]", length));
 		return (length);
 	}
 	lp = (const struct LAP *)bp;
@@ -111,36 +106,36 @@ llap_print(register const u_char *bp, u_int length)
 
 	case lapShortDDP:
 		if (length < ddpSSize) {
-			(void)printf(" [|sddp %u]", length);
+			ND_PRINT((ndo, " [|sddp %u]", length));
 			return (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, lp->src), ddpskt_string(ndo, sdp->srcSkt)));
+		ND_PRINT((ndo, " > %s.%s:",
+		    ataddr_string(ndo, 0, lp->dst), ddpskt_string(ndo, sdp->dstSkt)));
 		bp += ddpSSize;
 		length -= ddpSSize;
 		hdrlen += ddpSSize;
-		ddp_print(bp, length, sdp->type, 0, lp->src, sdp->srcSkt);
+		ddp_print(ndo, bp, length, sdp->type, 0, lp->src, sdp->srcSkt);
 		break;
 
 	case lapDDP:
 		if (length < ddpSize) {
-			(void)printf(" [|ddp %u]", length);
+			ND_PRINT((ndo, " [|ddp %u]", length));
 			return (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));
+		ND_PRINT((ndo, "%s.%s", ataddr_string(ndo, snet, dp->srcNode),
+		    ddpskt_string(ndo, dp->srcSkt)));
+		ND_PRINT((ndo, " > %s.%s:",
+		    ataddr_string(ndo, EXTRACT_16BITS(&dp->dstNet), dp->dstNode),
+		    ddpskt_string(ndo, dp->dstSkt)));
 		bp += ddpSize;
 		length -= ddpSize;
 		hdrlen += ddpSize;
-		ddp_print(bp, length, dp->type, snet, dp->srcNode, dp->srcSkt);
+		ddp_print(ndo, bp, length, dp->type, snet, dp->srcNode, dp->srcSkt);
 		break;
 
 #ifdef notdef
@@ -150,8 +145,8 @@ llap_print(register const u_char *bp, u_int length)
 #endif
 
 	default:
-		printf("%d > %d at-lap#%d %u",
-		    lp->src, lp->dst, lp->type, length);
+		ND_PRINT((ndo, "%d > %d at-lap#%d %u",
+		    lp->src, lp->dst, lp->type, length));
 		break;
 	}
 	return (hdrlen);
@@ -163,39 +158,41 @@ 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,
+            register const u_char *bp, u_int length)
 {
 	register const struct atDDP *dp;
 	u_short snet;
 
-        if(!eflag)
-            printf("AT ");
+        if(!ndo->ndo_eflag)
+            ND_PRINT((ndo, "AT "));
 
 	if (length < ddpSize) {
-		(void)printf(" [|ddp %u]", length);
+		ND_PRINT((ndo, " [|ddp %u]", length));
 		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));
+	ND_PRINT((ndo, "%s.%s", ataddr_string(ndo, snet, dp->srcNode),
+	       ddpskt_string(ndo, dp->srcSkt)));
+	ND_PRINT((ndo, " > %s.%s: ",
+	       ataddr_string(ndo, EXTRACT_16BITS(&dp->dstNet), dp->dstNode),
+	       ddpskt_string(ndo, dp->dstSkt)));
 	bp += ddpSize;
 	length -= ddpSize;
-	ddp_print(bp, length, dp->type, snet, dp->srcNode, dp->srcSkt);
+	ddp_print(ndo, bp, length, dp->type, snet, dp->srcNode, 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,
+           register const u_char *bp, u_int length)
 {
 	register 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 (EXTRACT_16BITS(&ap->htype) == 1 &&
 	    EXTRACT_16BITS(&ap->ptype) == ETHERTYPE_ATALK &&
@@ -203,151 +200,151 @@ aarp_print(register const u_char *bp, u_int length)
 		switch (EXTRACT_16BITS(&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(psaddr), etheraddr_string(ap->hsaddr));
+			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",
+	ND_PRINT((ndo, "len %u op %u htype %u ptype %#x halen %u palen %u",
 	    length, EXTRACT_16BITS(&ap->op), EXTRACT_16BITS(&ap->htype),
-	    EXTRACT_16BITS(&ap->ptype), ap->halen, ap->palen);
+	    EXTRACT_16BITS(&ap->ptype), ap->halen, 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,
+          register const u_char *bp, register u_int length, register int t,
+          register u_short snet, register 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(bp, length);
+		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,
+          register const struct atATP *ap, u_int length)
 {
 	char c;
-	u_int32_t data;
+	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)) {
-		(void)printf(" [|atp %u]", length);
+		ND_PRINT((ndo, " [|atp %u]", length));
 		return;
 	}
 	length -= sizeof(*ap);
 	switch (ap->control & 0xc0) {
 
 	case atpReqCode:
-		(void)printf(" atp-req%s %d",
+		ND_PRINT((ndo, " atp-req%s %d",
 			     ap->control & atpXO? " " : "*",
-			     EXTRACT_16BITS(&ap->transID));
+			     EXTRACT_16BITS(&ap->transID)));
 
-		atp_bitmap_print(ap->bitmap);
+		atp_bitmap_print(ndo, ap->bitmap);
 
 		if (length != 0)
-			(void)printf(" [len=%u]", length);
+			ND_PRINT((ndo, " [len=%u]", length));
 
 		switch (ap->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 (%u)",
+		ND_PRINT((ndo, " atp-resp%s%d:%d (%u)",
 			     ap->control & atpEOM? "*" : " ",
-			     EXTRACT_16BITS(&ap->transID), ap->bitmap, length);
+			     EXTRACT_16BITS(&ap->transID), ap->bitmap, length));
 		switch (ap->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  %d", EXTRACT_16BITS(&ap->transID)));
 
-		atp_bitmap_print(ap->bitmap);
+		atp_bitmap_print(ndo, ap->bitmap);
 
 		/* length should be zero */
 		if (length)
-			(void)printf(" [len=%u]", 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);
+				ND_PRINT((ndo, "%cXO", c));
 				c = ',';
 			}
 			if (ap->control & atpEOM) {
-				(void)printf("%cEOM", c);
+				ND_PRINT((ndo, "%cEOM", c));
 				c = ',';
 			}
 			if (ap->control & atpSTS) {
-				(void)printf("%cSTS", c);
+				ND_PRINT((ndo, "%cSTS", c));
 				c = ',';
 			}
-			(void)printf("]");
+			ND_PRINT((ndo, "]"));
 		}
 		break;
 
 	default:
-		(void)printf(" atp-0x%x  %d (%u)", ap->control,
-			     EXTRACT_16BITS(&ap->transID), length);
+		ND_PRINT((ndo, " atp-0x%x  %d (%u)", ap->control,
+			     EXTRACT_16BITS(&ap->transID), length));
 		break;
 	}
 	data = EXTRACT_32BITS(&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,
+                 register u_char bm)
 {
 	register char c;
 	register int i;
@@ -361,25 +358,26 @@ atp_bitmap_print(register u_char bm)
 		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,
+          register const struct atNBP *np, u_int length, register u_short snet,
+          register u_char snode, register u_char skt)
 {
 	register const struct atNBPtuple *tp =
 		(const struct atNBPtuple *)((u_char *)np + nbpHeaderSize);
@@ -387,138 +385,137 @@ nbp_print(register const struct atNBP *np, u_int length, register u_short snet,
 	const u_char *ep;
 
 	if (length < nbpHeaderSize) {
-		(void)printf(" truncated-nbp %u", length);
+		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 %u", 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) {
 
 	case nbpBrRq:
 	case nbpLkUp:
-		(void)printf(i == nbpLkUp? " nbp-lkup %d:":" nbp-brRq %d:",
-			     np->id);
+		ND_PRINT((ndo, i == nbpLkUp? " nbp-lkup %d:":" nbp-brRq %d:", 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);
+			ND_PRINT((ndo, " [ntup=%d]", np->control & 0xf));
 		if (tp->enumerator)
-			(void)printf(" [enum=%d]", tp->enumerator);
+			ND_PRINT((ndo, " [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);
+			ND_PRINT((ndo, " [addr=%s.%d]",
+			    ataddr_string(ndo, EXTRACT_16BITS(&tp->net),
+			    tp->node), tp->skt));
 		break;
 
 	case nbpLkUpReply:
-		(void)printf(" nbp-reply %d:", np->id);
+		ND_PRINT((ndo, " nbp-reply %d:", 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);
+			tp = nbp_tuple_print(ndo, tp, ep, snet, snode, skt);
 		break;
 
 	default:
-		(void)printf(" nbp-0x%x  %d (%u)", np->control, np->id,
-				length);
+		ND_PRINT((ndo, " nbp-0x%x  %d (%u)", np->control, 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,
+              register const char *cp, register const u_char *ep)
 {
 	register u_int length;
 
 	if (cp >= (const char *)ep) {
-		fputs(tstr, stdout);
+		ND_PRINT((ndo, "%s", tstr));
 		return (0);
 	}
 	length = *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 >= (const char *)ep) {
-			fputs(tstr, stdout);
+			ND_PRINT((ndo, "%s", tstr));
 			return (0);
 		}
-		putchar(*cp++);
+		ND_PRINT((ndo, "%c", *cp++));
 	}
 	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,
+                register const struct atNBPtuple *tp, register const u_char *ep,
+                register u_short snet, register u_char snode, register u_char skt)
 {
 	register 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);
+		ND_PRINT((ndo, "(%d)", tp->enumerator));
 
 	/* if the socket doesn't match the src socket, print it */
 	if (tp->skt != skt)
-		(void)printf(" %d", tp->skt);
+		ND_PRINT((ndo, " %d", 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));
+		ND_PRINT((ndo, " [addr=%s]",
+		    ataddr_string(ndo, EXTRACT_16BITS(&tp->net), 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, register const u_char *ep)
 {
 	register 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);
@@ -536,11 +533,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[256];
+	char nambuf[256+1];
 	static int first = 1;
 	FILE *fp;
 
@@ -548,7 +546,7 @@ 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;
@@ -602,7 +600,7 @@ ataddr_string(u_short atnet, u_char athost)
 	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 */
@@ -611,11 +609,12 @@ static struct tok skt2str[] = {
 };
 
 static const char *
-ddpskt_string(register int skt)
+ddpskt_string(netdissect_options *ndo,
+              register int skt)
 {
 	static char buf[8];
 
-	if (nflag) {
+	if (ndo->ndo_nflag) {
 		(void)snprintf(buf, sizeof(buf), "%d", skt);
 		return (buf);
 	}