* Routines for IEEE 802.2 LLC layer
* Gilbert Ramirez <gram@xiexie.org>
*
- * $Id: packet-llc.c,v 1.64 2000/05/31 03:58:54 gram 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 "xdlc.h"
#include "etypes.h"
#include "llcsaps.h"
-#include "packet-bpdu.h"
-#include "packet-cdp.h"
-#include "packet-cgmp.h"
+#include "bridged_pids.h"
#include "packet-ip.h"
#include "packet-ipx.h"
#include "packet-netbios.h"
-#include "packet-osi.h"
-#include "packet-sna.h"
-#include "packet-vtp.h"
+#include "sna-utils.h"
+
+#include "packet-llc.h"
static int proto_llc = -1;
static int hf_llc_dsap = -1;
static gint ett_llc_ctrl = -1;
static dissector_table_t subdissector_table;
+static dissector_table_t cisco_subdissector_table;
+
+static dissector_handle_t bpdu_handle;
+static dissector_handle_t eth_handle;
+static dissector_handle_t fddi_handle;
+static dissector_handle_t tr_handle;
typedef void (capture_func_t)(const u_char *, int, packet_counts *);
{ SAP_TI, "Texas Instruments" },
{ SAP_BPDU, "Spanning Tree BPDU" },
{ SAP_RS511, "EIA RS-511 Manufacturing Message Service" },
-#if 0
- /* XXX - setting the group bit makes this 0x7F; is that just
- a group version of this? */
- { 0x7E, "ISO 8208 (X.25 over 802.2 Type 2)" },
-#endif
+ { SAP_X25, "ISO 8208 (X.25 over 802.2)" },
+ /*
+ * XXX - setting the group bit of SAP_X25 make 0x7F; is this just
+ * a group version of that?
+ */
{ 0x7F, "ISO 802.2" },
{ SAP_XNS, "XNS" },
{ SAP_NESTAR, "Nestar" },
*/
{ OUI_CISCO, "Cisco" },
{ OUI_CISCO_90, "Cisco IOS 9.0 Compatible" },
- { OUI_BFR, "Bridged Frame-Relay" }, /* RFC 2427 */
+ { 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
}
}
-void
+static void
dissect_llc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
proto_tree *llc_tree = NULL;
int is_snap;
guint16 control;
int llc_header_len;
- guint32 oui;
- guint16 etype;
guint8 dsap, ssap;
tvbuff_t *next_tvb;
- const guint8 *pd;
- int offset;
-
- pinfo->current_proto = "LLC";
if (check_col(pinfo->fd, COL_PROTOCOL)) {
- col_add_str(pinfo->fd, COL_PROTOCOL, "LLC");
+ col_set_str(pinfo->fd, COL_PROTOCOL, "LLC");
+ }
+ if (check_col(pinfo->fd, COL_INFO)) {
+ col_clear(pinfo->fd, COL_INFO);
}
dsap = tvb_get_guint8(tvb, 0);
if (tree) {
- ti = proto_tree_add_item(tree, proto_llc, tvb, 0, 0, NULL);
+ ti = proto_tree_add_item(tree, proto_llc, tvb, 0, 0, FALSE);
llc_tree = proto_item_add_subtree(ti, ett_llc);
- proto_tree_add_item(llc_tree, hf_llc_dsap, tvb, 0,
+ proto_tree_add_uint(llc_tree, hf_llc_dsap, tvb, 0,
1, dsap & SAP_MASK);
- proto_tree_add_item(llc_tree, hf_llc_dsap_ig, tvb, 0,
+ proto_tree_add_boolean(llc_tree, hf_llc_dsap_ig, tvb, 0,
1, dsap & DSAP_GI_BIT);
} else
llc_tree = NULL;
ssap = tvb_get_guint8(tvb, 1);
if (tree) {
- proto_tree_add_item(llc_tree, hf_llc_ssap, tvb, 1,
+ proto_tree_add_uint(llc_tree, hf_llc_ssap, tvb, 1,
1, ssap & SAP_MASK);
- proto_tree_add_item(llc_tree, hf_llc_ssap_cr, tvb, 1,
+ proto_tree_add_boolean(llc_tree, hf_llc_ssap_cr, tvb, 1,
1, ssap & SSAP_CR_BIT);
} else
llc_tree = NULL;
*/
control = dissect_xdlc_control(tvb, 2, pinfo, llc_tree,
hf_llc_ctrl, ett_llc_ctrl,
- tvb_get_guint8(tvb, 1) & SSAP_CR_BIT, TRUE);
+ ssap & SSAP_CR_BIT, TRUE);
llc_header_len += XDLC_CONTROL_LEN(control, TRUE);
if (is_snap)
llc_header_len += 5; /* 3 bytes of OUI, 2 bytes of protocol ID */
if (tree)
proto_item_set_len(ti, llc_header_len);
- /*
- * XXX - do we want to append the SAP information to the stuff
- * "dissect_xdlc_control()" put in the COL_INFO column, rather
- * than overwriting it?
- */
if (is_snap) {
- oui = tvb_get_ntoh24(tvb, 3);
- etype = tvb_get_ntohs(tvb, 6);
-
+ dissect_snap(tvb, 3, pinfo, tree, llc_tree, control,
+ hf_llc_oui, hf_llc_type, hf_llc_pid, 2);
+ }
+ else {
if (check_col(pinfo->fd, COL_INFO)) {
- col_add_fstr(pinfo->fd, COL_INFO, "SNAP, OUI 0x%06X (%s), PID 0x%04X",
- oui, val_to_str(oui, oui_vals, "Unknown"),
- etype);
+ col_append_fstr(pinfo->fd, COL_INFO,
+ "; DSAP %s %s, SSAP %s %s",
+ val_to_str(dsap & SAP_MASK, sap_vals, "%02x"),
+ dsap & DSAP_GI_BIT ?
+ "Group" : "Individual",
+ val_to_str(ssap & SAP_MASK, sap_vals, "%02x"),
+ ssap & SSAP_CR_BIT ?
+ "Response" : "Command"
+ );
}
- if (tree) {
- proto_tree_add_item(llc_tree, hf_llc_oui, tvb, 3, 3,
- oui);
+
+ next_tvb = tvb_new_subset(tvb, llc_header_len, -1, -1);
+ if (XDLC_IS_INFORMATION(control)) {
+ /* non-SNAP */
+ /* do lookup with the subdissector table */
+ if (!dissector_try_port(subdissector_table, dsap,
+ next_tvb, pinfo, tree)) {
+ dissect_data(next_tvb, 0, pinfo, tree);
+ }
+ } else {
+ dissect_data(next_tvb, 0, pinfo, tree);
}
+ }
+}
- next_tvb = tvb_new_subset(tvb, 8, -1, -1);
- tvb_compat(next_tvb, &pd, &offset);
-
- switch (oui) {
-
- case OUI_ENCAP_ETHER:
- case OUI_APPLE_ATALK:
- /* No, I have no idea why Apple used
- one of their own OUIs, rather than
- OUI_ENCAP_ETHER, and an Ethernet
- packet type as protocol ID, for
- AppleTalk data packets - but used
- OUI_ENCAP_ETHER and an Ethernet
- packet type for AARP packets. */
- if (XDLC_IS_INFORMATION(control)) {
- ethertype(etype, tvb, 8,
- pinfo, tree, llc_tree, hf_llc_type);
- } else
- dissect_data_tvb(next_tvb, pinfo, tree);
- break;
+/*
+ * Dissect SNAP header; used elsewhere, e.g. in the Frame Relay dissector.
+ */
+void
+dissect_snap(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree,
+ proto_tree *snap_tree, int control, int hf_oui, int hf_type, int hf_pid,
+ int bridge_pad)
+{
+ guint32 oui;
+ guint16 etype;
+ tvbuff_t *next_tvb;
- case OUI_CISCO:
- /* So are all CDP packets LLC packets
- with an OUI of OUI_CISCO and a
- protocol ID of 0x2000, or
- are some of them raw or encapsulated
- Ethernet? */
- if (tree) {
- proto_tree_add_item(llc_tree,
- hf_llc_pid, tvb, 6, 2, etype);
- }
- if (XDLC_IS_INFORMATION(control)) {
- switch (etype) {
+ oui = tvb_get_ntoh24(tvb, offset);
+ etype = tvb_get_ntohs(tvb, offset+3);
-#if 0
- case 0x0102:
- dissect_drip(pd, offset, pinfo->fd, tree);
- break;
-#endif
+ if (check_col(pinfo->fd, COL_INFO)) {
+ col_append_fstr(pinfo->fd, COL_INFO,
+ "; SNAP, OUI 0x%06X (%s), PID 0x%04X",
+ oui, val_to_str(oui, oui_vals, "Unknown"), etype);
+ }
+ if (tree) {
+ proto_tree_add_uint(snap_tree, hf_oui, tvb, offset, 3, oui);
+ }
+
+ 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
+ OUI_ENCAP_ETHER, and an Ethernet
+ packet type as protocol ID, for
+ AppleTalk data packets - but used
+ OUI_ENCAP_ETHER and an Ethernet
+ packet type for AARP packets. */
+ if (XDLC_IS_INFORMATION(control)) {
+ ethertype(etype, tvb, offset+5,
+ pinfo, tree, snap_tree, hf_type, -1);
+ } else {
+ next_tvb = tvb_new_subset(tvb, offset+5, -1, -1);
+ dissect_data(next_tvb, 0, pinfo, tree);
+ }
+ break;
+
+ case OUI_BRIDGED:
+ /*
+ * MAC frames bridged over ATM (RFC 2684) or Frame Relay
+ * (RFC 2427).
+ *
+ * We have to figure out how much padding to put
+ * into the frame. We were handed a "bridge_pad"
+ * argument which should be 0 for Frame Relay and
+ * 2 for ATM; we add to that the amount of padding
+ * common to both bridging types.
+ */
+ if (tree) {
+ proto_tree_add_uint(snap_tree, hf_pid, tvb, offset+3, 2,
+ etype);
+ }
- case 0x2000:
- dissect_cdp(pd, offset, pinfo->fd, tree);
- break;
+ switch (etype) {
- case 0x2001:
- dissect_cgmp(pd, offset, pinfo->fd, tree);
- break;
+ case BPID_ETH_WITH_FCS:
+ case BPID_ETH_WITHOUT_FCS:
+ next_tvb = tvb_new_subset(tvb, offset+5+bridge_pad,
+ -1, -1);
+ call_dissector(eth_handle, next_tvb, pinfo, tree);
+ break;
- case 0x2003:
- dissect_vtp(pd, offset, pinfo->fd, tree);
- break;
+ case BPID_802_5_WITH_FCS:
+ case BPID_802_5_WITHOUT_FCS:
+ /*
+ * We treat the last padding byte as the Access
+ * Control byte, as that's what the Token
+ * Ring dissector expects the first byte to
+ * be.
+ */
+ next_tvb = tvb_new_subset(tvb, offset+5+bridge_pad,
+ -1, -1);
+ call_dissector(tr_handle, next_tvb, pinfo, tree);
+ break;
- default:
- dissect_data_tvb(next_tvb, pinfo, tree);
- break;
- }
- } else
- dissect_data_tvb(next_tvb, pinfo, tree);
+ case BPID_FDDI_WITH_FCS:
+ case BPID_FDDI_WITHOUT_FCS:
+ next_tvb = tvb_new_subset(tvb, offset+5+1+bridge_pad,
+ -1, -1);
+ call_dissector(fddi_handle, next_tvb, pinfo, tree);
break;
- case OUI_CABLE_BPDU: /* DOCSIS cable modem spanning tree BPDU */
- if (tree) {
- proto_tree_add_item(llc_tree,
- hf_llc_pid, tvb, 6, 2, etype);
- }
- dissect_bpdu(pd, offset, pinfo->fd, tree);
+ case BPID_BPDU:
+ next_tvb = tvb_new_subset(tvb, offset+5, -1, -1);
+ call_dissector(bpdu_handle, next_tvb, pinfo, tree);
break;
default:
- if (tree) {
- proto_tree_add_item(llc_tree,
- hf_llc_pid, tvb, 6, 2, etype);
- }
- dissect_data_tvb(next_tvb, pinfo, tree);
+ next_tvb = tvb_new_subset(tvb, offset+5, -1, -1);
+ dissect_data(next_tvb, 0, pinfo, tree);
break;
}
- }
- else {
- if (check_col(pinfo->fd, COL_INFO)) {
- col_add_fstr(pinfo->fd, COL_INFO,
- "DSAP %s %s, SSAP %s %s",
- val_to_str(dsap & SAP_MASK, sap_vals, "%02x"),
- dsap & DSAP_GI_BIT ?
- "Group" : "Individual",
- val_to_str(ssap & SAP_MASK, sap_vals, "%02x"),
- ssap & SSAP_CR_BIT ?
- "Response" : "Command"
- );
+ break;
+
+ case OUI_CISCO:
+ /* So are all CDP packets LLC packets
+ with an OUI of OUI_CISCO and a
+ protocol ID of 0x2000, or
+ are some of them raw or encapsulated
+ Ethernet? */
+ if (tree) {
+ proto_tree_add_uint(snap_tree, hf_pid, tvb, offset+3, 2,
+ etype);
}
-
- next_tvb = tvb_new_subset(tvb, llc_header_len, -1, -1);
+ next_tvb = tvb_new_subset(tvb, offset+5, -1, -1);
if (XDLC_IS_INFORMATION(control)) {
- tvb_compat(tvb, &pd, &offset);
- /* non-SNAP */
- offset += llc_header_len;
-
/* do lookup with the subdissector table */
- if (!dissector_try_port(subdissector_table, dsap,
- pd, offset, pinfo->fd, tree)) {
- dissect_data_tvb(next_tvb, pinfo, tree);
- }
- } else {
- dissect_data_tvb(next_tvb, pinfo, tree);
+ /* for future reference, 0x0102 is Cisco DRIP */
+ if (!dissector_try_port(cisco_subdissector_table,
+ etype, next_tvb, pinfo, tree))
+ dissect_data(next_tvb, 0, pinfo, tree);
+ } else
+ dissect_data(next_tvb, 0, pinfo, tree);
+ break;
+
+ case OUI_CABLE_BPDU: /* DOCSIS cable modem spanning tree BPDU */
+ if (tree) {
+ proto_tree_add_uint(snap_tree, hf_pid, tvb, offset+3, 2,
+ etype);
}
+ next_tvb = tvb_new_subset(tvb, offset+5, -1, -1);
+ call_dissector(bpdu_handle, next_tvb, pinfo, tree);
+ break;
+
+ default:
+ if (tree) {
+ proto_tree_add_uint(snap_tree, hf_pid, tvb, offset+3, 2,
+ etype);
+ }
+ next_tvb = tvb_new_subset(tvb, offset+5, -1, -1);
+ dissect_data(next_tvb, 0, pinfo, tree);
+ break;
}
}
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,
&ett_llc_ctrl,
};
- proto_llc = proto_register_protocol ("Logical-Link Control", "llc" );
+ proto_llc = proto_register_protocol("Logical-Link Control", "LLC", "llc");
proto_register_field_array(proto_llc, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
/* subdissector code */
subdissector_table = register_dissector_table("llc.dsap");
+ cisco_subdissector_table = register_dissector_table("llc.cisco_pid");
+
+ register_dissector("llc", dissect_llc, proto_llc);
+}
+
+void
+proto_reg_handoff_llc(void)
+{
+ /*
+ * Get handles for the BPDU, Ethernet, FDDI, and Token Ring
+ * dissectors.
+ */
+ bpdu_handle = find_dissector("bpdu");
+ eth_handle = find_dissector("eth");
+ fddi_handle = find_dissector("fddi");
+ tr_handle = find_dissector("tr");
+
+ dissector_add("wtap_encap", WTAP_ENCAP_ATM_RFC1483, dissect_llc,
+ proto_llc);
}
git.samba.org / obnox / wireshark / wip.git / blobdiff