]> The Tcpdump Group git mirrors - tcpdump/commitdiff
backout last commit and make the loopback decoder simply return a 0
authorhannes <hannes>
Mon, 29 Dec 2003 09:29:29 +0000 (09:29 +0000)
committerhannes <hannes>
Mon, 29 Dec 2003 09:29:29 +0000 (09:29 +0000)
print-ether.c

index 1c6d9092135238fe254ff79e8a32063a4278298d..0eaaf03b2de6e41ac54232965cbc1a0108f34075 100644 (file)
@@ -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.86 2003-12-29 09:29:29 hannes Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -139,11 +139,7 @@ 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);
-        }
+       } 
 }
 
 /*
@@ -259,7 +255,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: