/* packet-llc.c
* Routines for IEEE 802.2 LLC layer
- * Gilbert Ramirez <gramirez@tivoli.com>
+ * Gilbert Ramirez <gram@xiexie.org>
*
- * $Id: packet-llc.c,v 1.44 2000/01/24 02:44:52 guy Exp $
+ * $Id: packet-llc.c,v 1.64 2000/05/31 03:58:54 gram Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
#include "oui.h"
#include "xdlc.h"
#include "etypes.h"
-
+#include "llcsaps.h"
+#include "packet-bpdu.h"
+#include "packet-cdp.h"
+#include "packet-cgmp.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"
+
static int proto_llc = -1;
static int hf_llc_dsap = -1;
static int hf_llc_ssap = -1;
static gint ett_llc = -1;
static gint ett_llc_ctrl = -1;
+static dissector_table_t subdissector_table;
+
typedef void (capture_func_t)(const u_char *, int, packet_counts *);
-typedef void (dissect_func_t)(const u_char *, int, frame_data *, proto_tree *);
-/* The SAP info is split into two tables, one value_string table and one table of sap_info. This is
- * so that the value_string can be used in the header field registration.
+/* The SAP info is split into two tables, one value_string table and one
+ * table of sap_info. This is so that the value_string can be used in the
+ * header field registration.
*/
struct sap_info {
guint8 sap;
capture_func_t *capture_func;
- dissect_func_t *dissect_func;
};
/*
*/
#define SAP_MASK 0xFE
-#define SAP_SNAP 0xAA
-
/*
* These are for SSAP and DSAP, wth last bit always zero.
* XXX - some DSAPs come in separate "individual" and "group" versions,
* the ISO Network Layer Protocol, 0xFF is the Global LSAP.
*/
static const value_string sap_vals[] = {
- { 0x00, "NULL LSAP" },
- { 0x02, "LLC Sub-Layer Management" },
- { 0x04, "SNA Path Control" },
- { 0x06, "TCP/IP" },
- { 0x08, "SNA" },
- { 0x0C, "SNA" },
- { 0x0E, "PROWAY (IEC955) Network Management and Initialization" },
- { 0x18, "Texas Instruments" },
- { 0x42, "Spanning Tree BPDU" },
- { 0x4E, "EIA RS-511 Manufacturing Message Service" },
+ { SAP_NULL, "NULL LSAP" },
+ { SAP_LLC_SLMGMT, "LLC Sub-Layer Management" },
+ { SAP_SNA_PATHCTRL, "SNA Path Control" },
+ { SAP_IP, "TCP/IP" },
+ { SAP_SNA1, "SNA" },
+ { SAP_SNA2, "SNA" },
+ { SAP_PROWAY_NM_INIT, "PROWAY (IEC955) Network Management and Initialization" },
+ { 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)" },
+ { 0x7E, "ISO 8208 (X.25 over 802.2 Type 2)" },
#endif
- { 0x7F, "ISO 802.2" },
- { 0x80, "XNS" },
- { 0x86, "Nestar" },
- { 0x8E, "PROWAY (IEC955) Active Station List Maintenance" },
- { 0x98, "ARP" }, /* XXX - hand to "dissect_arp()"? */
- { SAP_SNAP, "SNAP" },
- { 0xBA, "Banyan Vines" },
- { 0xBC, "Banyan Vines" },
- { 0xE0, "NetWare" },
- { 0xF0, "NetBIOS" },
- { 0xF4, "IBM Net Management" },
- { 0xF8, "Remote Program Load" },
- { 0xFA, "Ungermann-Bass" },
- { 0xFC, "Remote Program Load" },
- { 0xFE, "ISO Network Layer" },
- { 0xFF, "Global LSAP" },
- { 0x00, NULL }
+ { 0x7F, "ISO 802.2" },
+ { SAP_XNS, "XNS" },
+ { SAP_NESTAR, "Nestar" },
+ { SAP_PROWAY_ASLM, "PROWAY (IEC955) Active Station List Maintenance" },
+ { SAP_ARP, "ARP" }, /* XXX - hand to "dissect_arp()"? */
+ { SAP_SNAP, "SNAP" },
+ { SAP_VINES1, "Banyan Vines" },
+ { SAP_VINES2, "Banyan Vines" },
+ { SAP_NETWARE, "NetWare" },
+ { SAP_NETBIOS, "NetBIOS" },
+ { SAP_IBMNM, "IBM Net Management" },
+ { SAP_RPL1, "Remote Program Load" },
+ { SAP_UB, "Ungermann-Bass" },
+ { SAP_RPL2, "Remote Program Load" },
+ { SAP_OSINL, "ISO Network Layer" },
+ { SAP_GLOBAL, "Global LSAP" },
+ { 0x00, NULL }
};
static struct sap_info saps[] = {
- { 0x00, NULL, NULL },
- { 0x02, NULL, NULL },
- { 0x03, NULL, NULL },
- { 0x04, NULL, dissect_sna },
- { 0x05, NULL, NULL },
- { 0x06, capture_ip, dissect_ip },
- { 0x08, NULL, NULL },
- { 0x0C, NULL, NULL },
- { 0x42, NULL, dissect_bpdu },
- { 0x7F, NULL, NULL },
- { 0x80, NULL, NULL },
- { SAP_SNAP, NULL, NULL },
- { 0xBA, NULL, NULL },
- { 0xBC, NULL, NULL },
- { 0xE0, capture_ipx, dissect_ipx },
- { 0xF0, capture_netbios, dissect_netbios },
- { 0xF4, NULL, NULL },
- { 0xF5, NULL, NULL },
- { 0xF8, NULL, NULL },
- { 0xFC, NULL, NULL },
- { 0xFE, NULL, dissect_osi },
- { 0xFF, NULL, NULL },
- { 0x00, NULL, NULL}
-};
-
-static const value_string llc_ctrl_vals[] = {
- { 0, "Information Transfer" },
- { 1, "Supervisory" },
- { 2, "Unknown" },
- { 3, "Unnumbered Information" },
- { 0, NULL }
+ { SAP_IP, capture_ip },
+ { SAP_NETWARE, capture_ipx },
+ { SAP_NETBIOS, capture_netbios },
+ { 0x00, NULL}
};
+/*
+ * See
+ *
+ * http://www.cisco.com/univercd/cc/td/doc/product/lan/trsrb/vlan.htm
+ *
+ * for the PIDs for VTP and DRiP that go with an OUI of OUI_CISCO.
+ */
const value_string oui_vals[] = {
{ OUI_ENCAP_ETHER, "Encapsulated Ethernet" },
/*
{ 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 }
};
return NULL;
}
-static dissect_func_t *
-sap_dissect_func(u_char sap) {
- int i=0;
-
- /* look for the second record where sap == 0, which should
- * be the last record
- */
- while (saps[i].sap > 0 || i == 0) {
- if (saps[i].sap == sap) {
- return saps[i].dissect_func;
- }
- i++;
- }
- return dissect_data;
-}
-
void
capture_llc(const u_char *pd, int offset, packet_counts *ld) {
}
void
-dissect_llc(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) {
-
+dissect_llc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+{
proto_tree *llc_tree = NULL;
proto_item *ti = NULL;
int is_snap;
int llc_header_len;
guint32 oui;
guint16 etype;
- dissect_func_t *dissect;
+ guint8 dsap, ssap;
+ tvbuff_t *next_tvb;
+ const guint8 *pd;
+ int offset;
- if (!BYTES_ARE_IN_FRAME(offset, 2)) {
- dissect_data(pd, offset, fd, tree);
- return;
- }
- is_snap = (pd[offset] == SAP_SNAP) && (pd[offset+1] == SAP_SNAP);
- llc_header_len = 2; /* DSAP + SSAP */
+ pinfo->current_proto = "LLC";
- if (check_col(fd, COL_PROTOCOL)) {
- col_add_str(fd, COL_PROTOCOL, "LLC");
+ if (check_col(pinfo->fd, COL_PROTOCOL)) {
+ col_add_str(pinfo->fd, COL_PROTOCOL, "LLC");
}
+ dsap = tvb_get_guint8(tvb, 0);
if (tree) {
- ti = proto_tree_add_item(tree, proto_llc, offset, 0, NULL);
+ ti = proto_tree_add_item(tree, proto_llc, tvb, 0, 0, NULL);
llc_tree = proto_item_add_subtree(ti, ett_llc);
- proto_tree_add_item(llc_tree, hf_llc_dsap, offset,
- 1, pd[offset] & SAP_MASK);
- proto_tree_add_item(llc_tree, hf_llc_dsap_ig, offset,
- 1, pd[offset] & DSAP_GI_BIT);
- proto_tree_add_item(llc_tree, hf_llc_ssap, offset+1,
- 1, pd[offset+1] & SAP_MASK);
- proto_tree_add_item(llc_tree, hf_llc_ssap_cr, offset+1,
- 1, pd[offset+1] & SSAP_CR_BIT);
+ proto_tree_add_item(llc_tree, hf_llc_dsap, tvb, 0,
+ 1, dsap & SAP_MASK);
+ proto_tree_add_item(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,
+ 1, ssap & SAP_MASK);
+ proto_tree_add_item(llc_tree, hf_llc_ssap_cr, tvb, 1,
+ 1, ssap & SSAP_CR_BIT);
} else
llc_tree = NULL;
+ is_snap = (dsap == SAP_SNAP) && (ssap == SAP_SNAP);
+ llc_header_len = 2; /* DSAP + SSAP */
+
/*
* XXX - the page referred to in the comment above about the
* Command/Response bit also implies that LLC Type 2 always
* uses extended operation, so we don't need to determine
* whether it's basic or extended operation; is that the case?
*/
- control = dissect_xdlc_control(pd, offset+2, fd, llc_tree,
+ control = dissect_xdlc_control(tvb, 2, pinfo, llc_tree,
hf_llc_ctrl, ett_llc_ctrl,
- pd[offset+1] & SSAP_CR_BIT, TRUE);
+ tvb_get_guint8(tvb, 1) & 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 (!BYTES_ARE_IN_FRAME(offset, llc_header_len)) {
- dissect_data(pd, offset, fd, tree);
- return;
- }
+
if (tree)
proto_item_set_len(ti, llc_header_len);
* than overwriting it?
*/
if (is_snap) {
- oui = pd[offset+3] << 16 | pd[offset+4] << 8 | pd[offset+5];
- etype = pntohs(&pd[offset+6]);
- if (check_col(fd, COL_INFO)) {
- col_add_fstr(fd, COL_INFO, "SNAP, OUI 0x%06X (%s), PID 0x%04X",
+ oui = tvb_get_ntoh24(tvb, 3);
+ etype = tvb_get_ntohs(tvb, 6);
+
+ 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);
}
if (tree) {
- proto_tree_add_item(llc_tree, hf_llc_oui, offset+3, 3,
+ proto_tree_add_item(llc_tree, hf_llc_oui, tvb, 3, 3,
oui);
}
+
+ next_tvb = tvb_new_subset(tvb, 8, -1, -1);
+ tvb_compat(next_tvb, &pd, &offset);
+
switch (oui) {
case OUI_ENCAP_ETHER:
OUI_ENCAP_ETHER and an Ethernet
packet type for AARP packets. */
if (XDLC_IS_INFORMATION(control)) {
- ethertype(etype, offset+8, pd,
- fd, tree, llc_tree, hf_llc_type);
+ ethertype(etype, tvb, 8,
+ pinfo, tree, llc_tree, hf_llc_type);
} else
- dissect_data(pd, offset+8, fd, tree);
+ dissect_data_tvb(next_tvb, pinfo, tree);
break;
case OUI_CISCO:
Ethernet? */
if (tree) {
proto_tree_add_item(llc_tree,
- hf_llc_pid, offset+6, 2, etype);
+ hf_llc_pid, tvb, 6, 2, etype);
}
if (XDLC_IS_INFORMATION(control)) {
switch (etype) {
+#if 0
+ case 0x0102:
+ dissect_drip(pd, offset, pinfo->fd, tree);
+ break;
+#endif
+
case 0x2000:
- dissect_cdp(pd, offset+8, fd, tree);
+ dissect_cdp(pd, offset, pinfo->fd, tree);
+ break;
+
+ case 0x2001:
+ dissect_cgmp(pd, offset, pinfo->fd, tree);
+ break;
+
+ case 0x2003:
+ dissect_vtp(pd, offset, pinfo->fd, tree);
break;
default:
- dissect_data(pd, offset+8, fd, tree);
+ dissect_data_tvb(next_tvb, pinfo, tree);
break;
}
} else
- dissect_data(pd, offset+8, fd, tree);
+ dissect_data_tvb(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);
break;
default:
if (tree) {
proto_tree_add_item(llc_tree,
- hf_llc_pid, offset+6, 2, etype);
+ hf_llc_pid, tvb, 6, 2, etype);
}
- dissect_data(pd, offset+8, fd, tree);
+ dissect_data_tvb(next_tvb, pinfo, tree);
break;
}
- }
+ }
else {
- if (check_col(fd, COL_INFO)) {
- col_add_fstr(fd, COL_INFO,
+ if (check_col(pinfo->fd, COL_INFO)) {
+ col_add_fstr(pinfo->fd, COL_INFO,
"DSAP %s %s, SSAP %s %s",
- val_to_str(pd[offset] & SAP_MASK, sap_vals, "%02x"),
- pd[offset] & DSAP_GI_BIT ?
+ val_to_str(dsap & SAP_MASK, sap_vals, "%02x"),
+ dsap & DSAP_GI_BIT ?
"Group" : "Individual",
- val_to_str(pd[offset+1] & SAP_MASK, sap_vals, "%02x"),
- pd[offset+1] & SSAP_CR_BIT ?
- "Command" : "Response"
+ val_to_str(ssap & SAP_MASK, sap_vals, "%02x"),
+ ssap & SSAP_CR_BIT ?
+ "Response" : "Command"
);
}
+ next_tvb = tvb_new_subset(tvb, llc_header_len, -1, -1);
if (XDLC_IS_INFORMATION(control)) {
- dissect = sap_dissect_func(pd[offset]);
-
+ tvb_compat(tvb, &pd, &offset);
/* non-SNAP */
offset += llc_header_len;
- if (dissect) {
- dissect(pd, offset, fd, tree);
+ /* 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(pd, offset, fd, tree);
- }
- } else
- dissect_data(pd, offset, fd, tree);
+ } else {
+ dissect_data_tvb(next_tvb, pinfo, tree);
+ }
}
}
&cr_bit, 0x0, "Command/Response" }},
{ &hf_llc_ctrl,
- { "Control", "llc.control", FT_UINT8, BASE_HEX,
- VALS(llc_ctrl_vals), 0x0, "" }},
+ { "Control", "llc.control", FT_UINT16, BASE_HEX,
+ NULL, 0x0, "" }},
/* registered here but handled in ethertype.c */
{ &hf_llc_type,
proto_llc = proto_register_protocol ("Logical-Link Control", "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");
}
git.samba.org / obnox / wireshark / wip.git / blobdiff