/* packet-llc.c
* Routines for IEEE 802.2 LLC layer
- * Gilbert Ramirez <gramirez@tivoli.com>
+ * Gilbert Ramirez <gram@alumni.rice.edu>
*
- * $Id: packet-llc.c,v 1.25 1999/10/08 20:50:38 guy Exp $
+ * $Id: packet-llc.c,v 1.99 2002/08/02 23:35:53 jmayer Exp $
*
* Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@unicom.net>
+ * By Gerald Combs <gerald@ethereal.com>
* Copyright 1998 Gerald Combs
- *
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
# include "config.h"
#endif
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
+#include "oui.h"
#include "xdlc.h"
-
+#include "etypes.h"
+#include "llcsaps.h"
+#include "bridged_pids.h"
+#include "ppptypes.h"
+#include "packet-ip.h"
+#include "packet-ipx.h"
+#include "packet-netbios.h"
+#include <epan/sna-utils.h>
+
+#include "packet-llc.h"
+
+#define UDP_PORT_LLC1 12000
+#define UDP_PORT_LLC2 12001
+#define UDP_PORT_LLC3 12002
+#define UDP_PORT_LLC4 12003
+#define UDP_PORT_LLC5 12004
+
static int proto_llc = -1;
static int hf_llc_dsap = -1;
static int hf_llc_ssap = -1;
+static int hf_llc_dsap_ig = -1;
+static int hf_llc_ssap_cr = -1;
static int hf_llc_ctrl = -1;
static int hf_llc_type = -1;
static int hf_llc_oui = -1;
+static int hf_llc_pid = -1;
-typedef void (capture_func_t)(const u_char *, int, guint32, packet_counts *);
-typedef void (dissect_func_t)(const u_char *, int, frame_data *, proto_tree *);
+static gint ett_llc = -1;
+static gint ett_llc_ctrl = -1;
-/* 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.
+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;
+static dissector_handle_t data_handle;
+
+/*
+ * Group/Individual bit, in the DSAP.
*/
-struct sap_info {
- guint8 sap;
- capture_func_t *capture_func;
- dissect_func_t *dissect_func;
-};
+#define DSAP_GI_BIT 0x01
-static const value_string sap_vals[] = {
- { 0x00, "NULL LSAP" },
- { 0x02, "LLC Sub-Layer Management Individual" },
- { 0x03, "LLC Sub-Layer Management Group" },
- { 0x04, "SNA Path Control Individual" },
- { 0x05, "SNA Path Control Group" },
- { 0x06, "TCP/IP" },
- { 0x08, "SNA" },
- { 0x0C, "SNA" },
- { 0x42, "Spanning Tree BPDU" },
- { 0x7F, "ISO 802.2" },
- { 0x80, "XNS" },
- { 0xAA, "SNAP" },
- { 0xBA, "Banyan Vines" },
- { 0xBC, "Banyan Vines" },
- { 0xE0, "NetWare" },
- { 0xF0, "NetBIOS" },
- { 0xF4, "IBM Net Management Individual" },
- { 0xF5, "IBM Net Management Group" },
- { 0xF8, "Remote Program Load" },
- { 0xFC, "Remote Program Load" },
- { 0xFE, "ISO Network Layer" },
- { 0xFF, "Global LSAP" },
- { 0x00, NULL }
-};
+/*
+ * Command/Response bit, in the SSAP.
+ *
+ * The low-order bit of the SSAP apparently determines whether this
+ * is a request or a response. (RFC 1390, "Transmission of IP and
+ * ARP over FDDI Networks", says
+ *
+ * Command frames are identified by having the low order
+ * bit of the SSAP address reset to zero. Response frames
+ * have the low order bit of the SSAP address set to one.
+ *
+ * and a page I've seen seems to imply that's part of 802.2.)
+ */
+#define SSAP_CR_BIT 0x01
-static struct sap_info saps[] = {
- { 0x00, NULL, NULL },
- { 0x02, NULL, NULL },
- { 0x03, NULL, NULL },
- { 0x04, NULL, NULL },
- { 0x05, NULL, NULL },
- { 0x06, capture_ip, dissect_ip },
- { 0x08, NULL, NULL },
- { 0x0C, NULL, NULL },
- { 0x42, NULL, dissect_bpdu },
- { 0x7F, NULL, NULL },
- { 0x80, NULL, NULL },
- { 0xAA, NULL, NULL },
- { 0xBA, NULL, NULL },
- { 0xBC, NULL, NULL },
- { 0xE0, NULL, 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}
-};
+/*
+ * Mask to extrace the SAP number from the DSAP or the SSAP.
+ */
+#define SAP_MASK 0xFE
-static const value_string llc_ctrl_vals[] = {
- { 0, "Information Transfer" },
- { 1, "Supervisory" },
- { 2, "Unknown" },
- { 3, "Unnumbered Information" },
- { 0, NULL }
+/*
+ * These are for SSAP and DSAP, wth last bit always zero.
+ * XXX - some DSAPs come in separate "individual" and "group" versions,
+ * with the last bit 0 and 1, respectively (e.g., LLC Sub-layer Management,
+ * IBM SNA Path Control, IBM Net Management), but, whilst 0xFE is
+ * the ISO Network Layer Protocol, 0xFF is the Global LSAP.
+ */
+static const value_string sap_vals[] = {
+ { 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" },
+ { 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" },
+ { 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 const value_string llc_oui_vals[] = {
- { 0x000000, "Encapsulated Ethernet" },
+/*
+ * 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" },
/*
http://www.cisco.com/univercd/cc/td/doc/product/software/ios113ed/113ed_cr/ibm_r/brprt1/brsrb.htm
*/
- { 0x0000f8, "Cisco 90-Compatible" },
- { 0x0000c0, "Cisco" },
- { 0x0080c2, "Bridged Frame-Relay" }, /* RFC 2427 */
- { 0, NULL }
+ { OUI_CISCO, "Cisco" },
+ { OUI_CISCO_90, "Cisco IOS 9.0 Compatible" },
+ { OUI_BRIDGED, "Frame Relay or ATM bridged frames" },
+ /* RFC 2427, RFC 2684 */
+ { OUI_ATM_FORUM, "ATM Forum" },
+ { OUI_CABLE_BPDU, "DOCSIS Spanning Tree" }, /* DOCSIS spanning tree BPDU */
+ { OUI_APPLE_ATALK, "Apple (AppleTalk)" },
+ { 0, NULL }
};
-static capture_func_t *
-sap_capture_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].capture_func;
- }
- i++;
- }
- 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, guint32 cap_len, packet_counts *ld) {
+capture_llc(const guchar *pd, int offset, int len, packet_counts *ld) {
int is_snap;
guint16 control;
- int control_len;
+ int llc_header_len;
+ guint32 oui;
guint16 etype;
- capture_func_t *capture;
- is_snap = (pd[offset] == 0xAA) && (pd[offset+1] == 0xAA);
+ if (!BYTES_ARE_IN_FRAME(offset, len, 2)) {
+ ld->other++;
+ return;
+ }
+ is_snap = (pd[offset] == SAP_SNAP) && (pd[offset+1] == SAP_SNAP);
+ llc_header_len = 2; /* DSAP + SSAP */
/*
- * The low-order bit of the SSAP apparently determines whether this
- * is a request or a response. (RFC 1390, "Transmission of IP and
- * ARP over FDDI Networks", says
- *
- * Command frames are identified by having the low order
- * bit of the SSAP address reset to zero. Response frames
- * have the low order bit of the SSAP address set to one.
- *
- * and a page I've seen seems to imply that's part of 802.2.)
- *
- * XXX - that page 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?
+ * 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 = get_xdlc_control(pd, offset+2, pd[offset+1] & 0x01, TRUE);
- control_len = XDLC_CONTROL_LEN(control, TRUE);
+ control = get_xdlc_control(pd, offset+2, pd[offset+1] & SSAP_CR_BIT);
+ llc_header_len += XDLC_CONTROL_LEN(control, TRUE);
if (is_snap)
- control_len += 5; /* 3 bytes of OUI, 2 bytes of ethertype */
+ llc_header_len += 5; /* 3 bytes of OUI, 2 bytes of protocol ID */
+ if (!BYTES_ARE_IN_FRAME(offset, len, llc_header_len)) {
+ ld->other++;
+ return;
+ }
if (is_snap) {
- if (XDLC_HAS_PAYLOAD(control)) {
- /*
- * This frame has a payload to be analyzed.
- */
- etype = (pd[offset+6] << 8) | pd[offset+7];
- offset += control_len;
- capture_ethertype(etype, offset, pd, cap_len, ld);
+ oui = pd[offset+3] << 16 | pd[offset+4] << 8 | pd[offset+5];
+ if (XDLC_IS_INFORMATION(control)) {
+ etype = pntohs(&pd[offset+6]);
+ 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. */
+ capture_ethertype(etype, pd, offset+8, len,
+ ld);
+ break;
+ case OUI_CISCO:
+ capture_ethertype(etype, pd, offset + 8, len,
+ ld);
+ break;
+ default:
+ ld->other++;
+ break;
+ }
}
}
else {
- if (XDLC_HAS_PAYLOAD(control)) {
- /*
- * This frame has a payload to be analyzed.
- */
- capture = sap_capture_func(pd[offset]);
+ /* non-SNAP */
+ if (XDLC_IS_INFORMATION(control)) {
+ switch (pd[offset]) {
- /* non-SNAP */
- offset += control_len;
+ case SAP_IP:
+ capture_ip(pd, offset + llc_header_len, len,
+ ld);
+ break;
- if (capture) {
- capture(pd, offset, cap_len, ld);
- }
- else {
+ case SAP_NETWARE:
+ capture_ipx(ld);
+ break;
+
+ case SAP_NETBIOS:
+ capture_netbios(ld);
+ break;
+
+ default:
ld->other++;
+ break;
}
}
}
}
-void
-dissect_llc(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) {
-
+static void
+dissect_llc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+{
proto_tree *llc_tree = NULL;
proto_item *ti = NULL;
int is_snap;
guint16 control;
- int control_len;
- guint16 etype;
- dissect_func_t *dissect;
+ int llc_header_len;
+ guint8 dsap, ssap;
+ tvbuff_t *next_tvb;
- is_snap = (pd[offset] == 0xAA) && (pd[offset+1] == 0xAA);
-
- if (check_col(fd, COL_PROTOCOL)) {
- col_add_str(fd, COL_PROTOCOL, "LLC");
+ if (check_col(pinfo->cinfo, COL_PROTOCOL)) {
+ col_set_str(pinfo->cinfo, COL_PROTOCOL, "LLC");
+ }
+ if (check_col(pinfo->cinfo, COL_INFO)) {
+ col_clear(pinfo->cinfo, COL_INFO);
}
-
+
+ dsap = tvb_get_guint8(tvb, 0);
if (tree) {
- ti = proto_tree_add_item(tree, proto_llc, offset, 0, NULL);
- llc_tree = proto_item_add_subtree(ti, ETT_LLC);
- proto_tree_add_item(llc_tree, hf_llc_dsap, offset, 1, pd[offset]);
- proto_tree_add_item(llc_tree, hf_llc_ssap, offset+1, 1, pd[offset+1]);
+ ti = proto_tree_add_item(tree, proto_llc, tvb, 0, -1, FALSE);
+ llc_tree = proto_item_add_subtree(ti, ett_llc);
+ proto_tree_add_uint(llc_tree, hf_llc_dsap, tvb, 0,
+ 1, dsap & SAP_MASK);
+ 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_uint(llc_tree, hf_llc_ssap, tvb, 1,
+ 1, ssap & SAP_MASK);
+ proto_tree_add_boolean(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 */
+
/*
- * The low-order bit of the SSAP apparently determines whether this
- * is a request or a response. (RFC 1390, "Transmission of IP and
- * ARP over FDDI Networks", says
- *
- * Command frames are identified by having the low order
- * bit of the SSAP address reset to zero. Response frames
- * have the low order bit of the SSAP address set to one.
- *
- * and a page I've seen seems to imply that's part of 802.2.)
- *
- * XXX - that page 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?
+ * 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,
- hf_llc_ctrl, pd[offset+1] & 0x01, TRUE);
- control_len = XDLC_CONTROL_LEN(control, TRUE);
+ control = dissect_xdlc_control(tvb, 2, pinfo, llc_tree,
+ hf_llc_ctrl, ett_llc_ctrl,
+ ssap & SSAP_CR_BIT, TRUE);
+ llc_header_len += XDLC_CONTROL_LEN(control, TRUE);
if (is_snap)
- control_len += 5; /* 3 bytes of OUI, 2 bytes of ethertype */
+ llc_header_len += 5; /* 3 bytes of OUI, 2 bytes of protocol ID */
+
if (tree)
- proto_item_set_len(ti, control_len);
+ 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) {
- if (check_col(fd, COL_INFO)) {
- col_add_str(fd, COL_INFO, "802.2 LLC (SNAP)");
+ dissect_snap(tvb, 3, pinfo, tree, llc_tree, control,
+ hf_llc_oui, hf_llc_type, hf_llc_pid, 2);
+ }
+ else {
+ if (check_col(pinfo->cinfo, COL_INFO)) {
+ col_append_fstr(pinfo->cinfo, 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, offset+3, 3,
- pd[offset+3] << 16 | pd[offset+4] << 8 | pd[offset+5]);
+
+ 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)) {
+ call_dissector(data_handle,next_tvb, pinfo, tree);
+ }
+ } else {
+ call_dissector(data_handle,next_tvb, pinfo, tree);
}
- if (XDLC_HAS_PAYLOAD(control)) {
- /*
- * This frame has a payload to be analyzed.
- */
- etype = pntohs(&pd[offset+6]);
- offset += control_len;
- /* w/o even checking, assume OUI is ethertype */
- ethertype(etype, offset, pd, fd, tree, llc_tree,
- hf_llc_type);
+ }
+}
+
+/*
+ * 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;
+
+ oui = tvb_get_ntoh24(tvb, offset);
+ etype = tvb_get_ntohs(tvb, offset+3);
+
+ if (check_col(pinfo->cinfo, COL_INFO)) {
+ col_append_fstr(pinfo->cinfo, 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);
+ call_dissector(data_handle,next_tvb, pinfo, tree);
}
- }
- else {
- if (check_col(fd, COL_INFO)) {
- col_add_fstr(fd, COL_INFO, "802.2 LLC (%s)",
- val_to_str(pd[offset], sap_vals, "%02x"));
+ 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);
}
- if (XDLC_HAS_PAYLOAD(control)) {
+ switch (etype) {
+
+ 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 BPID_802_5_WITH_FCS:
+ case BPID_802_5_WITHOUT_FCS:
/*
- * This frame has a payload to be analyzed.
+ * 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.
*/
- dissect = sap_dissect_func(pd[offset]);
-
- /* non-SNAP */
- offset += control_len;
+ next_tvb = tvb_new_subset(tvb, offset+5+bridge_pad,
+ -1, -1);
+ call_dissector(tr_handle, next_tvb, pinfo, tree);
+ break;
+
+ 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 BPID_BPDU:
+ next_tvb = tvb_new_subset(tvb, offset+5, -1, -1);
+ call_dissector(bpdu_handle, next_tvb, pinfo, tree);
+ break;
+
+ default:
+ next_tvb = tvb_new_subset(tvb, offset+5, -1, -1);
+ call_dissector(data_handle,next_tvb, pinfo, tree);
+ break;
+ }
+ 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, offset+5, -1, -1);
+ if (XDLC_IS_INFORMATION(control)) {
+ /* do lookup with the subdissector table */
+ /* for future reference, 0x0102 is Cisco DRIP */
+ if (!dissector_try_port(cisco_subdissector_table,
+ etype, next_tvb, pinfo, tree))
+ call_dissector(data_handle,next_tvb, pinfo, tree);
+ } else
+ call_dissector(data_handle,next_tvb, 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;
- if (dissect) {
- dissect(pd, offset, fd, tree);
- }
- else {
- dissect_data(pd, offset, fd, tree);
- }
+ 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);
+ call_dissector(data_handle,next_tvb, pinfo, tree);
+ break;
}
}
void
proto_register_llc(void)
{
+ static struct true_false_string ig_bit = { "Group", "Individual" };
+ static struct true_false_string cr_bit = { "Response", "Command" };
+
static hf_register_info hf[] = {
{ &hf_llc_dsap,
- { "DSAP", "llc.dsap", FT_VALS_UINT8, VALS(sap_vals) }},
+ { "DSAP", "llc.dsap", FT_UINT8, BASE_HEX,
+ VALS(sap_vals), 0x0, "", HFILL }},
+
+ { &hf_llc_dsap_ig,
+ { "IG Bit", "llc.dsap.ig", FT_BOOLEAN, BASE_HEX,
+ &ig_bit, 0x0, "Individual/Group", HFILL }},
{ &hf_llc_ssap,
- { "SSAP", "llc.ssap", FT_VALS_UINT8, VALS(sap_vals) }},
+ { "SSAP", "llc.ssap", FT_UINT8, BASE_HEX,
+ VALS(sap_vals), 0x0, "", HFILL }},
+
+ { &hf_llc_ssap_cr,
+ { "CR Bit", "llc.ssap.cr", FT_BOOLEAN, BASE_HEX,
+ &cr_bit, 0x0, "Command/Response", HFILL }},
{ &hf_llc_ctrl,
- { "Control", "llc.control", FT_VALS_UINT8, VALS(llc_ctrl_vals) }},
+ { "Control", "llc.control", FT_UINT16, BASE_HEX,
+ NULL, 0x0, "", HFILL }},
/* registered here but handled in ethertype.c */
{ &hf_llc_type,
- { "Type", "llc.type", FT_VALS_UINT16, VALS(etype_vals) }},
+ { "Type", "llc.type", FT_UINT16, BASE_HEX,
+ VALS(etype_vals), 0x0, "", HFILL }},
{ &hf_llc_oui,
- { "Organization Code", "llc.oui", FT_VALS_UINT24, VALS(llc_oui_vals) }}
+ { "Organization Code", "llc.oui", FT_UINT24, BASE_HEX,
+ VALS(oui_vals), 0x0, "", HFILL }},
+
+ { &hf_llc_pid,
+ { "Protocol ID", "llc.pid", FT_UINT16, BASE_HEX,
+ 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",
+ "LLC SAP", FT_UINT8, BASE_HEX);
+ cisco_subdissector_table = register_dissector_table("llc.cisco_pid",
+ "Cisco OUI PID", FT_UINT16, BASE_HEX);
+
+ register_dissector("llc", dissect_llc, proto_llc);
+}
+
+void
+proto_reg_handoff_llc(void)
+{
+ dissector_handle_t llc_handle;
+
+ /*
+ * 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");
+ data_handle = find_dissector("data");
+
+ llc_handle = find_dissector("llc");
+ dissector_add("wtap_encap", WTAP_ENCAP_ATM_RFC1483, llc_handle);
+ /* RFC 2043 */
+ dissector_add("ppp.protocol", PPP_LLC, llc_handle);
+ /* RFC 2353 */
+ dissector_add("udp.port", UDP_PORT_LLC1, llc_handle);
+ dissector_add("udp.port", UDP_PORT_LLC2, llc_handle);
+ dissector_add("udp.port", UDP_PORT_LLC3, llc_handle);
+ dissector_add("udp.port", UDP_PORT_LLC4, llc_handle);
+ dissector_add("udp.port", UDP_PORT_LLC5, llc_handle);
}
git.samba.org / obnox / wireshark / wip.git / blobdiff