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 c8fb45d33bca473e3a4ae0f725e92a2cfa830792..87b77d3fde83c8ee635d86d8a5a42898946856a9 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.92 2004-04-30 16:42:15 mcr 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
 #endif
 
 #ifdef HAVE_CONFIG_H


@@ -71,6 +71,7 @@ const struct tok ethertype_values[] = {
     { ETHERTYPE_JUMBO,          "Jumbo" },
     { ETHERTYPE_LOOPBACK,       "Loopback" },
     { ETHERTYPE_ISO,            "OSI" },
     { ETHERTYPE_JUMBO,          "Jumbo" },
     { ETHERTYPE_LOOPBACK,       "Loopback" },
     { ETHERTYPE_ISO,            "OSI" },

+    { ETHERTYPE_GRE_ISO,        "GRE-OSI" },

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


@@ -185,7 +186,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


@@ -312,9 +313,11 @@ ether_encap_print(u_short ether_type, const u_char *p,
        }
 }
 
        }
 }
 

+

 /*
  * Local Variables:
 /*
  * Local Variables:

- * c-style: bsd
+ * c-style: whitesmith
+ * c-basic-offset: 8

  * End:
  */
 
  * End:
  */