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
|
|
|
*
|
2006-05-21 04:49:01 +00:00
|
|
|
* Wireshark - Network traffic analyzer
|
|
|
|
|
* By Gerald Combs <gerald@wireshark.org>
|
1998-09-16 02:39:15 +00:00
|
|
|
* Copyright 1998 Gerald Combs
|
2002-08-28 21:04:11 +00:00
|
|
|
*
|
2018-02-12 11:23:27 +00:00
|
|
|
* SPDX-License-Identifier: GPL-2.0-or-later
|
1998-09-16 02:39:15 +00:00
|
|
|
*/
|
|
|
|
|
|
2012-09-20 02:03:38 +00:00
|
|
|
#include "config.h"
|
1998-09-16 02:39:15 +00:00
|
|
|
|
2002-01-21 07:37:49 +00:00
|
|
|
#include <epan/packet.h>
|
2015-12-13 21:54:16 +00:00
|
|
|
#include <epan/capture_dissectors.h>
|
2013-11-29 20:53:00 +00:00
|
|
|
#include <wiretap/wtap.h>
|
2013-11-09 15:44:29 +00:00
|
|
|
#include <wsutil/pint.h>
|
2005-09-17 00:02:31 +00:00
|
|
|
#include <epan/oui.h>
|
2004-09-28 23:48:02 +00:00
|
|
|
#include <epan/xdlc.h>
|
2005-09-17 00:02:31 +00:00
|
|
|
#include <epan/llcsaps.h>
|
|
|
|
|
#include <epan/bridged_pids.h>
|
|
|
|
|
#include <epan/ppptypes.h>
|
|
|
|
|
#include <epan/arcnet_pids.h>
|
2016-10-26 16:07:47 +00:00
|
|
|
#include <epan/nlpid.h>
|
2017-10-21 04:00:46 +00:00
|
|
|
#include <epan/addr_resolv.h>
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
#include "packet-fc.h"
|
2000-02-15 21:06:58 +00:00
|
|
|
#include "packet-ip.h"
|
|
|
|
|
#include "packet-ipx.h"
|
|
|
|
|
#include "packet-netbios.h"
|
2010-09-12 01:13:42 +00:00
|
|
|
#include "packet-sll.h"
|
2014-11-09 02:08:52 +00:00
|
|
|
#include "packet-juniper.h"
|
2000-02-15 21:06:58 +00:00
|
|
|
|
2001-01-10 09:07:35 +00:00
|
|
|
#include "packet-llc.h"
|
|
|
|
|
|
2013-12-15 23:44:12 +00:00
|
|
|
void proto_register_basicxid(void);
|
2013-12-18 06:51:09 +00:00
|
|
|
void proto_register_llc(void);
|
2013-12-15 23:44:12 +00:00
|
|
|
void proto_reg_handoff_llc(void);
|
|
|
|
|
|
2016-10-05 20:33:54 +00:00
|
|
|
#define UDP_PORT_LLC_RANGE "12000-12004"
|
2002-05-29 03:08:02 +00:00
|
|
|
|
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;
|
2014-08-13 12:56:22 +00:00
|
|
|
static int hf_llc_dsap_sap = -1;
|
1999-12-13 21:48:18 +00:00
|
|
|
static int hf_llc_dsap_ig = -1;
|
2014-08-13 12:56:22 +00:00
|
|
|
static int hf_llc_ssap_sap = -1;
|
1999-12-13 21:48:18 +00:00
|
|
|
static int hf_llc_ssap_cr = -1;
|
1999-07-29 05:47:07 +00:00
|
|
|
static int hf_llc_ctrl = -1;
|
2004-01-03 03:51:27 +00:00
|
|
|
static int hf_llc_n_r = -1;
|
|
|
|
|
static int hf_llc_n_s = -1;
|
|
|
|
|
static int hf_llc_p = -1;
|
|
|
|
|
static int hf_llc_p_ext = -1;
|
|
|
|
|
static int hf_llc_f = -1;
|
|
|
|
|
static int hf_llc_f_ext = -1;
|
|
|
|
|
static int hf_llc_s_ftype = -1;
|
|
|
|
|
static int hf_llc_u_modifier_cmd = -1;
|
|
|
|
|
static int hf_llc_u_modifier_resp = -1;
|
|
|
|
|
static int hf_llc_ftype_i = -1;
|
|
|
|
|
static int hf_llc_ftype_s_u = -1;
|
|
|
|
|
static int hf_llc_ftype_s_u_ext = -1;
|
1999-07-29 05:47:07 +00:00
|
|
|
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
|
|
|
|
2005-10-25 06:00:53 +00:00
|
|
|
static int proto_basicxid = -1;
|
|
|
|
|
static int hf_llc_xid_format = -1;
|
|
|
|
|
static int hf_llc_xid_types = -1;
|
|
|
|
|
static int hf_llc_xid_wsize = -1;
|
|
|
|
|
|
1999-11-16 11:44:20 +00:00
|
|
|
static gint ett_llc = -1;
|
From Peter Paluch via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9158
Currently, the LLC dissector in packet-llc.c displays the values of DSAP IG bit
and SSAP CR bit as separate items in the proto tree. This gives an impression
that these entries are separate fields in the LLC header while in reality, they
are only the least significant bits in DSAP/SSAP octets. In addition, the
importance of these bits is relatively low in today's LLC-based protocols (they
are mostly set to 0), so having them always displayed in the proto tree is
somewhat of a luxury.
Modify the LLC dissector by having added a subtree to both DSAP and SSAP items
that displays the IG and CR bits as bits in a bitfield, and moved the display
of IG and CR bits into these subtrees.
It may seem that adding a text item instead of a FT_UINT8 value is not a
sensible approach because such item is not filterable. However, if filtering by
the entire DSAP/SSAP value (which is the typical way of filtering on SAPs), this
value is always added to the tree in its entirety and indexed by "llc.dsap" and
"llc.ssap" filter strings. If the GI or CR bit are to be matched, "llc.dsap.ig"
and "llc.ssap.cr" filter strings are available. Searching for the value of the
DSAP/SSAP & 0xFE which would be the value currently added by the
proto_tree_add_text() is not done and should not be done, as IEEE stipulates:
"An individual actual address value does not necessarily have any relationship
with a group address of the same actual address value."
(http://standards.ieee.org/develop/regauth/tut/llc.pdf) Following this
consideration, the choice of displaying the SAP "actual address" using
proto_tree_add_text() is acceptable.
svn path=/trunk/; revision=54091
2013-12-14 14:11:30 +00:00
|
|
|
static gint ett_llc_dsap = -1;
|
|
|
|
|
static gint ett_llc_ssap = -1;
|
1999-11-16 11:44:20 +00:00
|
|
|
static gint ett_llc_ctrl = -1;
|
2005-10-25 06:00:53 +00:00
|
|
|
static gint ett_llc_basicxid = -1;
|
1999-11-16 11:44:20 +00:00
|
|
|
|
2009-05-03 01:16:34 +00:00
|
|
|
static dissector_table_t dsap_subdissector_table;
|
2003-02-13 00:47:42 +00:00
|
|
|
static dissector_table_t xid_subdissector_table;
|
2000-04-17 00:32:43 +00:00
|
|
|
|
2009-05-02 21:51:51 +00:00
|
|
|
static dissector_table_t ethertype_subdissector_table;
|
2009-06-23 21:05:47 +00:00
|
|
|
static dissector_table_t hpteam_subdissector_table;
|
2021-10-11 13:49:19 +00:00
|
|
|
static dissector_table_t other_control_dissector_table;
|
2009-05-02 21:51:51 +00:00
|
|
|
|
2000-11-16 07:35:43 +00:00
|
|
|
static dissector_handle_t bpdu_handle;
|
2004-11-24 09:13:52 +00:00
|
|
|
static dissector_handle_t eth_withoutfcs_handle;
|
|
|
|
|
static dissector_handle_t eth_withfcs_handle;
|
2001-01-10 09:07:35 +00:00
|
|
|
static dissector_handle_t fddi_handle;
|
|
|
|
|
static dissector_handle_t tr_handle;
|
2008-04-10 23:56:10 +00:00
|
|
|
static dissector_handle_t turbo_handle;
|
2009-05-02 21:51:51 +00:00
|
|
|
static dissector_handle_t mesh_handle;
|
2016-12-17 01:06:11 +00:00
|
|
|
static dissector_handle_t llc_handle;
|
2020-12-05 01:45:45 +00:00
|
|
|
static dissector_handle_t epd_llc_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
|
|
|
*/
|
2002-11-05 22:50:42 +00:00
|
|
|
const value_string sap_vals[] = {
|
2000-04-17 00:32:43 +00:00
|
|
|
{ SAP_NULL, "NULL LSAP" },
|
2016-02-13 13:56:08 +00:00
|
|
|
{ SAP_NULL+1, "NULL LSAP" },
|
2000-04-17 00:32:43 +00:00
|
|
|
{ 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" },
|
2003-06-10 05:38:52 +00:00
|
|
|
{ SAP_NETWARE1, "NetWare (unofficial?)" },
|
|
|
|
|
{ SAP_OSINL1, "ISO Network Layer (OSLAN 1)" },
|
2000-04-17 00:32:43 +00:00
|
|
|
{ SAP_TI, "Texas Instruments" },
|
2003-06-10 05:38:52 +00:00
|
|
|
{ SAP_OSINL2, "ISO Network Layer (unofficial?)" },
|
|
|
|
|
{ SAP_OSINL3, "ISO Network Layer (unofficial?)" },
|
2000-04-17 00:32:43 +00:00
|
|
|
{ SAP_BPDU, "Spanning Tree BPDU" },
|
|
|
|
|
{ SAP_RS511, "EIA RS-511 Manufacturing Message Service" },
|
2003-06-10 05:38:52 +00:00
|
|
|
{ SAP_OSINL4, "ISO Network Layer (OSLAN 2)" },
|
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" },
|
2002-11-16 08:55:13 +00:00
|
|
|
{ SAP_BACNET, "BACnet" },
|
2000-04-17 00:32:43 +00:00
|
|
|
{ SAP_NESTAR, "Nestar" },
|
|
|
|
|
{ SAP_PROWAY_ASLM, "PROWAY (IEC955) Active Station List Maintenance" },
|
|
|
|
|
{ SAP_ARP, "ARP" }, /* XXX - hand to "dissect_arp()"? */
|
2005-10-25 06:00:53 +00:00
|
|
|
{ SAP_HPJD, "HP JetDirect Printer" },
|
2000-04-17 00:32:43 +00:00
|
|
|
{ SAP_SNAP, "SNAP" },
|
|
|
|
|
{ SAP_VINES1, "Banyan Vines" },
|
|
|
|
|
{ SAP_VINES2, "Banyan Vines" },
|
2003-06-10 05:38:52 +00:00
|
|
|
{ SAP_NETWARE2, "NetWare" },
|
2000-04-17 00:32:43 +00:00
|
|
|
{ SAP_NETBIOS, "NetBIOS" },
|
|
|
|
|
{ SAP_IBMNM, "IBM Net Management" },
|
2003-03-02 21:52:21 +00:00
|
|
|
{ SAP_HPEXT, "HP Extended LLC" },
|
2000-04-17 00:32:43 +00:00
|
|
|
{ SAP_UB, "Ungermann-Bass" },
|
2003-03-02 21:52:21 +00:00
|
|
|
{ SAP_RPL, "Remote Program Load" },
|
2003-06-10 05:38:52 +00:00
|
|
|
{ SAP_OSINL5, "ISO Network Layer" },
|
2000-04-17 00:32:43 +00:00
|
|
|
{ SAP_GLOBAL, "Global LSAP" },
|
|
|
|
|
{ 0x00, NULL }
|
1998-09-17 18:43:11 +00:00
|
|
|
};
|
|
|
|
|
|
2010-10-10 23:28:40 +00:00
|
|
|
static const value_string format_vals[] = {
|
2005-10-25 06:00:53 +00:00
|
|
|
{ 0x81, "LLC basic format" },
|
|
|
|
|
{ 0, NULL }
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Mask to extract the type from XID frame.
|
|
|
|
|
*/
|
|
|
|
|
#define TYPES_MASK 0x1F
|
|
|
|
|
|
2010-10-10 23:28:40 +00:00
|
|
|
static const value_string type_vals[] = {
|
2005-10-25 06:00:53 +00:00
|
|
|
{ 1, "Type 1 LLC (Class I LLC)" },
|
|
|
|
|
{ 2, "Type 2 LLC" },
|
|
|
|
|
{ 3, "Type 1 and Type 2 LLCs (Class II LLC)" },
|
|
|
|
|
{ 4, "Type 3 LLC" },
|
|
|
|
|
{ 5, "Type 1 and Type 3 LLCs (Class III LLC)" },
|
|
|
|
|
{ 6, "Type 2 and Type 3 LLCs" },
|
|
|
|
|
{ 7, "Type 1 and Type 2 and Type 3 LLCs (Class IV LLC)" },
|
|
|
|
|
{ 0, NULL }
|
|
|
|
|
};
|
|
|
|
|
|
2003-08-28 01:29:16 +00:00
|
|
|
/*
|
2009-05-05 03:50:06 +00:00
|
|
|
* Hash table for translating OUIs to an oui_info_t.
|
2003-08-28 01:29:16 +00:00
|
|
|
*/
|
2017-02-04 22:53:10 +00:00
|
|
|
static wmem_map_t *oui_info_table = NULL;
|
2003-08-28 01:29:16 +00:00
|
|
|
|
From Peter Paluch via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9158
Currently, the LLC dissector in packet-llc.c displays the values of DSAP IG bit
and SSAP CR bit as separate items in the proto tree. This gives an impression
that these entries are separate fields in the LLC header while in reality, they
are only the least significant bits in DSAP/SSAP octets. In addition, the
importance of these bits is relatively low in today's LLC-based protocols (they
are mostly set to 0), so having them always displayed in the proto tree is
somewhat of a luxury.
Modify the LLC dissector by having added a subtree to both DSAP and SSAP items
that displays the IG and CR bits as bits in a bitfield, and moved the display
of IG and CR bits into these subtrees.
It may seem that adding a text item instead of a FT_UINT8 value is not a
sensible approach because such item is not filterable. However, if filtering by
the entire DSAP/SSAP value (which is the typical way of filtering on SAPs), this
value is always added to the tree in its entirety and indexed by "llc.dsap" and
"llc.ssap" filter strings. If the GI or CR bit are to be matched, "llc.dsap.ig"
and "llc.ssap.cr" filter strings are available. Searching for the value of the
DSAP/SSAP & 0xFE which would be the value currently added by the
proto_tree_add_text() is not done and should not be done, as IEEE stipulates:
"An individual actual address value does not necessarily have any relationship
with a group address of the same actual address value."
(http://standards.ieee.org/develop/regauth/tut/llc.pdf) Following this
consideration, the choice of displaying the SAP "actual address" using
proto_tree_add_text() is acceptable.
svn path=/trunk/; revision=54091
2013-12-14 14:11:30 +00:00
|
|
|
/*
|
|
|
|
|
* Decode the SAP value as a bitfield into a string, skipping the GI/CR bit.
|
|
|
|
|
* Ordinarily, this could be done easily by specifying a bitmask in the
|
|
|
|
|
* corresponding hf_ entry for the DSAP/SSAP value and simply using a
|
|
|
|
|
* proto_tree_add_... function to add the item into a proto tree. The
|
|
|
|
|
* problem is that the proto_tree_add_... functions always bitshift the
|
|
|
|
|
* value if a bitmask is specified. A SAP value always comprises the entire
|
|
|
|
|
* octet, however, and must not be shifted. Therefore, using a simple
|
|
|
|
|
* proto_tree_add_... function to display the topmost 7 bits of the SAP
|
|
|
|
|
* value as a bitfield produces incorrect results (while the bitfield is
|
|
|
|
|
* displayed correctly, Wireshark uses the bitshifted value to display the
|
2014-08-13 12:56:22 +00:00
|
|
|
* associated name and for filtering purposes). This function calls a
|
|
|
|
|
* BASE_CUSTOM routine to decode the SAP value as a bitfield
|
|
|
|
|
* counter-balancing the bitshift of the original value.
|
From Peter Paluch via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9158
Currently, the LLC dissector in packet-llc.c displays the values of DSAP IG bit
and SSAP CR bit as separate items in the proto tree. This gives an impression
that these entries are separate fields in the LLC header while in reality, they
are only the least significant bits in DSAP/SSAP octets. In addition, the
importance of these bits is relatively low in today's LLC-based protocols (they
are mostly set to 0), so having them always displayed in the proto tree is
somewhat of a luxury.
Modify the LLC dissector by having added a subtree to both DSAP and SSAP items
that displays the IG and CR bits as bits in a bitfield, and moved the display
of IG and CR bits into these subtrees.
It may seem that adding a text item instead of a FT_UINT8 value is not a
sensible approach because such item is not filterable. However, if filtering by
the entire DSAP/SSAP value (which is the typical way of filtering on SAPs), this
value is always added to the tree in its entirety and indexed by "llc.dsap" and
"llc.ssap" filter strings. If the GI or CR bit are to be matched, "llc.dsap.ig"
and "llc.ssap.cr" filter strings are available. Searching for the value of the
DSAP/SSAP & 0xFE which would be the value currently added by the
proto_tree_add_text() is not done and should not be done, as IEEE stipulates:
"An individual actual address value does not necessarily have any relationship
with a group address of the same actual address value."
(http://standards.ieee.org/develop/regauth/tut/llc.pdf) Following this
consideration, the choice of displaying the SAP "actual address" using
proto_tree_add_text() is acceptable.
svn path=/trunk/; revision=54091
2013-12-14 14:11:30 +00:00
|
|
|
*/
|
|
|
|
|
|
2014-08-13 12:56:22 +00:00
|
|
|
static void
|
|
|
|
|
llc_sap_value( gchar *result, guint32 sap )
|
|
|
|
|
{
|
|
|
|
|
g_snprintf( result, ITEM_LABEL_LENGTH, "%s", val_to_str_const(sap<<1, sap_vals, "Unknown"));
|
From Peter Paluch via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9158
Currently, the LLC dissector in packet-llc.c displays the values of DSAP IG bit
and SSAP CR bit as separate items in the proto tree. This gives an impression
that these entries are separate fields in the LLC header while in reality, they
are only the least significant bits in DSAP/SSAP octets. In addition, the
importance of these bits is relatively low in today's LLC-based protocols (they
are mostly set to 0), so having them always displayed in the proto tree is
somewhat of a luxury.
Modify the LLC dissector by having added a subtree to both DSAP and SSAP items
that displays the IG and CR bits as bits in a bitfield, and moved the display
of IG and CR bits into these subtrees.
It may seem that adding a text item instead of a FT_UINT8 value is not a
sensible approach because such item is not filterable. However, if filtering by
the entire DSAP/SSAP value (which is the typical way of filtering on SAPs), this
value is always added to the tree in its entirety and indexed by "llc.dsap" and
"llc.ssap" filter strings. If the GI or CR bit are to be matched, "llc.dsap.ig"
and "llc.ssap.cr" filter strings are available. Searching for the value of the
DSAP/SSAP & 0xFE which would be the value currently added by the
proto_tree_add_text() is not done and should not be done, as IEEE stipulates:
"An individual actual address value does not necessarily have any relationship
with a group address of the same actual address value."
(http://standards.ieee.org/develop/regauth/tut/llc.pdf) Following this
consideration, the choice of displaying the SAP "actual address" using
proto_tree_add_text() is acceptable.
svn path=/trunk/; revision=54091
2013-12-14 14:11:30 +00:00
|
|
|
}
|
|
|
|
|
|
2003-08-28 01:29:16 +00:00
|
|
|
/*
|
2003-09-03 06:27:03 +00:00
|
|
|
* Add an entry for a new OUI.
|
2003-08-28 01:29:16 +00:00
|
|
|
*/
|
|
|
|
|
void
|
2005-07-28 07:53:38 +00:00
|
|
|
llc_add_oui(guint32 oui, const char *table_name, const char *table_ui_name,
|
2016-03-13 11:51:45 +00:00
|
|
|
hf_register_info *hf_item, const int proto)
|
2003-08-28 01:29:16 +00:00
|
|
|
{
|
|
|
|
|
oui_info_t *new_info;
|
|
|
|
|
|
2017-02-04 22:53:10 +00:00
|
|
|
new_info = wmem_new(wmem_epan_scope(), oui_info_t);
|
2003-08-28 01:29:16 +00:00
|
|
|
new_info->table = register_dissector_table(table_name,
|
2016-08-30 22:51:54 +00:00
|
|
|
table_ui_name, proto, FT_UINT16, BASE_HEX);
|
2003-09-03 06:27:03 +00:00
|
|
|
new_info->field_info = hf_item;
|
2003-08-28 01:29:16 +00:00
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Create the hash table for OUI information, if it doesn't
|
|
|
|
|
* already exist.
|
|
|
|
|
*/
|
2003-09-03 06:27:03 +00:00
|
|
|
if (oui_info_table == NULL) {
|
2017-02-04 22:53:10 +00:00
|
|
|
oui_info_table = wmem_map_new(wmem_epan_scope(), g_direct_hash,
|
2003-08-28 01:29:16 +00:00
|
|
|
g_direct_equal);
|
|
|
|
|
}
|
2017-02-04 22:53:10 +00:00
|
|
|
wmem_map_insert(oui_info_table, GUINT_TO_POINTER(oui), new_info);
|
2003-08-28 01:29:16 +00:00
|
|
|
}
|
|
|
|
|
|
2016-11-12 14:46:43 +00:00
|
|
|
static gboolean
|
2015-12-15 00:25:31 +00:00
|
|
|
capture_snap(const guchar *pd, int offset, int len, capture_packet_info_t *cpinfo, const union wtap_pseudo_header *pseudo_header _U_)
|
2005-03-21 03:55:50 +00:00
|
|
|
{
|
|
|
|
|
guint32 oui;
|
|
|
|
|
guint16 etype;
|
|
|
|
|
|
2015-12-13 21:54:16 +00:00
|
|
|
if (!BYTES_ARE_IN_FRAME(offset, len, 5))
|
|
|
|
|
return FALSE;
|
2005-03-21 03:55:50 +00:00
|
|
|
|
|
|
|
|
oui = pd[offset] << 16 | pd[offset+1] << 8 | pd[offset+2];
|
2013-11-29 18:59:06 +00:00
|
|
|
etype = pntoh16(&pd[offset+3]);
|
2005-03-21 03:55:50 +00:00
|
|
|
switch (oui) {
|
|
|
|
|
|
|
|
|
|
case OUI_ENCAP_ETHER:
|
|
|
|
|
case OUI_CISCO_90:
|
2015-12-15 00:25:31 +00:00
|
|
|
return try_capture_dissector("ethertype", etype, pd, offset+5, len, cpinfo, pseudo_header);
|
2005-03-21 03:55:50 +00:00
|
|
|
|
|
|
|
|
case OUI_CISCO:
|
2015-12-15 00:25:31 +00:00
|
|
|
return try_capture_dissector("ethertype", etype, pd, offset+5, len, cpinfo, pseudo_header);
|
2005-03-21 03:55:50 +00:00
|
|
|
|
2009-05-02 21:51:51 +00:00
|
|
|
case OUI_MARVELL:
|
|
|
|
|
/*
|
|
|
|
|
* OLPC packet. The PID is an Ethertype, but
|
|
|
|
|
* there's a mesh header between the PID and
|
|
|
|
|
* the payload. (We assume the header is
|
|
|
|
|
* 5 bytes, for now).
|
|
|
|
|
*/
|
2015-12-15 00:25:31 +00:00
|
|
|
return try_capture_dissector("ethertype", etype, pd, offset+5+5, len, cpinfo, pseudo_header);
|
2005-03-21 03:55:50 +00:00
|
|
|
}
|
2015-12-13 21:54:16 +00:00
|
|
|
|
|
|
|
|
return FALSE;
|
2005-03-21 03:55:50 +00:00
|
|
|
}
|
|
|
|
|
|
2016-11-12 14:46:43 +00:00
|
|
|
static gboolean
|
2016-10-26 16:07:47 +00:00
|
|
|
capture_llc(const guchar *pd, int offset, int len, capture_packet_info_t *cpinfo, const union wtap_pseudo_header *pseudo_header _U_) {
|
|
|
|
|
|
|
|
|
|
int is_snap;
|
|
|
|
|
guint16 control;
|
|
|
|
|
int llc_header_len;
|
|
|
|
|
|
|
|
|
|
if (!BYTES_ARE_IN_FRAME(offset, len, 2))
|
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
|
|
is_snap = (pd[offset] == SAP_SNAP) && (pd[offset+1] == 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 = get_xdlc_control(pd, offset+2, pd[offset+1] & SSAP_CR_BIT);
|
|
|
|
|
llc_header_len += XDLC_CONTROL_LEN(control, TRUE);
|
|
|
|
|
if (!BYTES_ARE_IN_FRAME(offset, len, llc_header_len))
|
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
|
|
if (!XDLC_IS_INFORMATION(control))
|
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
|
|
if (is_snap)
|
|
|
|
|
return capture_snap(pd, offset+llc_header_len, len, cpinfo, pseudo_header);
|
|
|
|
|
|
|
|
|
|
/* non-SNAP */
|
|
|
|
|
return try_capture_dissector("llc.dsap", pd[offset], pd, offset + llc_header_len, len, cpinfo, pseudo_header);
|
|
|
|
|
}
|
|
|
|
|
|
2004-01-03 03:51:27 +00:00
|
|
|
/* Used only for U frames */
|
|
|
|
|
static const xdlc_cf_items llc_cf_items = {
|
|
|
|
|
NULL,
|
|
|
|
|
NULL,
|
|
|
|
|
&hf_llc_p,
|
|
|
|
|
&hf_llc_f,
|
|
|
|
|
NULL,
|
|
|
|
|
&hf_llc_u_modifier_cmd,
|
|
|
|
|
&hf_llc_u_modifier_resp,
|
|
|
|
|
NULL,
|
|
|
|
|
&hf_llc_ftype_s_u
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* Used only for I and S frames */
|
|
|
|
|
static const xdlc_cf_items llc_cf_items_ext = {
|
|
|
|
|
&hf_llc_n_r,
|
|
|
|
|
&hf_llc_n_s,
|
|
|
|
|
&hf_llc_p_ext,
|
|
|
|
|
&hf_llc_f_ext,
|
|
|
|
|
&hf_llc_s_ftype,
|
|
|
|
|
NULL,
|
|
|
|
|
NULL,
|
|
|
|
|
&hf_llc_ftype_i,
|
|
|
|
|
&hf_llc_ftype_s_u_ext
|
|
|
|
|
};
|
|
|
|
|
|
2015-11-14 01:18:34 +00:00
|
|
|
static int
|
|
|
|
|
dissect_basicxid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
|
2005-10-25 06:00:53 +00:00
|
|
|
{
|
|
|
|
|
proto_tree *xid_tree = NULL;
|
|
|
|
|
proto_item *ti = NULL;
|
|
|
|
|
guint8 format, types, wsize;
|
|
|
|
|
|
2009-08-09 07:59:51 +00:00
|
|
|
col_set_str(pinfo->cinfo, COL_PROTOCOL, "XID");
|
2009-08-09 08:14:59 +00:00
|
|
|
col_clear(pinfo->cinfo, COL_INFO);
|
2005-10-25 06:00:53 +00:00
|
|
|
|
|
|
|
|
format = tvb_get_guint8(tvb, 0);
|
2015-11-14 01:18:34 +00:00
|
|
|
|
|
|
|
|
ti = proto_tree_add_item(tree, proto_basicxid, tvb, 0, -1, ENC_NA);
|
|
|
|
|
xid_tree = proto_item_add_subtree(ti, ett_llc_basicxid);
|
|
|
|
|
proto_tree_add_uint(xid_tree, hf_llc_xid_format, tvb, 0, 1, format);
|
|
|
|
|
|
|
|
|
|
col_append_str(pinfo->cinfo, COL_INFO, "Basic Format");
|
2005-10-25 06:00:53 +00:00
|
|
|
|
|
|
|
|
types = tvb_get_guint8(tvb, 1);
|
2015-11-14 01:18:34 +00:00
|
|
|
proto_tree_add_uint(xid_tree, hf_llc_xid_types, tvb, 1,
|
2005-10-25 06:00:53 +00:00
|
|
|
1, types & TYPES_MASK);
|
2015-11-14 01:18:34 +00:00
|
|
|
|
2013-06-14 17:49:53 +00:00
|
|
|
col_append_fstr(pinfo->cinfo, COL_INFO,
|
2005-10-25 06:00:53 +00:00
|
|
|
"; %s", val_to_str(types & TYPES_MASK, type_vals, "0x%02x")
|
|
|
|
|
);
|
2013-06-14 17:49:53 +00:00
|
|
|
|
2005-10-25 06:00:53 +00:00
|
|
|
wsize = tvb_get_guint8(tvb, 2);
|
2015-11-14 01:18:34 +00:00
|
|
|
proto_tree_add_uint(xid_tree, hf_llc_xid_wsize, tvb, 2,
|
2005-10-25 06:00:53 +00:00
|
|
|
1, (wsize & 0xFE) >> 1);
|
2015-11-14 01:18:34 +00:00
|
|
|
|
2013-06-14 17:49:53 +00:00
|
|
|
col_append_fstr(pinfo->cinfo, COL_INFO,
|
2005-10-25 06:00:53 +00:00
|
|
|
"; Window Size %d", (wsize & 0xFE) >> 1);
|
2015-11-14 01:18:34 +00:00
|
|
|
return tvb_captured_length(tvb);
|
2005-10-25 06:00:53 +00:00
|
|
|
}
|
|
|
|
|
|
2020-12-05 01:45:45 +00:00
|
|
|
/*
|
|
|
|
|
* IEEE Std 802.2-1998 and ISO/IEC 8802-2.
|
|
|
|
|
*
|
|
|
|
|
* This is what IEEE Std 802-2014 describes in section 5.2.2 "LLC sublayer"
|
|
|
|
|
* as "LLC protocol discrimination (LPD)".
|
|
|
|
|
*/
|
2015-11-14 01:18:34 +00:00
|
|
|
static int
|
2020-12-05 01:45:45 +00:00
|
|
|
dissect_llc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
|
2000-05-11 22:04:18 +00:00
|
|
|
{
|
2014-08-13 12:56:22 +00:00
|
|
|
proto_tree *llc_tree;
|
|
|
|
|
proto_tree *field_tree;
|
|
|
|
|
proto_item *ti, *sap_item;
|
1998-09-17 18:43:11 +00:00
|
|
|
int is_snap;
|
2020-12-05 01:45:45 +00:00
|
|
|
guint16 control;
|
1999-11-11 08:04:06 +00:00
|
|
|
int llc_header_len;
|
2005-10-25 06:00:53 +00:00
|
|
|
guint8 dsap, ssap, format;
|
2000-05-11 22:04:18 +00:00
|
|
|
tvbuff_t *next_tvb;
|
1998-09-16 02:39:15 +00:00
|
|
|
|
2009-08-09 07:59:51 +00:00
|
|
|
col_set_str(pinfo->cinfo, COL_PROTOCOL, "LLC");
|
2009-08-09 08:14:59 +00:00
|
|
|
col_clear(pinfo->cinfo, COL_INFO);
|
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
|
|
|
|
2020-11-29 09:28:59 +00:00
|
|
|
dsap = tvb_get_guint8(tvb, 0);
|
|
|
|
|
|
|
|
|
|
ti = proto_tree_add_item(tree, proto_llc, tvb, 0, -1, ENC_NA);
|
|
|
|
|
llc_tree = proto_item_add_subtree(ti, ett_llc);
|
2018-10-02 14:59:58 +00:00
|
|
|
|
2014-12-13 21:26:07 +00:00
|
|
|
sap_item = proto_tree_add_item(llc_tree, hf_llc_dsap, tvb, 0, 1, ENC_BIG_ENDIAN);
|
2014-08-13 12:56:22 +00:00
|
|
|
field_tree = proto_item_add_subtree(sap_item, ett_llc_dsap);
|
2014-12-13 21:26:07 +00:00
|
|
|
proto_tree_add_item(field_tree, hf_llc_dsap_sap, tvb, 0, 1, ENC_BIG_ENDIAN);
|
2014-08-13 12:56:22 +00:00
|
|
|
proto_tree_add_item(field_tree, hf_llc_dsap_ig, tvb, 0, 1, ENC_NA);
|
2000-05-28 22:02:17 +00:00
|
|
|
|
|
|
|
|
ssap = tvb_get_guint8(tvb, 1);
|
2014-12-13 21:26:07 +00:00
|
|
|
sap_item = proto_tree_add_item(llc_tree, hf_llc_ssap, tvb, 1, 1, ENC_BIG_ENDIAN);
|
2014-08-13 12:56:22 +00:00
|
|
|
field_tree = proto_item_add_subtree(sap_item, ett_llc_ssap);
|
2014-12-13 21:26:07 +00:00
|
|
|
proto_tree_add_item(field_tree, hf_llc_ssap_sap, tvb, 1, 1, ENC_BIG_ENDIAN);
|
2014-08-13 12:56:22 +00:00
|
|
|
proto_tree_add_item(field_tree, hf_llc_ssap_cr, tvb, 1, 1, ENC_NA);
|
1999-08-04 04:37:46 +00:00
|
|
|
|
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,
|
2004-01-03 03:51:27 +00:00
|
|
|
&llc_cf_items, &llc_cf_items_ext,
|
2004-01-18 08:32:46 +00:00
|
|
|
NULL, NULL, ssap & SSAP_CR_BIT, TRUE, FALSE);
|
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) {
|
2009-07-13 22:29:59 +00:00
|
|
|
dissect_snap(tvb, 2+XDLC_CONTROL_LEN(control, TRUE), 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 {
|
2013-06-14 17:49:53 +00:00
|
|
|
col_append_fstr(pinfo->cinfo, COL_INFO,
|
2000-08-25 06:31:25 +00:00
|
|
|
"; DSAP %s %s, SSAP %s %s",
|
2005-07-20 22:11:48 +00:00
|
|
|
val_to_str(dsap & SAP_MASK, sap_vals, "0x%02x"),
|
2000-05-11 22:04:18 +00:00
|
|
|
dsap & DSAP_GI_BIT ?
|
1999-12-13 23:39:59 +00:00
|
|
|
"Group" : "Individual",
|
2005-07-20 22:11:48 +00:00
|
|
|
val_to_str(ssap & SAP_MASK, sap_vals, "0x%02x"),
|
2000-05-11 22:04:18 +00:00
|
|
|
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
|
|
|
|
2014-08-15 13:40:00 +00:00
|
|
|
if (tvb_reported_length_remaining(tvb, llc_header_len) > 0) {
|
2009-08-16 12:36:22 +00:00
|
|
|
next_tvb = tvb_new_subset_remaining(tvb, llc_header_len);
|
2003-02-13 00:47:42 +00:00
|
|
|
if (XDLC_IS_INFORMATION(control)) {
|
|
|
|
|
/*
|
|
|
|
|
* Non-SNAP I or UI frame.
|
|
|
|
|
* Try the regular LLC subdissector table
|
|
|
|
|
* with the DSAP.
|
|
|
|
|
*/
|
2010-12-20 05:35:29 +00:00
|
|
|
if (!dissector_try_uint(dsap_subdissector_table,
|
2003-02-13 00:47:42 +00:00
|
|
|
dsap, next_tvb, pinfo, tree)) {
|
2016-03-20 00:33:14 +00:00
|
|
|
call_data_dissector(next_tvb, pinfo, tree);
|
2003-02-13 00:47:42 +00:00
|
|
|
}
|
|
|
|
|
} else if ((control & (XDLC_U_MODIFIER_MASK|XDLC_U))
|
|
|
|
|
== (XDLC_XID|XDLC_U)) {
|
|
|
|
|
/*
|
|
|
|
|
* Non-SNAP XID frame.
|
2005-10-25 06:00:53 +00:00
|
|
|
* Test for LLC basic format first
|
|
|
|
|
*/
|
|
|
|
|
format = tvb_get_guint8(next_tvb, 0);
|
|
|
|
|
if (format == 0x81) {
|
2020-11-29 08:53:45 +00:00
|
|
|
dissect_basicxid(next_tvb, pinfo, tree, data);
|
2005-10-25 06:00:53 +00:00
|
|
|
} else {
|
2020-11-29 08:53:45 +00:00
|
|
|
/*
|
|
|
|
|
* Try the XID LLC subdissector table
|
|
|
|
|
* with the DSAP.
|
|
|
|
|
*/
|
|
|
|
|
if (!dissector_try_uint(
|
|
|
|
|
xid_subdissector_table, dsap,
|
|
|
|
|
next_tvb, pinfo, tree)) {
|
2016-03-20 00:33:14 +00:00
|
|
|
call_data_dissector(next_tvb, pinfo, tree);
|
2020-11-29 08:53:45 +00:00
|
|
|
}
|
2003-02-13 00:47:42 +00:00
|
|
|
}
|
|
|
|
|
} else {
|
2021-10-11 13:49:19 +00:00
|
|
|
if (!dissector_try_uint(
|
|
|
|
|
other_control_dissector_table, control,
|
|
|
|
|
next_tvb, pinfo, tree)) {
|
|
|
|
|
call_data_dissector(next_tvb, pinfo, tree);
|
|
|
|
|
}
|
1999-08-23 22:47:13 +00:00
|
|
|
}
|
2000-04-09 18:33:26 +00:00
|
|
|
}
|
1998-09-16 02:39:15 +00:00
|
|
|
}
|
2015-11-14 01:18:34 +00:00
|
|
|
return tvb_captured_length(tvb);
|
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,
|
2014-10-06 16:55:18 +00:00
|
|
|
proto_tree *snap_tree, int control, int hf_oui, int hf_type, int hf_pid,
|
|
|
|
|
int bridge_pad)
|
2001-01-10 09:07:35 +00:00
|
|
|
{
|
|
|
|
|
guint32 oui;
|
2017-10-21 04:00:46 +00:00
|
|
|
const gchar *oui_str;
|
2001-01-10 09:07:35 +00:00
|
|
|
guint16 etype;
|
|
|
|
|
tvbuff_t *next_tvb;
|
2003-08-28 01:29:16 +00:00
|
|
|
oui_info_t *oui_info;
|
|
|
|
|
dissector_table_t subdissector_table;
|
|
|
|
|
int hf;
|
2009-05-02 21:51:51 +00:00
|
|
|
int mesh_header_len;
|
2001-01-10 09:07:35 +00:00
|
|
|
|
2005-03-21 03:55:50 +00:00
|
|
|
/*
|
|
|
|
|
* XXX - what about non-UI frames?
|
|
|
|
|
*/
|
2001-01-10 09:07:35 +00:00
|
|
|
etype = tvb_get_ntohs(tvb, offset+3);
|
|
|
|
|
|
2017-10-21 04:00:46 +00:00
|
|
|
proto_tree_add_item_ret_uint(snap_tree, hf_oui, tvb, offset, 3, ENC_BIG_ENDIAN, &oui);
|
|
|
|
|
oui_str = uint_get_manuf_name_if_known(oui);
|
|
|
|
|
|
2013-06-14 17:49:53 +00:00
|
|
|
col_append_fstr(pinfo->cinfo, COL_INFO,
|
2001-01-10 09:07:35 +00:00
|
|
|
"; SNAP, OUI 0x%06X (%s), PID 0x%04X",
|
2017-10-21 04:00:46 +00:00
|
|
|
oui, oui_str ? oui_str : "Unknown", etype);
|
2001-01-10 09:07:35 +00:00
|
|
|
|
|
|
|
|
switch (oui) {
|
|
|
|
|
|
2009-06-23 21:05:47 +00:00
|
|
|
case OUI_HP_2:
|
2020-04-24 03:34:55 +00:00
|
|
|
/*
|
|
|
|
|
* We don't use the standard SNAP OUI mechanism here
|
|
|
|
|
* because that only calls the subdissector for
|
|
|
|
|
* information frames, and, according to the HP document
|
|
|
|
|
* at
|
|
|
|
|
*
|
|
|
|
|
* http://www.hp.com/sbso/bus_protect/teaming.pdf
|
|
|
|
|
*
|
|
|
|
|
* the heartbeats are sent to 03-00-C7-00-00-EE in SNAP
|
|
|
|
|
* frames in unnumbered TEST frames, not information
|
|
|
|
|
* frames (numbered or unnumbered).
|
|
|
|
|
*
|
|
|
|
|
* See the comment in epan/dissectors/packet-hpteam.c
|
|
|
|
|
* for more details.
|
|
|
|
|
*/
|
2009-06-23 21:05:47 +00:00
|
|
|
oui_info = get_snap_oui_info(oui);
|
|
|
|
|
hf = *oui_info->field_info->p_id;
|
|
|
|
|
proto_tree_add_uint(snap_tree, hf, tvb, offset+3, 2, etype);
|
2009-08-16 12:36:22 +00:00
|
|
|
next_tvb = tvb_new_subset_remaining(tvb, offset+5);
|
2009-06-23 21:05:47 +00:00
|
|
|
|
2010-12-20 05:35:29 +00:00
|
|
|
if(!dissector_try_uint(hpteam_subdissector_table,etype, next_tvb, pinfo, tree))
|
2016-03-20 00:33:14 +00:00
|
|
|
call_data_dissector(next_tvb, pinfo, tree);
|
2009-06-23 21:05:47 +00:00
|
|
|
break;
|
|
|
|
|
|
2001-01-10 09:07:35 +00:00
|
|
|
case OUI_ENCAP_ETHER:
|
2001-06-02 03:04:12 +00:00
|
|
|
case OUI_CISCO_90:
|
2001-01-10 09:07:35 +00:00
|
|
|
if (XDLC_IS_INFORMATION(control)) {
|
2009-05-03 01:16:34 +00:00
|
|
|
if (tree) {
|
|
|
|
|
proto_tree_add_uint(snap_tree, hf_type,
|
|
|
|
|
tvb, offset+3, 2, etype);
|
|
|
|
|
}
|
2009-08-16 12:36:22 +00:00
|
|
|
next_tvb = tvb_new_subset_remaining(tvb, offset+5);
|
2010-12-20 05:35:29 +00:00
|
|
|
if (!dissector_try_uint(ethertype_subdissector_table,
|
2009-05-03 01:16:34 +00:00
|
|
|
etype, next_tvb, pinfo, tree))
|
2016-03-20 00:33:14 +00:00
|
|
|
call_data_dissector(next_tvb, pinfo, tree);
|
2001-01-10 09:07:35 +00:00
|
|
|
} else {
|
2009-08-16 12:36:22 +00:00
|
|
|
next_tvb = tvb_new_subset_remaining(tvb, offset+5);
|
2016-03-20 00:33:14 +00:00
|
|
|
call_data_dissector(next_tvb, pinfo, tree);
|
2001-01-10 09:07:35 +00:00
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
2014-06-01 09:19:03 +00:00
|
|
|
case OUI_IEEE_802_1:
|
2001-01-10 09:07:35 +00:00
|
|
|
/*
|
|
|
|
|
* 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:
|
2009-08-16 12:36:22 +00:00
|
|
|
next_tvb = tvb_new_subset_remaining(tvb, offset+5+bridge_pad);
|
2004-11-24 09:13:52 +00:00
|
|
|
call_dissector(eth_withfcs_handle, next_tvb, pinfo,
|
|
|
|
|
tree);
|
|
|
|
|
break;
|
|
|
|
|
|
2001-01-10 09:07:35 +00:00
|
|
|
case BPID_ETH_WITHOUT_FCS:
|
2009-08-16 12:36:22 +00:00
|
|
|
next_tvb = tvb_new_subset_remaining(tvb, offset+5+bridge_pad);
|
2004-11-24 09:13:52 +00:00
|
|
|
call_dissector(eth_withoutfcs_handle, next_tvb, pinfo, tree);
|
2001-01-10 09:07:35 +00:00
|
|
|
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.
|
|
|
|
|
*/
|
2009-08-16 12:36:22 +00:00
|
|
|
next_tvb = tvb_new_subset_remaining(tvb, offset+5+bridge_pad);
|
2001-01-10 09:07:35 +00:00
|
|
|
call_dissector(tr_handle, next_tvb, pinfo, tree);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case BPID_FDDI_WITH_FCS:
|
|
|
|
|
case BPID_FDDI_WITHOUT_FCS:
|
2009-08-16 12:36:22 +00:00
|
|
|
next_tvb = tvb_new_subset_remaining(tvb, offset+5+1+bridge_pad);
|
2001-01-10 09:07:35 +00:00
|
|
|
call_dissector(fddi_handle, next_tvb, pinfo, tree);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case BPID_BPDU:
|
2009-08-16 12:36:22 +00:00
|
|
|
next_tvb = tvb_new_subset_remaining(tvb, offset+5);
|
2001-01-10 09:07:35 +00:00
|
|
|
call_dissector(bpdu_handle, next_tvb, pinfo, tree);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
default:
|
2009-08-16 12:36:22 +00:00
|
|
|
next_tvb = tvb_new_subset_remaining(tvb, offset+5);
|
2016-03-20 00:33:14 +00:00
|
|
|
call_data_dissector(next_tvb, pinfo, tree);
|
2001-01-10 09:07:35 +00:00
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
break;
|
2002-08-28 21:04:11 +00:00
|
|
|
|
2001-01-10 09:07:35 +00:00
|
|
|
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);
|
|
|
|
|
}
|
2009-08-16 12:36:22 +00:00
|
|
|
next_tvb = tvb_new_subset_remaining(tvb, offset+5);
|
2001-01-10 09:07:35 +00:00
|
|
|
call_dissector(bpdu_handle, next_tvb, pinfo, tree);
|
|
|
|
|
break;
|
|
|
|
|
|
2008-04-10 23:56:10 +00:00
|
|
|
case OUI_TURBOCELL:
|
2009-08-16 12:36:22 +00:00
|
|
|
next_tvb = tvb_new_subset_remaining(tvb, offset+3);
|
2008-04-10 23:56:10 +00:00
|
|
|
call_dissector(turbo_handle, next_tvb, pinfo, tree);
|
|
|
|
|
break;
|
|
|
|
|
|
2009-05-02 21:51:51 +00:00
|
|
|
case OUI_MARVELL:
|
|
|
|
|
/*
|
|
|
|
|
* OLPC packet. The PID is an Ethertype, but
|
|
|
|
|
* there's a mesh header between the PID and
|
|
|
|
|
* the payload.
|
|
|
|
|
*/
|
|
|
|
|
if (XDLC_IS_INFORMATION(control)) {
|
|
|
|
|
if (tree) {
|
2009-05-03 01:16:34 +00:00
|
|
|
proto_tree_add_uint(snap_tree, hf_type,
|
2009-05-02 21:51:51 +00:00
|
|
|
tvb, offset+3, 2, etype);
|
|
|
|
|
}
|
2009-08-16 12:36:22 +00:00
|
|
|
next_tvb = tvb_new_subset_remaining(tvb, offset+5);
|
2009-05-02 21:51:51 +00:00
|
|
|
mesh_header_len = call_dissector(mesh_handle,
|
|
|
|
|
next_tvb, pinfo, tree);
|
2009-08-16 12:36:22 +00:00
|
|
|
next_tvb = tvb_new_subset_remaining(tvb, offset+5+mesh_header_len);
|
2010-12-20 05:35:29 +00:00
|
|
|
if (!dissector_try_uint(ethertype_subdissector_table,
|
2009-05-02 21:51:51 +00:00
|
|
|
etype, next_tvb, pinfo, tree))
|
2016-03-20 00:33:14 +00:00
|
|
|
call_data_dissector(next_tvb, pinfo, tree);
|
2009-05-02 21:51:51 +00:00
|
|
|
} else {
|
2009-08-16 12:36:22 +00:00
|
|
|
next_tvb = tvb_new_subset_remaining(tvb, offset+5);
|
2016-03-20 00:33:14 +00:00
|
|
|
call_data_dissector(next_tvb, pinfo, tree);
|
2009-05-02 21:51:51 +00:00
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
2001-01-10 09:07:35 +00:00
|
|
|
default:
|
2003-08-28 01:29:16 +00:00
|
|
|
/*
|
|
|
|
|
* Do we have information for this OUI?
|
|
|
|
|
*/
|
2009-05-05 03:50:06 +00:00
|
|
|
oui_info = get_snap_oui_info(oui);
|
|
|
|
|
if (oui_info != NULL) {
|
2003-08-28 01:29:16 +00:00
|
|
|
/*
|
|
|
|
|
* Yes - use it.
|
|
|
|
|
*/
|
2003-09-03 06:27:03 +00:00
|
|
|
hf = *oui_info->field_info->p_id;
|
2003-08-28 01:29:16 +00:00
|
|
|
subdissector_table = oui_info->table;
|
|
|
|
|
} else {
|
|
|
|
|
/*
|
|
|
|
|
* No, use hf_pid for the PID and just dissect
|
|
|
|
|
* the payload as data.
|
|
|
|
|
*/
|
|
|
|
|
hf = hf_pid;
|
|
|
|
|
subdissector_table = NULL;
|
|
|
|
|
}
|
2001-01-10 09:07:35 +00:00
|
|
|
if (tree) {
|
2003-08-28 01:29:16 +00:00
|
|
|
proto_tree_add_uint(snap_tree, hf, tvb, offset+3, 2,
|
2001-01-10 09:07:35 +00:00
|
|
|
etype);
|
|
|
|
|
}
|
2009-08-16 12:36:22 +00:00
|
|
|
next_tvb = tvb_new_subset_remaining(tvb, offset+5);
|
2003-08-28 01:29:16 +00:00
|
|
|
if (XDLC_IS_INFORMATION(control)) {
|
|
|
|
|
if (subdissector_table != NULL) {
|
|
|
|
|
/* do lookup with the subdissector table */
|
2010-12-20 05:35:29 +00:00
|
|
|
if (dissector_try_uint(subdissector_table,
|
2003-08-28 01:29:16 +00:00
|
|
|
etype, next_tvb, pinfo, tree))
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
2016-03-20 00:33:14 +00:00
|
|
|
call_data_dissector(next_tvb, pinfo, tree);
|
2001-01-10 09:07:35 +00:00
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2009-05-05 03:50:06 +00:00
|
|
|
/*
|
|
|
|
|
* Return the oui_info_t for the PID for a particular OUI value, or NULL
|
|
|
|
|
* if there isn't one.
|
|
|
|
|
*/
|
|
|
|
|
oui_info_t *
|
|
|
|
|
get_snap_oui_info(guint32 oui)
|
|
|
|
|
{
|
|
|
|
|
if (oui_info_table != NULL) {
|
2017-02-04 22:53:10 +00:00
|
|
|
return (oui_info_t *)wmem_map_lookup(oui_info_table,
|
2009-05-05 03:50:06 +00:00
|
|
|
GUINT_TO_POINTER(oui));
|
|
|
|
|
} else
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
2020-12-05 01:45:45 +00:00
|
|
|
/*
|
|
|
|
|
* This is what IEEE Std 802-2014 describes in section 5.2.2 "LLC sublayer"
|
|
|
|
|
* as "EtherType protocol discrimination (EPD)".
|
|
|
|
|
*/
|
|
|
|
|
static int
|
|
|
|
|
dissect_epd_llc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
|
|
|
|
|
{
|
|
|
|
|
proto_tree *llc_tree;
|
|
|
|
|
proto_item *ti;
|
|
|
|
|
guint32 etype;
|
|
|
|
|
tvbuff_t *next_tvb;
|
|
|
|
|
|
|
|
|
|
col_set_str(pinfo->cinfo, COL_PROTOCOL, "LLC");
|
|
|
|
|
col_clear(pinfo->cinfo, COL_INFO);
|
|
|
|
|
|
|
|
|
|
ti = proto_tree_add_item(tree, proto_llc, tvb, 0, 2, ENC_NA);
|
|
|
|
|
llc_tree = proto_item_add_subtree(ti, ett_llc);
|
|
|
|
|
proto_tree_add_item_ret_uint(llc_tree, hf_llc_type, tvb, 0, 2, ENC_BIG_ENDIAN, &etype);
|
|
|
|
|
next_tvb = tvb_new_subset_remaining(tvb, 2);
|
|
|
|
|
if (dissector_try_uint(ethertype_subdissector_table, etype, next_tvb,
|
|
|
|
|
pinfo, tree) == 0)
|
|
|
|
|
call_data_dissector(next_tvb, pinfo, tree);
|
|
|
|
|
return tvb_captured_length(tvb);
|
|
|
|
|
}
|
|
|
|
|
|
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,
|
2002-08-28 21:04:11 +00:00
|
|
|
{ "DSAP", "llc.dsap", FT_UINT8, BASE_HEX,
|
From Peter Paluch via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9158
Currently, the LLC dissector in packet-llc.c displays the values of DSAP IG bit
and SSAP CR bit as separate items in the proto tree. This gives an impression
that these entries are separate fields in the LLC header while in reality, they
are only the least significant bits in DSAP/SSAP octets. In addition, the
importance of these bits is relatively low in today's LLC-based protocols (they
are mostly set to 0), so having them always displayed in the proto tree is
somewhat of a luxury.
Modify the LLC dissector by having added a subtree to both DSAP and SSAP items
that displays the IG and CR bits as bits in a bitfield, and moved the display
of IG and CR bits into these subtrees.
It may seem that adding a text item instead of a FT_UINT8 value is not a
sensible approach because such item is not filterable. However, if filtering by
the entire DSAP/SSAP value (which is the typical way of filtering on SAPs), this
value is always added to the tree in its entirety and indexed by "llc.dsap" and
"llc.ssap" filter strings. If the GI or CR bit are to be matched, "llc.dsap.ig"
and "llc.ssap.cr" filter strings are available. Searching for the value of the
DSAP/SSAP & 0xFE which would be the value currently added by the
proto_tree_add_text() is not done and should not be done, as IEEE stipulates:
"An individual actual address value does not necessarily have any relationship
with a group address of the same actual address value."
(http://standards.ieee.org/develop/regauth/tut/llc.pdf) Following this
consideration, the choice of displaying the SAP "actual address" using
proto_tree_add_text() is acceptable.
svn path=/trunk/; revision=54091
2013-12-14 14:11:30 +00:00
|
|
|
VALS(sap_vals), 0x0, "Destination Service Access Point", HFILL }},
|
1999-12-13 21:48:18 +00:00
|
|
|
|
2014-08-13 12:56:22 +00:00
|
|
|
{ &hf_llc_dsap_sap,
|
|
|
|
|
{ "SAP", "llc.dsap.sap", FT_UINT8, BASE_CUSTOM,
|
2015-02-16 01:58:12 +00:00
|
|
|
CF_FUNC(llc_sap_value), 0xFE, "Service Access Point", HFILL }},
|
2014-08-13 12:56:22 +00:00
|
|
|
|
1999-12-13 21:48:18 +00:00
|
|
|
{ &hf_llc_dsap_ig,
|
From Peter Paluch via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9158
Currently, the LLC dissector in packet-llc.c displays the values of DSAP IG bit
and SSAP CR bit as separate items in the proto tree. This gives an impression
that these entries are separate fields in the LLC header while in reality, they
are only the least significant bits in DSAP/SSAP octets. In addition, the
importance of these bits is relatively low in today's LLC-based protocols (they
are mostly set to 0), so having them always displayed in the proto tree is
somewhat of a luxury.
Modify the LLC dissector by having added a subtree to both DSAP and SSAP items
that displays the IG and CR bits as bits in a bitfield, and moved the display
of IG and CR bits into these subtrees.
It may seem that adding a text item instead of a FT_UINT8 value is not a
sensible approach because such item is not filterable. However, if filtering by
the entire DSAP/SSAP value (which is the typical way of filtering on SAPs), this
value is always added to the tree in its entirety and indexed by "llc.dsap" and
"llc.ssap" filter strings. If the GI or CR bit are to be matched, "llc.dsap.ig"
and "llc.ssap.cr" filter strings are available. Searching for the value of the
DSAP/SSAP & 0xFE which would be the value currently added by the
proto_tree_add_text() is not done and should not be done, as IEEE stipulates:
"An individual actual address value does not necessarily have any relationship
with a group address of the same actual address value."
(http://standards.ieee.org/develop/regauth/tut/llc.pdf) Following this
consideration, the choice of displaying the SAP "actual address" using
proto_tree_add_text() is acceptable.
svn path=/trunk/; revision=54091
2013-12-14 14:11:30 +00:00
|
|
|
{ "IG Bit", "llc.dsap.ig", FT_BOOLEAN, 8,
|
|
|
|
|
TFS(&ig_bit), DSAP_GI_BIT, "Individual/Group", HFILL }},
|
1999-07-07 22:52:57 +00:00
|
|
|
|
1999-07-15 15:33:52 +00:00
|
|
|
{ &hf_llc_ssap,
|
2002-08-28 21:04:11 +00:00
|
|
|
{ "SSAP", "llc.ssap", FT_UINT8, BASE_HEX,
|
From Peter Paluch via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9158
Currently, the LLC dissector in packet-llc.c displays the values of DSAP IG bit
and SSAP CR bit as separate items in the proto tree. This gives an impression
that these entries are separate fields in the LLC header while in reality, they
are only the least significant bits in DSAP/SSAP octets. In addition, the
importance of these bits is relatively low in today's LLC-based protocols (they
are mostly set to 0), so having them always displayed in the proto tree is
somewhat of a luxury.
Modify the LLC dissector by having added a subtree to both DSAP and SSAP items
that displays the IG and CR bits as bits in a bitfield, and moved the display
of IG and CR bits into these subtrees.
It may seem that adding a text item instead of a FT_UINT8 value is not a
sensible approach because such item is not filterable. However, if filtering by
the entire DSAP/SSAP value (which is the typical way of filtering on SAPs), this
value is always added to the tree in its entirety and indexed by "llc.dsap" and
"llc.ssap" filter strings. If the GI or CR bit are to be matched, "llc.dsap.ig"
and "llc.ssap.cr" filter strings are available. Searching for the value of the
DSAP/SSAP & 0xFE which would be the value currently added by the
proto_tree_add_text() is not done and should not be done, as IEEE stipulates:
"An individual actual address value does not necessarily have any relationship
with a group address of the same actual address value."
(http://standards.ieee.org/develop/regauth/tut/llc.pdf) Following this
consideration, the choice of displaying the SAP "actual address" using
proto_tree_add_text() is acceptable.
svn path=/trunk/; revision=54091
2013-12-14 14:11:30 +00:00
|
|
|
VALS(sap_vals), 0x0, "Source Service Access Point", HFILL }},
|
1999-12-13 21:48:18 +00:00
|
|
|
|
2014-08-13 12:56:22 +00:00
|
|
|
{ &hf_llc_ssap_sap,
|
|
|
|
|
{ "SAP", "llc.ssap.sap", FT_UINT8, BASE_CUSTOM,
|
2015-02-16 01:58:12 +00:00
|
|
|
CF_FUNC(llc_sap_value), 0xFE, "Service Access Point", HFILL }},
|
2014-08-13 12:56:22 +00:00
|
|
|
|
1999-12-13 21:48:18 +00:00
|
|
|
{ &hf_llc_ssap_cr,
|
From Peter Paluch via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9158
Currently, the LLC dissector in packet-llc.c displays the values of DSAP IG bit
and SSAP CR bit as separate items in the proto tree. This gives an impression
that these entries are separate fields in the LLC header while in reality, they
are only the least significant bits in DSAP/SSAP octets. In addition, the
importance of these bits is relatively low in today's LLC-based protocols (they
are mostly set to 0), so having them always displayed in the proto tree is
somewhat of a luxury.
Modify the LLC dissector by having added a subtree to both DSAP and SSAP items
that displays the IG and CR bits as bits in a bitfield, and moved the display
of IG and CR bits into these subtrees.
It may seem that adding a text item instead of a FT_UINT8 value is not a
sensible approach because such item is not filterable. However, if filtering by
the entire DSAP/SSAP value (which is the typical way of filtering on SAPs), this
value is always added to the tree in its entirety and indexed by "llc.dsap" and
"llc.ssap" filter strings. If the GI or CR bit are to be matched, "llc.dsap.ig"
and "llc.ssap.cr" filter strings are available. Searching for the value of the
DSAP/SSAP & 0xFE which would be the value currently added by the
proto_tree_add_text() is not done and should not be done, as IEEE stipulates:
"An individual actual address value does not necessarily have any relationship
with a group address of the same actual address value."
(http://standards.ieee.org/develop/regauth/tut/llc.pdf) Following this
consideration, the choice of displaying the SAP "actual address" using
proto_tree_add_text() is acceptable.
svn path=/trunk/; revision=54091
2013-12-14 14:11:30 +00:00
|
|
|
{ "CR Bit", "llc.ssap.cr", FT_BOOLEAN, 8,
|
|
|
|
|
TFS(&cr_bit), SSAP_CR_BIT, "Command/Response", HFILL }},
|
1999-07-07 22:52:57 +00:00
|
|
|
|
1999-07-15 15:33:52 +00:00
|
|
|
{ &hf_llc_ctrl,
|
2002-08-28 21:04:11 +00:00
|
|
|
{ "Control", "llc.control", FT_UINT16, BASE_HEX,
|
2009-05-08 06:53:43 +00:00
|
|
|
NULL, 0x0, NULL, HFILL }},
|
1999-07-15 15:33:52 +00:00
|
|
|
|
2004-01-03 03:51:27 +00:00
|
|
|
{ &hf_llc_n_r,
|
|
|
|
|
{ "N(R)", "llc.control.n_r", FT_UINT16, BASE_DEC,
|
2009-05-08 06:53:43 +00:00
|
|
|
NULL, XDLC_N_R_EXT_MASK, NULL, HFILL }},
|
2004-01-03 03:51:27 +00:00
|
|
|
|
|
|
|
|
{ &hf_llc_n_s,
|
|
|
|
|
{ "N(S)", "llc.control.n_s", FT_UINT16, BASE_DEC,
|
2009-05-08 06:53:43 +00:00
|
|
|
NULL, XDLC_N_S_EXT_MASK, NULL, HFILL }},
|
2004-01-03 03:51:27 +00:00
|
|
|
|
|
|
|
|
{ &hf_llc_p,
|
|
|
|
|
{ "Poll", "llc.control.p", FT_BOOLEAN, 8,
|
2009-07-07 14:54:15 +00:00
|
|
|
TFS(&tfs_set_notset), XDLC_P_F, NULL, HFILL }},
|
2004-01-03 03:51:27 +00:00
|
|
|
|
|
|
|
|
{ &hf_llc_p_ext,
|
|
|
|
|
{ "Poll", "llc.control.p", FT_BOOLEAN, 16,
|
2009-07-07 14:54:15 +00:00
|
|
|
TFS(&tfs_set_notset), XDLC_P_F_EXT, NULL, HFILL }},
|
2004-01-03 03:51:27 +00:00
|
|
|
|
|
|
|
|
{ &hf_llc_f,
|
|
|
|
|
{ "Final", "llc.control.f", FT_BOOLEAN, 8,
|
2009-07-07 14:54:15 +00:00
|
|
|
TFS(&tfs_set_notset), XDLC_P_F, NULL, HFILL }},
|
2004-01-03 03:51:27 +00:00
|
|
|
|
|
|
|
|
{ &hf_llc_f_ext,
|
|
|
|
|
{ "Final", "llc.control.f", FT_BOOLEAN, 16,
|
2009-07-07 14:54:15 +00:00
|
|
|
TFS(&tfs_set_notset), XDLC_P_F_EXT, NULL, HFILL }},
|
2004-01-03 03:51:27 +00:00
|
|
|
|
|
|
|
|
{ &hf_llc_s_ftype,
|
|
|
|
|
{ "Supervisory frame type", "llc.control.s_ftype", FT_UINT16, BASE_HEX,
|
2009-05-08 06:53:43 +00:00
|
|
|
VALS(stype_vals), XDLC_S_FTYPE_MASK, NULL, HFILL }},
|
2004-01-03 03:51:27 +00:00
|
|
|
|
|
|
|
|
{ &hf_llc_u_modifier_cmd,
|
|
|
|
|
{ "Command", "llc.control.u_modifier_cmd", FT_UINT8, BASE_HEX,
|
2009-05-08 06:53:43 +00:00
|
|
|
VALS(modifier_vals_cmd), XDLC_U_MODIFIER_MASK, NULL, HFILL }},
|
2004-01-03 03:51:27 +00:00
|
|
|
|
|
|
|
|
{ &hf_llc_u_modifier_resp,
|
|
|
|
|
{ "Response", "llc.control.u_modifier_resp", FT_UINT8, BASE_HEX,
|
2009-05-08 06:53:43 +00:00
|
|
|
VALS(modifier_vals_resp), XDLC_U_MODIFIER_MASK, NULL, HFILL }},
|
2004-01-03 03:51:27 +00:00
|
|
|
|
|
|
|
|
{ &hf_llc_ftype_i,
|
|
|
|
|
{ "Frame type", "llc.control.ftype", FT_UINT16, BASE_HEX,
|
2009-05-08 06:53:43 +00:00
|
|
|
VALS(ftype_vals), XDLC_I_MASK, NULL, HFILL }},
|
2004-01-03 03:51:27 +00:00
|
|
|
|
|
|
|
|
{ &hf_llc_ftype_s_u,
|
|
|
|
|
{ "Frame type", "llc.control.ftype", FT_UINT8, BASE_HEX,
|
2009-05-08 06:53:43 +00:00
|
|
|
VALS(ftype_vals), XDLC_S_U_MASK, NULL, HFILL }},
|
2004-01-03 03:51:27 +00:00
|
|
|
|
|
|
|
|
{ &hf_llc_ftype_s_u_ext,
|
|
|
|
|
{ "Frame type", "llc.control.ftype", FT_UINT16, BASE_HEX,
|
2009-05-08 06:53:43 +00:00
|
|
|
VALS(ftype_vals), XDLC_S_U_MASK, NULL, HFILL }},
|
2004-01-03 03:51:27 +00:00
|
|
|
|
1999-07-15 15:33:52 +00:00
|
|
|
/* registered here but handled in ethertype.c */
|
|
|
|
|
{ &hf_llc_type,
|
2002-08-28 21:04:11 +00:00
|
|
|
{ "Type", "llc.type", FT_UINT16, BASE_HEX,
|
2009-05-08 06:53:43 +00:00
|
|
|
VALS(etype_vals), 0x0, NULL, HFILL }},
|
1999-07-15 15:33:52 +00:00
|
|
|
|
|
|
|
|
{ &hf_llc_oui,
|
2017-10-21 04:00:46 +00:00
|
|
|
{ "Organization Code", "llc.oui", FT_UINT24, BASE_OUI,
|
|
|
|
|
NULL, 0x0, NULL, HFILL }},
|
1999-12-05 09:45:32 +00:00
|
|
|
|
|
|
|
|
{ &hf_llc_pid,
|
2002-08-28 21:04:11 +00:00
|
|
|
{ "Protocol ID", "llc.pid", FT_UINT16, BASE_HEX,
|
2009-05-08 06:53:43 +00:00
|
|
|
NULL, 0x0, NULL, HFILL }}
|
1999-07-07 22:52:57 +00:00
|
|
|
};
|
1999-11-16 11:44:20 +00:00
|
|
|
static gint *ett[] = {
|
|
|
|
|
&ett_llc,
|
From Peter Paluch via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9158
Currently, the LLC dissector in packet-llc.c displays the values of DSAP IG bit
and SSAP CR bit as separate items in the proto tree. This gives an impression
that these entries are separate fields in the LLC header while in reality, they
are only the least significant bits in DSAP/SSAP octets. In addition, the
importance of these bits is relatively low in today's LLC-based protocols (they
are mostly set to 0), so having them always displayed in the proto tree is
somewhat of a luxury.
Modify the LLC dissector by having added a subtree to both DSAP and SSAP items
that displays the IG and CR bits as bits in a bitfield, and moved the display
of IG and CR bits into these subtrees.
It may seem that adding a text item instead of a FT_UINT8 value is not a
sensible approach because such item is not filterable. However, if filtering by
the entire DSAP/SSAP value (which is the typical way of filtering on SAPs), this
value is always added to the tree in its entirety and indexed by "llc.dsap" and
"llc.ssap" filter strings. If the GI or CR bit are to be matched, "llc.dsap.ig"
and "llc.ssap.cr" filter strings are available. Searching for the value of the
DSAP/SSAP & 0xFE which would be the value currently added by the
proto_tree_add_text() is not done and should not be done, as IEEE stipulates:
"An individual actual address value does not necessarily have any relationship
with a group address of the same actual address value."
(http://standards.ieee.org/develop/regauth/tut/llc.pdf) Following this
consideration, the choice of displaying the SAP "actual address" using
proto_tree_add_text() is acceptable.
svn path=/trunk/; revision=54091
2013-12-14 14:11:30 +00:00
|
|
|
&ett_llc_dsap,
|
2014-02-25 16:27:32 +00:00
|
|
|
&ett_llc_ssap,
|
From Peter Paluch via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9158
Currently, the LLC dissector in packet-llc.c displays the values of DSAP IG bit
and SSAP CR bit as separate items in the proto tree. This gives an impression
that these entries are separate fields in the LLC header while in reality, they
are only the least significant bits in DSAP/SSAP octets. In addition, the
importance of these bits is relatively low in today's LLC-based protocols (they
are mostly set to 0), so having them always displayed in the proto tree is
somewhat of a luxury.
Modify the LLC dissector by having added a subtree to both DSAP and SSAP items
that displays the IG and CR bits as bits in a bitfield, and moved the display
of IG and CR bits into these subtrees.
It may seem that adding a text item instead of a FT_UINT8 value is not a
sensible approach because such item is not filterable. However, if filtering by
the entire DSAP/SSAP value (which is the typical way of filtering on SAPs), this
value is always added to the tree in its entirety and indexed by "llc.dsap" and
"llc.ssap" filter strings. If the GI or CR bit are to be matched, "llc.dsap.ig"
and "llc.ssap.cr" filter strings are available. Searching for the value of the
DSAP/SSAP & 0xFE which would be the value currently added by the
proto_tree_add_text() is not done and should not be done, as IEEE stipulates:
"An individual actual address value does not necessarily have any relationship
with a group address of the same actual address value."
(http://standards.ieee.org/develop/regauth/tut/llc.pdf) Following this
consideration, the choice of displaying the SAP "actual address" using
proto_tree_add_text() is acceptable.
svn path=/trunk/; revision=54091
2013-12-14 14:11:30 +00:00
|
|
|
&ett_llc_ctrl,
|
1999-11-16 11:44:20 +00:00
|
|
|
};
|
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
|
|
|
|
2009-05-08 06:53:43 +00:00
|
|
|
/* subdissector code */
|
2009-05-03 01:16:34 +00:00
|
|
|
dsap_subdissector_table = register_dissector_table("llc.dsap",
|
2016-08-30 22:51:54 +00:00
|
|
|
"LLC SAP", proto_llc, FT_UINT8, BASE_HEX);
|
2003-02-13 00:47:42 +00:00
|
|
|
xid_subdissector_table = register_dissector_table("llc.xid_dsap",
|
2016-08-30 22:51:54 +00:00
|
|
|
"LLC XID SAP", proto_llc, FT_UINT8, BASE_HEX);
|
2021-10-11 13:49:19 +00:00
|
|
|
other_control_dissector_table = register_dissector_table("llc.control",
|
|
|
|
|
"LLC Control", proto_llc, FT_UINT16, BASE_HEX);
|
2016-02-13 13:56:08 +00:00
|
|
|
register_capture_dissector_table("llc.dsap", "LLC");
|
2001-01-03 10:34:42 +00:00
|
|
|
|
2016-12-17 01:06:11 +00:00
|
|
|
llc_handle = register_dissector("llc", dissect_llc, proto_llc);
|
2020-12-05 01:45:45 +00:00
|
|
|
epd_llc_handle = register_dissector("epd_llc", dissect_epd_llc,
|
|
|
|
|
proto_llc);
|
2016-10-26 16:07:47 +00:00
|
|
|
|
|
|
|
|
register_capture_dissector("llc", capture_llc, proto_llc);
|
1999-07-07 22:52:57 +00:00
|
|
|
}
|
2000-11-16 07:35:43 +00:00
|
|
|
|
2005-10-25 06:00:53 +00:00
|
|
|
void
|
|
|
|
|
proto_register_basicxid(void)
|
|
|
|
|
{
|
|
|
|
|
static hf_register_info hf[] = {
|
|
|
|
|
{ &hf_llc_xid_format,
|
2007-10-07 23:30:14 +00:00
|
|
|
{ "XID Format", "basicxid.llc.xid.format", FT_UINT8, BASE_HEX,
|
2009-05-08 06:53:43 +00:00
|
|
|
VALS(format_vals), 0x0, NULL, HFILL }},
|
2005-10-25 06:00:53 +00:00
|
|
|
|
|
|
|
|
{ &hf_llc_xid_types,
|
2007-10-07 23:30:14 +00:00
|
|
|
{ "LLC Types/Classes", "basicxid.llc.xid.types", FT_UINT8, BASE_HEX,
|
2009-05-08 06:53:43 +00:00
|
|
|
VALS(type_vals), 0x0, NULL, HFILL }},
|
2005-10-25 06:00:53 +00:00
|
|
|
|
|
|
|
|
{ &hf_llc_xid_wsize,
|
2007-10-07 23:30:14 +00:00
|
|
|
{ "Receive Window Size", "basicxid.llc.xid.wsize", FT_UINT8, BASE_DEC,
|
2009-05-08 06:53:43 +00:00
|
|
|
NULL, 0x0, NULL, HFILL }}
|
2005-10-25 06:00:53 +00:00
|
|
|
};
|
|
|
|
|
static gint *ett[] = {
|
2009-05-08 06:53:43 +00:00
|
|
|
&ett_llc_basicxid
|
2005-10-25 06:00:53 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
proto_basicxid = proto_register_protocol("Logical-Link Control Basic Format XID", "Basic Format XID", "basicxid");
|
|
|
|
|
proto_register_field_array(proto_basicxid, hf, array_length(hf));
|
|
|
|
|
proto_register_subtree_array(ett, array_length(ett));
|
|
|
|
|
|
2015-12-09 04:04:01 +00:00
|
|
|
register_dissector("basicxid", dissect_basicxid, proto_basicxid);
|
2005-10-25 06:00:53 +00:00
|
|
|
}
|
|
|
|
|
|
2003-09-03 06:27:03 +00:00
|
|
|
static void
|
|
|
|
|
register_hf(gpointer key _U_, gpointer value, gpointer user_data _U_)
|
|
|
|
|
{
|
2013-03-19 19:28:57 +00:00
|
|
|
oui_info_t *info = (oui_info_t *)value;
|
2003-09-03 06:27:03 +00:00
|
|
|
|
|
|
|
|
proto_register_field_array(proto_llc, info->field_info, 1);
|
|
|
|
|
}
|
|
|
|
|
|
2000-11-16 07:35:43 +00:00
|
|
|
void
|
|
|
|
|
proto_reg_handoff_llc(void)
|
|
|
|
|
{
|
2016-10-26 16:07:47 +00:00
|
|
|
capture_dissector_handle_t llc_cap_handle;
|
|
|
|
|
capture_dissector_handle_t llc_snap_handle;
|
2001-12-03 04:00:26 +00:00
|
|
|
|
2000-11-16 07:35:43 +00:00
|
|
|
/*
|
2008-04-10 23:56:10 +00:00
|
|
|
* Get handles for the BPDU, Ethernet, FDDI, Token Ring and
|
|
|
|
|
* Turbocell dissectors.
|
2000-11-16 07:35:43 +00:00
|
|
|
*/
|
2016-03-16 13:02:52 +00:00
|
|
|
bpdu_handle = find_dissector_add_dependency("bpdu", proto_llc);
|
|
|
|
|
eth_withoutfcs_handle = find_dissector_add_dependency("eth_withoutfcs", proto_llc);
|
|
|
|
|
eth_withfcs_handle = find_dissector_add_dependency("eth_withfcs", proto_llc);
|
|
|
|
|
fddi_handle = find_dissector_add_dependency("fddi", proto_llc);
|
|
|
|
|
tr_handle = find_dissector_add_dependency("tr", proto_llc);
|
|
|
|
|
turbo_handle = find_dissector_add_dependency("turbocell", proto_llc);
|
|
|
|
|
mesh_handle = find_dissector_add_dependency("mesh", proto_llc);
|
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
|
|
|
|
2009-05-02 21:51:51 +00:00
|
|
|
/*
|
|
|
|
|
* Get the Ethertype dissector table.
|
|
|
|
|
*/
|
|
|
|
|
ethertype_subdissector_table = find_dissector_table("ethertype");
|
2009-06-23 21:05:47 +00:00
|
|
|
hpteam_subdissector_table = find_dissector_table("llc.hpteam_pid");
|
2009-05-02 21:51:51 +00:00
|
|
|
|
2010-12-20 05:35:29 +00:00
|
|
|
dissector_add_uint("wtap_encap", WTAP_ENCAP_ATM_RFC1483, llc_handle);
|
|
|
|
|
dissector_add_uint("sll.ltype", LINUX_SLL_P_802_2, llc_handle);
|
2002-05-29 03:08:02 +00:00
|
|
|
/* RFC 2043 */
|
2010-12-20 05:35:29 +00:00
|
|
|
dissector_add_uint("ppp.protocol", PPP_LLC, llc_handle);
|
2002-05-29 03:08:02 +00:00
|
|
|
/* RFC 2353 */
|
2016-10-05 20:33:54 +00:00
|
|
|
dissector_add_uint_range_with_preference("udp.port", UDP_PORT_LLC_RANGE, llc_handle);
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
/* IP-over-FC when we have the full FC frame */
|
2010-12-20 05:35:29 +00:00
|
|
|
dissector_add_uint("fc.ftype", FC_FTYPE_IP, llc_handle);
|
2003-01-25 00:06:12 +00:00
|
|
|
|
2015-04-02 17:38:30 +00:00
|
|
|
dissector_add_uint("atm.aal5.type", TRAF_LLCMX, llc_handle);
|
|
|
|
|
|
2003-01-25 00:06:12 +00:00
|
|
|
/*
|
|
|
|
|
* BACNET-over-ARCNET is really BACNET-over-802.2 LLC-over-ARCNET,
|
|
|
|
|
* apparently.
|
|
|
|
|
*/
|
2010-12-20 05:35:29 +00:00
|
|
|
dissector_add_uint("arcnet.protocol_id", ARCNET_PROTO_BACNET, llc_handle);
|
|
|
|
|
dissector_add_uint("ethertype", ETHERTYPE_JUMBO_LLC, llc_handle);
|
2003-09-03 06:27:03 +00:00
|
|
|
|
2014-11-09 02:08:52 +00:00
|
|
|
dissector_add_uint("juniper.proto", JUNIPER_PROTO_LLC, llc_handle);
|
|
|
|
|
dissector_add_uint("juniper.proto", JUNIPER_PROTO_LLC_SNAP, llc_handle);
|
|
|
|
|
|
2016-10-26 16:07:47 +00:00
|
|
|
llc_cap_handle = find_capture_dissector("llc");
|
|
|
|
|
capture_dissector_add_uint("ethertype", ETHERTYPE_JUMBO_LLC, llc_cap_handle);
|
|
|
|
|
capture_dissector_add_uint("atm.aal5.type", TRAF_LLCMX, llc_cap_handle);
|
|
|
|
|
capture_dissector_add_uint("sll.ltype", LINUX_SLL_P_802_2, llc_cap_handle);
|
|
|
|
|
|
|
|
|
|
llc_snap_handle = register_capture_dissector("llc_snap", capture_snap, proto_llc);
|
|
|
|
|
capture_dissector_add_uint("fr.nlpid", NLPID_SNAP, llc_snap_handle);
|
|
|
|
|
|
2015-12-13 21:54:16 +00:00
|
|
|
|
2003-09-03 06:27:03 +00:00
|
|
|
/*
|
|
|
|
|
* Register all the fields for PIDs for various OUIs.
|
|
|
|
|
*/
|
2005-01-06 08:21:25 +00:00
|
|
|
if (oui_info_table != NULL)
|
2017-02-04 22:53:10 +00:00
|
|
|
wmem_map_foreach(oui_info_table, register_hf, NULL);
|
2000-11-16 07:35:43 +00:00
|
|
|
}
|
2014-08-15 13:40:00 +00:00
|
|
|
|
|
|
|
|
/*
|
2019-07-26 18:43:17 +00:00
|
|
|
* Editor modelines - https://www.wireshark.org/tools/modelines.html
|
2014-08-15 13:40:00 +00:00
|
|
|
*
|
|
|
|
|
* Local variables:
|
|
|
|
|
* c-basic-offset: 8
|
|
|
|
|
* tab-width: 8
|
|
|
|
|
* indent-tabs-mode: t
|
|
|
|
|
* End:
|
|
|
|
|
*
|
|
|
|
|
* vi: set shiftwidth=8 tabstop=8 noexpandtab:
|
|
|
|
|
* :indentSize=8:tabSize=8:noTabs=false:
|
|
|
|
|
*/
|