hexdump only - if (unrecognized llc proto) && encapsulation == (jumbo || vlan)

diff --git a/print-ether.c b/print-ether.c
index 75f397b2eab0a5aa953052cd410c5647f15cd9cd..d2bbf1b71408dfb0d076b3975f4eaa134049eb03 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.95.2.5 2005-11-13 12:12:58 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-ether.c,v 1.95.2.6 2006-02-20 18:15:03 hannes Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -242,11 +242,13 @@ 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) {
-                               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 (!suppress_default_print)
-                       default_print(p - 18, caplen + 4);
 
                return (1);
 
@@ -268,10 +270,11 @@ ether_encap_print(u_short ether_type, const u_char *p,
                 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);
+                    if (!suppress_default_print) {
+                            default_print(p - 16, caplen + 2);
+                    }
+                }
 
                 return (1);