Print the Ethertype the same way for Ethertypes in VLAN tags as for others.

[tcpdump] / print-ether.c

diff --git a/print-ether.c b/print-ether.c
index ba48834341c0db164e560a5832aabe03078a2dea..4e0d6f0fc653cf4ad46553613dad3a6d70e4b3ba 100644 (file)
--- a/print-ether.c
+++ b/print-ether.c
@@ -100,13 +100,12 @@ const struct tok ethertype_values[] = {
     { ETHERTYPE_GEONET,         "GeoNet"},
     { ETHERTYPE_CALM_FAST,      "CALM FAST"},
     { ETHERTYPE_AOE,            "AoE" },
     { ETHERTYPE_GEONET,         "GeoNet"},
     { ETHERTYPE_CALM_FAST,      "CALM FAST"},
     { ETHERTYPE_AOE,            "AoE" },

-    { ETHERTYPE_MEDSA,          "MEDSA" },

     { 0, NULL}
 };
 
 static void
 ether_hdr_print(netdissect_options *ndo,
     { 0, NULL}
 };
 
 static void
 ether_hdr_print(netdissect_options *ndo,

-                const u_char *bp, u_int length,
+               const u_char *bp, u_int length,

                u_int hdrlen)
 {
        const struct ether_header *ehp;
                u_int hdrlen)
 {
        const struct ether_header *ehp;


@@ -115,28 +114,31 @@ ether_hdr_print(netdissect_options *ndo,
        ehp = (const struct ether_header *)bp;
 
        ND_PRINT("%s > %s",
        ehp = (const struct ether_header *)bp;
 
        ND_PRINT("%s > %s",

-                    etheraddr_string(ndo, ehp->ether_shost),
-                    etheraddr_string(ndo, ehp->ether_dhost));
-
-       length_type = EXTRACT_BE_U_2(bp +
-                                    (hdrlen - sizeof(ehp->ether_length_type)));
-       if (!ndo->ndo_qflag) {
-               if (length_type <= MAX_ETHERNET_LENGTH_VAL) {
-                       ND_PRINT(", 802.3");
-                       length = length_type;
-               } else
-                       ND_PRINT(", ethertype %s (0x%04x)",
-                                      tok2str(ethertype_values,"Unknown", length_type),
-                                       length_type);
-        } else {
-                if (length_type <= MAX_ETHERNET_LENGTH_VAL) {
-                        ND_PRINT(", 802.3");
-                       length = length_type;
-               } else
-                        ND_PRINT(", %s", tok2str(ethertype_values,"Unknown Ethertype (0x%04x)", length_type));
-        }
+                etheraddr_string(ndo, ehp->ether_shost),
+                etheraddr_string(ndo, ehp->ether_dhost));

 
 

-       ND_PRINT(", length %u: ", length);
+       length_type = GET_BE_U_2(bp + (hdrlen - sizeof(ehp->ether_length_type)));
+       if (length_type <= MAX_ETHERNET_LENGTH_VAL) {
+               /*
+                * It's a length field.
+                */
+               ND_PRINT(", 802.3, length %u", length_type);
+               if (length_type > length - hdrlen)
+                       ND_PRINT(" (too large, > %u)", length - hdrlen);
+               ND_PRINT(": ");
+       } else {
+               /*
+                * It's a type field.
+                */
+               if (!ndo->ndo_qflag)
+                       ND_PRINT(", ethertype %s (0x%04x), length %u: ",
+                                tok2str(ethertype_values,"Unknown", length_type),
+                                length_type, length);
+               else
+                       ND_PRINT(", %s, length %u: ",
+                                tok2str(ethertype_values,"Unknown Ethertype (0x%04x)", length_type),
+                                length);
+       }

 }
 
 /*
 }
 
 /*


@@ -149,10 +151,10 @@ ether_hdr_print(netdissect_options *ndo,
  * FIXME: caplen can and should be derived from ndo->ndo_snapend and p.
  */
 u_int
  * FIXME: caplen can and should be derived from ndo->ndo_snapend and p.
  */
 u_int

-ether_print_hdr_len(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, u_int hdrlen)
+ether_hdr_len_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, u_int hdrlen)

 {
        const struct ether_header *ehp;
        u_int orig_length;
 {
        const struct ether_header *ehp;
        u_int orig_length;


@@ -193,14 +195,29 @@ ether_print_hdr_len(netdissect_options *ndo,
        src.addr_string = etheraddr_string;
        dst.addr = ehp->ether_dhost;
        dst.addr_string = etheraddr_string;
        src.addr_string = etheraddr_string;
        dst.addr = ehp->ether_dhost;
        dst.addr_string = etheraddr_string;

-       length_type = EXTRACT_BE_U_2((const u_char *)ehp +
-                                    (hdrlen - sizeof(ehp->ether_length_type)));
+       length_type = GET_BE_U_2((const u_char *)ehp + (hdrlen - sizeof(ehp->ether_length_type)));

 
 recurse:
        /*
         * Is it (gag) an 802.3 encapsulation?
         */
        if (length_type <= MAX_ETHERNET_LENGTH_VAL) {
 
 recurse:
        /*
         * Is it (gag) an 802.3 encapsulation?
         */
        if (length_type <= MAX_ETHERNET_LENGTH_VAL) {

+               /*
+                * The length/type field contains the length of the
+                * remaining payload; use it as such, as long as
+                * it's not too large (bigger than the actual payload).
+                */
+               if (length_type < length) {
+                       length = length_type;
+                       if (caplen > length)
+                               caplen = length;
+               }
+
+               /*
+                * Cut off the snapshot length to the end of the payload.
+                */
+               nd_push_snapend(ndo, p + length);
+

                /* Try to print the LLC-layer header & higher layers */
                llc_hdrlen = llc_print(ndo, p, length, caplen, &src, &dst);
                if (llc_hdrlen < 0) {
                /* Try to print the LLC-layer header & higher layers */
                llc_hdrlen = llc_print(ndo, p, length, caplen, &src, &dst);
                if (llc_hdrlen < 0) {


@@ -210,10 +227,12 @@ recurse:
                        llc_hdrlen = -llc_hdrlen;
                }
                hdrlen += llc_hdrlen;
                        llc_hdrlen = -llc_hdrlen;
                }
                hdrlen += llc_hdrlen;

+               nd_pop_packet_info(ndo);
+               return (hdrlen);

        } else if (length_type == ETHERTYPE_8021Q  ||
        } else if (length_type == ETHERTYPE_8021Q  ||

-                length_type == ETHERTYPE_8021Q9100 ||
-                length_type == ETHERTYPE_8021Q9200 ||
-                length_type == ETHERTYPE_8021QinQ) {
+               length_type == ETHERTYPE_8021Q9100 ||
+               length_type == ETHERTYPE_8021Q9200 ||
+               length_type == ETHERTYPE_8021QinQ) {

                /*
                 * Print VLAN information, and then go back and process
                 * the enclosed type field.
                /*
                 * Print VLAN information, and then go back and process
                 * the enclosed type field.


@@ -228,15 +247,22 @@ recurse:
                        nd_print_trunc(ndo);
                        return (hdrlen + length);
                }
                        nd_print_trunc(ndo);
                        return (hdrlen + length);
                }

-               if (ndo->ndo_eflag) {
-                       uint16_t tag = EXTRACT_BE_U_2(p);
+               if (ndo->ndo_eflag) {
+                       uint16_t tag = GET_BE_U_2(p);

 
                        ND_PRINT("%s, ", ieee8021q_tci_string(tag));
                }
 
 
                        ND_PRINT("%s, ", ieee8021q_tci_string(tag));
                }
 

-               length_type = EXTRACT_BE_U_2(p + 2);
-               if (ndo->ndo_eflag && length_type > MAX_ETHERNET_LENGTH_VAL)
-                       ND_PRINT("ethertype %s, ", tok2str(ethertype_values,"0x%04x", length_type));
+               length_type = GET_BE_U_2(p + 2);
+               if (ndo->ndo_eflag && length_type > MAX_ETHERNET_LENGTH_VAL) {
+                       if (!ndo->ndo_qflag)
+                               ND_PRINT("ethertype %s (0x%04x), ",
+                                        tok2str(ethertype_values,"Unknown", length_type),
+                                        length_type);
+                       else
+                               ND_PRINT("%s, ",
+                                        tok2str(ethertype_values,"Unknown Ethertype (0x%04x)", length_type));
+               }

                p += 4;
                length -= 4;
                caplen -= 4;
                p += 4;
                length -= 4;
                caplen -= 4;


@@ -288,13 +314,13 @@ recurse:
  */
 u_int
 ether_print(netdissect_options *ndo,
  */
 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)
+           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)

 {
 {

-       return (ether_print_hdr_len(ndo, p, length, caplen,
-                                         print_encap_header, encap_header_arg,
-                                         ETHER_HDRLEN));
+       return (ether_hdr_len_print(ndo, p, length, caplen,
+                                   print_encap_header, encap_header_arg,
+                                   ETHER_HDRLEN));

 }
 
 /*
 }
 
 /*


@@ -305,7 +331,7 @@ ether_print(netdissect_options *ndo,
  */
 u_int
 ether_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h,
  */
 u_int
 ether_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h,

-               const u_char *p)
+              const u_char *p)

 {
        ndo->ndo_protocol = "ether_if";
        return (ether_print(ndo, p, h->len, h->caplen, NULL, NULL));
 {
        ndo->ndo_protocol = "ether_if";
        return (ether_print(ndo, p, h->len, h->caplen, NULL, NULL));


@@ -322,7 +348,7 @@ ether_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h,
  */
 u_int
 netanalyzer_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h,
  */
 u_int
 netanalyzer_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h,

-                     const u_char *p)
+                    const u_char *p)

 {
        /*
         * Fail if we don't have enough data for the Hilscher pseudo-header.
 {
        /*
         * Fail if we don't have enough data for the Hilscher pseudo-header.


@@ -349,8 +375,8 @@ netanalyzer_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h,
  */
 u_int
 netanalyzer_transparent_if_print(netdissect_options *ndo,
  */
 u_int
 netanalyzer_transparent_if_print(netdissect_options *ndo,

-                                 const struct pcap_pkthdr *h,
-                                 const u_char *p)
+                                const struct pcap_pkthdr *h,
+                                const u_char *p)

 {
        /*
         * Fail if we don't have enough data for the Hilscher pseudo-header,
 {
        /*
         * Fail if we don't have enough data for the Hilscher pseudo-header,


@@ -375,14 +401,14 @@ netanalyzer_transparent_if_print(netdissect_options *ndo,
 
 int
 ethertype_print(netdissect_options *ndo,
 
 int
 ethertype_print(netdissect_options *ndo,

-                u_short ether_type, const u_char *p,
-                u_int length, u_int caplen,
-                const struct lladdr_info *src, const struct lladdr_info *dst)
+               u_short ether_type, const u_char *p,
+               u_int length, u_int caplen,
+               const struct lladdr_info *src, const struct lladdr_info *dst)

 {
        switch (ether_type) {
 
        case ETHERTYPE_IP:
 {
        switch (ether_type) {
 
        case ETHERTYPE_IP:

-               ip_print(ndo, p, length);
+               ip_print(ndo, p, length);

                return (1);
 
        case ETHERTYPE_IPV6:
                return (1);
 
        case ETHERTYPE_IPV6:


@@ -391,7 +417,7 @@ ethertype_print(netdissect_options *ndo,
 
        case ETHERTYPE_ARP:
        case ETHERTYPE_REVARP:
 
        case ETHERTYPE_ARP:
        case ETHERTYPE_REVARP:

-               arp_print(ndo, p, length, caplen);
+               arp_print(ndo, p, length, caplen);

                return (1);
 
        case ETHERTYPE_DN:
                return (1);
 
        case ETHERTYPE_DN:


@@ -430,11 +456,11 @@ ethertype_print(netdissect_options *ndo,
                return (1);
 
        case ETHERTYPE_EAPOL:
                return (1);
 
        case ETHERTYPE_EAPOL:

-               eap_print(ndo, p, length);
+               eap_print(ndo, p, length);

                return (1);
 
        case ETHERTYPE_RRCP:
                return (1);
 
        case ETHERTYPE_RRCP:

-               rrcp_print(ndo, p, length, src, dst);
+               rrcp_print(ndo, p, length, src, dst);

                return (1);
 
        case ETHERTYPE_PPP:
                return (1);
 
        case ETHERTYPE_PPP:


@@ -445,11 +471,11 @@ ethertype_print(netdissect_options *ndo,
                return (1);
 
        case ETHERTYPE_MPCP:
                return (1);
 
        case ETHERTYPE_MPCP:

-               mpcp_print(ndo, p, length);
+               mpcp_print(ndo, p, length);

                return (1);
 
        case ETHERTYPE_SLOW:
                return (1);
 
        case ETHERTYPE_SLOW:

-               slow_print(ndo, p, length);
+               slow_print(ndo, p, length);

                return (1);
 
        case ETHERTYPE_CFM:
                return (1);
 
        case ETHERTYPE_CFM:


@@ -461,13 +487,13 @@ ethertype_print(netdissect_options *ndo,
                lldp_print(ndo, p, length);
                return (1);
 
                lldp_print(ndo, p, length);
                return (1);
 

-        case ETHERTYPE_NSH:
-                nsh_print(ndo, p, length);
-                return (1);
+       case ETHERTYPE_NSH:
+               nsh_print(ndo, p, length);
+               return (1);

 
 

-        case ETHERTYPE_LOOPBACK:
+       case ETHERTYPE_LOOPBACK:

                loopback_print(ndo, p, length);
                loopback_print(ndo, p, length);

-                return (1);
+               return (1);

 
        case ETHERTYPE_MPLS:
        case ETHERTYPE_MPLS_MULTI:
 
        case ETHERTYPE_MPLS:
        case ETHERTYPE_MPLS_MULTI:


@@ -482,23 +508,19 @@ ethertype_print(netdissect_options *ndo,
                msnlb_print(ndo, p);
                return (1);
 
                msnlb_print(ndo, p);
                return (1);
 

-        case ETHERTYPE_GEONET_OLD:
-        case ETHERTYPE_GEONET:
-                geonet_print(ndo, p, length, src);
-                return (1);
+       case ETHERTYPE_GEONET_OLD:
+       case ETHERTYPE_GEONET:
+               geonet_print(ndo, p, length, src);
+               return (1);

 
 

-        case ETHERTYPE_CALM_FAST:
-                calm_fast_print(ndo, p, length, src);
-                return (1);
+       case ETHERTYPE_CALM_FAST:
+               calm_fast_print(ndo, p, length, src);
+               return (1);

 
        case ETHERTYPE_AOE:
                aoe_print(ndo, p, length);
                return (1);
 
 
        case ETHERTYPE_AOE:
                aoe_print(ndo, p, length);
                return (1);
 

-       case ETHERTYPE_MEDSA:
-               medsa_print(ndo, p, length, caplen, src, dst);
-               return (1);
-

        case ETHERTYPE_LAT:
        case ETHERTYPE_SCA:
        case ETHERTYPE_MOPRC:
        case ETHERTYPE_LAT:
        case ETHERTYPE_SCA:
        case ETHERTYPE_MOPRC: