Protect code for particular Juniper DLT_ values with #ifdefs, so this

[tcpdump] / print-ether.c

diff --git a/print-ether.c b/print-ether.c
index 1c6d9092135238fe254ff79e8a32063a4278298d..87b77d3fde83c8ee635d86d8a5a42898946856a9 100644 (file)
--- a/print-ether.c
+++ b/print-ether.c
@@ -20,7 +20,7 @@
  */
 #ifndef lint
 static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-ether.c,v 1.85 2003-12-29 09:19:38 hannes Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-ether.c,v 1.95.2.1 2005-04-25 17:57:15 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -38,8 +38,6 @@ static const char rcsid[] _U_ =
 
 #include "ether.h"
 
-const u_char *snapend;
-
 const struct tok ethertype_values[] = { 
     { ETHERTYPE_IP,            "IPv4" },
     { ETHERTYPE_MPLS,          "MPLS unicast" },
@@ -69,7 +67,11 @@ const struct tok ethertype_values[] = {
     { ETHERTYPE_PPP,            "PPP" },
     { ETHERTYPE_PPPOED,         "PPPoE D" },
     { ETHERTYPE_PPPOES,         "PPPoE S" },
+    { ETHERTYPE_EAPOL,          "EAPOL" },
+    { ETHERTYPE_JUMBO,          "Jumbo" },
     { ETHERTYPE_LOOPBACK,       "Loopback" },
+    { ETHERTYPE_ISO,            "OSI" },
+    { ETHERTYPE_GRE_ISO,        "GRE-OSI" },
     { 0, NULL}
 };
 
@@ -87,8 +89,14 @@ ether_hdr_print(register const u_char *bp, u_int length)
                if (ntohs(ep->ether_type) <= ETHERMTU)
                          (void)printf(", 802.3");
                 else 
-                         (void)printf(", ethertype %s",
-                                      tok2str(ethertype_values,"0x%04x", ntohs(ep->ether_type)));            
+                         (void)printf(", ethertype %s (0x%04x)",
+                                      tok2str(ethertype_values,"Unknown", ntohs(ep->ether_type)),
+                                       ntohs(ep->ether_type));       
+        } else {
+                if (ntohs(ep->ether_type) <= ETHERMTU)
+                          (void)printf(", 802.3");
+                else 
+                          (void)printf(", %s", tok2str(ethertype_values,"Unknown Ethertype (0x%04x)", ntohs(ep->ether_type)));  
         }
 
        (void)printf(", length %u: ", length);
@@ -139,17 +147,13 @@ ether_print(const u_char *p, u_int length, u_int caplen)
 
                if (!xflag && !qflag)
                        default_print(p, caplen);
-       } else { /* handle the case where we know the ethertype but do not have a printer for it */
-                printf("%s, length %u",
-                       tok2str(ethertype_values,"Unknown Ethertype (0x%04x)", ether_type),
-                       length);
-        }
+       } 
 }
 
 /*
  * 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
@@ -182,7 +186,7 @@ ether_encap_print(u_short ether_type, const u_char *p,
        switch (ether_type) {
 
        case ETHERTYPE_IP:
-               ip_print(p, length);
+               ip_print(gndo, p, length);
                return (1);
 
 #ifdef INET6
@@ -193,7 +197,7 @@ ether_encap_print(u_short ether_type, const u_char *p,
 
        case ETHERTYPE_ARP:
        case ETHERTYPE_REVARP:
-               arp_print(p, length, caplen);
+               arp_print(gndo, p, length, caplen);
                return (1);
 
        case ETHERTYPE_DN:
@@ -246,11 +250,44 @@ ether_encap_print(u_short ether_type, const u_char *p,
 
                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 (!xflag && !qflag)
+                    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_EAPOL:
+               eap_print(gndo, p, length);
+               return (1);
+
        case ETHERTYPE_PPP:
                if (length) {
                        printf(": ");
@@ -259,7 +296,7 @@ ether_encap_print(u_short ether_type, const u_char *p,
                return (1);
 
         case ETHERTYPE_LOOPBACK:
-                return (1);
+                return (0);
 
        case ETHERTYPE_MPLS:
        case ETHERTYPE_MPLS_MULTI:
@@ -275,3 +312,12 @@ ether_encap_print(u_short ether_type, const u_char *p,
                return (0);
        }
 }
+
+
+/*
+ * Local Variables:
+ * c-style: whitesmith
+ * c-basic-offset: 8
+ * End:
+ */
+