diff options
| author | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2000-01-13 17:59:14 +0000 |
|---|---|---|
| committer | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2000-01-13 17:59:14 +0000 |
| commit | d5115ea9aa8d741772e04f987c5907772705893b (patch) | |
| tree | c02c159fb3576ab5fc0804895b6cf9c11ee96e37 | |
| parent | 14c5cc8f4ef3b01b938c6d94f30b097bbe3f9674 (diff) | |
0x2000, for CDP, doesn't appear to be an Ethernet type - it's not
registered as a type for CDP, and CDP packets appear to be LLC packets
with an OUI of 00-00-0C, not the encapsulated Ethernet OUI of 00-00-00.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1465 f5534014-38df-0310-8fa8-9805f1628bb7
| -rw-r--r-- | ethertype.c | 6 | ||||
| -rw-r--r-- | etypes.h | 6 |
2 files changed, 2 insertions, 10 deletions
diff --git a/ethertype.c b/ethertype.c index 103a456122..f04ea14b83 100644 --- a/ethertype.c +++ b/ethertype.c @@ -2,7 +2,7 @@ * Routines for calling the right protocol for the ethertype. * This is called by both packet-eth.c (Ethernet II) and packet-llc.c (SNAP) * - * $Id: ethertype.c,v 1.22 2000/01/13 04:49:54 guy Exp $ + * $Id: ethertype.c,v 1.23 2000/01/13 17:59:14 guy Exp $ * * Gilbert Ramirez <gram@verdict.uthscsa.edu> * @@ -48,7 +48,6 @@ const value_string etype_vals[] = { {ETHERTYPE_AARP, "AARP" }, {ETHERTYPE_IPX, "Netware IPX/SPX"}, {ETHERTYPE_VINES, "Vines" }, - {ETHERTYPE_CDP, "CDP" }, /* Cisco Discovery Protocol */ {ETHERTYPE_TRAIN, "Netmon Train" }, {ETHERTYPE_LOOP, "Loopback" }, /* Ethernet Loopback */ {ETHERTYPE_PPPOED, "PPPoE Discovery"}, @@ -112,9 +111,6 @@ ethertype(guint16 etype, int offset, case ETHERTYPE_VINES: dissect_vines(pd, offset, fd, tree); break; - case ETHERTYPE_CDP: - dissect_cdp(pd, offset, fd, tree); - break; case ETHERTYPE_LOOP: dissect_data(pd, offset, fd, tree); if (check_col(fd, COL_PROTOCOL)) { col_add_fstr(fd, COL_PROTOCOL, "LOOP"); } @@ -1,7 +1,7 @@ /* etypes.h * Defines ethernet packet types, similar to tcpdump's ethertype.h * - * $Id: etypes.h,v 1.11 2000/01/13 04:49:54 guy Exp $ + * $Id: etypes.h,v 1.12 2000/01/13 17:59:13 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -86,10 +86,6 @@ /* Created by Netmon as a summary packet */ #endif -#ifndef ETHERTYPE_CDP -#define ETHERTYPE_CDP 0x2000 /* Cisco Discovery Protocol */ -#endif - #ifndef ETHERTYPE_LOOP #define ETHERTYPE_LOOP 0x9000 /* used for layer 2 testing (do i see my own frames on the wire) */ #endif |