* Routines for IEEE 802.2 LLC layer
* Gilbert Ramirez <gram@xiexie.org>
*
- * $Id: packet-llc.c,v 1.82 2001/01/21 22:51:46 guy Exp $
+ * $Id: packet-llc.c,v 1.87 2001/06/18 02:17:48 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
#include "packet-ip.h"
#include "packet-ipx.h"
#include "packet-netbios.h"
-#include "packet-osi.h"
-#include "packet-sna.h"
+#include "sna-utils.h"
#include "packet-llc.h"
{ OUI_BRIDGED, "Frame Relay or ATM bridged frames" },
/* RFC 2427, RFC 2684 */
{ OUI_ATM_FORUM, "ATM Forum" },
- { OUI_APPLE_ATALK, "Apple (AppleTalk)" },
{ OUI_CABLE_BPDU, "DOCSIS Spanning Tree" }, /* DOCSIS spanning tree BPDU */
+ { OUI_APPLE_ATALK, "Apple (AppleTalk)" },
{ 0, NULL }
};
switch (oui) {
case OUI_ENCAP_ETHER:
+ case OUI_CISCO_90:
case OUI_APPLE_ATALK:
/* No, I have no idea why Apple used
one of their own OUIs, rather than
switch (oui) {
case OUI_ENCAP_ETHER:
+ case OUI_CISCO_90:
case OUI_APPLE_ATALK:
/* No, I have no idea why Apple used
one of their own OUIs, rather than
static hf_register_info hf[] = {
{ &hf_llc_dsap,
{ "DSAP", "llc.dsap", FT_UINT8, BASE_HEX,
- VALS(sap_vals), 0x0, "" }},
+ VALS(sap_vals), 0x0, "", HFILL }},
{ &hf_llc_dsap_ig,
{ "IG Bit", "llc.dsap.ig", FT_BOOLEAN, BASE_HEX,
- &ig_bit, 0x0, "Individual/Group" }},
+ &ig_bit, 0x0, "Individual/Group", HFILL }},
{ &hf_llc_ssap,
{ "SSAP", "llc.ssap", FT_UINT8, BASE_HEX,
- VALS(sap_vals), 0x0, "" }},
+ VALS(sap_vals), 0x0, "", HFILL }},
{ &hf_llc_ssap_cr,
{ "CR Bit", "llc.ssap.cr", FT_BOOLEAN, BASE_HEX,
- &cr_bit, 0x0, "Command/Response" }},
+ &cr_bit, 0x0, "Command/Response", HFILL }},
{ &hf_llc_ctrl,
{ "Control", "llc.control", FT_UINT16, BASE_HEX,
- NULL, 0x0, "" }},
+ NULL, 0x0, "", HFILL }},
/* registered here but handled in ethertype.c */
{ &hf_llc_type,
{ "Type", "llc.type", FT_UINT16, BASE_HEX,
- VALS(etype_vals), 0x0, "" }},
+ VALS(etype_vals), 0x0, "", HFILL }},
{ &hf_llc_oui,
{ "Organization Code", "llc.oui", FT_UINT24, BASE_HEX,
- VALS(oui_vals), 0x0, ""}},
+ VALS(oui_vals), 0x0, "", HFILL }},
{ &hf_llc_pid,
{ "Protocol ID", "llc.pid", FT_UINT16, BASE_HEX,
- NULL, 0x0, ""}}
+ NULL, 0x0, "", HFILL }}
};
static gint *ett[] = {
&ett_llc,