From Carlos Pignataro: Add MPLS Echo support.

svn path=/trunk/; revision=10876

AUTHORS

@@ -2104,11 +2104,16 @@ Lukas Pokorny <maskis [AT] seznam.cz> {
 	RTPS (Real-Time Publish-Subscribe) support
 }
 
-Carlos M. Pignataro <cpignata [AT] cisco.com> {
+Carlos Pignataro <cpignata [AT] cisco.com> {
 	Graceful Restart Mechanism for LDP [RFC3478]
 	Fault Tolerance for LDP [RFC3479]
 	Other LDP enhancements
         PPP OSI Network Layer Control Protocol [RFC1377]
+	Fix dissecting of CLNS Protocols over Cisco HDLC
+	PWE3 Interface parameter additions and miscelaneous updates
+	    from various IETF PWE3 drafts
+	MPLS PW Control Channel Header
+	Multiprotocol Label Switching Echo [draft-ietf-mpls-lsp-ping-05]
 }
 
 Thomas Anders <thomas.anders [AT] blue-cable.de> {

Makefile.common

@@ -3,7 +3,7 @@
 #     a) common to both files and
 #     b) portable between both files
 #
-# $Id: Makefile.common,v 1.43 2004/05/10 03:30:24 gerald Exp $
+# $Id: Makefile.common,v 1.44 2004/05/13 20:20:33 gerald Exp $
 #
 # Ethereal - Network traffic analyzer
 # By Gerald Combs <gerald@ethereal.com>
@@ -128,6 +128,7 @@ DISSECTOR_INCLUDES =	\
 	packet-kerberos.h	\
 	packet-klm.h	\
 	packet-ldap.h	\
+	packet-ldp.h	\
 	packet-llc.h	\
 	packet-mip6.h	\
 	packet-mount.h	\

NEWS

@@ -1,4 +1,4 @@
-$Id: NEWS,v 1.146 2004/05/13 20:02:24 gerald Exp $
+$Id: NEWS,v 1.147 2004/05/13 20:20:33 gerald Exp $
 
 == May ??, 2004
 
@@ -34,7 +34,7 @@ New and updated features
 New protocol support
 
   ANSI IS-801, BEA Tuxedo, DCERPC EFS, DICOM, GPRS LLC, GPRS SNDCP,
-  IEEE 1588/PTP, PVSTP, RTPS, WBXML OPAQUE
+  IEEE 1588/PTP, PVSTP, MPLS Echo, RTPS, WBXML OPAQUE
 
 
 Updated protocol support

epan/Makefile.common

@@ -3,7 +3,7 @@
 #     a) common to both files and
 #     b) portable between both files
 #
-# $Id: Makefile.common,v 1.24 2004/05/12 03:37:28 gerald Exp $
+# $Id: Makefile.common,v 1.25 2004/05/13 20:20:34 gerald Exp $
 #
 # Ethereal - Network traffic analyzer
 # By Gerald Combs <gerald@ethereal.com>
@@ -308,6 +308,7 @@ DISSECTOR_SRC =	\
 	../packet-mount.c	\
 	../packet-mpeg1.c	\
 	../packet-mpls.c	\
+	../packet-mpls-echo.c   \
 	../packet-mq.c		\
 	../packet-mq-pcf.c	\
 	../packet-mrdisc.c	\

packet-ldp.c

@@ -1,7 +1,7 @@
 /* packet-ldp.c
  * Routines for LDP (RFC 3036) packet disassembly
  *
- * $Id: packet-ldp.c,v 1.52 2004/05/11 11:20:34 guy Exp $
+ * $Id: packet-ldp.c,v 1.53 2004/05/13 20:20:33 gerald Exp $
  *
  * Copyright (c) November 2000 by Richard Sharpe <rsharpe@ns.aus.com>
  *
@@ -397,7 +397,7 @@ static const value_string fec_types[] = {
 };
 
 
-static const value_string fec_vc_types_vals[] = {
+const value_string fec_vc_types_vals[] = {
   {0x0001, "Frame Relay DLCI"},
   {0x0002, "ATM AAL5 SDU VCC transport"},
   {0x0003, "ATM transparent cell transport"},

packet-ldp.h

@@ -0,0 +1,34 @@
+/* packet-ldp.h
+ * Declarations of exported routines from LDP dissector
+ * Copyright 2004, Carlos Pignataro <cpignata@cisco.com>
+ *
+ * $Id: packet-ldp.h,v 1.1 2004/05/13 20:20:34 gerald Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@ethereal.com>
+ * 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.
+ */
+
+#ifndef __PACKET_LDP_H_
+#define __PACKET_LDP_H__
+
+/*
+ * Used by MPLS Echo dissector as well.
+ */
+extern const enum_val_t fec_vc_types_vals[];
+
+#endif