/* packet-llc.c
* Routines for IEEE 802.2 LLC layer
- * Gilbert Ramirez <gram@xiexie.org>
+ * Gilbert Ramirez <gram@alumni.rice.edu>
*
- * $Id: packet-llc.c,v 1.53 2000/04/12 20:24:34 gram Exp $
+ * $Id: packet-llc.c,v 1.99 2002/08/02 23:35:53 jmayer Exp $
*
* Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@zing.org>
+ * 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 "packet-bpdu.h"
-#include "packet-cdp.h"
-#include "packet-cgmp.h"
+#include "llcsaps.h"
+#include "bridged_pids.h"
+#include "ppptypes.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 <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 gint ett_llc = -1;
static gint ett_llc_ctrl = -1;
-typedef void (capture_func_t)(const u_char *, int, packet_counts *);
-typedef void (dissect_func_t)(const u_char *, int, frame_data *, proto_tree *);
+static dissector_table_t subdissector_table;
+static dissector_table_t cisco_subdissector_table;
-/* 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;
-};
+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.
*/
#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" },
-#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
- { 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 }
-};
-
-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}
+ { 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 }
};
/*
*/
{ 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 }
};
-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, packet_counts *ld) {
+capture_llc(const guchar *pd, int offset, int len, packet_counts *ld) {
int is_snap;
guint16 control;
int llc_header_len;
guint32 oui;
guint16 etype;
- capture_func_t *capture;
- if (!BYTES_ARE_IN_FRAME(offset, 2)) {
+ if (!BYTES_ARE_IN_FRAME(offset, len, 2)) {
ld->other++;
return;
}
* 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] & SSAP_CR_BIT,
- 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)
llc_header_len += 5; /* 3 bytes of OUI, 2 bytes of protocol ID */
- if (!BYTES_ARE_IN_FRAME(offset, llc_header_len)) {
+ if (!BYTES_ARE_IN_FRAME(offset, len, llc_header_len)) {
ld->other++;
return;
}
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
AppleTalk data packets - but used
OUI_ENCAP_ETHER and an Ethernet
packet type for AARP packets. */
- capture_ethertype(etype, offset+8, pd,
+ capture_ethertype(etype, pd, offset+8, len,
ld);
break;
case OUI_CISCO:
- capture_ethertype(etype,
- offset + 8, pd, ld);
+ capture_ethertype(etype, pd, offset + 8, len,
+ ld);
break;
default:
ld->other++;
}
}
else {
+ /* non-SNAP */
if (XDLC_IS_INFORMATION(control)) {
- capture = sap_capture_func(pd[offset]);
+ switch (pd[offset]) {
- /* non-SNAP */
- offset += llc_header_len;
+ case SAP_IP:
+ capture_ip(pd, offset + llc_header_len, len,
+ ld);
+ break;
- if (capture) {
- capture(pd, offset, 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 llc_header_len;
- guint32 oui;
- guint16 etype;
- dissect_func_t *dissect;
+ guint8 dsap, ssap;
+ tvbuff_t *next_tvb;
- if (!BYTES_ARE_IN_FRAME(offset, 2)) {
- dissect_data(pd, offset, fd, tree);
- return;
+ if (check_col(pinfo->cinfo, COL_PROTOCOL)) {
+ col_set_str(pinfo->cinfo, COL_PROTOCOL, "LLC");
}
- is_snap = (pd[offset] == SAP_SNAP) && (pd[offset+1] == SAP_SNAP);
- llc_header_len = 2; /* DSAP + SSAP */
-
- if (check_col(fd, COL_PROTOCOL)) {
- col_add_str(fd, 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);
+ ti = proto_tree_add_item(tree, proto_llc, tvb, 0, -1, FALSE);
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_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 */
+
/*
* 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);
+ 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 (!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);
- /*
- * 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 = 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, val_to_str(oui, oui_vals, "Unknown"),
- etype);
- }
- if (tree) {
- proto_tree_add_item(llc_tree, hf_llc_oui, offset+3, 3,
- oui);
+ 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"
+ );
}
- 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, offset+8, pd,
- fd, tree, llc_tree, hf_llc_type);
- } else
- dissect_data(pd, offset+8, fd, tree);
- 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_item(llc_tree,
- hf_llc_pid, offset+6, 2, etype);
+ 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);
}
- if (XDLC_IS_INFORMATION(control)) {
- switch (etype) {
+ } else {
+ call_dissector(data_handle,next_tvb, pinfo, tree);
+ }
+ }
+}
-#if 0
- case 0x0102:
- dissect_drip(pd, offset+8, fd, tree);
- break;
-#endif
+/*
+ * 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 0x2000:
- dissect_cdp(pd, offset+8, fd, tree);
- break;
+ oui = tvb_get_ntoh24(tvb, offset);
+ etype = tvb_get_ntohs(tvb, offset+3);
- case 0x2001:
- dissect_cgmp(pd, offset+8, fd, tree);
- break;
+ 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);
+ }
- case 0x2003:
- dissect_vtp(pd, offset+8, fd, tree);
- break;
+ 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);
+ }
+ 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);
+ }
- default:
- dissect_data(pd, offset+8, fd, tree);
- break;
- }
- } else
- dissect_data(pd, offset+8, fd, tree);
+ 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 OUI_CABLE_BPDU: /* DOCSIS cable modem spanning tree BPDU */
- if (tree) {
- proto_tree_add_item(llc_tree,
- hf_llc_pid, offset+6, 2, etype);
- }
- dissect_bpdu(pd, offset+8, fd, tree);
+ 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;
+
+ 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:
- if (tree) {
- proto_tree_add_item(llc_tree,
- hf_llc_pid, offset+6, 2, etype);
- }
- dissect_data(pd, offset+8, fd, tree);
+ next_tvb = tvb_new_subset(tvb, offset+5, -1, -1);
+ call_dissector(data_handle,next_tvb, pinfo, tree);
break;
}
- }
- else {
- if (check_col(fd, COL_INFO)) {
- col_add_fstr(fd, COL_INFO,
- "DSAP %s %s, SSAP %s %s",
- val_to_str(pd[offset] & SAP_MASK, sap_vals, "%02x"),
- pd[offset] & DSAP_GI_BIT ?
- "Group" : "Individual",
- val_to_str(pd[offset+1] & SAP_MASK, sap_vals, "%02x"),
- pd[offset+1] & 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, offset+5, -1, -1);
if (XDLC_IS_INFORMATION(control)) {
- dissect = sap_dissect_func(pd[offset]);
-
- /* non-SNAP */
- offset += llc_header_len;
+ /* 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);
- }
- } else {
- offset += llc_header_len;
- 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;
}
}
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_UINT8, BASE_HEX,
- NULL, 0x0, "" }},
+ { "Control", "llc.control", FT_UINT16, BASE_HEX,
+ 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",
+ "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