X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/525875a63ee715aed734cbdf6048424ff3ce4b02..refs/heads/tcpdump-4.6:/print-llc.c

diff --git a/print-llc.c b/print-llc.c
index 5619730a..e78378d0 100644
--- a/print-llc.c
+++ b/print-llc.c
@@ -124,7 +124,7 @@ static const struct tok null_values[] = {
 };
 
 struct oui_tok {
-	u_int32_t	oui;
+	uint32_t	oui;
 	const struct tok *tok;
 };
 
@@ -144,8 +144,8 @@ int
 llc_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen,
 	  const u_char *esrc, const u_char *edst, u_short *extracted_ethertype)
 {
-	u_int8_t dsap_field, dsap, ssap_field, ssap;
-	u_int16_t control;
+	uint8_t dsap_field, dsap, ssap_field, ssap;
+	uint16_t control;
 	int is_u;
 	register int ret;
 
@@ -312,8 +312,8 @@ llc_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen,
 				ND_PRINT((ndo, "%s ", tok2str(llc_values, "Unknown DSAP 0x%02x", dsap)));
 			else
 				ND_PRINT((ndo, "%s > %s %s ",
-						etheraddr_string(esrc),
-						etheraddr_string(edst),
+						etheraddr_string(ndo, esrc),
+						etheraddr_string(ndo, edst),
 						tok2str(llc_values, "Unknown DSAP 0x%02x", dsap)));
 		} else {
 			if (esrc == NULL || edst == NULL)
@@ -322,9 +322,9 @@ llc_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen,
 					tok2str(llc_values, "Unknown DSAP 0x%02x", dsap)));
 			else
 				ND_PRINT((ndo, "%s %s > %s %s ",
-					etheraddr_string(esrc),
+					etheraddr_string(ndo, esrc),
                                         tok2str(llc_values, "Unknown SSAP 0x%02x", ssap),
-					etheraddr_string(edst),
+					etheraddr_string(ndo, edst),
 					tok2str(llc_values, "Unknown DSAP 0x%02x", dsap)));
 		}
 	}
@@ -363,7 +363,7 @@ llc_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen,
 int
 snap_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen, u_int bridge_pad)
 {
-	u_int32_t orgcode;
+	uint32_t orgcode;
 	register u_short et;
 	register int ret;