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. svn path=/trunk/; revision=1465
This commit is contained in:
parent
cc9a1060ca
commit
288e23e5d8
|
@ -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"); }
|
||||
|
|
6
etypes.h
6
etypes.h
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue