From 2d99c2dbb4c060a9ccecff9448e3e61ec6358ef4 Mon Sep 17 00:00:00 2001 From: Chris Maynard Date: Wed, 29 Jun 2011 17:22:18 +0000 Subject: Although technically not needed, for clarity, explicity catch invalid Ethernet frames, increment the "other" count and return. Previously, code execution would have fallen through to the ETHERNET_II case and capture_ethertype() would have incremented the "other" count. svn path=/trunk/; revision=37835 --- epan/dissectors/packet-eth.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'epan/dissectors/packet-eth.c') diff --git a/epan/dissectors/packet-eth.c b/epan/dissectors/packet-eth.c index 8eb737d4be..6c1c720767 100644 --- a/epan/dissectors/packet-eth.c +++ b/epan/dissectors/packet-eth.c @@ -172,11 +172,10 @@ capture_eth(const guchar *pd, int offset, int len, packet_counts *ld) * frame; the dissector for those frames registers itself with * an ethernet type of ETHERTYPE_UNK. */ -#if 0 /* TODO */ if (etype > IEEE_802_3_MAX_LEN && etype < ETHERNET_II_MIN_LEN) { + ld->other++; return; } -#endif if (etype <= IEEE_802_3_MAX_LEN && etype != ETHERTYPE_UNK) { length = etype; -- cgit v1.2.3