osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

For the Cisco OUI, always add the protocol ID to the tree if we're 

constructing a protocol tree.

Don't add the protocol ID for unknown OUIs unless we're constructing a
protocol tree.

svn path=/trunk/; revision=1453
This commit is contained in:
Guy Harris 2000-01-12 20:00:19 +00:00
parent 3db486ab74
commit 8c09da31c8
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
packet-llc.c
View File

@ -2,7 +2,7 @@
* Routines for IEEE 802.2 LLC layer
* Gilbert Ramirez <gramirez@tivoli.com>
*
* $Id: packet-llc.c,v 1.38 2000/01/12 19:37:23 guy Exp $
* $Id: packet-llc.c,v 1.39 2000/01/12 20:00:19 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@ -376,22 +376,23 @@ dissect_llc(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) {
protocol ID of 0x2000, or
are some of them raw or encapsulated
Ethernet? */
if (tree) {
proto_tree_add_item(llc_tree,
hf_llc_pid, offset+6, 2, etype);
}
switch (etype) {
case 0x2000:
if (tree) {
proto_tree_add_item(llc_tree,
hf_llc_pid, offset+6,
2, etype);
}
dissect_cdp(pd, offset+8, fd, tree);
break;
}
break;
default:
proto_tree_add_item(llc_tree, hf_llc_pid,
offset+6, 2, etype);
if (tree) {
proto_tree_add_item(llc_tree,
hf_llc_pid, offset+6, 2, etype);
}
dissect_data(pd, offset+8, fd, tree);
break;
}