X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/720616ddbde6f0fc136e14417bcbb3f2901f1232..8534f3b7bfbb81a76fc110a79bbbfedf35cc4f30:/print-ether.c

diff --git a/print-ether.c b/print-ether.c
index e1d3b36d..0454c9a7 100644
--- a/print-ether.c
+++ b/print-ether.c
@@ -100,6 +100,7 @@ const struct tok ethertype_values[] = {
     { ETHERTYPE_GEONET,         "GeoNet"},
     { ETHERTYPE_CALM_FAST,      "CALM FAST"},
     { ETHERTYPE_AOE,            "AoE" },
+    { ETHERTYPE_ARISTA,         "Arista Vendor Specific Protocol" },
     { 0, NULL}
 };
 
@@ -193,6 +194,7 @@ ether_print_common(netdissect_options *ndo, const u_char *p, u_int length,
 	 * Get the length/type field, skip past it, and print it
 	 * if we're printing the link-layer header.
 	 */
+recurse:
 	length_type = GET_BE_U_2(p);
 
 	length -= 2;
@@ -287,7 +289,7 @@ ether_print_common(netdissect_options *ndo, const u_char *p, u_int length,
 		 * It's a type field, with the type for Alteon jumbo frames.
 		 * See
 		 *
-		 *	http://tools.ietf.org/html/draft-ietf-isis-ext-eth-01
+		 *	https://tools.ietf.org/html/draft-ietf-isis-ext-eth-01
 		 *
 		 * which indicates that, following the type field,
 		 * there's an LLC header and payload.
@@ -301,6 +303,34 @@ ether_print_common(netdissect_options *ndo, const u_char *p, u_int length,
 			llc_hdrlen = -llc_hdrlen;
 		}
 		hdrlen += llc_hdrlen;
+	} else if (length_type == ETHERTYPE_ARISTA) {
+		if (caplen < 2) {
+			ND_PRINT("[|arista]");
+			return (hdrlen + caplen);
+		}
+		if (length < 2) {
+			ND_PRINT("[|arista]");
+			return (hdrlen + length);
+		}
+		ether_type_print(ndo, length_type);
+		ND_PRINT(", length %u: ", orig_length);
+		int bytesConsumed = arista_ethertype_print(ndo, p, length);
+		if (bytesConsumed > 0) {
+			p += bytesConsumed;
+			length -= bytesConsumed;
+			caplen -= bytesConsumed;
+			hdrlen += bytesConsumed;
+			goto recurse;
+		} else {
+			/* subtype/version not known, print raw packet */
+			if (!ndo->ndo_eflag && length_type > MAX_ETHERNET_LENGTH_VAL) {
+				ether_addresses_print(ndo, src.addr, dst.addr);
+				ether_type_print(ndo, length_type);
+				ND_PRINT(", length %u: ", orig_length);
+			}
+			 if (!ndo->ndo_suppress_default_print)
+				 ND_DEFAULTPRINT(p, caplen);
+		}
 	} else {
 		/*
 		 * It's a type field with some other value.