1999-10-20 22:41:12 +00:00
|
|
|
/* packet-vlan.c
|
|
|
|
* Routines for VLAN 802.1Q ethernet header disassembly
|
|
|
|
*
|
2000-11-13 04:44:14 +00:00
|
|
|
* $Id: packet-vlan.c,v 1.22 2000/11/13 04:44:14 guy Exp $
|
1999-10-20 22:41:12 +00:00
|
|
|
*
|
|
|
|
* Ethereal - Network traffic analyzer
|
|
|
|
* By Gerald Combs <gerald@zing.org>
|
|
|
|
* 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
|
|
|
|
|
|
|
|
#ifdef HAVE_SYS_TYPES_H
|
|
|
|
# include <sys/types.h>
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef HAVE_NETINET_IN_H
|
|
|
|
# include <netinet/in.h>
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#include <glib.h>
|
|
|
|
#include "packet.h"
|
2000-02-15 21:06:58 +00:00
|
|
|
#include "packet-ipx.h"
|
|
|
|
#include "packet-llc.h"
|
1999-12-03 21:28:11 +00:00
|
|
|
#include "etypes.h"
|
1999-10-20 22:41:12 +00:00
|
|
|
|
|
|
|
static int proto_vlan = -1;
|
|
|
|
static int hf_vlan_priority = -1;
|
|
|
|
static int hf_vlan_cfi = -1;
|
2000-11-12 05:58:34 +00:00
|
|
|
static int hf_vlan_id = -1;
|
|
|
|
static int hf_vlan_etype = -1;
|
|
|
|
static int hf_vlan_len = -1;
|
2000-11-13 04:44:14 +00:00
|
|
|
static int hf_vlan_trailer = -1;
|
1999-10-20 22:41:12 +00:00
|
|
|
|
1999-11-16 11:44:20 +00:00
|
|
|
static gint ett_vlan = -1;
|
|
|
|
|
1999-12-05 20:05:45 +00:00
|
|
|
void
|
2000-01-23 08:55:37 +00:00
|
|
|
capture_vlan(const u_char *pd, int offset, packet_counts *ld ) {
|
1999-12-05 20:05:45 +00:00
|
|
|
guint32 encap_proto;
|
|
|
|
if ( !BYTES_ARE_IN_FRAME(offset,5) ) {
|
2000-01-23 08:55:37 +00:00
|
|
|
ld->other++;
|
1999-12-05 20:05:45 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
encap_proto = pntohs( &pd[offset+2] );
|
|
|
|
if ( encap_proto <= IEEE_802_3_MAX_LEN) {
|
|
|
|
if ( pd[offset+4] == 0xff && pd[offset+5] == 0xff ) {
|
2000-01-23 08:55:37 +00:00
|
|
|
capture_ipx(pd,offset+4,ld);
|
1999-12-05 20:05:45 +00:00
|
|
|
} else {
|
2000-01-23 08:55:37 +00:00
|
|
|
capture_llc(pd,offset+4,ld);
|
1999-12-05 20:05:45 +00:00
|
|
|
}
|
|
|
|
} else {
|
2000-01-23 08:55:37 +00:00
|
|
|
capture_ethertype(encap_proto, offset+4, pd, ld);
|
1999-12-05 20:05:45 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2000-04-16 22:59:37 +00:00
|
|
|
static void
|
2000-11-13 04:44:14 +00:00
|
|
|
dissect_vlan(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|
|
|
{
|
|
|
|
proto_tree *ti;
|
1999-11-05 18:50:52 +00:00
|
|
|
guint16 tci,encap_proto;
|
2000-11-13 04:44:14 +00:00
|
|
|
volatile gboolean is_802_2;
|
|
|
|
tvbuff_t *volatile next_tvb;
|
|
|
|
tvbuff_t *volatile trailer_tvb;
|
|
|
|
proto_tree *volatile vlan_tree;
|
1999-10-20 22:41:12 +00:00
|
|
|
|
2000-11-12 05:43:26 +00:00
|
|
|
CHECK_DISPLAY_AS_DATA(proto_vlan, tvb, pinfo, tree);
|
Add the "Edit:Protocols..." feature which currently only implements
the following:
It is now possible to enable/disable a particular protocol decoding
(i.e. the protocol dissector is void or not). When a protocol
is disabled, it is displayed as Data and of course, all linked
sub-protocols are disabled as well.
Disabling a protocol could be interesting:
- in case of buggy dissectors
- in case of wrong heuristics
- for performance reasons
- to decode the data as another protocol (TODO)
Currently (if I am not wrong), all dissectors but NFS can be disabled
(and dissectors that do not register protocols :-)
I do not like the way the RPC sub-dissectors are disabled (in the
sub-dissectors) since this could be done in the RPC dissector itself,
knowing the sub-protocol hfinfo entry (this is why, I've not modified
the NFS one yet).
Two functions are added in proto.c :
gboolean proto_is_protocol_enabled(int n);
void proto_set_decoding(int n, gboolean enabled);
and two MACROs which can be used in dissectors:
OLD_CHECK_DISPLAY_AS_DATA(index, pd, offset, fd, tree)
CHECK_DISPLAY_AS_DATA(index, tvb, pinfo, tree)
See also the XXX in proto_dlg.c and proto.c around the new functions.
svn path=/trunk/; revision=2267
2000-08-13 14:09:15 +00:00
|
|
|
|
2000-11-12 05:43:26 +00:00
|
|
|
pinfo->current_proto = "VLAN";
|
1999-10-20 22:41:12 +00:00
|
|
|
|
2000-11-12 05:43:26 +00:00
|
|
|
if (check_col(pinfo->fd, COL_PROTOCOL))
|
|
|
|
col_add_str(pinfo->fd, COL_PROTOCOL, "VLAN");
|
1999-10-20 22:41:12 +00:00
|
|
|
|
2000-11-12 05:43:26 +00:00
|
|
|
tci = tvb_get_ntohs( tvb, 0 );
|
|
|
|
encap_proto = tvb_get_ntohs( tvb, 2 );
|
1999-11-05 18:50:52 +00:00
|
|
|
|
2000-11-12 05:43:26 +00:00
|
|
|
if (check_col(pinfo->fd, COL_INFO)) {
|
|
|
|
col_add_fstr(pinfo->fd, COL_INFO, "PRI: %d CFI: %d ID: %d",
|
1999-11-05 18:50:52 +00:00
|
|
|
(tci >> 13), ((tci >> 12) & 1), (tci & 0xFFF));
|
1999-10-20 22:41:12 +00:00
|
|
|
}
|
|
|
|
|
2000-11-13 04:44:14 +00:00
|
|
|
vlan_tree = NULL;
|
|
|
|
|
1999-10-20 22:41:12 +00:00
|
|
|
if (tree) {
|
2000-11-12 05:43:26 +00:00
|
|
|
ti = proto_tree_add_item(tree, proto_vlan, tvb, 0, 4, FALSE);
|
1999-11-16 11:44:20 +00:00
|
|
|
vlan_tree = proto_item_add_subtree(ti, ett_vlan);
|
1999-10-20 22:41:12 +00:00
|
|
|
|
2000-11-12 05:43:26 +00:00
|
|
|
proto_tree_add_uint(vlan_tree, hf_vlan_priority, tvb, 0, 2, tci);
|
|
|
|
proto_tree_add_uint(vlan_tree, hf_vlan_cfi, tvb, 0, 2, tci);
|
|
|
|
proto_tree_add_uint(vlan_tree, hf_vlan_id, tvb, 0, 2, tci);
|
1999-10-20 22:41:12 +00:00
|
|
|
}
|
|
|
|
|
1999-12-03 21:28:11 +00:00
|
|
|
if ( encap_proto <= IEEE_802_3_MAX_LEN) {
|
2000-11-13 04:44:14 +00:00
|
|
|
/* Give the next dissector only 'length' number of bytes */
|
2000-11-12 05:58:34 +00:00
|
|
|
proto_tree_add_uint(vlan_tree, hf_vlan_len, tvb, 2, 2, encap_proto);
|
2000-11-13 04:44:14 +00:00
|
|
|
TRY {
|
|
|
|
next_tvb = tvb_new_subset(tvb, 4, encap_proto, encap_proto);
|
|
|
|
trailer_tvb = tvb_new_subset(tvb, 4 + encap_proto, -1, -1);
|
|
|
|
}
|
|
|
|
CATCH2(BoundsError, ReportedBoundsError) {
|
|
|
|
next_tvb = tvb_new_subset(tvb, 4, -1, encap_proto);
|
|
|
|
}
|
|
|
|
ENDTRY;
|
|
|
|
|
|
|
|
/* Is there an 802.2 layer? I can tell by looking at the first 2
|
|
|
|
bytes after the VLAN header. If they are 0xffff, then what
|
|
|
|
follows the VLAN header is an IPX payload, meaning no 802.2.
|
|
|
|
(IPX/SPX is they only thing that can be contained inside a
|
|
|
|
straight 802.3 packet, so presumably the same applies for
|
|
|
|
Ethernet VLAN packets). A non-0xffff value means that there's an
|
|
|
|
802.2 layer inside the VLAN layer */
|
|
|
|
is_802_2 = TRUE;
|
|
|
|
TRY {
|
|
|
|
if (tvb_get_ntohs(next_tvb, 2) == 0xffff) {
|
|
|
|
is_802_2 = FALSE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
CATCH2(BoundsError, ReportedBoundsError) {
|
|
|
|
; /* do nothing */
|
|
|
|
|
|
|
|
}
|
|
|
|
ENDTRY;
|
|
|
|
if (is_802_2 ) {
|
|
|
|
/* 802.2 LLC */
|
2000-11-12 05:43:26 +00:00
|
|
|
dissect_llc(next_tvb, pinfo, tree);
|
2000-11-13 04:44:14 +00:00
|
|
|
} else {
|
|
|
|
dissect_ipx(next_tvb, pinfo, tree);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* If there's some bytes left over, mark them. */
|
|
|
|
if (trailer_tvb && tree) {
|
|
|
|
int trailer_length;
|
|
|
|
const guint8 *ptr;
|
|
|
|
|
|
|
|
trailer_length = tvb_length(trailer_tvb);
|
|
|
|
if (trailer_length > 0) {
|
|
|
|
ptr = tvb_get_ptr(trailer_tvb, 0, trailer_length);
|
|
|
|
proto_tree_add_bytes(vlan_tree, hf_vlan_trailer, tvb, 4 + encap_proto,
|
|
|
|
trailer_length, ptr);
|
|
|
|
}
|
1999-12-03 21:28:11 +00:00
|
|
|
}
|
|
|
|
} else {
|
2000-11-12 05:43:26 +00:00
|
|
|
ethertype(encap_proto, tvb, 4, pinfo, tree, vlan_tree, hf_vlan_etype);
|
1999-12-03 21:28:11 +00:00
|
|
|
}
|
1999-10-20 22:41:12 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
proto_register_vlan(void)
|
|
|
|
{
|
|
|
|
static hf_register_info hf[] = {
|
|
|
|
{ &hf_vlan_priority, {
|
1999-11-10 05:42:06 +00:00
|
|
|
"Priority", "vlan.priority", FT_UINT16, BASE_BIN,
|
1999-10-20 22:41:12 +00:00
|
|
|
0, 0xE000, "Priority" }},
|
|
|
|
{ &hf_vlan_cfi, {
|
1999-11-10 05:42:06 +00:00
|
|
|
"CFI", "vlan.cfi", FT_UINT16, BASE_BIN,
|
2000-11-12 05:58:34 +00:00
|
|
|
0, 0x1000, "CFI" }}, /* XXX - Boolean? */
|
1999-10-20 22:41:12 +00:00
|
|
|
{ &hf_vlan_id, {
|
1999-11-10 05:42:06 +00:00
|
|
|
"ID", "vlan.id", FT_UINT16, BASE_BIN,
|
1999-10-20 22:41:12 +00:00
|
|
|
0, 0x0FFF, "ID" }},
|
2000-11-12 05:58:34 +00:00
|
|
|
{ &hf_vlan_etype, {
|
|
|
|
"Type", "vlan.etype", FT_UINT16, BASE_HEX,
|
|
|
|
VALS(etype_vals), 0x0, "Type" }},
|
|
|
|
{ &hf_vlan_len, {
|
|
|
|
"Length", "vlan.len", FT_UINT16, BASE_DEC,
|
2000-11-13 04:44:14 +00:00
|
|
|
NULL, 0x0, "Length" }},
|
|
|
|
{ &hf_vlan_trailer, {
|
|
|
|
"Trailer", "vlan.trailer", FT_BYTES, BASE_NONE,
|
|
|
|
NULL, 0x0, "VLAN Trailer" }}
|
1999-10-20 22:41:12 +00:00
|
|
|
};
|
1999-11-16 11:44:20 +00:00
|
|
|
static gint *ett[] = {
|
|
|
|
&ett_vlan,
|
|
|
|
};
|
1999-10-20 22:41:12 +00:00
|
|
|
|
|
|
|
proto_vlan = proto_register_protocol("802.1q Virtual LAN", "vlan");
|
|
|
|
proto_register_field_array(proto_vlan, hf, array_length(hf));
|
1999-11-16 11:44:20 +00:00
|
|
|
proto_register_subtree_array(ett, array_length(ett));
|
1999-10-20 22:41:12 +00:00
|
|
|
}
|
Change the sub-dissector handoff registration routines so that the
sub-dissector table is not stored in the header_field_info struct, but
in a separate namespace. Dissector tables are now registered by name
and not by field ID. For example:
udp_dissector_table = register_dissector_table("udp.port");
Because of this different namespace, dissector tables can have names
that are not field names. This is useful for ethertype, since multiple
fields are "ethertypes".
packet-ethertype.c replaces ethertype.c (the name was changed so that it
would be named in the same fashion as all the filenames passed to make-reg-dotc)
Although it registers no protocol or field, it registers one dissector table:
ethertype_dissector_table = register_dissector_table("ethertype");
All protocols that can be called because of an ethertype field now register
that fact with dissector_add() calls.
In this way, one dissector_table services all ethertype fields
(hf_eth_type, hf_llc_type, hf_null_etype, hf_vlan_etype)
Furthermore, the code allows for names of protocols to exist in the
etype_vals, yet a dissector for that protocol doesn't exist. The name
of the dissector is printed in COL_INFO. You're welcome, Richard. :-)
svn path=/trunk/; revision=1848
2000-04-13 18:18:56 +00:00
|
|
|
|
|
|
|
void
|
|
|
|
proto_reg_handoff_vlan(void)
|
|
|
|
{
|
2000-11-12 05:43:26 +00:00
|
|
|
dissector_add("ethertype", ETHERTYPE_VLAN, dissect_vlan);
|
Change the sub-dissector handoff registration routines so that the
sub-dissector table is not stored in the header_field_info struct, but
in a separate namespace. Dissector tables are now registered by name
and not by field ID. For example:
udp_dissector_table = register_dissector_table("udp.port");
Because of this different namespace, dissector tables can have names
that are not field names. This is useful for ethertype, since multiple
fields are "ethertypes".
packet-ethertype.c replaces ethertype.c (the name was changed so that it
would be named in the same fashion as all the filenames passed to make-reg-dotc)
Although it registers no protocol or field, it registers one dissector table:
ethertype_dissector_table = register_dissector_table("ethertype");
All protocols that can be called because of an ethertype field now register
that fact with dissector_add() calls.
In this way, one dissector_table services all ethertype fields
(hf_eth_type, hf_llc_type, hf_null_etype, hf_vlan_etype)
Furthermore, the code allows for names of protocols to exist in the
etype_vals, yet a dissector for that protocol doesn't exist. The name
of the dissector is printed in COL_INFO. You're welcome, Richard. :-)
svn path=/trunk/; revision=1848
2000-04-13 18:18:56 +00:00
|
|
|
}
|