Add support for the Marvell Extended Distributed Switch Architecture header

[tcpdump] / print-ether.c

diff --git a/print-ether.c b/print-ether.c
index 0e7777e90a7fb426a126ff86c3842c8433afe117..83cc4e5f8e750bcb11a0f2f91d6bc9dd84bba956 100644 (file)
--- a/print-ether.c
+++ b/print-ether.c
@@ -19,7 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -83,6 +82,7 @@ const struct tok ethertype_values[] = {
     { ETHERTYPE_GEONET,         "GeoNet"},
     { ETHERTYPE_CALM_FAST,      "CALM FAST"},
     { ETHERTYPE_AOE,            "AoE" },
+    { ETHERTYPE_MEDSA,          "MEDSA" },
     { 0, NULL}
 };
 
@@ -123,7 +123,7 @@ ether_hdr_print(netdissect_options *ndo,
  * a pointer to a function that can print header information for that
  * frame's protocol, and an argument to pass to that function.
  */
-void
+u_int
 ether_print(netdissect_options *ndo,
             const u_char *p, u_int length, u_int caplen,
             void (*print_encap_header)(netdissect_options *ndo, const u_char *), const u_char *encap_header_arg)
@@ -131,11 +131,16 @@ ether_print(netdissect_options *ndo,
        struct ether_header *ep;
        u_int orig_length;
        u_short ether_type;
-       u_short extracted_ether_type;
+       u_int hdrlen;
+       int llc_hdrlen;
 
-       if (caplen < ETHER_HDRLEN || length < ETHER_HDRLEN) {
+       if (caplen < ETHER_HDRLEN) {
+               ND_PRINT((ndo, "[|ether]"));
+               return (caplen);
+       }
+       if (length < ETHER_HDRLEN) {
                ND_PRINT((ndo, "[|ether]"));
-               return;
+               return (length);
        }
 
        if (ndo->ndo_eflag) {
@@ -149,6 +154,7 @@ ether_print(netdissect_options *ndo,
        caplen -= ETHER_HDRLEN;
        ep = (struct ether_header *)p;
        p += ETHER_HDRLEN;
+       hdrlen = ETHER_HDRLEN;
 
        ether_type = EXTRACT_16BITS(&ep->ether_type);
 
@@ -158,18 +164,14 @@ recurse:
         */
        if (ether_type <= ETHERMTU) {
                /* Try to print the LLC-layer header & higher layers */
-               if (llc_print(ndo, p, length, caplen, ESRC(ep), EDST(ep),
-                   &extracted_ether_type) == 0) {
-                       /* ether_type not known, print raw packet */
-                       if (!ndo->ndo_eflag) {
-                               if (print_encap_header != NULL)
-                                       (*print_encap_header)(ndo, encap_header_arg);
-                               ether_hdr_print(ndo, (u_char *)ep, orig_length);
-                       }
-
+               llc_hdrlen = llc_print(ndo, p, length, caplen, ESRC(ep), EDST(ep));
+               if (llc_hdrlen < 0) {
+                       /* packet type not known, print raw packet */
                        if (!ndo->ndo_suppress_default_print)
                                ND_DEFAULTPRINT(p, caplen);
+                       llc_hdrlen = -llc_hdrlen;
                }
+               hdrlen += llc_hdrlen;
        } else if (ether_type == ETHERTYPE_8021Q  ||
                 ether_type == ETHERTYPE_8021Q9100 ||
                 ether_type == ETHERTYPE_8021Q9200 ||
@@ -178,17 +180,18 @@ recurse:
                 * Print VLAN information, and then go back and process
                 * the enclosed type field.
                 */
-               if (caplen < 4 || length < 4) {
+               if (caplen < 4) {
+                       ND_PRINT((ndo, "[|vlan]"));
+                       return (hdrlen + caplen);
+               }
+               if (length < 4) {
                        ND_PRINT((ndo, "[|vlan]"));
-                       return;
+                       return (hdrlen + length);
                }
                if (ndo->ndo_eflag) {
                        uint16_t tag = EXTRACT_16BITS(p);
 
-                       ND_PRINT((ndo, "vlan %u, p %u%s, ",
-                           tag & 0xfff,
-                           tag >> 13,
-                           (tag & 0x1000) ? ", CFI" : ""));
+                       ND_PRINT((ndo, "%s, ", ieee8021q_tci_string(tag)));
                }
 
                ether_type = EXTRACT_16BITS(p + 2);
@@ -197,6 +200,7 @@ recurse:
                p += 4;
                length -= 4;
                caplen -= 4;
+               hdrlen += 4;
                goto recurse;
        } else if (ether_type == ETHERTYPE_JUMBO) {
                /*
@@ -209,18 +213,14 @@ recurse:
                 * there's an LLC header and payload.
                 */
                /* Try to print the LLC-layer header & higher layers */
-               if (llc_print(ndo, p, length, caplen, ESRC(ep), EDST(ep),
-                   &extracted_ether_type) == 0) {
-                       /* ether_type not known, print raw packet */
-                       if (!ndo->ndo_eflag) {
-                               if (print_encap_header != NULL)
-                                       (*print_encap_header)(ndo, encap_header_arg);
-                               ether_hdr_print(ndo, (u_char *)ep, orig_length);
-                       }
-
+               llc_hdrlen = llc_print(ndo, p, length, caplen, ESRC(ep), EDST(ep));
+               if (llc_hdrlen < 0) {
+                       /* packet type not known, print raw packet */
                        if (!ndo->ndo_suppress_default_print)
                                ND_DEFAULTPRINT(p, caplen);
+                       llc_hdrlen = -llc_hdrlen;
                }
+               hdrlen += llc_hdrlen;
        } else {
                if (ethertype_print(ndo, ether_type, p, length, caplen) == 0) {
                        /* ether_type not known, print raw packet */
@@ -234,6 +234,7 @@ recurse:
                                ND_DEFAULTPRINT(p, caplen);
                }
        }
+       return (hdrlen);
 }
 
 /*
@@ -246,9 +247,7 @@ u_int
 ether_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h,
                const u_char *p)
 {
-       ether_print(ndo, p, h->len, h->caplen, NULL, NULL);
-
-       return (ETHER_HDRLEN);
+       return (ether_print(ndo, p, h->len, h->caplen, NULL, NULL));
 }
 
 /*
@@ -273,9 +272,7 @@ netanalyzer_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h,
        }
 
        /* Skip the pseudo-header. */
-       ether_print(ndo, p + 4, h->len - 4, h->caplen - 4, NULL, NULL);
-
-       return (4 + ETHER_HDRLEN);
+       return (4 + ether_print(ndo, p + 4, h->len - 4, h->caplen - 4, NULL, NULL));
 }
 
 /*
@@ -303,9 +300,7 @@ netanalyzer_transparent_if_print(netdissect_options *ndo,
        }
 
        /* Skip the pseudo-header, preamble, and SOF. */
-       ether_print(ndo, p + 12, h->len - 12, h->caplen - 12, NULL, NULL);
-
-       return (12 + ETHER_HDRLEN);
+       return (12 + ether_print(ndo, p + 12, h->len - 12, h->caplen - 12, NULL, NULL));
 }
 
 /*
@@ -326,11 +321,9 @@ ethertype_print(netdissect_options *ndo,
                ip_print(ndo, p, length);
                return (1);
 
-#ifdef INET6
        case ETHERTYPE_IPV6:
                ip6_print(ndo, p, length);
                return (1);
-#endif /*INET6*/
 
        case ETHERTYPE_ARP:
        case ETHERTYPE_REVARP:
@@ -429,6 +422,10 @@ ethertype_print(netdissect_options *ndo,
                aoe_print(ndo, p, length);
                return (1);
 
+       case ETHERTYPE_MEDSA:
+               medsa_print(ndo, p, length, caplen);
+               return (1);
+
        case ETHERTYPE_LAT:
        case ETHERTYPE_SCA:
        case ETHERTYPE_MOPRC: