Merge pull request #492 from vel21ripn/nflog-print

[tcpdump] / print-ether.c

diff --git a/print-ether.c b/print-ether.c
index e1d3b36d1b5d7ed3281c0895d4d15eb4c5aa4015..74479ccf82fc40b39ed8dbc9a743eadb2a6d240e 100644 (file)
--- a/print-ether.c
+++ b/print-ether.c
@@ -100,6 +100,8 @@ const struct tok ethertype_values[] = {
     { ETHERTYPE_GEONET,         "GeoNet"},
     { ETHERTYPE_CALM_FAST,      "CALM FAST"},
     { ETHERTYPE_AOE,            "AoE" },
+    { ETHERTYPE_PTP,            "PTP" },
+    { ETHERTYPE_ARISTA,         "Arista Vendor Specific Protocol" },
     { 0, NULL}
 };
 
@@ -108,7 +110,7 @@ ether_addresses_print(netdissect_options *ndo, const u_char *src,
                      const u_char *dst)
 {
        ND_PRINT("%s > %s, ",
-                etheraddr_string(ndo, src), etheraddr_string(ndo, dst));
+                GET_ETHERADDR_STRING(src), GET_ETHERADDR_STRING(dst));
 }
 
 static void
@@ -193,6 +195,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 +290,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 +304,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.
@@ -570,6 +601,10 @@ ethertype_print(netdissect_options *ndo,
                aoe_print(ndo, p, length);
                return (1);
 
+       case ETHERTYPE_PTP:
+               ptp_print(ndo, p, length);
+               return (1);
+
        case ETHERTYPE_LAT:
        case ETHERTYPE_SCA:
        case ETHERTYPE_MOPRC: