2000-03-09 18:31:51 +00:00
|
|
|
/* packet-mpls.c
|
|
|
|
* Routines for MPLS data packet disassembly
|
2004-08-07 03:36:20 +00:00
|
|
|
* RFC 3032
|
2002-08-28 21:04:11 +00:00
|
|
|
*
|
2000-03-09 18:31:51 +00:00
|
|
|
* (c) Copyright Ashok Narayanan <ashokn@cisco.com>
|
|
|
|
*
|
2004-07-18 00:24:25 +00:00
|
|
|
* $Id$
|
2000-03-09 18:31:51 +00:00
|
|
|
*
|
|
|
|
* Ethereal - Network traffic analyzer
|
2001-04-23 18:05:19 +00:00
|
|
|
* By Gerald Combs <gerald@ethereal.com>
|
2000-03-09 18:31:51 +00:00
|
|
|
* Copyright 1998 Gerald Combs
|
2002-08-28 21:04:11 +00:00
|
|
|
*
|
2000-03-09 18:31:51 +00:00
|
|
|
* 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.
|
2002-08-28 21:04:11 +00:00
|
|
|
*
|
2000-03-09 18:31:51 +00:00
|
|
|
* 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.
|
2002-08-28 21:04:11 +00:00
|
|
|
*
|
2000-03-09 18:31:51 +00:00
|
|
|
* 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.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/*
|
|
|
|
* NOTES
|
|
|
|
*
|
|
|
|
* This module defines routines to handle Ethernet-encapsulated MPLS IP packets.
|
|
|
|
* It should implement all the functionality in <draft-ietf-mpls-label-encaps-07.txt>
|
|
|
|
* Multicast MPLS support is not tested yet
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
|
|
# include "config.h"
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#include <glib.h>
|
2002-01-21 07:37:49 +00:00
|
|
|
#include <epan/packet.h>
|
2000-12-14 08:20:31 +00:00
|
|
|
#include "ppptypes.h"
|
2001-04-17 06:43:21 +00:00
|
|
|
#include "etypes.h"
|
2004-09-27 22:55:15 +00:00
|
|
|
#include <epan/prefs.h>
|
2004-05-12 20:20:49 +00:00
|
|
|
#include "packet-ppp.h"
|
2000-03-09 18:31:51 +00:00
|
|
|
|
|
|
|
static gint proto_mpls = -1;
|
|
|
|
|
|
|
|
static gint ett_mpls = -1;
|
2004-05-12 20:20:49 +00:00
|
|
|
static gint ett_mpls_control = -1;
|
2000-03-09 18:31:51 +00:00
|
|
|
|
|
|
|
/* Special labels in MPLS */
|
|
|
|
enum {
|
|
|
|
IP4_EXPLICIT_NULL = 0,
|
|
|
|
ROUTER_ALERT,
|
|
|
|
IP6_EXPLICIT_NULL,
|
|
|
|
IMPLICIT_NULL,
|
|
|
|
|
|
|
|
MAX_RESERVED = 15
|
|
|
|
};
|
|
|
|
|
|
|
|
static const value_string special_labels[] = {
|
|
|
|
{IP4_EXPLICIT_NULL, "IPv4 Explicit-Null"},
|
|
|
|
{ROUTER_ALERT, "Router Alert"},
|
|
|
|
{IP6_EXPLICIT_NULL, "IPv6 Explicit-Null"},
|
|
|
|
{IMPLICIT_NULL, "Implicit-Null"},
|
|
|
|
{0, NULL }
|
|
|
|
};
|
|
|
|
|
|
|
|
/* MPLS filter values */
|
|
|
|
enum mpls_filter_keys {
|
|
|
|
|
|
|
|
/* Is the packet MPLS-encapsulated? */
|
2000-03-20 22:52:48 +00:00
|
|
|
/* MPLSF_PACKET,*/
|
2000-03-09 18:31:51 +00:00
|
|
|
|
|
|
|
/* MPLS encap properties */
|
|
|
|
MPLSF_LABEL,
|
|
|
|
MPLSF_EXP,
|
|
|
|
MPLSF_BOTTOM_OF_STACK,
|
|
|
|
MPLSF_TTL,
|
|
|
|
|
|
|
|
MPLSF_MAX
|
|
|
|
};
|
|
|
|
|
|
|
|
static int mpls_filter[MPLSF_MAX];
|
2004-05-12 20:20:49 +00:00
|
|
|
static int hf_mpls_control_control = -1;
|
|
|
|
static int hf_mpls_control_res = -1;
|
|
|
|
|
2000-03-09 18:31:51 +00:00
|
|
|
static hf_register_info mplsf_info[] = {
|
|
|
|
|
2002-08-28 21:04:11 +00:00
|
|
|
/* {&mpls_filter[MPLSF_PACKET],
|
|
|
|
{"MPLS Label Switched Packet", "mpls", FT_UINT8, BASE_DEC, NULL, 0x0,
|
2001-06-18 02:18:27 +00:00
|
|
|
"", HFILL }},*/
|
2000-03-09 18:31:51 +00:00
|
|
|
|
2002-08-28 21:04:11 +00:00
|
|
|
{&mpls_filter[MPLSF_LABEL],
|
|
|
|
{"MPLS Label", "mpls.label", FT_UINT32, BASE_DEC, VALS(special_labels), 0x0,
|
2001-06-18 02:18:27 +00:00
|
|
|
"", HFILL }},
|
2000-03-09 18:31:51 +00:00
|
|
|
|
2002-08-28 21:04:11 +00:00
|
|
|
{&mpls_filter[MPLSF_EXP],
|
|
|
|
{"MPLS Experimental Bits", "mpls.exp", FT_UINT8, BASE_DEC, NULL, 0x0,
|
2001-06-18 02:18:27 +00:00
|
|
|
"", HFILL }},
|
2000-03-09 18:31:51 +00:00
|
|
|
|
2002-08-28 21:04:11 +00:00
|
|
|
{&mpls_filter[MPLSF_BOTTOM_OF_STACK],
|
|
|
|
{"MPLS Bottom Of Label Stack", "mpls.bottom", FT_UINT8, BASE_DEC, NULL, 0x0,
|
2001-06-18 02:18:27 +00:00
|
|
|
"", HFILL }},
|
2000-03-09 18:31:51 +00:00
|
|
|
|
2002-08-28 21:04:11 +00:00
|
|
|
{&mpls_filter[MPLSF_TTL],
|
|
|
|
{"MPLS TTL", "mpls.ttl", FT_UINT8, BASE_DEC, NULL, 0x0,
|
2001-06-18 02:18:27 +00:00
|
|
|
"", HFILL }},
|
2004-05-12 20:20:49 +00:00
|
|
|
|
|
|
|
{&hf_mpls_control_control,
|
|
|
|
{"MPLS Control Channel", "mpls.cw.control", FT_UINT8, BASE_DEC, NULL, 0xF0,
|
|
|
|
"First nibble", HFILL }},
|
|
|
|
|
|
|
|
{&hf_mpls_control_res,
|
|
|
|
{"Reserved", "mpls.cw.res", FT_UINT16, BASE_HEX, NULL, 0xFFF,
|
|
|
|
"Reserved", HFILL }},
|
2000-03-09 18:31:51 +00:00
|
|
|
};
|
|
|
|
|
2001-11-07 20:26:38 +00:00
|
|
|
static dissector_handle_t ipv4_handle;
|
|
|
|
static dissector_handle_t ipv6_handle;
|
2004-11-24 09:13:52 +00:00
|
|
|
static dissector_handle_t eth_withoutfcs_handle;
|
2004-05-12 20:20:49 +00:00
|
|
|
static dissector_handle_t data_handle;
|
|
|
|
static dissector_table_t ppp_subdissector_table;
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
|
2000-03-09 18:31:51 +00:00
|
|
|
/*
|
2001-01-06 05:09:35 +00:00
|
|
|
* Given a 4-byte MPLS label starting at offset "offset", in tvbuff "tvb",
|
|
|
|
* decode it.
|
2000-03-09 18:31:51 +00:00
|
|
|
* Return the label in "label", EXP bits in "exp",
|
|
|
|
* bottom_of_stack in "bos", and TTL in "ttl"
|
|
|
|
*/
|
2001-01-06 05:09:35 +00:00
|
|
|
void decode_mpls_label(tvbuff_t *tvb, int offset,
|
2000-03-09 18:31:51 +00:00
|
|
|
guint32 *label, guint8 *exp,
|
|
|
|
guint8 *bos, guint8 *ttl)
|
|
|
|
{
|
2001-01-06 05:09:35 +00:00
|
|
|
guint8 octet0 = tvb_get_guint8(tvb, offset+0);
|
|
|
|
guint8 octet1 = tvb_get_guint8(tvb, offset+1);
|
|
|
|
guint8 octet2 = tvb_get_guint8(tvb, offset+2);
|
|
|
|
|
|
|
|
*label = (octet0 << 12) + (octet1 << 4) + ((octet2 >> 4) & 0xff);
|
|
|
|
*exp = (octet2 >> 1) & 0x7;
|
|
|
|
*bos = (octet2 & 0x1);
|
|
|
|
*ttl = tvb_get_guint8(tvb, offset+3);
|
2000-03-09 18:31:51 +00:00
|
|
|
}
|
|
|
|
|
2004-05-12 20:20:49 +00:00
|
|
|
static void
|
|
|
|
dissect_mpls_control(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|
|
|
{
|
|
|
|
proto_tree *mpls_control_tree = NULL;
|
|
|
|
proto_item *ti;
|
|
|
|
tvbuff_t *next_tvb;
|
|
|
|
guint8 ctrl;
|
|
|
|
guint16 res, ppp_proto;
|
|
|
|
|
|
|
|
if (tvb_reported_length_remaining(tvb, 0) < 4){
|
|
|
|
if(tree)
|
|
|
|
proto_tree_add_text(tree, tvb, 0, -1, "Error processing Message");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
ctrl = (tvb_get_guint8(tvb, 0) & 0xF0) >> 4;
|
|
|
|
res = tvb_get_ntohs(tvb, 0) & 0x0FFF;
|
|
|
|
ppp_proto = tvb_get_ntohs(tvb, 2);
|
|
|
|
if (tree) {
|
|
|
|
ti = proto_tree_add_text(tree, tvb, 0, 4, "MPLS PW Control Channel Header");
|
|
|
|
mpls_control_tree = proto_item_add_subtree(ti, ett_mpls_control);
|
|
|
|
if(mpls_control_tree == NULL) return;
|
|
|
|
|
|
|
|
proto_tree_add_uint_format(mpls_control_tree, hf_mpls_control_control, tvb, 0, 1,
|
|
|
|
ctrl, "Control Channel: 0x%1x", ctrl);
|
|
|
|
proto_tree_add_uint_format(mpls_control_tree, hf_mpls_control_res, tvb, 0, 2,
|
|
|
|
res, "Reserved: 0x%03x", res);
|
|
|
|
proto_tree_add_text(mpls_control_tree, tvb, 2, 2,
|
|
|
|
"PPP DLL Protocol Number: %s (0x%04X)",
|
|
|
|
val_to_str(ppp_proto, ppp_vals, "Unknown"), ppp_proto);
|
|
|
|
}
|
|
|
|
next_tvb = tvb_new_subset(tvb, 4, -1, -1);
|
|
|
|
if (!dissector_try_port(ppp_subdissector_table, ppp_proto,
|
|
|
|
next_tvb, pinfo, tree)) {
|
|
|
|
call_dissector(data_handle, next_tvb, pinfo, tree);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
2000-04-16 22:59:37 +00:00
|
|
|
static void
|
2002-08-28 21:04:11 +00:00
|
|
|
dissect_mpls(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
2000-03-09 18:31:51 +00:00
|
|
|
{
|
2001-01-06 05:09:35 +00:00
|
|
|
int offset = 0;
|
2000-03-09 18:31:51 +00:00
|
|
|
guint32 label;
|
|
|
|
guint8 exp;
|
|
|
|
guint8 bos;
|
|
|
|
guint8 ttl;
|
2001-11-07 20:26:38 +00:00
|
|
|
guint8 ipvers;
|
2000-03-09 18:31:51 +00:00
|
|
|
|
|
|
|
proto_tree *mpls_tree;
|
|
|
|
proto_item *ti;
|
2001-01-06 05:09:35 +00:00
|
|
|
tvbuff_t *next_tvb;
|
2000-03-09 18:31:51 +00:00
|
|
|
|
2001-12-10 00:26:21 +00:00
|
|
|
if (check_col(pinfo->cinfo, COL_PROTOCOL)) {
|
|
|
|
col_set_str(pinfo->cinfo,COL_PROTOCOL, "MPLS");
|
2000-03-09 18:31:51 +00:00
|
|
|
}
|
2002-08-28 21:04:11 +00:00
|
|
|
|
2001-12-10 00:26:21 +00:00
|
|
|
if (check_col(pinfo->cinfo,COL_INFO)) {
|
|
|
|
col_add_fstr(pinfo->cinfo,COL_INFO,"MPLS Label Switched Packet");
|
2000-03-09 18:31:51 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Start Decoding Here. */
|
2001-01-06 05:09:35 +00:00
|
|
|
while (tvb_reported_length_remaining(tvb, offset) > 0) {
|
|
|
|
decode_mpls_label(tvb, offset, &label, &exp, &bos, &ttl);
|
2000-03-09 18:31:51 +00:00
|
|
|
|
|
|
|
if (tree) {
|
|
|
|
|
2001-01-06 05:09:35 +00:00
|
|
|
ti = proto_tree_add_item(tree, proto_mpls, tvb, offset, 4, FALSE);
|
2000-03-09 18:31:51 +00:00
|
|
|
mpls_tree = proto_item_add_subtree(ti, ett_mpls);
|
|
|
|
|
2004-09-23 20:51:09 +00:00
|
|
|
proto_item_append_text(ti, ", Label: %u", label);
|
|
|
|
if (label <= MAX_RESERVED){
|
2001-01-06 05:09:35 +00:00
|
|
|
proto_tree_add_uint_format(mpls_tree, mpls_filter[MPLSF_LABEL], tvb,
|
2004-09-22 16:28:39 +00:00
|
|
|
offset, 3, label, "MPLS Label: %u (%s)",
|
2002-08-28 21:04:11 +00:00
|
|
|
label, val_to_str(label, special_labels,
|
2000-03-09 18:31:51 +00:00
|
|
|
"Reserved - Unknown"));
|
2004-09-23 20:51:09 +00:00
|
|
|
proto_item_append_text(ti, " (%s)", val_to_str(label, special_labels,
|
|
|
|
"Reserved - Unknown"));
|
|
|
|
} else {
|
2004-09-22 16:28:39 +00:00
|
|
|
proto_tree_add_uint_format(mpls_tree, mpls_filter[MPLSF_LABEL], tvb,
|
|
|
|
offset, 3, label, "MPLS Label: %u", label);
|
2004-09-23 20:51:09 +00:00
|
|
|
}
|
2000-03-13 16:36:31 +00:00
|
|
|
|
2002-08-28 21:04:11 +00:00
|
|
|
proto_tree_add_uint(mpls_tree,mpls_filter[MPLSF_EXP], tvb,
|
2000-03-09 18:31:51 +00:00
|
|
|
offset+2,1, exp);
|
2004-09-22 16:28:39 +00:00
|
|
|
proto_item_append_text(ti, ", Exp: %u", exp);
|
|
|
|
|
2002-08-28 21:04:11 +00:00
|
|
|
proto_tree_add_uint(mpls_tree,mpls_filter[MPLSF_BOTTOM_OF_STACK], tvb,
|
2000-03-09 18:31:51 +00:00
|
|
|
offset+2,1, bos);
|
2004-09-22 16:28:39 +00:00
|
|
|
proto_item_append_text(ti, ", S: %u", bos);
|
|
|
|
|
2002-08-28 21:04:11 +00:00
|
|
|
proto_tree_add_uint(mpls_tree,mpls_filter[MPLSF_TTL], tvb,
|
2000-03-09 18:31:51 +00:00
|
|
|
offset+3,1, ttl);
|
2004-09-22 16:28:39 +00:00
|
|
|
proto_item_append_text(ti, ", TTL: %u", ttl);
|
2000-03-09 18:31:51 +00:00
|
|
|
}
|
|
|
|
offset += 4;
|
|
|
|
if (bos) break;
|
|
|
|
}
|
2001-01-06 05:09:35 +00:00
|
|
|
next_tvb = tvb_new_subset(tvb, offset, -1, -1);
|
2001-11-07 20:26:38 +00:00
|
|
|
|
|
|
|
ipvers = (tvb_get_guint8(tvb, offset) >> 4) & 0x0F;
|
|
|
|
if (ipvers == 6) {
|
2002-03-18 18:56:53 +00:00
|
|
|
call_dissector(ipv6_handle, next_tvb, pinfo, tree);
|
|
|
|
} else if (ipvers == 4) {
|
|
|
|
call_dissector(ipv4_handle, next_tvb, pinfo, tree);
|
2004-05-12 20:20:49 +00:00
|
|
|
} else if (ipvers == 1) {
|
|
|
|
dissect_mpls_control(next_tvb, pinfo, tree);
|
2001-11-07 20:26:38 +00:00
|
|
|
} else {
|
2004-11-24 09:13:52 +00:00
|
|
|
call_dissector(eth_withoutfcs_handle, next_tvb, pinfo, tree);
|
2001-11-07 20:26:38 +00:00
|
|
|
}
|
2000-03-09 18:31:51 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
proto_register_mpls(void)
|
|
|
|
{
|
|
|
|
static gint *ett[] = {
|
|
|
|
&ett_mpls,
|
2004-05-12 20:20:49 +00:00
|
|
|
&ett_mpls_control,
|
2000-03-09 18:31:51 +00:00
|
|
|
};
|
|
|
|
|
2001-01-03 06:56:03 +00:00
|
|
|
proto_mpls = proto_register_protocol("MultiProtocol Label Switching Header",
|
|
|
|
"MPLS", "mpls");
|
2000-03-09 18:31:51 +00:00
|
|
|
proto_register_field_array(proto_mpls, mplsf_info, array_length(mplsf_info));
|
|
|
|
proto_register_subtree_array(ett, array_length(ett));
|
|
|
|
}
|
|
|
|
|
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_mpls(void)
|
|
|
|
{
|
2001-12-03 04:00:26 +00:00
|
|
|
dissector_handle_t mpls_handle;
|
|
|
|
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
/*
|
2004-05-12 20:20:49 +00:00
|
|
|
* Get a handle for the IPv4 and IPv6 dissectors and PPP protocol dissector table.
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
*/
|
2001-11-07 20:26:38 +00:00
|
|
|
ipv4_handle = find_dissector("ip");
|
|
|
|
ipv6_handle = find_dissector("ipv6");
|
2004-11-24 09:13:52 +00:00
|
|
|
eth_withoutfcs_handle = find_dissector("eth_withoutfcs");
|
2004-05-12 20:20:49 +00:00
|
|
|
data_handle = find_dissector("data");
|
|
|
|
ppp_subdissector_table = find_dissector_table("ppp.protocol");
|
|
|
|
|
2001-01-06 05:09:35 +00:00
|
|
|
|
2001-12-03 04:00:26 +00:00
|
|
|
mpls_handle = create_dissector_handle(dissect_mpls, proto_mpls);
|
|
|
|
dissector_add("ethertype", ETHERTYPE_MPLS, mpls_handle);
|
2004-08-07 00:07:53 +00:00
|
|
|
dissector_add("ethertype", ETHERTYPE_MPLS_MULTI, mpls_handle);
|
2001-12-03 04:00:26 +00:00
|
|
|
dissector_add("ppp.protocol", PPP_MPLS_UNI, mpls_handle);
|
2004-08-07 03:36:20 +00:00
|
|
|
dissector_add("ppp.protocol", PPP_MPLS_MULTI, mpls_handle);
|
2003-01-27 19:28:52 +00:00
|
|
|
dissector_add("chdlctype", ETHERTYPE_MPLS, mpls_handle);
|
|
|
|
dissector_add("chdlctype", ETHERTYPE_MPLS_MULTI, mpls_handle);
|
2004-05-15 19:54:10 +00:00
|
|
|
dissector_add("gre.proto", ETHERTYPE_MPLS, mpls_handle);
|
2004-08-07 03:36:20 +00:00
|
|
|
dissector_add("gre.proto", ETHERTYPE_MPLS_MULTI, mpls_handle);
|
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
|
|
|
}
|