1998-09-16 02:39:15 +00:00
|
|
|
/* packet-llc.c
|
|
|
|
* Routines for IEEE 802.2 LLC layer
|
2001-11-13 23:55:44 +00:00
|
|
|
* Gilbert Ramirez <gram@alumni.rice.edu>
|
1998-09-16 02:39:15 +00:00
|
|
|
*
|
2002-08-02 23:36:07 +00:00
|
|
|
* $Id: packet-llc.c,v 1.99 2002/08/02 23:35:53 jmayer Exp $
|
1998-09-16 03:22:19 +00:00
|
|
|
*
|
1998-09-16 02:39:15 +00:00
|
|
|
* Ethereal - Network traffic analyzer
|
2001-11-20 21:59:18 +00:00
|
|
|
* By Gerald Combs <gerald@ethereal.com>
|
1998-09-16 02:39:15 +00:00
|
|
|
* 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
|
|
|
|
* as published by the Free Software Foundation; either version 2
|
|
|
|
* of the License, or (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
* along with this program; if not, write to the Free Software
|
|
|
|
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
|
|
# include "config.h"
|
|
|
|
#endif
|
|
|
|
|
1999-03-23 03:14:46 +00:00
|
|
|
#include <glib.h>
|
2002-01-21 07:37:49 +00:00
|
|
|
#include <epan/packet.h>
|
1999-12-29 05:20:00 +00:00
|
|
|
#include "oui.h"
|
1999-08-04 04:37:46 +00:00
|
|
|
#include "xdlc.h"
|
2000-01-22 21:49:50 +00:00
|
|
|
#include "etypes.h"
|
2000-04-17 00:32:43 +00:00
|
|
|
#include "llcsaps.h"
|
2001-01-10 09:07:35 +00:00
|
|
|
#include "bridged_pids.h"
|
2002-05-29 03:08:02 +00:00
|
|
|
#include "ppptypes.h"
|
2000-02-15 21:06:58 +00:00
|
|
|
#include "packet-ip.h"
|
|
|
|
#include "packet-ipx.h"
|
|
|
|
#include "packet-netbios.h"
|
2002-01-21 07:37:49 +00:00
|
|
|
#include <epan/sna-utils.h>
|
2000-02-15 21:06:58 +00:00
|
|
|
|
2001-01-10 09:07:35 +00:00
|
|
|
#include "packet-llc.h"
|
|
|
|
|
2002-05-29 03:08:02 +00:00
|
|
|
#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
|
|
|
|
|
1999-07-29 05:47:07 +00:00
|
|
|
static int proto_llc = -1;
|
|
|
|
static int hf_llc_dsap = -1;
|
|
|
|
static int hf_llc_ssap = -1;
|
1999-12-13 21:48:18 +00:00
|
|
|
static int hf_llc_dsap_ig = -1;
|
|
|
|
static int hf_llc_ssap_cr = -1;
|
1999-07-29 05:47:07 +00:00
|
|
|
static int hf_llc_ctrl = -1;
|
|
|
|
static int hf_llc_type = -1;
|
|
|
|
static int hf_llc_oui = -1;
|
1999-12-05 09:45:32 +00:00
|
|
|
static int hf_llc_pid = -1;
|
1998-09-16 02:39:15 +00:00
|
|
|
|
1999-11-16 11:44:20 +00:00
|
|
|
static gint ett_llc = -1;
|
|
|
|
static gint ett_llc_ctrl = -1;
|
|
|
|
|
2000-04-17 00:32:43 +00:00
|
|
|
static dissector_table_t subdissector_table;
|
Tvbuffify the CDP, CGMP, ISL, and VTP dissectors.
Add a new subdissector table in the LLC dissector for protocol IDs with
a Cisco OUI, and register the CDP, CGMP, and VTMP dissectors in that
table, rather than calling them via a switch statement.
Register the ISL dissector by name, and have the Ethernet dissector call
it via a handle.
Fix the handling of the checksum field in the CDP dissector.
The strings in CDP are counted, not null-terminated; treat them as such.
Fix the handling of the encapsulated frame CRC, and the encapsulated
frame, in the ISL dissector, at least for Ethernet frames; it may not be
correct for encapsulated Token Ring frames.
svn path=/trunk/; revision=2792
2000-12-28 09:49:09 +00:00
|
|
|
static dissector_table_t cisco_subdissector_table;
|
2000-04-17 00:32:43 +00:00
|
|
|
|
2000-11-16 07:35:43 +00:00
|
|
|
static dissector_handle_t bpdu_handle;
|
2001-01-10 09:07:35 +00:00
|
|
|
static dissector_handle_t eth_handle;
|
|
|
|
static dissector_handle_t fddi_handle;
|
|
|
|
static dissector_handle_t tr_handle;
|
2001-11-25 22:51:14 +00:00
|
|
|
static dissector_handle_t data_handle;
|
2000-11-16 07:35:43 +00:00
|
|
|
|
1999-12-13 23:39:59 +00:00
|
|
|
/*
|
|
|
|
* Group/Individual bit, in the DSAP.
|
|
|
|
*/
|
|
|
|
#define DSAP_GI_BIT 0x01
|
|
|
|
|
|
|
|
/*
|
|
|
|
* 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
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Mask to extrace the SAP number from the DSAP or the SSAP.
|
|
|
|
*/
|
|
|
|
#define SAP_MASK 0xFE
|
|
|
|
|
|
|
|
/*
|
|
|
|
* These are for SSAP and DSAP, wth last bit always zero.
|
1999-12-14 07:22:56 +00:00
|
|
|
* XXX - some DSAPs come in separate "individual" and "group" versions,
|
|
|
|
* with the last bit 0 and 1, respectively (e.g., LLC Sub-layer Management,
|
2000-01-24 02:44:52 +00:00
|
|
|
* IBM SNA Path Control, IBM Net Management), but, whilst 0xFE is
|
1999-12-14 07:22:56 +00:00
|
|
|
* the ISO Network Layer Protocol, 0xFF is the Global LSAP.
|
1999-12-13 23:39:59 +00:00
|
|
|
*/
|
1999-07-07 22:52:57 +00:00
|
|
|
static const value_string sap_vals[] = {
|
2000-04-17 00:32:43 +00:00
|
|
|
{ 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" },
|
2001-01-05 19:07:38 +00:00
|
|
|
{ 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?
|
|
|
|
*/
|
2000-04-17 00:32:43 +00:00
|
|
|
{ 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 }
|
1998-09-17 18:43:11 +00:00
|
|
|
};
|
|
|
|
|
2000-02-05 09:34:33 +00:00
|
|
|
/*
|
|
|
|
* 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.
|
|
|
|
*/
|
1999-12-29 05:20:00 +00:00
|
|
|
const value_string oui_vals[] = {
|
1999-12-05 09:45:32 +00:00
|
|
|
{ OUI_ENCAP_ETHER, "Encapsulated Ethernet" },
|
1999-07-07 22:52:57 +00:00
|
|
|
/*
|
|
|
|
http://www.cisco.com/univercd/cc/td/doc/product/software/ios113ed/113ed_cr/ibm_r/brprt1/brsrb.htm
|
|
|
|
*/
|
2000-01-12 19:37:24 +00:00
|
|
|
{ OUI_CISCO, "Cisco" },
|
2000-01-22 21:49:50 +00:00
|
|
|
{ OUI_CISCO_90, "Cisco IOS 9.0 Compatible" },
|
2001-01-10 09:07:35 +00:00
|
|
|
{ OUI_BRIDGED, "Frame Relay or ATM bridged frames" },
|
|
|
|
/* RFC 2427, RFC 2684 */
|
1999-12-29 05:20:00 +00:00
|
|
|
{ OUI_ATM_FORUM, "ATM Forum" },
|
2000-04-10 14:45:30 +00:00
|
|
|
{ OUI_CABLE_BPDU, "DOCSIS Spanning Tree" }, /* DOCSIS spanning tree BPDU */
|
2001-06-01 23:04:37 +00:00
|
|
|
{ OUI_APPLE_ATALK, "Apple (AppleTalk)" },
|
1999-12-05 09:45:32 +00:00
|
|
|
{ 0, NULL }
|
1999-07-07 22:52:57 +00:00
|
|
|
};
|
1998-09-16 02:39:15 +00:00
|
|
|
|
1999-02-09 00:35:38 +00:00
|
|
|
void
|
2002-08-02 23:36:07 +00:00
|
|
|
capture_llc(const guchar *pd, int offset, int len, packet_counts *ld) {
|
1999-02-09 00:35:38 +00:00
|
|
|
|
|
|
|
int is_snap;
|
1999-09-26 20:31:51 +00:00
|
|
|
guint16 control;
|
1999-11-11 08:04:06 +00:00
|
|
|
int llc_header_len;
|
1999-12-05 09:45:32 +00:00
|
|
|
guint32 oui;
|
1999-08-23 22:47:13 +00:00
|
|
|
guint16 etype;
|
1999-02-09 00:35:38 +00:00
|
|
|
|
2001-11-20 21:59:18 +00:00
|
|
|
if (!BYTES_ARE_IN_FRAME(offset, len, 2)) {
|
Apple, for some unknown reason, doesn't just encapsulate AppleTalk data
packets as SNAP-encapsulated Ethernet; instead, they use one of their
*own* OUIs, followed by the Ethernet packet type for AppleTalk. (Even
more oddly, they *do* use SNAP-encapsulated Ethernet for AARP....)
Dissect OUI 08-00-07 the same way we dissect the SNAP-encapsulated
Ethernet OUI of 00-00-00, and identify it as an Apple OUI.
Add checks to make sure we actually have a full LLC header and, if it's
a SNAP frame, that we have a full SNAP header as well.
For non-SNAP frames, list both the DSAP and the SSAP in the Info column,
and, for SNAP frames, list the OUI and PID.
svn path=/trunk/; revision=1220
1999-12-05 22:52:00 +00:00
|
|
|
ld->other++;
|
|
|
|
return;
|
|
|
|
}
|
2000-01-24 02:44:52 +00:00
|
|
|
is_snap = (pd[offset] == SAP_SNAP) && (pd[offset+1] == SAP_SNAP);
|
1999-11-11 08:04:06 +00:00
|
|
|
llc_header_len = 2; /* DSAP + SSAP */
|
1999-02-09 00:35:38 +00:00
|
|
|
|
1999-08-23 22:47:13 +00:00
|
|
|
/*
|
1999-12-13 23:39:59 +00:00
|
|
|
* 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?
|
1999-08-23 22:47:13 +00:00
|
|
|
*/
|
2002-03-31 21:09:00 +00:00
|
|
|
control = get_xdlc_control(pd, offset+2, pd[offset+1] & SSAP_CR_BIT);
|
1999-11-11 08:04:06 +00:00
|
|
|
llc_header_len += XDLC_CONTROL_LEN(control, TRUE);
|
1999-09-26 20:40:00 +00:00
|
|
|
if (is_snap)
|
1999-12-05 09:45:32 +00:00
|
|
|
llc_header_len += 5; /* 3 bytes of OUI, 2 bytes of protocol ID */
|
2001-11-20 21:59:18 +00:00
|
|
|
if (!BYTES_ARE_IN_FRAME(offset, len, llc_header_len)) {
|
Apple, for some unknown reason, doesn't just encapsulate AppleTalk data
packets as SNAP-encapsulated Ethernet; instead, they use one of their
*own* OUIs, followed by the Ethernet packet type for AppleTalk. (Even
more oddly, they *do* use SNAP-encapsulated Ethernet for AARP....)
Dissect OUI 08-00-07 the same way we dissect the SNAP-encapsulated
Ethernet OUI of 00-00-00, and identify it as an Apple OUI.
Add checks to make sure we actually have a full LLC header and, if it's
a SNAP frame, that we have a full SNAP header as well.
For non-SNAP frames, list both the DSAP and the SSAP in the Info column,
and, for SNAP frames, list the OUI and PID.
svn path=/trunk/; revision=1220
1999-12-05 22:52:00 +00:00
|
|
|
ld->other++;
|
|
|
|
return;
|
|
|
|
}
|
1999-02-09 00:35:38 +00:00
|
|
|
|
1999-08-23 22:47:13 +00:00
|
|
|
if (is_snap) {
|
1999-12-05 09:45:32 +00:00
|
|
|
oui = pd[offset+3] << 16 | pd[offset+4] << 8 | pd[offset+5];
|
2000-01-24 02:05:39 +00:00
|
|
|
if (XDLC_IS_INFORMATION(control)) {
|
1999-12-05 09:45:32 +00:00
|
|
|
etype = pntohs(&pd[offset+6]);
|
|
|
|
switch (oui) {
|
|
|
|
|
|
|
|
case OUI_ENCAP_ETHER:
|
2001-06-02 03:04:12 +00:00
|
|
|
case OUI_CISCO_90:
|
Apple, for some unknown reason, doesn't just encapsulate AppleTalk data
packets as SNAP-encapsulated Ethernet; instead, they use one of their
*own* OUIs, followed by the Ethernet packet type for AppleTalk. (Even
more oddly, they *do* use SNAP-encapsulated Ethernet for AARP....)
Dissect OUI 08-00-07 the same way we dissect the SNAP-encapsulated
Ethernet OUI of 00-00-00, and identify it as an Apple OUI.
Add checks to make sure we actually have a full LLC header and, if it's
a SNAP frame, that we have a full SNAP header as well.
For non-SNAP frames, list both the DSAP and the SSAP in the Info column,
and, for SNAP frames, list the OUI and PID.
svn path=/trunk/; revision=1220
1999-12-05 22:52:00 +00:00
|
|
|
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
|
2001-06-02 03:04:12 +00:00
|
|
|
packet type for AARP packets. */
|
2001-11-20 21:59:18 +00:00
|
|
|
capture_ethertype(etype, pd, offset+8, len,
|
2000-01-23 08:55:37 +00:00
|
|
|
ld);
|
1999-12-05 09:45:32 +00:00
|
|
|
break;
|
2000-01-22 21:49:50 +00:00
|
|
|
case OUI_CISCO:
|
2001-11-20 21:59:18 +00:00
|
|
|
capture_ethertype(etype, pd, offset + 8, len,
|
|
|
|
ld);
|
2000-01-22 21:49:50 +00:00
|
|
|
break;
|
1999-12-05 09:45:32 +00:00
|
|
|
default:
|
|
|
|
ld->other++;
|
|
|
|
break;
|
|
|
|
}
|
1999-02-09 00:35:38 +00:00
|
|
|
}
|
1999-08-23 22:47:13 +00:00
|
|
|
}
|
|
|
|
else {
|
2002-04-24 06:03:34 +00:00
|
|
|
/* non-SNAP */
|
2000-01-24 02:05:39 +00:00
|
|
|
if (XDLC_IS_INFORMATION(control)) {
|
2002-04-24 06:03:34 +00:00
|
|
|
switch (pd[offset]) {
|
1999-08-23 22:47:13 +00:00
|
|
|
|
2002-04-24 06:03:34 +00:00
|
|
|
case SAP_IP:
|
|
|
|
capture_ip(pd, offset + llc_header_len, len,
|
|
|
|
ld);
|
|
|
|
break;
|
1999-08-23 22:47:13 +00:00
|
|
|
|
2002-04-24 06:03:34 +00:00
|
|
|
case SAP_NETWARE:
|
|
|
|
capture_ipx(ld);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case SAP_NETBIOS:
|
|
|
|
capture_netbios(ld);
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
1999-08-23 22:47:13 +00:00
|
|
|
ld->other++;
|
2002-04-24 06:03:34 +00:00
|
|
|
break;
|
1999-08-23 22:47:13 +00:00
|
|
|
}
|
1999-02-09 00:35:38 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2001-01-03 10:34:42 +00:00
|
|
|
static void
|
2000-05-11 22:04:18 +00:00
|
|
|
dissect_llc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|
|
|
{
|
1999-03-23 03:14:46 +00:00
|
|
|
proto_tree *llc_tree = NULL;
|
1999-09-26 20:31:51 +00:00
|
|
|
proto_item *ti = NULL;
|
1998-09-17 18:43:11 +00:00
|
|
|
int is_snap;
|
1999-09-26 20:31:51 +00:00
|
|
|
guint16 control;
|
1999-11-11 08:04:06 +00:00
|
|
|
int llc_header_len;
|
2000-05-11 22:04:18 +00:00
|
|
|
guint8 dsap, ssap;
|
|
|
|
tvbuff_t *next_tvb;
|
1998-09-16 02:39:15 +00:00
|
|
|
|
2001-12-10 00:26:21 +00:00
|
|
|
if (check_col(pinfo->cinfo, COL_PROTOCOL)) {
|
|
|
|
col_set_str(pinfo->cinfo, COL_PROTOCOL, "LLC");
|
1998-09-16 02:39:15 +00:00
|
|
|
}
|
2001-12-10 00:26:21 +00:00
|
|
|
if (check_col(pinfo->cinfo, COL_INFO)) {
|
|
|
|
col_clear(pinfo->cinfo, COL_INFO);
|
2001-01-05 08:43:30 +00:00
|
|
|
}
|
Apple, for some unknown reason, doesn't just encapsulate AppleTalk data
packets as SNAP-encapsulated Ethernet; instead, they use one of their
*own* OUIs, followed by the Ethernet packet type for AppleTalk. (Even
more oddly, they *do* use SNAP-encapsulated Ethernet for AARP....)
Dissect OUI 08-00-07 the same way we dissect the SNAP-encapsulated
Ethernet OUI of 00-00-00, and identify it as an Apple OUI.
Add checks to make sure we actually have a full LLC header and, if it's
a SNAP frame, that we have a full SNAP header as well.
For non-SNAP frames, list both the DSAP and the SSAP in the Info column,
and, for SNAP frames, list the OUI and PID.
svn path=/trunk/; revision=1220
1999-12-05 22:52:00 +00:00
|
|
|
|
2000-05-11 22:04:18 +00:00
|
|
|
dsap = tvb_get_guint8(tvb, 0);
|
1998-09-16 02:39:15 +00:00
|
|
|
if (tree) {
|
Allow a length of -1 to be specified when adding FT_NONE and FT_PROTOCOL
items to the protocol tree; it's interpreted as "the rest of the data in
the tvbuff". This can be used if
1) the item covers the entire packet or the remaining payload in
the packet
or
2) the item's length won't be known until it's dissected, and
will be then set with "proto_item_set_len()" - if an
exception is thrown in the dissection, it means the item ran
*past* the end of the tvbuff, so saying it runs to the end of
the tvbuff is reasonable.
Convert a number of "proto_tree_add_XXX()" calls using
"tvb_length_remaining()", values derived from the result of
"tvb_length()", or 0 (in the case of items whose length is unknown) to
use -1 instead (using 0 means that if an exception is thrown, selecting
the item highlights nothing; using -1 means it highlights all the data
for that item that's available).
In some places where "tvb_length()" or "tvb_length_remaining()" was used
to determine how large a packet is, use "tvb_reported_length()" or
"tvb_reported_length_remaining()", instead - the first two calls
indicate how much captured data was in the packet, the latter two calls
indicate how large the packet actually was (and the fact that using the
latter could cause BoundsError exceptions to be thrown is a feature - if
such an exception is thrown, the frame really *was* short, and it should
be tagged as such).
Replace some "proto_tree_add_XXX()" calls with equivalent
"proto_tree_add_item()" calls.
Fix some indentation.
svn path=/trunk/; revision=4578
2002-01-20 22:12:39 +00:00
|
|
|
ti = proto_tree_add_item(tree, proto_llc, tvb, 0, -1, FALSE);
|
1999-11-16 11:44:20 +00:00
|
|
|
llc_tree = proto_item_add_subtree(ti, ett_llc);
|
2000-05-31 05:09:07 +00:00
|
|
|
proto_tree_add_uint(llc_tree, hf_llc_dsap, tvb, 0,
|
2000-05-11 22:04:18 +00:00
|
|
|
1, dsap & SAP_MASK);
|
2000-05-31 05:09:07 +00:00
|
|
|
proto_tree_add_boolean(llc_tree, hf_llc_dsap_ig, tvb, 0,
|
2000-05-11 22:04:18 +00:00
|
|
|
1, dsap & DSAP_GI_BIT);
|
2000-05-28 22:02:17 +00:00
|
|
|
} else
|
|
|
|
llc_tree = NULL;
|
|
|
|
|
|
|
|
ssap = tvb_get_guint8(tvb, 1);
|
|
|
|
if (tree) {
|
2000-05-31 05:09:07 +00:00
|
|
|
proto_tree_add_uint(llc_tree, hf_llc_ssap, tvb, 1,
|
2000-05-11 22:04:18 +00:00
|
|
|
1, ssap & SAP_MASK);
|
2000-05-31 05:09:07 +00:00
|
|
|
proto_tree_add_boolean(llc_tree, hf_llc_ssap_cr, tvb, 1,
|
2000-05-11 22:04:18 +00:00
|
|
|
1, ssap & SSAP_CR_BIT);
|
1999-08-04 04:37:46 +00:00
|
|
|
} else
|
|
|
|
llc_tree = NULL;
|
|
|
|
|
2000-05-28 22:02:17 +00:00
|
|
|
is_snap = (dsap == SAP_SNAP) && (ssap == SAP_SNAP);
|
|
|
|
llc_header_len = 2; /* DSAP + SSAP */
|
|
|
|
|
1999-08-04 04:37:46 +00:00
|
|
|
/*
|
1999-12-13 23:39:59 +00:00
|
|
|
* 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?
|
1999-08-04 04:37:46 +00:00
|
|
|
*/
|
2000-05-31 03:58:56 +00:00
|
|
|
control = dissect_xdlc_control(tvb, 2, pinfo, llc_tree,
|
1999-11-16 11:44:20 +00:00
|
|
|
hf_llc_ctrl, ett_llc_ctrl,
|
2000-05-31 05:09:07 +00:00
|
|
|
ssap & SSAP_CR_BIT, TRUE);
|
1999-11-11 08:04:06 +00:00
|
|
|
llc_header_len += XDLC_CONTROL_LEN(control, TRUE);
|
1999-09-26 20:40:00 +00:00
|
|
|
if (is_snap)
|
1999-12-05 09:45:32 +00:00
|
|
|
llc_header_len += 5; /* 3 bytes of OUI, 2 bytes of protocol ID */
|
2000-05-11 22:04:18 +00:00
|
|
|
|
1999-09-26 20:31:51 +00:00
|
|
|
if (tree)
|
1999-11-11 08:04:06 +00:00
|
|
|
proto_item_set_len(ti, llc_header_len);
|
1999-08-04 04:37:46 +00:00
|
|
|
|
1998-09-16 02:39:15 +00:00
|
|
|
if (is_snap) {
|
2001-01-10 09:07:35 +00:00
|
|
|
dissect_snap(tvb, 3, pinfo, tree, llc_tree, control,
|
2001-01-11 07:24:17 +00:00
|
|
|
hf_llc_oui, hf_llc_type, hf_llc_pid, 2);
|
2000-05-11 22:04:18 +00:00
|
|
|
}
|
1998-09-16 02:39:15 +00:00
|
|
|
else {
|
2001-12-10 00:26:21 +00:00
|
|
|
if (check_col(pinfo->cinfo, COL_INFO)) {
|
|
|
|
col_append_fstr(pinfo->cinfo, COL_INFO,
|
2000-08-25 06:31:25 +00:00
|
|
|
"; DSAP %s %s, SSAP %s %s",
|
2000-05-11 22:04:18 +00:00
|
|
|
val_to_str(dsap & SAP_MASK, sap_vals, "%02x"),
|
|
|
|
dsap & DSAP_GI_BIT ?
|
1999-12-13 23:39:59 +00:00
|
|
|
"Group" : "Individual",
|
2000-05-11 22:04:18 +00:00
|
|
|
val_to_str(ssap & SAP_MASK, sap_vals, "%02x"),
|
|
|
|
ssap & SSAP_CR_BIT ?
|
2000-04-09 18:33:26 +00:00
|
|
|
"Response" : "Command"
|
1999-12-13 23:39:59 +00:00
|
|
|
);
|
1998-09-16 02:39:15 +00:00
|
|
|
}
|
|
|
|
|
2000-05-16 04:44:14 +00:00
|
|
|
next_tvb = tvb_new_subset(tvb, llc_header_len, -1, -1);
|
2000-01-24 02:05:39 +00:00
|
|
|
if (XDLC_IS_INFORMATION(control)) {
|
1999-08-23 22:47:13 +00:00
|
|
|
/* non-SNAP */
|
2000-04-17 00:32:43 +00:00
|
|
|
/* do lookup with the subdissector table */
|
|
|
|
if (!dissector_try_port(subdissector_table, dsap,
|
Allow either old-style (pre-tvbuff) or new-style (tvbuffified)
dissectors to be registered as dissectors for particular ports,
registered as heuristic dissectors, and registered as dissectors for
conversations, and have routines to be used both by old-style and
new-style dissectors to call registered dissectors.
Have the code that calls those dissectors translate the arguments as
necessary. (For conversation dissectors, replace
"find_conversation_dissector()", which just returns a pointer to the
dissector, with "old_try_conversation_dissector()" and
"try_conversation_dissector()", which actually call the dissector, so
that there's a single place at which we can do that translation. Also
make "dissector_lookup()" static and, instead of calling it and, if it
returns a non-null pointer, calling that dissector, just use
"old_dissector_try_port()" or "dissector_try_port()", for the same
reason.)
This allows some dissectors that took old-style arguments and
immediately translated them to new-style arguments to just take
new-style arguments; make them do so. It also allows some new-style
dissectors not to have to translate arguments before calling routines to
look up and call dissectors; make them not do so.
Get rid of checks for too-short frames in new-style dissectors - the
tvbuff code does those checks for you.
Give the routines to register old-style dissectors, and to call
dissectors from old-style dissectors, names beginning with "old_", with
the routines for new-style dissectors not having the "old_". Update the
dissectors that use those routines appropriately.
Rename "dissect_data()" to "old_dissect_data()", and
"dissect_data_tvb()" to "dissect_data()".
svn path=/trunk/; revision=2218
2000-08-07 03:21:25 +00:00
|
|
|
next_tvb, pinfo, tree)) {
|
2001-11-25 22:51:14 +00:00
|
|
|
call_dissector(data_handle,next_tvb, pinfo, tree);
|
1999-08-23 22:47:13 +00:00
|
|
|
}
|
2000-04-09 18:33:26 +00:00
|
|
|
} else {
|
2001-11-25 22:51:14 +00:00
|
|
|
call_dissector(data_handle,next_tvb, pinfo, tree);
|
2000-04-09 18:33:26 +00:00
|
|
|
}
|
1998-09-16 02:39:15 +00:00
|
|
|
}
|
|
|
|
}
|
1999-07-07 22:52:57 +00:00
|
|
|
|
2001-01-10 09:07:35 +00:00
|
|
|
/*
|
|
|
|
* 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);
|
|
|
|
|
2001-12-10 00:26:21 +00:00
|
|
|
if (check_col(pinfo->cinfo, COL_INFO)) {
|
|
|
|
col_append_fstr(pinfo->cinfo, COL_INFO,
|
2001-01-10 09:07:35 +00:00
|
|
|
"; 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:
|
2001-06-02 03:04:12 +00:00
|
|
|
case OUI_CISCO_90:
|
2001-01-10 09:07:35 +00:00
|
|
|
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
|
2001-06-02 03:04:12 +00:00
|
|
|
packet type for AARP packets. */
|
2001-01-10 09:07:35 +00:00
|
|
|
if (XDLC_IS_INFORMATION(control)) {
|
|
|
|
ethertype(etype, tvb, offset+5,
|
2001-01-18 07:44:41 +00:00
|
|
|
pinfo, tree, snap_tree, hf_type, -1);
|
2001-01-10 09:07:35 +00:00
|
|
|
} else {
|
|
|
|
next_tvb = tvb_new_subset(tvb, offset+5, -1, -1);
|
2001-11-25 22:51:14 +00:00
|
|
|
call_dissector(data_handle,next_tvb, pinfo, tree);
|
2001-01-10 09:07:35 +00:00
|
|
|
}
|
|
|
|
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);
|
|
|
|
}
|
|
|
|
|
|
|
|
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:
|
|
|
|
/*
|
|
|
|
* 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:
|
|
|
|
next_tvb = tvb_new_subset(tvb, offset+5, -1, -1);
|
2001-11-25 22:51:14 +00:00
|
|
|
call_dissector(data_handle,next_tvb, pinfo, tree);
|
2001-01-10 09:07:35 +00:00
|
|
|
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))
|
2001-11-25 22:51:14 +00:00
|
|
|
call_dissector(data_handle,next_tvb, pinfo, tree);
|
2001-01-10 09:07:35 +00:00
|
|
|
} else
|
2001-11-25 22:51:14 +00:00
|
|
|
call_dissector(data_handle,next_tvb, pinfo, tree);
|
2001-01-10 09:07:35 +00:00
|
|
|
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);
|
2001-11-25 22:51:14 +00:00
|
|
|
call_dissector(data_handle,next_tvb, pinfo, tree);
|
2001-01-10 09:07:35 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
1999-07-07 22:52:57 +00:00
|
|
|
void
|
|
|
|
proto_register_llc(void)
|
|
|
|
{
|
1999-12-13 21:48:18 +00:00
|
|
|
static struct true_false_string ig_bit = { "Group", "Individual" };
|
|
|
|
static struct true_false_string cr_bit = { "Response", "Command" };
|
|
|
|
|
1999-07-15 15:33:52 +00:00
|
|
|
static hf_register_info hf[] = {
|
|
|
|
{ &hf_llc_dsap,
|
1999-12-13 21:48:18 +00:00
|
|
|
{ "DSAP", "llc.dsap", FT_UINT8, BASE_HEX,
|
2001-06-18 02:18:27 +00:00
|
|
|
VALS(sap_vals), 0x0, "", HFILL }},
|
1999-12-13 21:48:18 +00:00
|
|
|
|
|
|
|
{ &hf_llc_dsap_ig,
|
|
|
|
{ "IG Bit", "llc.dsap.ig", FT_BOOLEAN, BASE_HEX,
|
2001-06-18 02:18:27 +00:00
|
|
|
&ig_bit, 0x0, "Individual/Group", HFILL }},
|
1999-07-07 22:52:57 +00:00
|
|
|
|
1999-07-15 15:33:52 +00:00
|
|
|
{ &hf_llc_ssap,
|
1999-12-13 21:48:18 +00:00
|
|
|
{ "SSAP", "llc.ssap", FT_UINT8, BASE_HEX,
|
2001-06-18 02:18:27 +00:00
|
|
|
VALS(sap_vals), 0x0, "", HFILL }},
|
1999-12-13 21:48:18 +00:00
|
|
|
|
|
|
|
{ &hf_llc_ssap_cr,
|
|
|
|
{ "CR Bit", "llc.ssap.cr", FT_BOOLEAN, BASE_HEX,
|
2001-06-18 02:18:27 +00:00
|
|
|
&cr_bit, 0x0, "Command/Response", HFILL }},
|
1999-07-07 22:52:57 +00:00
|
|
|
|
1999-07-15 15:33:52 +00:00
|
|
|
{ &hf_llc_ctrl,
|
2000-04-13 02:36:35 +00:00
|
|
|
{ "Control", "llc.control", FT_UINT16, BASE_HEX,
|
2001-06-18 02:18:27 +00:00
|
|
|
NULL, 0x0, "", HFILL }},
|
1999-07-15 15:33:52 +00:00
|
|
|
|
|
|
|
/* registered here but handled in ethertype.c */
|
|
|
|
{ &hf_llc_type,
|
1999-12-13 21:48:18 +00:00
|
|
|
{ "Type", "llc.type", FT_UINT16, BASE_HEX,
|
2001-06-18 02:18:27 +00:00
|
|
|
VALS(etype_vals), 0x0, "", HFILL }},
|
1999-07-15 15:33:52 +00:00
|
|
|
|
|
|
|
{ &hf_llc_oui,
|
1999-12-13 21:48:18 +00:00
|
|
|
{ "Organization Code", "llc.oui", FT_UINT24, BASE_HEX,
|
2001-06-18 02:18:27 +00:00
|
|
|
VALS(oui_vals), 0x0, "", HFILL }},
|
1999-12-05 09:45:32 +00:00
|
|
|
|
|
|
|
{ &hf_llc_pid,
|
1999-12-13 21:48:18 +00:00
|
|
|
{ "Protocol ID", "llc.pid", FT_UINT16, BASE_HEX,
|
2001-06-18 02:18:27 +00:00
|
|
|
NULL, 0x0, "", HFILL }}
|
1999-07-07 22:52:57 +00:00
|
|
|
};
|
1999-11-16 11:44:20 +00:00
|
|
|
static gint *ett[] = {
|
|
|
|
&ett_llc,
|
|
|
|
&ett_llc_ctrl,
|
|
|
|
};
|
1999-07-07 22:52:57 +00:00
|
|
|
|
2001-01-03 06:56:03 +00:00
|
|
|
proto_llc = proto_register_protocol("Logical-Link Control", "LLC", "llc");
|
1999-07-07 22:52:57 +00:00
|
|
|
proto_register_field_array(proto_llc, hf, array_length(hf));
|
1999-11-16 11:44:20 +00:00
|
|
|
proto_register_subtree_array(ett, array_length(ett));
|
2000-04-17 00:32:43 +00:00
|
|
|
|
|
|
|
/* subdissector code */
|
2001-12-08 06:41:48 +00:00
|
|
|
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);
|
2001-01-03 10:34:42 +00:00
|
|
|
|
2001-01-09 06:32:10 +00:00
|
|
|
register_dissector("llc", dissect_llc, proto_llc);
|
1999-07-07 22:52:57 +00:00
|
|
|
}
|
2000-11-16 07:35:43 +00:00
|
|
|
|
|
|
|
void
|
|
|
|
proto_reg_handoff_llc(void)
|
|
|
|
{
|
2001-12-03 04:00:26 +00:00
|
|
|
dissector_handle_t llc_handle;
|
|
|
|
|
2000-11-16 07:35:43 +00:00
|
|
|
/*
|
2001-01-10 09:07:35 +00:00
|
|
|
* Get handles for the BPDU, Ethernet, FDDI, and Token Ring
|
|
|
|
* dissectors.
|
2000-11-16 07:35:43 +00:00
|
|
|
*/
|
|
|
|
bpdu_handle = find_dissector("bpdu");
|
2001-01-10 09:07:35 +00:00
|
|
|
eth_handle = find_dissector("eth");
|
|
|
|
fddi_handle = find_dissector("fddi");
|
|
|
|
tr_handle = find_dissector("tr");
|
2001-11-25 22:51:14 +00:00
|
|
|
data_handle = find_dissector("data");
|
Tvbuffify the CDP, CGMP, ISL, and VTP dissectors.
Add a new subdissector table in the LLC dissector for protocol IDs with
a Cisco OUI, and register the CDP, CGMP, and VTMP dissectors in that
table, rather than calling them via a switch statement.
Register the ISL dissector by name, and have the Ethernet dissector call
it via a handle.
Fix the handling of the checksum field in the CDP dissector.
The strings in CDP are counted, not null-terminated; treat them as such.
Fix the handling of the encapsulated frame CRC, and the encapsulated
frame, in the ISL dissector, at least for Ethernet frames; it may not be
correct for encapsulated Token Ring frames.
svn path=/trunk/; revision=2792
2000-12-28 09:49:09 +00:00
|
|
|
|
2001-12-03 04:00:26 +00:00
|
|
|
llc_handle = find_dissector("llc");
|
|
|
|
dissector_add("wtap_encap", WTAP_ENCAP_ATM_RFC1483, llc_handle);
|
2002-05-29 03:08:02 +00:00
|
|
|
/* 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);
|
2000-11-16 07:35:43 +00:00
|
|
|
}
|