diff options
| author | Gerald Combs <gerald@wireshark.org> | 2000-04-10 14:45:30 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2000-04-10 14:45:30 +0000 |
| commit | a42b1820e4a35f6fee3aec4193331b319943ab5a (patch) | |
| tree | 4925e141c32ff0ee9beddfddb46d98cb8fc42024 | |
| parent | cd3eccbef8e046dfe6d3432e0704fa890236c4ca (diff) | |
| download | wireshark-a42b1820e4a35f6fee3aec4193331b319943ab5a.tar.gz | |
Add DOCSIS BPDU patch from Johannes Hennecke <Johannes.Hennecke@elsa.de>.
svn path=/trunk/; revision=1826
| -rw-r--r-- | oui.h | 3 | ||||
| -rw-r--r-- | packet-llc.c | 11 |
2 files changed, 12 insertions, 2 deletions
@@ -2,7 +2,7 @@ * Definitions of OUIs * Gilbert Ramirez <gramirez@tivoli.com> * - * $Id: oui.h,v 1.4 2000/01/22 21:49:50 gerald Exp $ + * $Id: oui.h,v 1.5 2000/04/10 14:45:30 gerald Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -30,5 +30,6 @@ #define OUI_BFR 0x0080C2 /* Bridged Frame-Relay, RFC 2427 */ #define OUI_ATM_FORUM 0x00A03E /* ATM Forum */ #define OUI_APPLE_ATALK 0x080007 /* Appletalk */ +#define OUI_CABLE_BPDU 0x00E02F /* DOCSIS spanning tree BPDU */ extern const value_string oui_vals[]; diff --git a/packet-llc.c b/packet-llc.c index 9baff41bf6..86e5e61c36 100644 --- a/packet-llc.c +++ b/packet-llc.c @@ -2,7 +2,7 @@ * Routines for IEEE 802.2 LLC layer * Gilbert Ramirez <gramirez@tivoli.com> * - * $Id: packet-llc.c,v 1.51 2000/04/09 18:33:26 guy Exp $ + * $Id: packet-llc.c,v 1.52 2000/04/10 14:45:30 gerald Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -184,6 +184,7 @@ http://www.cisco.com/univercd/cc/td/doc/product/software/ios113ed/113ed_cr/ibm_r { OUI_BFR, "Bridged Frame-Relay" }, /* RFC 2427 */ { OUI_ATM_FORUM, "ATM Forum" }, { OUI_APPLE_ATALK, "Apple (AppleTalk)" }, + { OUI_CABLE_BPDU, "DOCSIS Spanning Tree" }, /* DOCSIS spanning tree BPDU */ { 0, NULL } }; @@ -427,6 +428,14 @@ dissect_llc(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) { dissect_data(pd, offset+8, fd, tree); break; + case OUI_CABLE_BPDU: /* DOCSIS cable modem spanning tree BPDU */ + if (tree) { + proto_tree_add_item(llc_tree, + hf_llc_pid, offset+6, 2, etype); + } + dissect_bpdu(pd, offset+8, fd, tree); + break; + default: if (tree) { proto_tree_add_item(llc_tree, |