X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/d1cffd99e6487cc1c2f2dbbc6ea4cc60c36226c7..refs/pull/433/head:/print-token.c

diff --git a/print-token.c b/print-token.c
index 18a461b7..b88bcf79 100644
--- a/print-token.c
+++ b/print-token.c
@@ -82,12 +82,12 @@
 #define SEGMENT_COUNT(trp)	((int)((RIF_LENGTH(trp) - 2) / 2))
 
 struct token_header {
-	u_int8_t  token_ac;
-	u_int8_t  token_fc;
-	u_int8_t  token_dhost[TOKEN_RING_MAC_LEN];
-	u_int8_t  token_shost[TOKEN_RING_MAC_LEN];
-	u_int16_t token_rcf;
-	u_int16_t token_rseg[ROUTING_SEGMENT_MAX];
+	uint8_t  token_ac;
+	uint8_t  token_fc;
+	uint8_t  token_dhost[TOKEN_RING_MAC_LEN];
+	uint8_t  token_shost[TOKEN_RING_MAC_LEN];
+	uint16_t token_rcf;
+	uint16_t token_rseg[ROUTING_SEGMENT_MAX];
 };
 
 static const char tstr[] = "[|token-ring]";
@@ -110,8 +110,8 @@ token_hdr_print(netdissect_options *ndo,
 {
 	const char *srcname, *dstname;
 
-	srcname = etheraddr_string(fsrc);
-	dstname = etheraddr_string(fdst);
+	srcname = etheraddr_string(ndo, fsrc);
+	dstname = etheraddr_string(ndo, fdst);
 
 	if (ndo->ndo_vflag)
 		ND_PRINT((ndo, "%02x %02x %s %s %d: ",
@@ -223,7 +223,7 @@ token_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen
 			etherproto_string(htons(extracted_ethertype))));
 			}
 			if (!ndo->ndo_suppress_default_print)
-				ndo->ndo_default_print(ndo, p, caplen);
+				ND_DEFAULTPRINT(p, caplen);
 		}
 	} else {
 		/* Some kinds of TR packet we cannot handle intelligently */
@@ -232,7 +232,7 @@ token_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen
 			token_hdr_print(ndo, trp, length + TOKEN_HDRLEN + route_len,
 			    ESRC(&ehdr), EDST(&ehdr));
 		if (!ndo->ndo_suppress_default_print)
-			ndo->ndo_default_print(ndo, p, caplen);
+			ND_DEFAULTPRINT(p, caplen);
 	}
 	return (hdr_len);
 }