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>
|
|
|
|
*
|
2006-03-31 05:09:37 +00:00
|
|
|
* (c) Copyright 2006, _FF_ Francesco Fondelli <francesco.fondelli@gmail.com>
|
2008-07-13 17:19:33 +00:00
|
|
|
* - added MPLS OAM support, ITU-T Y.1711
|
|
|
|
* - PW Associated Channel Header dissection as per RFC 4385
|
|
|
|
* - PW MPLS Control Word dissection as per RFC 4385
|
|
|
|
* - mpls subdissector table indexed by label value
|
|
|
|
* - enhanced "what's past last mpls label?" heuristic
|
2006-03-31 05:09:37 +00:00
|
|
|
*
|
2004-07-18 00:24:25 +00:00
|
|
|
* $Id$
|
2000-03-09 18:31:51 +00:00
|
|
|
*
|
2006-05-21 04:49:01 +00:00
|
|
|
* Wireshark - Network traffic analyzer
|
|
|
|
* By Gerald Combs <gerald@wireshark.org>
|
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
|
|
|
|
*/
|
|
|
|
|
2006-03-31 05:09:37 +00:00
|
|
|
/* FF NOTES
|
|
|
|
*
|
|
|
|
* The OAM patch should dissect OAM pdus as described in ITU-T Y.1711
|
|
|
|
*/
|
2000-03-09 18:31:51 +00:00
|
|
|
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
|
|
# include "config.h"
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#include <glib.h>
|
2002-01-21 07:37:49 +00:00
|
|
|
#include <epan/packet.h>
|
2005-09-17 00:02:31 +00:00
|
|
|
#include <epan/ppptypes.h>
|
|
|
|
#include <epan/etypes.h>
|
2004-09-27 22:55:15 +00:00
|
|
|
#include <epan/prefs.h>
|
2006-07-14 14:58:17 +00:00
|
|
|
#include <epan/ipproto.h>
|
2008-07-13 17:19:33 +00:00
|
|
|
#include <epan/addr_resolv.h>
|
2004-05-12 20:20:49 +00:00
|
|
|
#include "packet-ppp.h"
|
2005-03-04 22:32:06 +00:00
|
|
|
#include "packet-mpls.h"
|
2000-03-09 18:31:51 +00:00
|
|
|
|
|
|
|
static gint proto_mpls = -1;
|
2008-07-13 17:19:33 +00:00
|
|
|
static gint proto_pw_ach = -1;
|
|
|
|
static gint proto_pw_mcw = -1;
|
2000-03-09 18:31:51 +00:00
|
|
|
|
|
|
|
static gint ett_mpls = -1;
|
2008-07-13 17:19:33 +00:00
|
|
|
static gint ett_mpls_pw_ach = -1;
|
|
|
|
static gint ett_mpls_pw_mcw = -1;
|
2006-03-31 05:09:37 +00:00
|
|
|
static gint ett_mpls_oam = -1;
|
2000-03-09 18:31:51 +00:00
|
|
|
|
2005-03-04 22:32:06 +00:00
|
|
|
const value_string special_labels[] = {
|
|
|
|
{LABEL_IP4_EXPLICIT_NULL, "IPv4 Explicit-Null"},
|
|
|
|
{LABEL_ROUTER_ALERT, "Router Alert"},
|
|
|
|
{LABEL_IP6_EXPLICIT_NULL, "IPv6 Explicit-Null"},
|
|
|
|
{LABEL_IMPLICIT_NULL, "Implicit-Null"},
|
2006-03-31 05:09:37 +00:00
|
|
|
{LABEL_OAM_ALERT, "OAM Alert"},
|
2000-03-09 18:31:51 +00:00
|
|
|
{0, NULL }
|
|
|
|
};
|
|
|
|
|
|
|
|
/* MPLS filter values */
|
|
|
|
enum mpls_filter_keys {
|
|
|
|
/* MPLS encap properties */
|
|
|
|
MPLSF_LABEL,
|
|
|
|
MPLSF_EXP,
|
|
|
|
MPLSF_BOTTOM_OF_STACK,
|
|
|
|
MPLSF_TTL,
|
|
|
|
|
|
|
|
MPLSF_MAX
|
|
|
|
};
|
|
|
|
|
|
|
|
static int mpls_filter[MPLSF_MAX];
|
2008-07-13 17:19:33 +00:00
|
|
|
|
|
|
|
static int hf_mpls_1st_nibble = -1;
|
|
|
|
|
|
|
|
static int hf_mpls_pw_ach_ver = -1;
|
|
|
|
static int hf_mpls_pw_ach_res = -1;
|
|
|
|
static int hf_mpls_pw_ach_channel_type = -1;
|
|
|
|
|
|
|
|
static int hf_mpls_pw_mcw_flags = -1;
|
|
|
|
static int hf_mpls_pw_mcw_length = -1;
|
|
|
|
static int hf_mpls_pw_mcw_sequence_number = -1;
|
2004-05-12 20:20:49 +00:00
|
|
|
|
2006-03-31 05:09:37 +00:00
|
|
|
static int hf_mpls_oam_function_type = -1;
|
|
|
|
static int hf_mpls_oam_ttsi = -1;
|
|
|
|
static int hf_mpls_oam_frequency = -1;
|
|
|
|
static int hf_mpls_oam_defect_type = -1;
|
|
|
|
static int hf_mpls_oam_defect_location = -1;
|
|
|
|
static int hf_mpls_oam_bip16 = -1;
|
|
|
|
|
|
|
|
static const value_string oam_function_type_vals[] = {
|
|
|
|
{0x00, "Reserved"},
|
|
|
|
{0x01, "CV (Connectivity Verification)"},
|
|
|
|
{0x02, "FDI (Forward Defect Indicator)"},
|
|
|
|
{0x03, "BDI (Backward Defect Indicator)"},
|
|
|
|
{0x04, "Reserved for Performance packets"},
|
|
|
|
{0x05, "Reserved for LB-Req (Loopback Request)"},
|
|
|
|
{0x06, "Reserved for LB-Rsp (Loopback Response)"},
|
|
|
|
{0x07, "FDD (Fast Failure Detection)"},
|
|
|
|
{0, NULL }
|
|
|
|
};
|
|
|
|
|
|
|
|
static const value_string oam_frequency_vals[] = {
|
|
|
|
{0x00, "Reserved"},
|
|
|
|
{0x01, "10 ms"},
|
|
|
|
{0x02, "20 ms"},
|
|
|
|
{0x03, "50 ms (default value)"},
|
|
|
|
{0x04, "100 ms"},
|
|
|
|
{0x05, "200 ms"},
|
|
|
|
{0x06, "500 ms"},
|
|
|
|
/* 7-255 Reserved */
|
|
|
|
{0, NULL }
|
|
|
|
};
|
|
|
|
|
|
|
|
static const value_string oam_defect_type_vals[] = {
|
|
|
|
{0x0000, "Reserved"},
|
|
|
|
{0x0101, "dServer"},
|
|
|
|
{0x0102, "dPeerME"},
|
|
|
|
{0x0201, "dLOCV"},
|
|
|
|
{0x0202, "dTTSI_Mismatch"},
|
|
|
|
{0x0203, "dTTSI_Mismerge"},
|
|
|
|
{0x0204, "dExcess"},
|
|
|
|
{0x02FF, "dUnknown"},
|
|
|
|
{0xFFFF, "Reserved"},
|
|
|
|
{0, NULL }
|
|
|
|
};
|
|
|
|
|
2000-03-09 18:31:51 +00:00
|
|
|
static hf_register_info mplsf_info[] = {
|
|
|
|
|
2008-07-13 17:19:33 +00:00
|
|
|
/* MPLS header fields */
|
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
|
|
|
|
2008-07-13 17:19:33 +00:00
|
|
|
/* 1st nibble */
|
|
|
|
{&hf_mpls_1st_nibble,
|
|
|
|
{"MPLS 1st nibble", "mpls.1st_nibble", FT_UINT8,
|
|
|
|
BASE_DEC, NULL, 0x0, "MPLS 1st nibble", HFILL }},
|
|
|
|
|
|
|
|
/* PW Associated Channel Header fields */
|
|
|
|
{&hf_mpls_pw_ach_ver,
|
|
|
|
{"PW Associated Channel Version", "pwach.ver", FT_UINT8, BASE_DEC,
|
|
|
|
NULL, 0x0, "PW Associated Channel Version", HFILL }},
|
|
|
|
|
|
|
|
{&hf_mpls_pw_ach_res,
|
|
|
|
{"Reserved", "pwach.res", FT_UINT8, BASE_DEC,
|
|
|
|
NULL, 0x0, "Reserved", HFILL }},
|
|
|
|
|
|
|
|
{&hf_mpls_pw_ach_channel_type,
|
|
|
|
{"PW Associated Channel Type", "pwach.channel_type", FT_UINT16, BASE_HEX,
|
|
|
|
NULL, 0x0, "PW Associated Channel Type", HFILL }},
|
|
|
|
|
|
|
|
/* Generic/Preferred PW MPLS Control Word fields */
|
|
|
|
{&hf_mpls_pw_mcw_flags,
|
|
|
|
{"Generic/Preferred PW MPLS Control Word Flags", "pwmcw.flags", FT_UINT8,
|
|
|
|
BASE_HEX, NULL, 0x0, "Generic/Preferred PW MPLS Control Word Flags",
|
|
|
|
HFILL }},
|
|
|
|
|
|
|
|
{&hf_mpls_pw_mcw_length,
|
|
|
|
{"Generic/Preferred PW MPLS Control Word Length", "pwmcw.length", FT_UINT8,
|
|
|
|
BASE_DEC, NULL, 0x0, "Generic/Preferred PW MPLS Control Word Length",
|
|
|
|
HFILL }},
|
2004-05-12 20:20:49 +00:00
|
|
|
|
2008-07-13 17:19:33 +00:00
|
|
|
{&hf_mpls_pw_mcw_sequence_number,
|
|
|
|
{"Generic/Preferred PW MPLS Control Word Sequence Number",
|
|
|
|
"pwmcw.sequence_number", FT_UINT16, BASE_DEC, NULL, 0x0,
|
|
|
|
"Generic/Preferred PW MPLS Control Word Sequence Number", HFILL }},
|
2006-03-31 05:09:37 +00:00
|
|
|
|
|
|
|
/* OAM header fields */
|
|
|
|
{&hf_mpls_oam_function_type,
|
|
|
|
{"Function Type", "mpls.oam.function_type", FT_UINT8,
|
|
|
|
BASE_HEX, VALS(oam_function_type_vals), 0x0, "Function Type codepoint", HFILL }},
|
|
|
|
|
|
|
|
{&hf_mpls_oam_ttsi,
|
|
|
|
{"Trail Termination Source Identifier", "mpls.oam.ttsi", FT_UINT32,
|
|
|
|
BASE_HEX, NULL, 0x0, "Trail Termination Source Identifier", HFILL }},
|
|
|
|
|
|
|
|
{&hf_mpls_oam_frequency,
|
|
|
|
{"Frequency", "mpls.oam.frequency", FT_UINT8,
|
|
|
|
BASE_HEX, VALS(oam_frequency_vals), 0x0, "Frequency of probe injection", HFILL }},
|
|
|
|
|
|
|
|
{&hf_mpls_oam_defect_type,
|
|
|
|
{"Defect Type", "mpls.oam.defect_type", FT_UINT16,
|
|
|
|
BASE_HEX, VALS(oam_defect_type_vals), 0x0, "Defect Type", HFILL }},
|
|
|
|
|
|
|
|
{&hf_mpls_oam_defect_location,
|
|
|
|
{"Defect Location (AS)", "mpls.oam.defect_location", FT_UINT32,
|
|
|
|
BASE_DEC, NULL, 0x0, "Defect Location", HFILL }},
|
|
|
|
|
|
|
|
{&hf_mpls_oam_bip16,
|
|
|
|
{"BIP16", "mpls.oam.bip16", FT_UINT16,
|
|
|
|
BASE_HEX, NULL, 0x0, "BIP16", 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;
|
2008-07-13 17:19:33 +00:00
|
|
|
static dissector_table_t mpls_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
|
|
|
}
|
|
|
|
|
2008-07-13 17:19:33 +00:00
|
|
|
/*
|
|
|
|
* FF: PW Associated Channel Header dissection as per RFC 4385.
|
|
|
|
*/
|
2004-05-12 20:20:49 +00:00
|
|
|
static void
|
2008-07-13 17:19:33 +00:00
|
|
|
dissect_pw_ach(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
2004-05-12 20:20:49 +00:00
|
|
|
{
|
2008-07-13 17:19:33 +00:00
|
|
|
proto_tree *mpls_pw_ach_tree = NULL;
|
|
|
|
proto_item *ti = NULL;
|
|
|
|
tvbuff_t *next_tvb = NULL;
|
|
|
|
guint8 ver = 0;
|
|
|
|
guint16 res = 0;
|
|
|
|
guint16 channel_type = 0;
|
2004-05-12 20:20:49 +00:00
|
|
|
|
2008-07-13 17:19:33 +00:00
|
|
|
if (tvb_reported_length_remaining(tvb, 0) < 4) {
|
|
|
|
if (tree)
|
2004-05-12 20:20:49 +00:00
|
|
|
proto_tree_add_text(tree, tvb, 0, -1, "Error processing Message");
|
|
|
|
return;
|
|
|
|
}
|
2008-07-13 17:19:33 +00:00
|
|
|
ver = (tvb_get_guint8(tvb, 0) & 0x0F);
|
|
|
|
res = tvb_get_guint8(tvb, 1);
|
|
|
|
channel_type = tvb_get_ntohs(tvb, 2);
|
2004-05-12 20:20:49 +00:00
|
|
|
if (tree) {
|
2008-07-13 17:19:33 +00:00
|
|
|
ti = proto_tree_add_item(tree, proto_pw_ach, tvb, 0, 4, FALSE);
|
|
|
|
mpls_pw_ach_tree = proto_item_add_subtree(ti, ett_mpls_pw_ach);
|
|
|
|
if (mpls_pw_ach_tree == NULL)
|
|
|
|
return;
|
|
|
|
proto_tree_add_uint_format(mpls_pw_ach_tree, hf_mpls_pw_ach_ver,
|
|
|
|
tvb, 0, 1, ver, "Version: %d", ver);
|
|
|
|
ti = proto_tree_add_uint_format(mpls_pw_ach_tree, hf_mpls_pw_ach_res,
|
|
|
|
tvb, 1, 1, res, "Reserved: 0x%02x", res);
|
|
|
|
PROTO_ITEM_SET_HIDDEN(ti);
|
|
|
|
if (res != 0)
|
|
|
|
proto_tree_add_text(mpls_pw_ach_tree, tvb, 1, 1,
|
|
|
|
"Error: this byte is reserved and must be 0");
|
|
|
|
proto_tree_add_uint_format(mpls_pw_ach_tree, hf_mpls_pw_ach_channel_type,
|
|
|
|
tvb, 2, 2, channel_type,
|
|
|
|
"Channel Type: %s (0x%04x)",
|
|
|
|
val_to_str(channel_type, ppp_vals, "Unknown"),
|
|
|
|
channel_type);
|
2004-05-12 20:20:49 +00:00
|
|
|
}
|
|
|
|
next_tvb = tvb_new_subset(tvb, 4, -1, -1);
|
2008-07-13 17:19:33 +00:00
|
|
|
if (!dissector_try_port(ppp_subdissector_table, channel_type,
|
|
|
|
next_tvb, pinfo, tree)) {
|
2004-05-12 20:20:49 +00:00
|
|
|
call_dissector(data_handle, next_tvb, pinfo, tree);
|
|
|
|
}
|
2008-07-13 17:19:33 +00:00
|
|
|
}
|
2004-05-12 20:20:49 +00:00
|
|
|
|
2008-07-13 17:19:33 +00:00
|
|
|
/*
|
|
|
|
* FF: Generic/Preferred PW MPLS Control Word dissection as per RFC 4385.
|
|
|
|
*/
|
|
|
|
static void
|
|
|
|
dissect_pw_mcw(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|
|
|
{
|
|
|
|
proto_tree *mpls_pw_mcw_tree = NULL;
|
|
|
|
proto_item *ti = NULL;
|
|
|
|
tvbuff_t *next_tvb = NULL;
|
|
|
|
guint8 flags = 0;
|
|
|
|
guint8 frg = 0;
|
|
|
|
guint8 length = 0;
|
|
|
|
guint16 sequence_number = 0;
|
|
|
|
|
|
|
|
if (tvb_reported_length_remaining(tvb, 0) < 4) {
|
|
|
|
if (tree)
|
|
|
|
proto_tree_add_text(tree, tvb, 0, -1, "Error processing Message");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
/* bits 4 to 7 and FRG bits are displayed together */
|
|
|
|
flags = (tvb_get_guint8(tvb, 0) & 0x0F) << 2;
|
|
|
|
frg = (tvb_get_guint8(tvb, 1) & 0xC0) >> 6;
|
|
|
|
flags |= frg;
|
|
|
|
length = tvb_get_guint8(tvb, 1) & 0x3F;
|
|
|
|
sequence_number = tvb_get_ntohs(tvb, 2);
|
|
|
|
if (tree) {
|
|
|
|
ti = proto_tree_add_item(tree, proto_pw_mcw, tvb, 0, 4, FALSE);
|
|
|
|
mpls_pw_mcw_tree = proto_item_add_subtree(ti, ett_mpls_pw_mcw);
|
|
|
|
if (mpls_pw_mcw_tree == NULL)
|
|
|
|
return;
|
|
|
|
proto_tree_add_uint_format(mpls_pw_mcw_tree, hf_mpls_pw_mcw_flags,
|
|
|
|
tvb, 0, 1, flags, "Flags: 0x%02x", flags);
|
|
|
|
ti = proto_tree_add_uint_format(mpls_pw_mcw_tree, hf_mpls_pw_mcw_length,
|
|
|
|
tvb, 1, 1, length, "Length: %u", length);
|
|
|
|
proto_tree_add_uint_format(mpls_pw_mcw_tree, hf_mpls_pw_mcw_sequence_number,
|
|
|
|
tvb, 2, 2, sequence_number,
|
|
|
|
"Sequence Number: %d", sequence_number);
|
|
|
|
}
|
|
|
|
next_tvb = tvb_new_subset(tvb, 4, -1, -1);
|
|
|
|
call_dissector(eth_withoutfcs_handle, next_tvb, pinfo, tree);
|
2004-05-12 20:20:49 +00:00
|
|
|
}
|
|
|
|
|
2006-03-31 05:09:37 +00:00
|
|
|
static void
|
|
|
|
dissect_mpls_oam_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree *mpls_tree,
|
|
|
|
int offset, guint8 exp, guint8 bos, guint8 ttl)
|
|
|
|
{
|
|
|
|
proto_tree *mpls_oam_tree = NULL;
|
|
|
|
proto_item *ti = NULL;
|
|
|
|
int functype = -1;
|
|
|
|
const guint8 allone[] = { 0xff, 0xff };
|
|
|
|
const guint8 allzero[] = { 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
|
|
0x00, 0x00, 0x00, 0x00, 0x00,
|
|
|
|
0x00, 0x00, 0x00, 0x00, 0x00,
|
|
|
|
0x00, 0x00, 0x00, 0x00, 0x00 };
|
|
|
|
|
|
|
|
/* if called with main tree == null just set col info with func type string and return */
|
|
|
|
if (!tree) {
|
|
|
|
if (check_col(pinfo->cinfo, COL_INFO)) {
|
|
|
|
if (tvb_bytes_exist(tvb, offset, 1)) {
|
|
|
|
functype = tvb_get_guint8(tvb, offset);
|
|
|
|
col_append_fstr(pinfo->cinfo, COL_INFO, " (OAM: %s)",
|
|
|
|
(functype == 0x01) ? "CV" :
|
|
|
|
(functype == 0x02) ? "FDI" :
|
|
|
|
(functype == 0x03) ? "BDI" :
|
|
|
|
(functype == 0x07) ? "FDD" : "reserved/unknown");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* sanity checks */
|
|
|
|
if (!mpls_tree)
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (!tvb_bytes_exist(tvb, offset, 44)) {
|
|
|
|
/* ITU-T Y.1711, 5.3: OAM pdus must have a minimum payload length of 44 bytes */
|
|
|
|
proto_tree_add_text(mpls_tree, tvb, offset, -1, "Error: must have a minimum payload length of 44 bytes");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
ti = proto_tree_add_text(mpls_tree, tvb, offset, 44, "MPLS Operation & Maintenance");
|
|
|
|
mpls_oam_tree = proto_item_add_subtree(ti, ett_mpls_oam);
|
|
|
|
|
|
|
|
if (!mpls_oam_tree)
|
|
|
|
return;
|
|
|
|
|
|
|
|
/* checks for exp, bos and ttl encoding */
|
|
|
|
|
|
|
|
if (exp!=0)
|
|
|
|
proto_tree_add_text(mpls_oam_tree, tvb, offset - 2, 1, "Warning: Exp bits should be 0 for OAM");
|
|
|
|
|
|
|
|
if (bos!=1)
|
|
|
|
proto_tree_add_text(mpls_oam_tree, tvb, offset - 2, 1, "Warning: S bit should be 1 for OAM");
|
|
|
|
|
|
|
|
if (ttl!=1)
|
|
|
|
proto_tree_add_text(mpls_oam_tree, tvb, offset - 1, 1, "Warning: TTL should be 1 for OAM");
|
|
|
|
|
|
|
|
/* starting dissection */
|
|
|
|
|
|
|
|
functype = tvb_get_guint8(tvb, offset);
|
|
|
|
proto_tree_add_item(mpls_oam_tree, hf_mpls_oam_function_type, tvb, offset, 1, TRUE);
|
|
|
|
offset++;
|
|
|
|
|
|
|
|
switch(functype) {
|
|
|
|
case 0x01: /* CV */
|
|
|
|
{
|
|
|
|
guint32 lsrid_ipv4addr;
|
|
|
|
|
|
|
|
/* 3 octets reserved (all 0x00) */
|
|
|
|
if (tvb_memeql(tvb, offset, allzero, 3) == -1) {
|
|
|
|
proto_tree_add_text(mpls_oam_tree, tvb, offset, 3,
|
|
|
|
"Error: these bytes are reserved and must be 0x00");
|
|
|
|
}
|
|
|
|
offset+=3;
|
|
|
|
|
|
|
|
/* ttsi (ipv4 flavor as in RFC 2373) */
|
|
|
|
if (tvb_memeql(tvb, offset, allzero, 10) == -1) {
|
|
|
|
proto_tree_add_text(mpls_oam_tree, tvb, offset, 10,
|
|
|
|
"Error: these bytes are padding and must be 0x00");
|
|
|
|
}
|
|
|
|
offset+=10;
|
|
|
|
|
|
|
|
if (tvb_memeql(tvb, offset, allone, 2) == -1) {
|
|
|
|
proto_tree_add_text(mpls_oam_tree, tvb, offset, 2,
|
|
|
|
"Error: these bytes are padding and must be 0xFF");
|
|
|
|
}
|
|
|
|
offset+=2;
|
|
|
|
|
|
|
|
lsrid_ipv4addr = tvb_get_ipv4(tvb, offset);
|
|
|
|
proto_tree_add_text(mpls_oam_tree, tvb, offset, 4, "LSR ID: %s", ip_to_str((guint8 *)&lsrid_ipv4addr));
|
|
|
|
offset+=4;
|
|
|
|
|
|
|
|
proto_tree_add_text(mpls_oam_tree, tvb, offset, 4, "LSP ID: %d", tvb_get_ntohl(tvb, offset));
|
|
|
|
offset+=4;
|
|
|
|
|
|
|
|
/* 18 octets of padding (all 0x00) */
|
|
|
|
if (tvb_memeql(tvb, offset, allzero, 18) == -1) {
|
|
|
|
proto_tree_add_text(mpls_oam_tree, tvb, offset, 18,
|
|
|
|
"Error: these bytes are padding and must be 0x00");
|
|
|
|
}
|
|
|
|
offset+=18;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 0x02: /* FDI */
|
|
|
|
case 0x03: /* BDI */
|
|
|
|
{
|
|
|
|
guint32 lsrid_ipv4addr;
|
|
|
|
|
|
|
|
/* 1 octets reserved (all 0x00) */
|
|
|
|
if (tvb_memeql(tvb, offset, allzero, 1) == -1) {
|
|
|
|
proto_tree_add_text(mpls_oam_tree, tvb, offset, 3,
|
|
|
|
"Error: this byte is reserved and must be 0x00");
|
|
|
|
}
|
|
|
|
offset++;
|
|
|
|
|
|
|
|
proto_tree_add_item(mpls_oam_tree, hf_mpls_oam_defect_type, tvb, offset, 2, TRUE);
|
|
|
|
offset+=2;
|
|
|
|
|
|
|
|
/* ttsi (ipv4 flavor as in RFC 2373) is optional if not used must be set to all 0x00 */
|
|
|
|
if (tvb_memeql(tvb, offset, allzero, 20) == 0) {
|
|
|
|
proto_tree_add_text(mpls_oam_tree, tvb, offset, 20, "TTSI not preset (optional for FDI/BDI)");
|
|
|
|
offset+=20;
|
|
|
|
} else {
|
|
|
|
if (tvb_memeql(tvb, offset, allzero, 10) == -1) {
|
|
|
|
proto_tree_add_text(mpls_oam_tree, tvb, offset, 10,
|
|
|
|
"Error: these bytes are padding and must be 0x00");
|
|
|
|
}
|
|
|
|
offset+=10;
|
|
|
|
|
|
|
|
if (tvb_memeql(tvb, offset, allone, 2) == -1) {
|
|
|
|
proto_tree_add_text(mpls_oam_tree, tvb, offset, 2,
|
|
|
|
"Error: these bytes are padding and must be 0xFF");
|
|
|
|
}
|
|
|
|
offset+=2;
|
|
|
|
|
|
|
|
lsrid_ipv4addr = tvb_get_ipv4(tvb, offset);
|
|
|
|
proto_tree_add_text(mpls_oam_tree, tvb, offset, 4, "LSR ID: %s", ip_to_str((guint8 *)&lsrid_ipv4addr));
|
|
|
|
offset+=4;
|
|
|
|
|
|
|
|
proto_tree_add_text(mpls_oam_tree, tvb, offset, 4, "LSP ID: %d", tvb_get_ntohl(tvb, offset));
|
|
|
|
offset+=4;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* defect location */
|
|
|
|
proto_tree_add_item(mpls_oam_tree, hf_mpls_oam_defect_location, tvb, offset, 4, TRUE);
|
|
|
|
offset+=4;
|
|
|
|
|
|
|
|
/* 14 octets of padding (all 0x00) */
|
|
|
|
if (tvb_memeql(tvb, offset, allzero, 14) == -1) {
|
|
|
|
proto_tree_add_text(mpls_oam_tree, tvb, offset, 14,
|
|
|
|
"Error: these bytes are padding and must be 0x00");
|
|
|
|
}
|
|
|
|
offset+=14;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 0x07: /* FDD */
|
|
|
|
{
|
|
|
|
guint32 lsrid_ipv4addr;
|
|
|
|
|
|
|
|
/* 3 octets reserved (all 0x00) */
|
|
|
|
if (tvb_memeql(tvb, offset, allzero, 3) == -1) {
|
|
|
|
proto_tree_add_text(mpls_oam_tree, tvb, offset, 3,
|
|
|
|
"Error: these bytes are reserved and must be 0x00");
|
|
|
|
}
|
|
|
|
offset+=3;
|
|
|
|
|
|
|
|
/* ttsi (ipv4 flavor as in RFC 2373) */
|
|
|
|
if (tvb_memeql(tvb, offset, allzero, 10) == -1) {
|
|
|
|
proto_tree_add_text(mpls_oam_tree, tvb, offset, 10,
|
|
|
|
"Error: these bytes are padding and must be 0x00");
|
|
|
|
}
|
|
|
|
offset+=10;
|
|
|
|
|
|
|
|
if (tvb_memeql(tvb, offset, allone, 2) == -1) {
|
|
|
|
proto_tree_add_text(mpls_oam_tree, tvb, offset, 2,
|
|
|
|
"Error: these bytes are padding and must be 0xFF");
|
|
|
|
}
|
|
|
|
offset+=2;
|
|
|
|
|
|
|
|
lsrid_ipv4addr = tvb_get_ipv4(tvb, offset);
|
|
|
|
proto_tree_add_text(mpls_oam_tree, tvb, offset, 4, "LSR ID: %s", ip_to_str((guint8 *)&lsrid_ipv4addr));
|
|
|
|
offset+=4;
|
|
|
|
|
|
|
|
proto_tree_add_text(mpls_oam_tree, tvb, offset, 4, "LSP ID: %d", tvb_get_ntohl(tvb, offset));
|
|
|
|
offset+=4;
|
|
|
|
|
|
|
|
proto_tree_add_item(mpls_oam_tree, hf_mpls_oam_frequency, tvb, offset, 1, TRUE);
|
|
|
|
offset++;
|
|
|
|
|
|
|
|
/* 17 octets of padding (all 0x00) */
|
|
|
|
if (tvb_memeql(tvb, offset, allzero, 17) == -1) {
|
|
|
|
proto_tree_add_text(mpls_oam_tree, tvb, offset, 17,
|
|
|
|
"Error: these bytes are padding and must be 0x00");
|
|
|
|
}
|
|
|
|
offset+=17;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
proto_tree_add_text(mpls_oam_tree, tvb, offset - 1, -1, "Unknown MPLS OAM pdu");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* BIP16 */
|
|
|
|
proto_tree_add_item(mpls_oam_tree, hf_mpls_oam_bip16, tvb, offset, 2, TRUE);
|
|
|
|
offset+=2;
|
|
|
|
}
|
2008-07-13 17:19:33 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* FF: this function returns TRUE if the first 12 bytes in tvb looks like
|
|
|
|
* two valid ethernet addresses. FALSE otherwise.
|
|
|
|
*/
|
|
|
|
static gboolean
|
|
|
|
looks_like_plain_eth(tvbuff_t *tvb _U_)
|
|
|
|
{
|
|
|
|
const gchar *manuf_name_da = NULL;
|
|
|
|
const gchar *manuf_name_sa = NULL;
|
|
|
|
|
|
|
|
if (tvb_reported_length_remaining(tvb, 0) < 14) {
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
manuf_name_da = get_manuf_name_if_known(tvb_get_ptr(tvb, 0, 6));
|
|
|
|
manuf_name_sa = get_manuf_name_if_known(tvb_get_ptr(tvb, 6, 6));
|
|
|
|
|
|
|
|
if (manuf_name_da && manuf_name_sa) {
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
return FALSE;
|
|
|
|
}
|
2006-03-31 05:09:37 +00:00
|
|
|
|
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;
|
2008-07-13 17:19:33 +00:00
|
|
|
guint8 nibble;
|
2000-03-09 18:31:51 +00:00
|
|
|
|
2006-04-16 22:00:11 +00:00
|
|
|
proto_tree *mpls_tree = NULL;
|
2000-03-09 18:31:51 +00:00
|
|
|
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)) {
|
2007-10-23 05:50:00 +00:00
|
|
|
col_set_str(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) {
|
2006-03-31 05:09:37 +00:00
|
|
|
|
2001-01-06 05:09:35 +00:00
|
|
|
decode_mpls_label(tvb, offset, &label, &exp, &bos, &ttl);
|
2008-07-13 17:19:33 +00:00
|
|
|
pinfo->mpls_label = label;
|
|
|
|
|
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);
|
2005-03-04 22:32:06 +00:00
|
|
|
if (label <= 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);
|
2006-03-31 05:09:37 +00:00
|
|
|
proto_item_append_text(ti, ", TTL: %u", ttl);
|
2000-03-09 18:31:51 +00:00
|
|
|
}
|
2006-03-31 05:09:37 +00:00
|
|
|
|
|
|
|
if (label == LABEL_OAM_ALERT) {
|
|
|
|
/* OAM pdus are injected in normal data plane flow in order to test a LSP,
|
|
|
|
* they carry no user data.
|
|
|
|
*/
|
|
|
|
dissect_mpls_oam_pdu(tvb, pinfo, tree, mpls_tree, offset + 4, exp, bos, ttl);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2000-03-09 18:31:51 +00:00
|
|
|
offset += 4;
|
|
|
|
if (bos) break;
|
|
|
|
}
|
2008-07-13 17:19:33 +00:00
|
|
|
|
|
|
|
nibble = (tvb_get_guint8(tvb, offset) >> 4) & 0x0F;
|
|
|
|
ti = proto_tree_add_uint(mpls_tree, hf_mpls_1st_nibble, tvb, offset, 1, nibble);
|
|
|
|
PROTO_ITEM_SET_HIDDEN(ti);
|
|
|
|
|
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
|
|
|
|
2008-07-13 17:19:33 +00:00
|
|
|
if (!dissector_try_port(mpls_subdissector_table, label,
|
|
|
|
next_tvb, pinfo, tree)) {
|
|
|
|
if (nibble == 6) {
|
|
|
|
call_dissector(ipv6_handle, next_tvb, pinfo, tree);
|
|
|
|
} else if (nibble == 4) {
|
|
|
|
call_dissector(ipv4_handle, next_tvb, pinfo, tree);
|
|
|
|
} else if (nibble == 1) {
|
|
|
|
dissect_pw_ach(next_tvb, pinfo, tree);
|
|
|
|
} else if (nibble == 0) {
|
|
|
|
if (looks_like_plain_eth(next_tvb)) {
|
|
|
|
call_dissector(eth_withoutfcs_handle, next_tvb, pinfo, tree);
|
|
|
|
} else {
|
|
|
|
dissect_pw_mcw(next_tvb, pinfo, tree);
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
/*
|
|
|
|
* FF: no external hint, 1st nibble is not 6, 4, 1 or 0...
|
|
|
|
* good luck!
|
|
|
|
*/
|
|
|
|
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,
|
2008-07-13 17:19:33 +00:00
|
|
|
&ett_mpls_pw_ach,
|
|
|
|
&ett_mpls_pw_mcw,
|
2006-03-31 05:09:37 +00:00
|
|
|
&ett_mpls_oam,
|
2000-03-09 18:31:51 +00:00
|
|
|
};
|
|
|
|
|
2008-07-13 17:19:33 +00:00
|
|
|
/* FF: mpls subdissector table is indexed by label */
|
|
|
|
mpls_subdissector_table = register_dissector_table("mpls.label",
|
|
|
|
"MPLS protocol",
|
|
|
|
FT_UINT32, BASE_DEC);
|
2001-01-03 06:56:03 +00:00
|
|
|
proto_mpls = proto_register_protocol("MultiProtocol Label Switching Header",
|
2008-07-13 17:19:33 +00:00
|
|
|
"MPLS", "mpls");
|
|
|
|
proto_pw_ach = proto_register_protocol("PW Associated Channel Header",
|
|
|
|
"PWACH", "pwach");
|
|
|
|
proto_pw_mcw = proto_register_protocol("PW MPLS Control Word (generic/preferred)",
|
|
|
|
"PWMCW", "pwmcw");
|
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));
|
2005-01-15 23:36:24 +00:00
|
|
|
register_dissector("mpls", dissect_mpls, proto_mpls);
|
2000-03-09 18:31:51 +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_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");
|
|
|
|
|
2008-09-30 14:49:44 +00:00
|
|
|
mpls_handle = find_dissector("mpls");
|
2001-12-03 04:00:26 +00:00
|
|
|
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);
|
2008-07-13 17:19:33 +00:00
|
|
|
dissector_add("ip.proto", IP_PROTO_MPLS_IN_IP, 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
|
|
|
}
|