change 802.1ag pre-standard codepoint to standard codepoint

[tcpdump] / print-ether.c

diff --git a/print-ether.c b/print-ether.c
index e6f759b56bee00cd6e909647f38f92994f1303b0..e54c9d4eff37db54d39fc1d12b354d5a1b1fb8fe 100644 (file)
--- a/print-ether.c
+++ b/print-ether.c
@@ -20,7 +20,7 @@
  */
 #ifndef lint
 static const char rcsid[] _U_ =
  */
 #ifndef lint
 static const char rcsid[] _U_ =

-    "@(#) $Header: /tcpdump/master/tcpdump/print-ether.c,v 1.87 2003-12-29 19:05:37 hannes Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-ether.c,v 1.104 2007-07-23 09:01:09 hannes Exp $ (LBL)";

 #endif
 
 #ifdef HAVE_CONFIG_H
 #endif
 
 #ifdef HAVE_CONFIG_H


@@ -38,8 +38,6 @@ static const char rcsid[] _U_ =
 
 #include "ether.h"
 
 
 #include "ether.h"
 

-const u_char *snapend;
-

 const struct tok ethertype_values[] = { 
     { ETHERTYPE_IP,            "IPv4" },
     { ETHERTYPE_MPLS,          "MPLS unicast" },
 const struct tok ethertype_values[] = { 
     { ETHERTYPE_IP,            "IPv4" },
     { ETHERTYPE_MPLS,          "MPLS unicast" },


@@ -49,7 +47,7 @@ const struct tok ethertype_values[] = {
     { ETHERTYPE_VMAN,          "VMAN" },
     { ETHERTYPE_PUP,            "PUP" },
     { ETHERTYPE_ARP,            "ARP"},
     { ETHERTYPE_VMAN,          "VMAN" },
     { ETHERTYPE_PUP,            "PUP" },
     { ETHERTYPE_ARP,            "ARP"},

-    { ETHERTYPE_REVARP ,        "Reverse ARP"},
+    { ETHERTYPE_REVARP,         "Reverse ARP"},

     { ETHERTYPE_NS,             "NS" },
     { ETHERTYPE_SPRITE,         "Sprite" },
     { ETHERTYPE_TRAIL,          "Trail" },
     { ETHERTYPE_NS,             "NS" },
     { ETHERTYPE_SPRITE,         "Sprite" },
     { ETHERTYPE_TRAIL,          "Trail" },


@@ -67,9 +65,17 @@ const struct tok ethertype_values[] = {
     { ETHERTYPE_AARP,           "Appletalk ARP" },
     { ETHERTYPE_IPX,            "IPX" },
     { ETHERTYPE_PPP,            "PPP" },
     { ETHERTYPE_AARP,           "Appletalk ARP" },
     { ETHERTYPE_IPX,            "IPX" },
     { ETHERTYPE_PPP,            "PPP" },

+    { ETHERTYPE_MPCP,           "MPCP" },
+    { ETHERTYPE_SLOW,           "Slow Protocols" },

     { ETHERTYPE_PPPOED,         "PPPoE D" },
     { ETHERTYPE_PPPOES,         "PPPoE S" },
     { ETHERTYPE_PPPOED,         "PPPoE D" },
     { ETHERTYPE_PPPOES,         "PPPoE S" },

+    { ETHERTYPE_EAPOL,          "EAPOL" },
+    { ETHERTYPE_JUMBO,          "Jumbo" },

     { ETHERTYPE_LOOPBACK,       "Loopback" },
     { ETHERTYPE_LOOPBACK,       "Loopback" },

+    { ETHERTYPE_ISO,            "OSI" },
+    { ETHERTYPE_GRE_ISO,        "GRE-OSI" },
+    { ETHERTYPE_CFM_OLD,        "CFM (old)" },
+    { ETHERTYPE_CFM,            "CFM" },

     { 0, NULL}
 };
 
     { 0, NULL}
 };
 


@@ -125,7 +131,6 @@ ether_print(const u_char *p, u_int length, u_int caplen)
        /*
         * Is it (gag) an 802.3 encapsulation?
         */
        /*
         * Is it (gag) an 802.3 encapsulation?
         */

-       extracted_ether_type = 0;

        if (ether_type <= ETHERMTU) {
                /* Try to print the LLC-layer header & higher layers */
                if (llc_print(p, length, caplen, ESRC(ep), EDST(ep),
        if (ether_type <= ETHERMTU) {
                /* Try to print the LLC-layer header & higher layers */
                if (llc_print(p, length, caplen, ESRC(ep), EDST(ep),


@@ -134,7 +139,7 @@ ether_print(const u_char *p, u_int length, u_int caplen)
                        if (!eflag)
                                ether_hdr_print((u_char *)ep, length + ETHER_HDRLEN);
 
                        if (!eflag)
                                ether_hdr_print((u_char *)ep, length + ETHER_HDRLEN);
 

-                       if (!xflag && !qflag)
+                       if (!suppress_default_print)

                                default_print(p, caplen);
                }
        } else if (ether_encap_print(ether_type, p, length, caplen,
                                default_print(p, caplen);
                }
        } else if (ether_encap_print(ether_type, p, length, caplen,


@@ -143,7 +148,7 @@ ether_print(const u_char *p, u_int length, u_int caplen)
                if (!eflag)
                        ether_hdr_print((u_char *)ep, length + ETHER_HDRLEN);
 
                if (!eflag)
                        ether_hdr_print((u_char *)ep, length + ETHER_HDRLEN);
 

-               if (!xflag && !qflag)
+               if (!suppress_default_print)

                        default_print(p, caplen);
        } 
 }
                        default_print(p, caplen);
        } 
 }


@@ -151,7 +156,7 @@ ether_print(const u_char *p, u_int length, u_int caplen)
 /*
  * This is the top level routine of the printer.  'p' points
  * to the ether header of the packet, 'h->ts' is the timestamp,
 /*
  * This is the top level routine of the printer.  'p' points
  * to the ether header of the packet, 'h->ts' is the timestamp,

- * 'h->length' is the length of the packet off the wire, and 'h->caplen'
+ * 'h->len' is the length of the packet off the wire, and 'h->caplen'

  * is the number of bytes actually captured.
  */
 u_int
  * is the number of bytes actually captured.
  */
 u_int


@@ -184,7 +189,7 @@ ether_encap_print(u_short ether_type, const u_char *p,
        switch (ether_type) {
 
        case ETHERTYPE_IP:
        switch (ether_type) {
 
        case ETHERTYPE_IP:

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

                return (1);
 
 #ifdef INET6
                return (1);
 
 #ifdef INET6


@@ -195,7 +200,7 @@ ether_encap_print(u_short ether_type, const u_char *p,
 
        case ETHERTYPE_ARP:
        case ETHERTYPE_REVARP:
 
        case ETHERTYPE_ARP:
        case ETHERTYPE_REVARP:

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

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


@@ -240,19 +245,55 @@ ether_encap_print(u_short ether_type, const u_char *p,
 
                if (llc_print(p, length, caplen, p - 18, p - 12,
                    extracted_ether_type) == 0) {
 
                if (llc_print(p, length, caplen, p - 18, p - 12,
                    extracted_ether_type) == 0) {

-                               ether_hdr_print(p - 18, length + 4);
+                        ether_hdr_print(p - 18, length + 4);
+
+                        if (!suppress_default_print) {
+                                default_print(p - 18, caplen + 4);
+                        }

                }
 
                }
 

-               if (!xflag && !qflag)
-                       default_print(p - 18, caplen + 4);

 
                return (1);
 
 
                return (1);
 

+        case ETHERTYPE_JUMBO:
+                ether_type = ntohs(*(u_int16_t *)(p));
+                p += 2;
+                length -= 2;      
+                caplen -= 2;
+
+                if (ether_type > ETHERMTU) {
+                    if (eflag)
+                        printf("ethertype %s, ",
+                               tok2str(ethertype_values,"0x%04x", ether_type));
+                    goto recurse;
+                }
+
+                *extracted_ether_type = 0;
+
+                if (llc_print(p, length, caplen, p - 16, p - 10,
+                              extracted_ether_type) == 0) {
+                    ether_hdr_print(p - 16, length + 2);
+
+                    if (!suppress_default_print) {
+                            default_print(p - 16, caplen + 2);
+                    }
+                }
+
+                return (1);
+
+        case ETHERTYPE_ISO:
+                isoclns_print(p+1, length-1, length-1);
+                return(1);
+

        case ETHERTYPE_PPPOED:
        case ETHERTYPE_PPPOES:
                pppoe_print(p, length);
                return (1);
 
        case ETHERTYPE_PPPOED:
        case ETHERTYPE_PPPOES:
                pppoe_print(p, length);
                return (1);
 

+       case ETHERTYPE_EAPOL:
+               eap_print(gndo, p, length);
+               return (1);
+

        case ETHERTYPE_PPP:
                if (length) {
                        printf(": ");
        case ETHERTYPE_PPP:
                if (length) {
                        printf(": ");


@@ -260,8 +301,21 @@ ether_encap_print(u_short ether_type, const u_char *p,
                }
                return (1);
 
                }
                return (1);
 

+       case ETHERTYPE_MPCP:
+               mpcp_print(p, length);
+               return (1);
+
+       case ETHERTYPE_SLOW:
+               slow_print(p, length);
+               return (1);
+
+       case ETHERTYPE_CFM:
+       case ETHERTYPE_CFM_OLD:
+               cfm_print(p, length);
+               return (1);
+

         case ETHERTYPE_LOOPBACK:
         case ETHERTYPE_LOOPBACK:

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

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


@@ -277,3 +331,12 @@ ether_encap_print(u_short ether_type, const u_char *p,
                return (0);
        }
 }
                return (0);
        }
 }

+
+
+/*
+ * Local Variables:
+ * c-style: whitesmith
+ * c-basic-offset: 8
+ * End:
+ */
+