X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/56e6581c34ceec5469b9f37c19b31a36b0256f3c..d2777156522f139a858bd6b5b51e364826bc95a7:/print-llc.c

diff --git a/print-llc.c b/print-llc.c
index 95668f92..ae3ae4cf 100644
--- a/print-llc.c
+++ b/print-llc.c
@@ -157,18 +157,18 @@ llc_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen,
 
 	ndo->ndo_protocol = "llc";
 	if (caplen < 3) {
-		ND_PRINT("[|llc]");
+		nd_print_trunc(ndo);
 		ND_DEFAULTPRINT((const u_char *)p, caplen);
 		return (caplen);
 	}
 	if (length < 3) {
-		ND_PRINT("[|llc]");
+		nd_print_trunc(ndo);
 		ND_DEFAULTPRINT((const u_char *)p, caplen);
 		return (length);
 	}
 
-	dsap_field = EXTRACT_U_1(p);
-	ssap_field = EXTRACT_U_1(p + 1);
+	dsap_field = GET_U_1(p);
+	ssap_field = GET_U_1(p + 1);
 
 	/*
 	 * OK, what type of LLC frame is this?  The length
@@ -176,7 +176,7 @@ llc_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen,
 	 * have a two-byte control field, and U frames have
 	 * a one-byte control field.
 	 */
-	control = EXTRACT_U_1(p + 2);
+	control = GET_U_1(p + 2);
 	if ((control & LLC_U_FMT) == LLC_U_FMT) {
 		/*
 		 * U frame.
@@ -189,12 +189,12 @@ llc_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen,
 		 * 2 bytes...
 		 */
 		if (caplen < 4) {
-			ND_PRINT("[|llc]");
+			nd_print_trunc(ndo);
 			ND_DEFAULTPRINT((const u_char *)p, caplen);
 			return (caplen);
 		}
 		if (length < 4) {
-			ND_PRINT("[|llc]");
+			nd_print_trunc(ndo);
 			ND_DEFAULTPRINT((const u_char *)p, caplen);
 			return (length);
 		}
@@ -202,7 +202,7 @@ llc_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen,
 		/*
 		 * ...and is little-endian.
 		 */
-		control = EXTRACT_LE_U_2(p + 2);
+		control = GET_LE_U_2(p + 2);
 		is_u = 0;
 		hdrlen = 4;	/* DSAP, SSAP, 2-byte control field */
 	}
@@ -368,20 +368,20 @@ llc_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen,
 				return (hdrlen);
 			}
 			if (caplen < 1) {
-				ND_PRINT("[|llc]");
+				nd_print_trunc(ndo);
 				if (caplen > 0)
 					ND_DEFAULTPRINT((const u_char *)p, caplen);
 				return (hdrlen);
 			}
-			if (EXTRACT_U_1(p) == LLC_XID_FI) {
+			if (GET_U_1(p) == LLC_XID_FI) {
 				if (caplen < 3 || length < 3) {
-					ND_PRINT("[|llc]");
+					nd_print_trunc(ndo);
 					if (caplen > 0)
 						ND_DEFAULTPRINT((const u_char *)p, caplen);
 				} else
 					ND_PRINT(": %02x %02x",
-						  EXTRACT_U_1(p + 1),
-						  EXTRACT_U_1(p + 2));
+						  GET_U_1(p + 1),
+						  GET_U_1(p + 2));
 				return (hdrlen);
 			}
 		}
@@ -432,8 +432,8 @@ snap_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen,
 	ND_TCHECK_5(p);
 	if (caplen < 5 || length < 5)
 		goto trunc;
-	orgcode = EXTRACT_BE_U_3(p);
-	et = EXTRACT_BE_U_2(p + 3);
+	orgcode = GET_BE_U_3(p);
+	et = GET_BE_U_2(p + 3);
 
 	if (ndo->ndo_eflag) {
 		/*
@@ -485,7 +485,7 @@ snap_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen,
 	case OUI_CISCO:
                 switch (et) {
                 case PID_CISCO_CDP:
-                        cdp_print(ndo, p, length, caplen);
+                        cdp_print(ndo, p, length);
                         return (1);
                 case PID_CISCO_DTP:
                         dtp_print(ndo, p, length);
@@ -605,6 +605,6 @@ snap_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen,
 	return (0);
 
 trunc:
-	ND_PRINT("[|snap]");
+	nd_print_trunc(ndo);
 	return (1);
 }