1999-10-20 22:41:12 +00:00
|
|
|
/* packet-vlan.c
|
|
|
|
* Routines for VLAN 802.1Q ethernet header disassembly
|
|
|
|
*
|
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
|
|
|
* $Id: packet-vlan.c,v 1.19 2000/08/13 14:09:06 deniel 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_etype = -1;
|
|
|
|
static int hf_vlan_priority = -1;
|
|
|
|
static int hf_vlan_id = -1;
|
|
|
|
static int hf_vlan_cfi = -1;
|
|
|
|
|
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
|
1999-10-20 22:41:12 +00:00
|
|
|
dissect_vlan(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) {
|
|
|
|
proto_tree *ti, *vlan_tree = NULL;
|
1999-11-05 18:50:52 +00:00
|
|
|
guint16 tci,encap_proto;
|
2000-05-11 22:04:18 +00:00
|
|
|
tvbuff_t *next_tvb;
|
1999-10-20 22:41:12 +00:00
|
|
|
|
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
|
|
|
OLD_CHECK_DISPLAY_AS_DATA(proto_vlan, pd, offset, fd, tree);
|
|
|
|
|
1999-10-20 22:41:12 +00:00
|
|
|
if (!BYTES_ARE_IN_FRAME(offset, 2*sizeof(guint16))) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (check_col(fd, COL_PROTOCOL))
|
|
|
|
col_add_str(fd, COL_PROTOCOL, "VLAN");
|
|
|
|
|
1999-11-05 18:50:52 +00:00
|
|
|
tci = pntohs( &pd[offset] );
|
|
|
|
encap_proto = pntohs( &pd[offset+2] );
|
|
|
|
|
1999-10-20 22:41:12 +00:00
|
|
|
if (check_col(fd, COL_INFO)) {
|
|
|
|
col_add_fstr(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
|
|
|
}
|
|
|
|
|
|
|
|
if (tree) {
|
2000-05-31 05:09:07 +00:00
|
|
|
ti = proto_tree_add_item(tree, proto_vlan, NullTVB, offset, 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-05-31 05:09:07 +00:00
|
|
|
proto_tree_add_uint(vlan_tree, hf_vlan_priority, NullTVB, offset, 2, tci);
|
|
|
|
proto_tree_add_uint(vlan_tree, hf_vlan_cfi, NullTVB, offset, 2, tci);
|
|
|
|
proto_tree_add_uint(vlan_tree, hf_vlan_id, NullTVB, offset, 2, tci);
|
1999-10-20 22:41:12 +00:00
|
|
|
}
|
|
|
|
|
Convert IPX-and-friend dissectors in packet-ipx.c to use
tvbuffs.
In doing so, I realied that my recommendation for using
tvb_new_subset(pi.compat_top_tvb, -1, -1) was incorrect, because
some dissectors (ethernet!) change pi.len and pi.cap_len. So, I have
to take those two variables into account instead of using -1 and -1.
So, I provide a macro called tvb_create_from_top(offset), where
offset is the name of your offset variable. It is a wrapper around
tvb_new_subset().
I converted the lines that followed my suggestion to use
tvb_create_from_top().
In proto.c I added
proto_tree_add_debug_text(proto_tree*, const char*, ...)
It's much like proto_tree_add_text(), except that it takes no offset
or length; it's soley for temporarily putting debug text into the
proto_tree while debugging a dissector. In making sure that its
use is temporary, the funciton also prints the debug string to stdout
to remind the programmer that the debug code needs to be removed
before shipping the code.
svn path=/trunk/; revision=2068
2000-06-15 03:49:00 +00:00
|
|
|
next_tvb = tvb_create_from_top(offset+4); /* XXX - should TRY() like dissect_eth() */
|
1999-12-03 21:28:11 +00:00
|
|
|
if ( encap_proto <= IEEE_802_3_MAX_LEN) {
|
|
|
|
if ( pd[offset+4] == 0xff && pd[offset+5] == 0xff ) {
|
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
|
|
|
dissect_ipx(next_tvb, &pi, tree);
|
|
|
|
} else {
|
2000-05-11 22:04:18 +00:00
|
|
|
dissect_llc(next_tvb, &pi, tree);
|
1999-12-03 21:28:11 +00:00
|
|
|
}
|
|
|
|
} else {
|
2000-05-19 04:54:36 +00:00
|
|
|
ethertype(encap_proto, pi.compat_top_tvb, offset+4, &pi, 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_etype, {
|
|
|
|
"Type", "vlan.etype", FT_UINT16, BASE_HEX,
|
|
|
|
VALS(etype_vals), 0x0, "Type" }},
|
|
|
|
{ &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,
|
1999-10-20 22:41:12 +00:00
|
|
|
0, 0x1000, "CFI" }},
|
|
|
|
{ &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" }},
|
|
|
|
};
|
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)
|
|
|
|
{
|
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
|
|
|
old_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
|
|
|
}
|