X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/5d85aa67ed0a3ade5096d58c75169b23e87ecb8a..refs/pull/482/head:/print-atalk.c

diff --git a/print-atalk.c b/print-atalk.c
index 00f9dac4..72fd72ad 100644
--- a/print-atalk.c
+++ b/print-atalk.c
@@ -21,20 +21,19 @@
  * Format and print AppleTalk packets.
  */
 
-#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
 
 #include <stdio.h>
 #include <string.h>
 
-#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"
 
 static const char tstr[] = "[|atalk]";
@@ -50,13 +49,13 @@ static const 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 void atp_print(netdissect_options *, const struct atATP *, u_int);
@@ -204,7 +203,7 @@ aarp_print(netdissect_options *ndo,
 			return;
 
 		case 2:				/* response */
-			ND_PRINT((ndo, "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!) */
@@ -250,11 +249,11 @@ 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) > ndo->ndo_snapend) {
 		/* Just bail if we don't have the whole chunk. */
-		ND_PRINT((ndo, tstr));
+		ND_PRINT((ndo, "%s", tstr));
 		return;
 	}
 	if (length < sizeof(*ap)) {
@@ -380,7 +379,7 @@ nbp_print(netdissect_options *ndo,
           register u_char snode, register u_char skt)
 {
 	register const struct atNBPtuple *tp =
-		(const struct atNBPtuple *)((u_char *)np + nbpHeaderSize);
+		(const struct atNBPtuple *)((const u_char *)np + nbpHeaderSize);
 	int i;
 	const u_char *ep;
 
@@ -398,7 +397,7 @@ nbp_print(netdissect_options *ndo,
 	/* ep points to end of available data */
 	ep = ndo->ndo_snapend;
 	if ((const u_char *)tp > ep) {
-		ND_PRINT((ndo, tstr));
+		ND_PRINT((ndo, "%s", tstr));
 		return;
 	}
 	switch (i = np->control & 0xf0) {
@@ -407,7 +406,7 @@ nbp_print(netdissect_options *ndo,
 	case nbpLkUp:
 		ND_PRINT((ndo, i == nbpLkUp? " nbp-lkup %d:":" nbp-brRq %d:", np->id));
 		if ((const u_char *)(tp + 1) > ep) {
-			ND_PRINT((ndo, tstr));
+			ND_PRINT((ndo, "%s", tstr));
 			return;
 		}
 		(void)nbp_name_print(ndo, tp, ep);
@@ -449,7 +448,7 @@ print_cstring(netdissect_options *ndo,
 	register u_int length;
 
 	if (cp >= (const char *)ep) {
-		ND_PRINT((ndo, tstr));
+		ND_PRINT((ndo, "%s", tstr));
 		return (0);
 	}
 	length = *cp++;
@@ -461,7 +460,7 @@ print_cstring(netdissect_options *ndo,
 	}
 	while ((int)--length >= 0) {
 		if (cp >= (const char *)ep) {
-			ND_PRINT((ndo, tstr));
+			ND_PRINT((ndo, "%s", tstr));
 			return (0);
 		}
 		ND_PRINT((ndo, "%c", *cp++));
@@ -477,7 +476,7 @@ nbp_tuple_print(netdissect_options *ndo,
 	register const struct atNBPtuple *tpn;
 
 	if ((const u_char *)(tp + 1) > ep) {
-		ND_PRINT((ndo, tstr));
+		ND_PRINT((ndo, "%s", tstr));
 		return 0;
 	}
 	tpn = nbp_name_print(ndo, tp, ep);
@@ -567,8 +566,11 @@ ataddr_string(netdissect_options *ndo,
 			     tp->nxt; tp = tp->nxt)
 				;
 			tp->addr = i2;
-			tp->nxt = newhnamemem();
+			tp->nxt = newhnamemem(ndo);
 			tp->name = strdup(nambuf);
+			if (tp->name == NULL)
+				(*ndo->ndo_error)(ndo,
+						  "ataddr_string: strdup(nambuf)");
 		}
 		fclose(fp);
 	}
@@ -582,20 +584,25 @@ ataddr_string(netdissect_options *ndo,
 	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 = 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", atnet, athost);
 	else
 		(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);
 }