Updated LMP to handle the latest protocol. Removed old protocol values

since they are no longer useful.

Manu Pathak <mapathak@cisco.com> contributed these changes


svn path=/trunk/; revision=14533

1 files changed, 1263 insertions, 1513 deletions

diff --git a/epan/dissectors/packet-lmp.c b/epan/dissectors/packet-lmp.c
index 49eeb9d108..5ce749e0d4 100644
--- a/epan/dissectors/packet-lmp.c
+++ b/epan/dissectors/packet-lmp.c
@@ -25,12 +25,13 @@
  */
 
 /*
- * LMP as a standard has shown a remarkable ability to get completely rewritten
- * across minor versions of the draft. This file currently implements
- * three versions of LMP; IP based versions described in draft-ietf-ccamp-lmp-02.txt and
- * draft-ietf-ccamp-lmp-03.txt, and the new UDP based version in draft-ietf-ccamp-lmp-09.txt. 
- * The -09 version is the default; the version being dissected can be changed from 
- * the LMP protocol preferences
+ * Code for dissecting the Link Management Protocol (LMP). The latest LMP
+ * specification is in draft-ieft-ccamp-lmp-10.txt. This version also includes
+ * support for dissecting LMP service discovery extensions defined in the
+ * UNI 1.0 specification.
+ *
+ * Support for LMP service discovery extensions added by Manu Pathak
+ * (mapathak@cisco.com), June 2005.
  */
 
 #ifdef HAVE_CONFIG_H
@@ -60,13 +61,8 @@
 #include "packet-frame.h"
 
 static int proto_lmp = -1;
-#define LMP_VER_DRAFT_CCAMP_02  2
-#define LMP_VER_DRAFT_CCAMP_03  3
-#define LMP_VER_DRAFT_CCAMP_09  9
-static int lmp_draft_ver = LMP_VER_DRAFT_CCAMP_09;
 
-#define IP_PROTO_LMP 140
-#define UDP_PORT_LMP_DEFAULT 49998
+#define UDP_PORT_LMP_DEFAULT 701
 static int lmp_udp_port = UDP_PORT_LMP_DEFAULT;
 static int lmp_udp_port_config = UDP_PORT_LMP_DEFAULT;
 
@@ -95,7 +91,10 @@ typedef enum {
     LMP_MSG_CHANNEL_STATUS,
     LMP_MSG_CHANNEL_STATUS_ACK,
     LMP_MSG_CHANNEL_STATUS_REQ,
-    LMP_MSG_CHANNEL_STATUS_RESP
+    LMP_MSG_CHANNEL_STATUS_RESP,
+    LMP_MSG_SERVICE_CONFIG=50,
+    LMP_MSG_SERVICE_CONFIG_ACK,
+    LMP_MSG_SERVICE_CONFIG_NACK
 } lmp_message_types;
 
 static value_string message_type_vals[] = {
@@ -119,6 +118,9 @@ static value_string message_type_vals[] = {
     {LMP_MSG_CHANNEL_STATUS_ACK,  "ChannelStatusAck Message. "},
     {LMP_MSG_CHANNEL_STATUS_REQ,  "ChannelStatusRequest Message. "},
     {LMP_MSG_CHANNEL_STATUS_RESP, "ChannelStatusResponse Message. "},
+    {LMP_MSG_SERVICE_CONFIG,      "ServiceConfig Message. "},
+    {LMP_MSG_SERVICE_CONFIG_ACK,  "ServiceConfigAck Message. "},
+    {LMP_MSG_SERVICE_CONFIG_NACK, "ServiceConfigNack Message. "},
     {0, NULL}
 };
 
@@ -127,57 +129,32 @@ static value_string message_type_vals[] = {
  */
 #define LMP_CLASS_NULL				0
 
-#define LMP_CLASS_LOCAL_CCID			1
-#define LMP_CLASS_REMOTE_CCID			2
-#define LMP_CLASS_LOCAL_NODE_ID			3
-#define LMP_CLASS_REMOTE_NODE_ID		4
-#define LMP_CLASS_LOCAL_LINK_ID			5
-#define LMP_CLASS_REMOTE_LINK_ID		6
-#define LMP_CLASS_LOCAL_INTERFACE_ID		7
-#define LMP_CLASS_REMOTE_INTERFACE_ID		8
-#define LMP_CLASS_MESSAGE_ID			9
-#define LMP_CLASS_MESSAGE_ID_ACK		10
-#define LMP_CLASS_CONFIG			11
-#define LMP_CLASS_HELLO				12
-#define LMP_CLASS_BEGIN_VERIFY			13
-#define LMP_CLASS_BEGIN_VERIFY_ACK		14
-#define LMP_CLASS_VERIFY_ID			15
-#define LMP_CLASS_TE_LINK			16
-#define LMP_CLASS_DATA_LINK			17
-#define LMP_CLASS_CHANNEL_STATUS		18
-#define LMP_CLASS_CHANNEL_STATUS_REQUEST	19
-#define LMP_CLASS_ERROR				20
-#define LMP_CLASS_MAX				20
-
-#define	LMP_09_CLASS_CCID			1
-#define	LMP_09_CLASS_NODE_ID			2
-#define	LMP_09_CLASS_LINK_ID			3
-#define	LMP_09_CLASS_INTERFACE_ID		4
-#define	LMP_09_CLASS_MESSAGE_ID			5
-#define	LMP_09_CLASS_CONFIG			6
-#define	LMP_09_CLASS_HELLO			7
-#define	LMP_09_CLASS_BEGIN_VERIFY		8
-#define	LMP_09_CLASS_BEGIN_VERIFY_ACK 		9
-#define	LMP_09_CLASS_VERIFY_ID			10
-#define	LMP_09_CLASS_TE_LINK			11
-#define	LMP_09_CLASS_DATA_LINK			12
-#define	LMP_09_CLASS_CHANNEL_STATUS		13
-#define	LMP_09_CLASS_CHANNEL_STATUS_REQUEST	14
-#define	LMP_09_CLASS_ERROR			20
-#define	LMP_09_CLASS_MAX			15
+#define	LMP_CLASS_CCID                          1
+#define	LMP_CLASS_NODE_ID                       2
+#define	LMP_CLASS_LINK_ID                       3
+#define	LMP_CLASS_INTERFACE_ID                  4
+#define	LMP_CLASS_MESSAGE_ID                    5
+#define	LMP_CLASS_CONFIG                        6
+#define	LMP_CLASS_HELLO                         7
+#define	LMP_CLASS_BEGIN_VERIFY                  8
+#define	LMP_CLASS_BEGIN_VERIFY_ACK              9
+#define	LMP_CLASS_VERIFY_ID                     10
+#define	LMP_CLASS_TE_LINK                       11
+#define	LMP_CLASS_DATA_LINK                     12
+#define	LMP_CLASS_CHANNEL_STATUS                13
+#define	LMP_CLASS_CHANNEL_STATUS_REQUEST        14
+#define LMP_LAST_CONTIGUOUS_CLASS              	LMP_CLASS_CHANNEL_STATUS_REQUEST  
+#define	LMP_CLASS_ERROR                         20
+#define LMP_CLASS_SERVICE_CONFIG                51
+#define	LMP_CLASS_MAX                           52
 
 static value_string lmp_class_vals[] = {
 
-    {LMP_CLASS_LOCAL_CCID, "LOCAL_CCID"},
-    {LMP_CLASS_REMOTE_CCID, "REMOTE_CCID"},
-    {LMP_CLASS_LOCAL_NODE_ID, "LOCAL_NODE_ID"},
-    {LMP_CLASS_REMOTE_NODE_ID, "REMOTE_NODE_ID"},
-    {LMP_CLASS_LOCAL_LINK_ID, "LOCAL_LINK_ID"},
-    {LMP_CLASS_REMOTE_LINK_ID, "REMOTE_LINK_ID"},
-    {LMP_CLASS_LOCAL_INTERFACE_ID, "LOCAL_INTERFACE_ID"},
-    {LMP_CLASS_REMOTE_INTERFACE_ID, "REMOTE_INTERFACE_ID"},
+    {LMP_CLASS_CCID, "CCID"},
+    {LMP_CLASS_NODE_ID, "NODE_ID"},
+    {LMP_CLASS_LINK_ID, "LINK_ID"},
+    {LMP_CLASS_INTERFACE_ID, "INTERFACE_ID"},
     {LMP_CLASS_MESSAGE_ID, "MESSAGE_ID"},
-    {LMP_CLASS_MESSAGE_ID_ACK, "MESSAGE_ID_ACK"},
     {LMP_CLASS_CONFIG, "CONFIG"},
     {LMP_CLASS_HELLO, "HELLO"},
     {LMP_CLASS_BEGIN_VERIFY, "BEGIN_VERIFY"},
@@ -188,30 +165,9 @@ static value_string lmp_class_vals[] = {
     {LMP_CLASS_CHANNEL_STATUS, "CHANNEL_STATUS"},
     {LMP_CLASS_CHANNEL_STATUS_REQUEST, "CHANNEL_STATUS_REQUEST"},
     {LMP_CLASS_ERROR, "ERROR"},
+    {LMP_CLASS_SERVICE_CONFIG, "SERVICE_CONFIG " },
 };
 
-static value_string lmp_09_class_vals[] = {
-
-    {LMP_09_CLASS_CCID, "CCID"},
-    {LMP_09_CLASS_NODE_ID, "NODE_ID"},
-    {LMP_09_CLASS_LINK_ID, "LINK_ID"},
-    {LMP_09_CLASS_INTERFACE_ID, "INTERFACE_ID"},
-    {LMP_09_CLASS_MESSAGE_ID, "MESSAGE_ID"},
-    {LMP_09_CLASS_CONFIG, "CONFIG"},
-    {LMP_09_CLASS_HELLO, "HELLO"},
-    {LMP_09_CLASS_BEGIN_VERIFY, "BEGIN_VERIFY"},
-    {LMP_09_CLASS_BEGIN_VERIFY_ACK, "BEGIN_VERIFY_ACK"},
-    {LMP_09_CLASS_VERIFY_ID, "VERIFY_ID"},
-    {LMP_09_CLASS_TE_LINK, "TE_LINK"},
-    {LMP_09_CLASS_DATA_LINK, "DATA_LINK"},
-    {LMP_09_CLASS_CHANNEL_STATUS, "CHANNEL_STATUS"},
-    {LMP_09_CLASS_CHANNEL_STATUS_REQUEST, "CHANNEL_STATUS_REQUEST"},
-    {LMP_09_CLASS_ERROR, "ERROR"},
-};
-
-
-#define VALID_CLASS(class) ((class) > LMP_CLASS_NULL && (class) < LMP_CLASS_MAX)
-#define VALID_09_CLASS(class) ((class) > LMP_CLASS_NULL && (((class) < LMP_09_CLASS_CHANNEL_STATUS_REQUEST) || ((class)==LMP_09_CLASS_ERROR)))
 
 /*------------------------------------------------------------------------------
  * Other constants & stuff
@@ -229,6 +185,47 @@ static const value_string channel_status_short_str[] = {
     {3, "SF"},
 };
 
+/* Service Discovery Client ServiceConfig object (defined in UNI 1.0) */
+
+/* Client Port-Level Service Attribute Object */
+
+/* Link Type */
+static const value_string service_attribute_link_type_str[] = {
+    {5, "SDH ITU-T G.707"},
+    {6, "SONET ANSI T1.105"},
+};
+
+/* Signal Types for SDH */
+static const value_string service_attribute_signal_types_sdh_str[] = {
+    {5,  "VC-3"},
+    {6,  "VC-4"},
+    {7,  "STM-0"},
+    {8,  "STM-1"},
+    {9,  "STM-4"},
+    {10, "STM-16"},
+    {11, "STM-64"},
+    {12, "STM-256"},
+};
+
+/* Signal Types for SONET */
+static const value_string service_attribute_signal_types_sonet_str[] = {
+    {5,  "STS-1 SPE"},
+    {6,  "STS-3c SPE"},
+    {7,  "STS-1"},
+    {8,  "STS-3"},
+    {9,  "STS-12"},
+    {10, "STS-48"},
+    {11, "STS-192"},
+    {12, "STS-768"},
+};
+
+/* 
+ * These values are used by the code that handles the Service Discovery
+ * Client Port-Level Service Attributes Object.
+ */
+#define LMP_CLASS_SERVICE_CONFIG_CPSA_SIGNAL_TYPES_SDH 5
+#define LMP_CLASS_SERVICE_CONFIG_CPSA_SIGNAL_TYPES_SONET 6
+
 /*------------------------------------------------------------------------------
  * LMP Filter values
  */
@@ -258,6 +255,11 @@ enum lmp_filter_keys {
   LMPF_MSG_CHANNEL_STATUS_ACK,
   LMPF_MSG_CHANNEL_STATUS_REQ,
   LMPF_MSG_CHANNEL_STATUS_RESP,
+  LMPF_MSG_SERVICE_CONFIG=50,
+  LMPF_MSG_SERVICE_CONFIG_ACK,
+  LMPF_MSG_SERVICE_CONFIG_NACK,
+
+  LMPF_MSG_MAX,
 
   /* LMP Message Header Fields ------------------ */
   LMPF_HDR_FLAGS,
@@ -267,16 +269,11 @@ enum lmp_filter_keys {
   /* LMP Object Class Filters -------------------- */
   LMPF_OBJECT,
 
-  LMPF_CLASS_LOCAL_CCID,
-  LMPF_CLASS_REMOTE_CCID,
-  LMPF_CLASS_LOCAL_NODE_ID,
-  LMPF_CLASS_REMOTE_NODE_ID,
-  LMPF_CLASS_LOCAL_LINK_ID,
-  LMPF_CLASS_REMOTE_LINK_ID,
-  LMPF_CLASS_LOCAL_INTERFACE_ID,
-  LMPF_CLASS_REMOTE_INTERFACE_ID,
+  LMPF_CLASS_CCID,
+  LMPF_CLASS_NODE_ID,
+  LMPF_CLASS_LINK_ID,
+  LMPF_CLASS_INTERFACE_ID,
   LMPF_CLASS_MESSAGE_ID,
-  LMPF_CLASS_MESSAGE_ID_ACK,
   LMPF_CLASS_CONFIG,
   LMPF_CLASS_HELLO,
   LMPF_CLASS_BEGIN_VERIFY,
@@ -287,24 +284,7 @@ enum lmp_filter_keys {
   LMPF_CLASS_CHANNEL_STATUS,
   LMPF_CLASS_CHANNEL_STATUS_REQUEST,
   LMPF_CLASS_ERROR,
-
-  LMPF_09_OBJECT,
-
-  LMPF_09_CLASS_CCID,
-  LMPF_09_CLASS_NODE_ID,
-  LMPF_09_CLASS_LINK_ID,
-  LMPF_09_CLASS_INTERFACE_ID,
-  LMPF_09_CLASS_MESSAGE_ID,
-  LMPF_09_CLASS_CONFIG,
-  LMPF_09_CLASS_HELLO,
-  LMPF_09_CLASS_BEGIN_VERIFY,
-  LMPF_09_CLASS_BEGIN_VERIFY_ACK,
-  LMPF_09_CLASS_VERIFY_ID,
-  LMPF_09_CLASS_TE_LINK,
-  LMPF_09_CLASS_DATA_LINK,
-  LMPF_09_CLASS_CHANNEL_STATUS,
-  LMPF_09_CLASS_CHANNEL_STATUS_REQUEST,
-  LMPF_09_CLASS_ERROR,
+  LMPF_CLASS_SERVICE_CONFIG,
 
   LMPF_VAL_CTYPE,
   LMPF_VAL_LOCAL_CCID,
@@ -376,20 +356,30 @@ enum lmp_filter_keys {
   LMPF_VAL_ERROR_CONFIG_RENEGOTIATE,
   LMPF_VAL_ERROR_CONFIG_BAD_CCID,
 
-  LMPF_VAL_SVCCFG_SIGPROTO_PROTO,
-  LMPF_VAL_SVCCFG_SIGPROTO_UNI_VERSION,
-  LMPF_VAL_SVCCFG_PORTATTR_LINK_TYPE,
-  LMPF_VAL_SVCCFG_PORTATTR_SIGNAL_TYPE,
-  LMPF_VAL_SVCCFG_PORTATTR_TP_TRANSPARENCY,
-  LMPF_VAL_SVCCFG_PORTATTR_MAX_NCC,
-  LMPF_VAL_SVCCFG_PORTATTR_MIN_NCC,
-  LMPF_VAL_SVCCFG_PORTATTR_MAX_NVC,
-  LMPF_VAL_SVCCFG_PORTATTR_MIN_NVC,
-  LMPF_VAL_SVCCFG_PORTATTR_INTFC_ID,
-  LMPF_VAL_SVCCFG_TRANSP_TRANSPARENCY,
-  LMPF_VAL_SVCCFG_TRANSP_TCM,
-  LMPF_VAL_SVCCFG_DIVERSITY_DIVERSITY,
-
+  LMPF_VAL_SERVICE_CONFIG_SP_FLAGS,
+  LMPF_VAL_SERVICE_CONFIG_SP_FLAGS_RSVP,
+  LMPF_VAL_SERVICE_CONFIG_SP_FLAGS_LDP,
+  LMPF_VAL_SERVICE_CONFIG_CPSA_TP_FLAGS,
+  LMPF_VAL_SERVICE_CONFIG_CPSA_TP_FLAGS_PATH_OVERHEAD,
+  LMPF_VAL_SERVICE_CONFIG_CPSA_TP_FLAGS_LINE_OVERHEAD,
+  LMPF_VAL_SERVICE_CONFIG_CPSA_TP_FLAGS_SECTION_OVERHEAD,
+  LMPF_VAL_SERVICE_CONFIG_CPSA_CCT_FLAGS,
+  LMPF_VAL_SERVICE_CONFIG_CPSA_CCT_FLAGS_CC_SUPPORTED,
+  LMPF_VAL_SERVICE_CONFIG_CPSA_MIN_NCC,
+  LMPF_VAL_SERVICE_CONFIG_CPSA_MAX_NCC,
+  LMPF_VAL_SERVICE_CONFIG_CPSA_MIN_NVC,
+  LMPF_VAL_SERVICE_CONFIG_CPSA_MAX_NVC,
+  LMPF_VAL_SERVICE_CONFIG_CPSA_INTERFACE_ID,
+  LMPF_VAL_SERVICE_CONFIG_NSA_TRANSPARENCY_FLAGS,
+  LMPF_VAL_SERVICE_CONFIG_NSA_TRANSPARENCY_FLAGS_SOH,
+  LMPF_VAL_SERVICE_CONFIG_NSA_TRANSPARENCY_FLAGS_LOH,
+  LMPF_VAL_SERVICE_CONFIG_NSA_TCM_FLAGS,
+  LMPF_VAL_SERVICE_CONFIG_NSA_TCM_FLAGS_TCM_SUPPORTED,
+  LMPF_VAL_SERVICE_CONFIG_NSA_NETWORK_DIVERSITY_FLAGS,
+  LMPF_VAL_SERVICE_CONFIG_NSA_NETWORK_DIVERSITY_FLAGS_NODE,
+  LMPF_VAL_SERVICE_CONFIG_NSA_NETWORK_DIVERSITY_FLAGS_LINK,
+  LMPF_VAL_SERVICE_CONFIG_NSA_NETWORK_DIVERSITY_FLAGS_SRLG,
+  
   LMPF_MAX
 };
 
@@ -483,6 +473,17 @@ static hf_register_info lmpf_info[] = {
      { "ChannelStatusResponse Message", "lmp.msg.channelstatusresponse", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
      	"", HFILL }},
 
+    {&lmp_filter[LMPF_MSG_SERVICE_CONFIG],
+     { "ServiceConfig Message", "lmp.msg.serviceconfig", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
+     	"", HFILL }},
+
+    {&lmp_filter[LMPF_MSG_SERVICE_CONFIG_ACK],
+     { "ServiceConfigAck Message", "lmp.msg.serviceconfigack", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
+     	"", HFILL }},
+
+    {&lmp_filter[LMPF_MSG_SERVICE_CONFIG_NACK],
+     { "ServiceConfigNack Message", "lmp.msg.serviceconfignack", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
+     	"", HFILL }},
 
     /* LMP Message Header Fields ------------------- */
 
@@ -504,36 +505,21 @@ static hf_register_info lmpf_info[] = {
      { "LOCAL_CCID", "lmp.object", FT_UINT8, BASE_DEC, NULL, 0x0,
      	"", HFILL }},
 
-    {&lmp_filter[LMPF_CLASS_LOCAL_CCID],
-     { "Local CCID", "lmp.obj.ccid", FT_NONE, BASE_NONE, NULL, 0x0,
-     	"", HFILL }},
-    {&lmp_filter[LMPF_CLASS_REMOTE_CCID],
-     { "Remote CCID", "lmp.obj.ccid", FT_NONE, BASE_NONE, NULL, 0x0,
-     	"", HFILL }},
-    {&lmp_filter[LMPF_CLASS_LOCAL_NODE_ID],
-     { "Local NODE_ID", "lmp.obj.Nodeid", FT_NONE, BASE_NONE, NULL, 0x0,
-     	"", HFILL }},
-    {&lmp_filter[LMPF_CLASS_REMOTE_NODE_ID],
-     { "Remote NODE_ID", "lmp.obj.Nodeid", FT_NONE, BASE_NONE, NULL, 0x0,
-     	"", HFILL }},
-    {&lmp_filter[LMPF_CLASS_LOCAL_LINK_ID],
-     { "Local LINK_ID", "lmp.obj.linkid", FT_NONE, BASE_NONE, NULL, 0x0,
+    {&lmp_filter[LMPF_CLASS_CCID],
+     { "CCID", "lmp.obj.ccid", FT_NONE, BASE_NONE, NULL, 0x0,
      	"", HFILL }},
-    {&lmp_filter[LMPF_CLASS_REMOTE_LINK_ID],
-     { "Remote LINK_ID", "lmp.obj.linkid", FT_NONE, BASE_NONE, NULL, 0x0,
+    {&lmp_filter[LMPF_CLASS_NODE_ID],
+     { "NODE_ID", "lmp.obj.Nodeid", FT_NONE, BASE_NONE, NULL, 0x0,
      	"", HFILL }},
-    {&lmp_filter[LMPF_CLASS_LOCAL_INTERFACE_ID],
-     { "Local INTERFACE_ID", "lmp.obj.interfaceid", FT_NONE, BASE_NONE, NULL, 0x0,
+    {&lmp_filter[LMPF_CLASS_LINK_ID],
+     { "LINK_ID", "lmp.obj.linkid", FT_NONE, BASE_NONE, NULL, 0x0,
      	"", HFILL }},
-    {&lmp_filter[LMPF_CLASS_REMOTE_INTERFACE_ID],
-     { "Remote INTERFACE_ID", "lmp.obj.interfaceid", FT_NONE, BASE_NONE, NULL, 0x0,
+    {&lmp_filter[LMPF_CLASS_INTERFACE_ID],
+     { "INTERFACE_ID", "lmp.obj.interfaceid", FT_NONE, BASE_NONE, NULL, 0x0,
      	"", HFILL }},
     {&lmp_filter[LMPF_CLASS_MESSAGE_ID],
      { "MESSAGE_ID", "lmp.obj.messageid", FT_NONE, BASE_NONE, NULL, 0x0,
      	"", HFILL }},
-    {&lmp_filter[LMPF_CLASS_MESSAGE_ID_ACK],
-     { "MESSAGE_ID Ack", "lmp.obj.messageid", FT_NONE, BASE_NONE, NULL, 0x0,
-     	"", HFILL }},
     {&lmp_filter[LMPF_CLASS_CONFIG],
      { "CONFIG", "lmp.obj.config", FT_NONE, BASE_NONE, NULL, 0x0,
      	"", HFILL }},
@@ -567,57 +553,9 @@ static hf_register_info lmpf_info[] = {
      { "ERROR", "lmp.obj.error", FT_NONE, BASE_NONE, NULL, 0x0,
      	"", HFILL }},
 
-    {&lmp_filter[LMPF_09_OBJECT],
-     { "LOCAL_CCID", "lmp.object", FT_UINT8, BASE_DEC, NULL, 0x0,
-     	"", HFILL }},
-
-    {&lmp_filter[LMPF_09_CLASS_CCID],
-     { "CCID", "lmp.obj.ccid", FT_NONE, BASE_NONE, NULL, 0x0,
-     	"", HFILL }},
-    {&lmp_filter[LMPF_09_CLASS_NODE_ID],
-     { "NODE_ID", "lmp.obj.Nodeid", FT_NONE, BASE_NONE, NULL, 0x0,
-     	"", HFILL }},
-    {&lmp_filter[LMPF_09_CLASS_LINK_ID],
-     { "LINK_ID", "lmp.obj.linkid", FT_NONE, BASE_NONE, NULL, 0x0,
-     	"", HFILL }},
-    {&lmp_filter[LMPF_09_CLASS_INTERFACE_ID],
-     { "INTERFACE_ID", "lmp.obj.interfaceid", FT_NONE, BASE_NONE, NULL, 0x0,
-     	"", HFILL }},
-    {&lmp_filter[LMPF_09_CLASS_MESSAGE_ID],
-     { "MESSAGE_ID", "lmp.obj.messageid", FT_NONE, BASE_NONE, NULL, 0x0,
-     	"", HFILL }},
-    {&lmp_filter[LMPF_09_CLASS_CONFIG],
-     { "CONFIG", "lmp.obj.config", FT_NONE, BASE_NONE, NULL, 0x0,
-     	"", HFILL }},
-    {&lmp_filter[LMPF_09_CLASS_HELLO],
-     { "HELLO", "lmp.obj.hello", FT_NONE, BASE_NONE, NULL, 0x0,
-     	"", HFILL }},
-    {&lmp_filter[LMPF_09_CLASS_BEGIN_VERIFY],
-     { "BEGIN_VERIFY", "lmp.obj.begin_verify", FT_NONE, BASE_NONE, NULL, 0x0,
-     	"", HFILL }},
-    {&lmp_filter[LMPF_09_CLASS_BEGIN_VERIFY_ACK],
-     { "BEGIN_VERIFY_ACK", "lmp.obj.begin_verify_ack", FT_NONE, BASE_NONE, NULL, 0x0,
-     	"", HFILL }},
-    {&lmp_filter[LMPF_09_CLASS_VERIFY_ID],
-     { "VERIFY_ID", "lmp.obj.verifyid", FT_NONE, BASE_NONE, NULL, 0x0,
-     	"", HFILL }},
-
-    {&lmp_filter[LMPF_09_CLASS_TE_LINK],
-     { "TE_LINK", "lmp.obj.te_link", FT_NONE, BASE_NONE, NULL, 0x0,
-     	"", HFILL }},
-    {&lmp_filter[LMPF_09_CLASS_DATA_LINK],
-     { "DATA_LINK", "lmp.obj.data_link", FT_NONE, BASE_NONE, NULL, 0x0,
-     	"", HFILL }},
-
-    {&lmp_filter[LMPF_09_CLASS_CHANNEL_STATUS],
-     { "CHANNEL_STATUS", "lmp.obj.channel_status", FT_NONE, BASE_NONE, NULL, 0x0,
-     	"", HFILL }},
-    {&lmp_filter[LMPF_09_CLASS_CHANNEL_STATUS_REQUEST],
-     { "CHANNEL_STATUS_REQUEST", "lmp.obj.channel_status_request", FT_NONE, BASE_NONE, NULL, 0x0,
-     	"", HFILL }},
-    {&lmp_filter[LMPF_09_CLASS_ERROR],
-     { "ERROR", "lmp.obj.error", FT_NONE, BASE_NONE, NULL, 0x0,
-     	"", HFILL }},
+    {&lmp_filter[LMPF_CLASS_SERVICE_CONFIG],
+     { "SERVICE_CONFIG", "lmp.obj.serviceconfig", FT_NONE, BASE_NONE, NULL, 0x0,
+       "", HFILL }},
 
     /* Other LMP Value Filters ------------------------------ */
 
@@ -805,31 +743,171 @@ static hf_register_info lmpf_info[] = {
        FT_BOOLEAN, 8, NULL, 0x02, "", HFILL }},
     {&lmp_filter[LMPF_VAL_ERROR_CONFIG_BAD_CCID],
      { "Config - Bad CC ID", "lmp.error.config_bad_ccid",
-       FT_BOOLEAN, 8, NULL, 0x04, "", HFILL }}
+       FT_BOOLEAN, 8, NULL, 0x04, "", HFILL }},
+
+    {&lmp_filter[LMPF_VAL_SERVICE_CONFIG_SP_FLAGS],
+     { "Service Config - Supported Signalling Protocols", 
+     "lmp.service_config.sp", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL}},
+
+    {&lmp_filter[LMPF_VAL_SERVICE_CONFIG_SP_FLAGS_RSVP],
+    { " RSVP is supported", "lmp.service_config.sp.rsvp", 
+      FT_BOOLEAN, 8, NULL, 0x01, "", HFILL}},
+
+    {&lmp_filter[LMPF_VAL_SERVICE_CONFIG_SP_FLAGS_LDP],
+     { "LDP is supported", "lmp.service_config.sp.ldp", 
+       FT_BOOLEAN, 8, NULL, 0x02, "", HFILL}},
+
+    {&lmp_filter[LMPF_VAL_SERVICE_CONFIG_CPSA_TP_FLAGS],
+     { "Client Port Service Attributes", "lmp.service_config.cpsa", 
+       FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL}},
+
+    {&lmp_filter[LMPF_VAL_SERVICE_CONFIG_CPSA_TP_FLAGS_PATH_OVERHEAD],
+     { "Path/VC Overhead Transparency Supported", 
+       "lmp.service_config.cpsa.path_overhead", 
+       FT_BOOLEAN, 8, NULL, 0x01, "", HFILL}},
+
+    {&lmp_filter[LMPF_VAL_SERVICE_CONFIG_CPSA_TP_FLAGS_LINE_OVERHEAD],
+     { "Line/MS Overhead Transparency Supported", 
+       "lmp.service_config.cpsa.line_overhead", 
+       FT_BOOLEAN, 8, NULL, 0x02, "", HFILL}},
+
+    {&lmp_filter[LMPF_VAL_SERVICE_CONFIG_CPSA_TP_FLAGS_SECTION_OVERHEAD],
+     { "Section/RS Overhead Transparency Supported", 
+       "lmp.service_config.cpsa.section_overhead", 
+       FT_BOOLEAN, 8, NULL, 0x04, "", HFILL}},
+
+    {&lmp_filter[LMPF_VAL_SERVICE_CONFIG_CPSA_CCT_FLAGS],
+     { "Contiguous Concatenation Types", "lmp.service_config.cct", 
+       FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL}},
+
+    {&lmp_filter[LMPF_VAL_SERVICE_CONFIG_CPSA_CCT_FLAGS_CC_SUPPORTED],
+     { "Contiguous Concatenation Types Supported", 
+       "lmp.service_config.cpsa.line_overhead", 
+       FT_BOOLEAN, 8, NULL, 0x01, "", HFILL}},
+
+    {&lmp_filter[LMPF_VAL_SERVICE_CONFIG_CPSA_MIN_NCC], 
+     { "Minimum Number of Contiguously Concatenated Components", 
+       "lmp.service_config.cpsa.min_ncc",
+       FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}}, 
+
+    {&lmp_filter[LMPF_VAL_SERVICE_CONFIG_CPSA_MAX_NCC], 
+     { "Maximum Number of Contiguously Concatenated Components", 
+       "lmp.service_config.cpsa.max_ncc",
+       FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}}, 
+
+    {&lmp_filter[LMPF_VAL_SERVICE_CONFIG_CPSA_MIN_NVC], 
+     { "Maximum Number of Contiguously Concatenated Components", 
+       "lmp.service_config.cpsa.min_nvc",
+       FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}}, 
+
+    {&lmp_filter[LMPF_VAL_SERVICE_CONFIG_CPSA_MAX_NVC], 
+     { "Minimum Number of Virtually Concatenated Components", 
+       "lmp.service_config.cpsa.max_nvc",
+       FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}},
+
+    {&lmp_filter[LMPF_VAL_SERVICE_CONFIG_CPSA_INTERFACE_ID], 
+     { "Local interface id of the client interface referred to", 
+       "lmp.service_config.cpsa.local_ifid",
+       FT_IPv4, BASE_NONE, NULL, 0x0, "", HFILL}},
+
+    {&lmp_filter[LMPF_VAL_SERVICE_CONFIG_NSA_TRANSPARENCY_FLAGS],
+     { "Network Transparency Flags",
+       "lmp.service_config.nsa.transparency",
+       FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL}},
+
+    {&lmp_filter[LMPF_VAL_SERVICE_CONFIG_NSA_TRANSPARENCY_FLAGS_SOH],
+     { "Standard SOH/RSOH transparency supported",
+       "lmp.service_config.nsa.transparency.soh",
+       FT_BOOLEAN, 8, NULL, 0x01, "", HFILL}},
+
+    {&lmp_filter[LMPF_VAL_SERVICE_CONFIG_NSA_TRANSPARENCY_FLAGS_LOH],
+     { "Standard LOH/MSOH transparency supported",
+       "lmp.service_config.nsa.transparency.loh",
+       FT_BOOLEAN, 8, NULL, 0x02, "", HFILL}},
+
+    {&lmp_filter[LMPF_VAL_SERVICE_CONFIG_NSA_TCM_FLAGS],
+     { "TCM Monitoring", 
+     "lmp.service_config.nsa.tcm", 
+       FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL}},
+
+    {&lmp_filter[LMPF_VAL_SERVICE_CONFIG_NSA_TCM_FLAGS_TCM_SUPPORTED],
+     { "TCM Monitoring Supported",
+       "lmp.service_config.nsa.transparency.tcm",
+       FT_BOOLEAN, 8, NULL, 0x01, "", HFILL}},
+
+    {&lmp_filter[LMPF_VAL_SERVICE_CONFIG_NSA_NETWORK_DIVERSITY_FLAGS],
+     { "Network Diversity Flags", 
+     "lmp.service_config.nsa.diversity", 
+       FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL}},
+    
+    {&lmp_filter[LMPF_VAL_SERVICE_CONFIG_NSA_NETWORK_DIVERSITY_FLAGS_NODE],
+     { "Node diversity supported",
+       "lmp.service_config.nsa.diversity.node",
+       FT_BOOLEAN, 8, NULL, 0x01, "", HFILL}},
+
+    {&lmp_filter[LMPF_VAL_SERVICE_CONFIG_NSA_NETWORK_DIVERSITY_FLAGS_LINK],
+     { "Link diversity supported",
+       "lmp.service_config.nsa.diversity.link",
+       FT_BOOLEAN, 8, NULL, 0x02, "", HFILL}},
+
+    {&lmp_filter[LMPF_VAL_SERVICE_CONFIG_NSA_NETWORK_DIVERSITY_FLAGS_SRLG],
+     { "SRLG diversity supported",
+       "lmp.service_config.nsa.diversity.srlg",
+       FT_BOOLEAN, 8, NULL, 0x04, "", HFILL}},
 
 };
 
 static int
-lmp_class_to_filter_num(int class)
+lmp_valid_class(int class)
 {
-    if (VALID_CLASS(class))
-	return class + LMPF_OBJECT;
-    return -1;
+    /* Contiguous classes */
+    if (class > LMP_CLASS_NULL && class <= LMP_LAST_CONTIGUOUS_CLASS) 
+	return 1;
+
+    /* Noncontiguous classes */
+    if (class == LMP_CLASS_ERROR || 
+	class == LMP_CLASS_SERVICE_CONFIG) 
+	return 1;
+
+    return 0;
 }
 
 static int
-lmp_09_class_to_filter_num(int class)
+lmp_class_to_filter_num(int class)
 {
-    guint16 gap = LMP_09_CLASS_ERROR - LMP_09_CLASS_CHANNEL_STATUS_REQUEST;
 
-    if (VALID_09_CLASS(class)) {
-	if (class != LMP_09_CLASS_ERROR)
-	    return LMPF_09_OBJECT + class;
-	else {
-	    return LMPF_09_OBJECT + class - gap + 1;
-	}
+    /* 
+     * The contiguous values can all be handled in the same way. The ERROR and
+     * Service Config objects, whose C-Type values are not contiguously assigned,
+     * must be handled separately.
+     */
+    switch (class) {
+	
+    case LMP_CLASS_CCID:
+    case LMP_CLASS_NODE_ID:
+    case LMP_CLASS_LINK_ID:
+    case LMP_CLASS_INTERFACE_ID:
+    case LMP_CLASS_MESSAGE_ID:
+    case LMP_CLASS_CONFIG:
+    case LMP_CLASS_HELLO:
+    case LMP_CLASS_BEGIN_VERIFY:
+    case LMP_CLASS_BEGIN_VERIFY_ACK:
+    case LMP_CLASS_VERIFY_ID:
+    case LMP_CLASS_TE_LINK:
+    case LMP_CLASS_DATA_LINK:
+    case LMP_CLASS_CHANNEL_STATUS:
+    case LMP_CLASS_CHANNEL_STATUS_REQUEST:
+	return LMPF_OBJECT + class;
+
+    case LMP_CLASS_ERROR:
+	return LMPF_CLASS_ERROR;
+	
+    case LMP_CLASS_SERVICE_CONFIG:
+	return LMPF_CLASS_SERVICE_CONFIG;
+
+    default:
+	return -1;
     }
-    return -1;
 }
 
 
@@ -851,28 +929,29 @@ enum {
     LMP_TREE_DATA_LINK_FLAGS,
     LMP_TREE_DATA_LINK_SUBOBJ,
     LMP_TREE_CHANNEL_STATUS_ID,
+    LMP_TREE_SERVICE_CONFIG_SP_FLAGS,
+    LMP_TREE_SERVICE_CONFIG_CPSA_TP_FLAGS,
+    LMP_TREE_SERVICE_CONFIG_CPSA_CCT_FLAGS,
+    LMP_TREE_SERVICE_CONFIG_NSA_TRANSPARENCY_FLAGS,
+    LMP_TREE_SERVICE_CONFIG_NSA_TCM_FLAGS,
+    LMP_TREE_SERVICE_CONFIG_NSA_NETWORK_DIVERSITY_FLAGS,
 
     LMP_TREE_CLASS_START
 };
+
 #define NUM_LMP_SUBTREES (LMP_TREE_CLASS_START + LMP_CLASS_MAX)
-#define NUM_LMP_09_SUBTREES (LMP_TREE_CLASS_START + LMP_09_CLASS_MAX)
 
-static gint lmp_subtree[MAX(NUM_LMP_SUBTREES,NUM_LMP_09_SUBTREES)];
-static gint lmp_09_subtree[NUM_LMP_09_SUBTREES];
+static gint lmp_subtree[NUM_LMP_SUBTREES];
 
 static int lmp_class_to_subtree(int class)
 {
-    if (VALID_CLASS(class))
-	return lmp_subtree[LMP_TREE_CLASS_START + class];
-
-    return -1;
-}
-
-static int lmp_09_class_to_subtree(int class)
-{
-    if (VALID_09_CLASS(class))
-	return lmp_09_subtree[LMP_TREE_CLASS_START + class];
+    if (lmp_valid_class(class)) {
+	if (class == LMP_CLASS_SERVICE_CONFIG) {
+	    return lmp_subtree[LMP_TREE_CLASS_START + LMP_CLASS_SERVICE_CONFIG];
+	}
 
+	return lmp_subtree[LMP_TREE_CLASS_START + class];
+    }
     return -1;
 }
 
@@ -905,21 +984,10 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     int proto;
 
     proto = pinfo->ipproto;
-    switch (lmp_draft_ver) {
 
-    case LMP_VER_DRAFT_CCAMP_09:
-	/* If the current preference is LMP09, process only UDP packets */
-	if (proto != IP_PROTO_UDP) {
+    /* Only process UDP packets */
+    if (proto != IP_PROTO_UDP) {
 	    return 0;
-	}
-	break;
-
-    default:
-	/* If the current preference is NOT LMP09, do not process UDP packets */
-	if (proto == IP_PROTO_UDP) {
-	    return 0;
-	}
-	break;
     }
 
     if (check_col(pinfo->cinfo, COL_PROTOCOL))
@@ -957,8 +1025,7 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 			    offset+3, 1, message_type);
 	proto_tree_add_text(lmp_header_tree, tvb, offset+4, 2, "Length: %d bytes",
 			    msg_length);
-	if (LMPF_MSG + message_type <= LMPF_MSG_CHANNEL_STATUS_RESP &&
-		       message_type > 0) {
+	if (LMPF_MSG + message_type < LMPF_MSG_MAX && message_type > 0) {
 	    proto_tree_add_boolean_hidden(lmp_header_tree, lmp_filter[LMPF_MSG + message_type], tvb,
 					  offset+3, 1, 1);
 	} else {
@@ -1003,1278 +1070,972 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	  class = tvb_get_guint8(tvb, offset+1);
 	  type = tvb_get_guint8(tvb, offset);
 	  negotiable = (type >> 7); type &= 0x7f;
-	  if (lmp_draft_ver == LMP_VER_DRAFT_CCAMP_09) {
-		object_type = val_to_str(class, lmp_09_class_vals, "Unknown");
-		proto_tree_add_uint_hidden(lmp_tree, lmp_filter[LMPF_09_OBJECT],
-					   tvb,
-					   offset, 1, class);
-		if (VALID_09_CLASS(class)) {
-		    ti = proto_tree_add_item(lmp_tree, lmp_filter[lmp_09_class_to_filter_num(class)],
-			tvb, offset, obj_length, FALSE);
-		} else {
-		    proto_tree_add_protocol_format(lmp_tree, proto_malformed, tvb, offset+1, 1,
-			"Invalid class: %u", class);
-		    return tvb_length(tvb);
-		}
-		lmp_object_tree = proto_item_add_subtree(ti, lmp_09_class_to_subtree(class));
-
-		ti2 = proto_tree_add_text(lmp_object_tree, tvb, offset, 4,
-				      "Header. Class %d, C-Type %d, Length %d, %s",
-				      class, type, obj_length,
-				      negotiable ? "Negotiable" : "Not Negotiable");
-		lmp_object_header_tree = proto_item_add_subtree(ti2, lmp_09_subtree[LMP_TREE_OBJECT_HEADER]);
-		proto_tree_add_text(lmp_object_header_tree, tvb, offset, 1,
-				negotiable ? "Negotiable" : "Not Negotiable");
-		proto_tree_add_item(lmp_object_header_tree, lmp_filter[LMPF_VAL_CTYPE],
-				    tvb, offset, 1, type);
-		proto_tree_add_text(lmp_object_header_tree, tvb, offset+1, 1,
-				"Object Class: %u - %s",
-				class, object_type);
-		if (obj_length < 4) {
-		    proto_tree_add_text(lmp_object_header_tree, tvb, offset+2, 2,
-				    "Length: %u (bogus, must be >= 4)", obj_length);
-		    break;
-		}
-		proto_tree_add_text(lmp_object_header_tree, tvb, offset+2, 2,
-				"Length: %u", obj_length);
-		offset2 = offset+4;
-		mylen = obj_length - 4;
-	  } else /* LMP_VER_DRAFT_CCAMP_03 */ {
-		object_type = val_to_str(class, lmp_class_vals, "Unknown");
-		proto_tree_add_uint_hidden(lmp_tree, lmp_filter[LMPF_OBJECT],
-					   tvb,
-					   offset, 1, class);
-
-		if (VALID_CLASS(class)) {
-		    ti = proto_tree_add_item(lmp_tree, lmp_filter[lmp_class_to_filter_num(class)],
-			tvb, offset, obj_length, FALSE);
-		} else {
-		    proto_tree_add_protocol_format(lmp_tree, proto_malformed, tvb, offset+1, 1,
-			"Invalid class: %u", class);
-		    return tvb_length(tvb);
-		}
-
-		lmp_object_tree = proto_item_add_subtree(ti, lmp_class_to_subtree(class));
-
-		ti2 = proto_tree_add_text(lmp_object_tree, tvb, offset, 4,
-				      "Header. Class %d, C-Type %d, Length %d, %s",
-				      class, type, obj_length,
-				      negotiable ? "Negotiable" : "Not Negotiable");
-		lmp_object_header_tree = proto_item_add_subtree(ti2, lmp_subtree[LMP_TREE_OBJECT_HEADER]);
-		proto_tree_add_text(lmp_object_header_tree, tvb, offset, 1,
-				negotiable ? "Negotiable" : "Not Negotiable");
-		proto_tree_add_item(lmp_object_header_tree, lmp_filter[LMPF_VAL_CTYPE],
-				    tvb, offset, 1, type);
-		proto_tree_add_text(lmp_object_header_tree, tvb, offset+1, 1,
-				"Object Class: %u - %s",
-				class, object_type);
-		if (obj_length < 4) {
-		    proto_tree_add_text(lmp_object_header_tree, tvb, offset+2, 2,
-				    "Length: %u (bogus, must be >= 4)", obj_length);
-		    break;
-		}
-		proto_tree_add_text(lmp_object_header_tree, tvb, offset+2, 2,
-				"Length: %u", obj_length);
-		offset2 = offset+4;
-		mylen = obj_length - 4;
+	  object_type = val_to_str(class, lmp_class_vals, "Unknown");
+	  proto_tree_add_uint_hidden(lmp_tree, lmp_filter[LMPF_OBJECT],
+				     tvb,
+				     offset, 1, class);
+	  if (lmp_valid_class(class)) {
+
+	      ti = proto_tree_add_item(lmp_tree, 
+				       lmp_filter[lmp_class_to_filter_num(class)],
+				       tvb, offset, obj_length, FALSE);
+	  } else {
+	      proto_tree_add_protocol_format(lmp_tree, proto_malformed, tvb, 
+					     offset+1, 1,
+					     "Invalid class: %u", class);
+	      return tvb_length(tvb);
 	  }
+	  lmp_object_tree = proto_item_add_subtree(ti, lmp_class_to_subtree(class));
+
+	  ti2 = proto_tree_add_text(lmp_object_tree, tvb, offset, 4,
+				    "Header. Class %d, C-Type %d, Length %d, %s",
+				    class, type, obj_length,
+				    negotiable ? "Negotiable" : "Not Negotiable");
+
+	  lmp_object_header_tree = 
+	      proto_item_add_subtree(ti2, lmp_subtree[LMP_TREE_OBJECT_HEADER]);
+
+	  proto_tree_add_text(lmp_object_header_tree, tvb, offset, 1,
+			      negotiable ? "Negotiable" : "Not Negotiable");
+	  proto_tree_add_text(lmp_object_header_tree, tvb, offset+2, 2,
+			      "Length: %u", obj_length);
+	  proto_tree_add_text(lmp_object_header_tree, tvb, offset+1, 1,
+			      "Object Class: %u - %s",
+			      class, object_type);
+	  proto_tree_add_item(lmp_object_header_tree, lmp_filter[LMPF_VAL_CTYPE],
+			      tvb, offset, 1, type);
+	  offset2 = offset+4;
+	  mylen = obj_length - 4;
+	  
+	  switch (class) {
+
+	  case LMP_CLASS_NULL:
+	      break;
+
+	  case LMP_CLASS_CCID:
+	      switch(type) {
+		  
+	      case 1:
+		  l = LMPF_VAL_LOCAL_CCID;
+		  proto_item_append_text(ti, ": %d", tvb_get_ntohl(tvb, offset2));
+		  proto_tree_add_uint(lmp_object_tree, lmp_filter[l], tvb, 
+				      offset2, 4, tvb_get_ntohl(tvb, offset2));
+		  break;
+		  
+	      case 2:
+		  l = LMPF_VAL_REMOTE_CCID;
+		  proto_item_append_text(ti, ": %d", tvb_get_ntohl(tvb, offset2));
+		  proto_tree_add_uint(lmp_object_tree, lmp_filter[l], tvb, 
+				      offset2, 4, tvb_get_ntohl(tvb, offset2));
+	      default:
+		  proto_tree_add_text(lmp_object_tree, tvb, offset2, mylen,
+				      "Data (%d bytes)", mylen);
+		  break;
+	      }
+	      break;
+	      
+	  case LMP_CLASS_NODE_ID:
+	      switch(type) {
+		  
+	      case 1:
+		  l = LMPF_VAL_LOCAL_NODE_ID;
+		  proto_item_append_text(ti, ": %s",
+					 ip_to_str(tvb_get_ptr(tvb, offset2, 4)));
+		  proto_tree_add_item(lmp_object_tree, lmp_filter[l], tvb, 
+				      offset2, 4, FALSE);
+		  break;
+		  
+	      case 2:
+		  l = LMPF_VAL_REMOTE_NODE_ID;
+		  proto_item_append_text(ti, ": %s",
+					 ip_to_str(tvb_get_ptr(tvb, offset2, 4)));
+		  proto_tree_add_item(lmp_object_tree, lmp_filter[l], tvb, 
+				      offset2, 4, FALSE);
+		  break;
+		  
+	      default:
+		  proto_tree_add_text(lmp_object_tree, tvb, offset2, mylen,
+				      "Data (%d bytes)", mylen);
+		  break;
+	      }
+	      break;
+	      
+	  case LMP_CLASS_LINK_ID:
+	      
+	      switch(type) {
+		  
+	      case 1:
+	      case 2:
+		  l = (type == 1)? LMPF_VAL_LOCAL_LINK_ID_IPV4:
+		      LMPF_VAL_REMOTE_LINK_ID_IPV4;
+		  proto_item_append_text(ti, ": IPv4 %s",
+					 ip_to_str(tvb_get_ptr(tvb, offset2, 4)));
+		  proto_tree_add_item(lmp_object_tree, lmp_filter[l], tvb, 
+				      offset2, 4, FALSE);
+		  break;
+		  
+	      case 3:
+	      case 4:
+		  l = (type == 3)? LMPF_VAL_LOCAL_LINK_ID_IPV6:
+		      LMPF_VAL_REMOTE_LINK_ID_IPV6;
+		  proto_item_append_text(ti, ": IPv6 %s",
+					 ip6_to_str((const struct e_in6_addr *)tvb_get_ptr(tvb, offset2, 16)));
+		  proto_tree_add_text(lmp_object_tree, tvb, offset2, 16, "IPv6: %s",
+				      ip6_to_str((const struct e_in6_addr *)tvb_get_ptr(tvb, offset2, 16)));
+		  break;
+	      case 5:
+	      case 6:
+		  l = (type == 5)? LMPF_VAL_LOCAL_LINK_ID_UNNUM:
+		      LMPF_VAL_REMOTE_LINK_ID_UNNUM;
+		  proto_item_append_text(ti, ": Unnumbered %d", 
+					 tvb_get_ntohl(tvb, offset2));
+		  proto_tree_add_item(lmp_object_tree, lmp_filter[l], tvb, 
+				      offset2, 4, FALSE);
+		  break;
 
-	  if (lmp_draft_ver == LMP_VER_DRAFT_CCAMP_09) {
-
-	    switch (class) {
-
-	    case LMP_CLASS_NULL:
-		break;
-
-	    case LMP_09_CLASS_CCID:
-		switch(type) {
-		case 1:
-		    l = LMPF_VAL_LOCAL_CCID;
-		    proto_item_append_text(ti, ": %d", tvb_get_ntohl(tvb, offset2));
-		    proto_tree_add_uint(lmp_object_tree, lmp_filter[l], tvb, offset2, 4,
-					tvb_get_ntohl(tvb, offset2));
-		    break;
-		case 2:
-		    l = LMPF_VAL_REMOTE_CCID;
-		    proto_item_append_text(ti, ": %d", tvb_get_ntohl(tvb, offset2));
-		    proto_tree_add_uint(lmp_object_tree, lmp_filter[l], tvb, offset2, 4,
-					tvb_get_ntohl(tvb, offset2));
-		default:
-		    proto_tree_add_text(lmp_object_tree, tvb, offset2, mylen,
-					"Data (%d bytes)", mylen);
-		    break;
-		}
-		break;
-
-	    case LMP_09_CLASS_NODE_ID:
-		switch(type) {
-		case 1:
-		    l = LMPF_VAL_LOCAL_NODE_ID;
-		    proto_item_append_text(ti, ": %s",
-					   ip_to_str(tvb_get_ptr(tvb, offset2, 4)));
-		    proto_tree_add_item(lmp_object_tree, lmp_filter[l], tvb, offset2, 4,
-					FALSE);
-		    break;
-		case 2:
-		    l = LMPF_VAL_REMOTE_NODE_ID;
-		    proto_item_append_text(ti, ": %s",
-					   ip_to_str(tvb_get_ptr(tvb, offset2, 4)));
-		    proto_tree_add_item(lmp_object_tree, lmp_filter[l], tvb, offset2, 4,
-					FALSE);
-		    break;
-		default:
-		    proto_tree_add_text(lmp_object_tree, tvb, offset2, mylen,
-					"Data (%d bytes)", mylen);
-		    break;
-		}
-		break;
-
-	    case LMP_09_CLASS_LINK_ID:
-		switch(type) {
-		case 1:
-		case 2:
-		    l = (type == 1)? LMPF_VAL_LOCAL_LINK_ID_IPV4:
-			LMPF_VAL_REMOTE_LINK_ID_IPV4;
-		    proto_item_append_text(ti, ": IPv4 %s",
-					   ip_to_str(tvb_get_ptr(tvb, offset2, 4)));
-		    proto_tree_add_item(lmp_object_tree, lmp_filter[l], tvb, offset2, 4,
-					FALSE);
-		    break;
-		case 3:
-		case 4:
-		    l = (type == 3)? LMPF_VAL_LOCAL_LINK_ID_IPV6:
-			LMPF_VAL_REMOTE_LINK_ID_IPV6;
-		    proto_item_append_text(ti, ": IPv6 %s",
-					   ip6_to_str((const struct e_in6_addr *)tvb_get_ptr(tvb, offset2, 16)));
-		    proto_tree_add_text(lmp_object_tree, tvb, offset2, 16, "IPv6: %s",
-					ip6_to_str((const struct e_in6_addr *)tvb_get_ptr(tvb, offset2, 16)));
-		    break;
-		case 5:
-		case 6:
-		    l = (type == 5)? LMPF_VAL_LOCAL_LINK_ID_UNNUM:
-			LMPF_VAL_REMOTE_LINK_ID_UNNUM;
-		    proto_item_append_text(ti, ": Unnumbered %d", tvb_get_ntohl(tvb, offset2));
-		    proto_tree_add_item(lmp_object_tree, lmp_filter[l], tvb, offset2, 4,
-					FALSE);
-		    break;
+	      default:
+		  proto_tree_add_text(lmp_object_tree, tvb, offset2, mylen,
+				      "Data (%d bytes)", mylen);
+		  break;
+	      }
+	      break;
+
+	  case LMP_CLASS_INTERFACE_ID:
+	      
+	      switch(type) {
+		  
+	      case 1:
+	      case 2:
+		  l = (type == 1)? LMPF_VAL_LOCAL_INTERFACE_ID_IPV4:
+		      LMPF_VAL_REMOTE_INTERFACE_ID_IPV4;
+		  proto_item_append_text(ti, ": IPv4 %s",
+					 ip_to_str(tvb_get_ptr(tvb, offset2, 4)));
+		  proto_tree_add_item(lmp_object_tree, lmp_filter[l], tvb, 
+				      offset2, 4, FALSE);
+		  break;
+  
+	      case 3:
+	      case 4:
+		  l = (type == 3)? LMPF_VAL_LOCAL_INTERFACE_ID_IPV6:
+		      LMPF_VAL_REMOTE_INTERFACE_ID_IPV6;
+		  proto_item_append_text(ti, ": IPv6 %s",
+					 ip6_to_str((const struct e_in6_addr *)tvb_get_ptr(tvb, offset2, 16)));
+		  proto_tree_add_text(lmp_object_tree, tvb, offset2, 16, "IPv6: %s",
+				      ip6_to_str((const struct e_in6_addr *)tvb_get_ptr(tvb, offset2, 16)));
+		  break;
+
+	      case 5:
+	      case 6:
+		  l = (type == 5)? LMPF_VAL_LOCAL_INTERFACE_ID_UNNUM:
+		      LMPF_VAL_REMOTE_INTERFACE_ID_UNNUM;
+		  proto_item_append_text(ti, ": Unnumbered %d", 
+					 tvb_get_ntohl(tvb, offset2));
+		  proto_tree_add_item(lmp_object_tree, lmp_filter[l], tvb, 
+				      offset2, 4, FALSE);
+		  break;
 
-		default:
-		    proto_tree_add_text(lmp_object_tree, tvb, offset2, mylen,
+	      default:
+		  proto_tree_add_text(lmp_object_tree, tvb, offset2, mylen,
+				      "Data (%d bytes)", mylen);
+		  break;
+	      }
+	      break;
+
+	  case LMP_CLASS_MESSAGE_ID:
+	      
+	      switch(type) {
+		  
+	      case 1:
+		  
+		  l = LMPF_VAL_MESSAGE_ID;
+		  proto_item_append_text(ti, ": %d", tvb_get_ntohl(tvb, offset2));
+		  proto_tree_add_uint(lmp_object_tree, lmp_filter[l], tvb, 
+				      offset2, 4, tvb_get_ntohl(tvb, offset2));
+		  break;
+		  
+	      case 2:
+		  l = LMPF_VAL_MESSAGE_ID_ACK;
+		  proto_item_append_text(ti, ": %d", tvb_get_ntohl(tvb, offset2));
+		  proto_tree_add_uint(lmp_object_tree, lmp_filter[l], tvb, 
+				      offset2, 4, tvb_get_ntohl(tvb, offset2));
+		  break;
+		  
+	      default:
+		  proto_tree_add_text(lmp_object_tree, tvb, offset2, mylen,
 					"Data (%d bytes)", mylen);
-		    break;
-		}
-		break;
+		  break;
+	      }
+	      break;
+
+	  case LMP_CLASS_CONFIG:
+
+	      switch(type) {
+		  
+	      case 1:
+		  proto_item_append_text(ti, ": HelloInterval: %d, HelloDeadInterval: %d",
+					 tvb_get_ntohs(tvb, offset2), 
+					 tvb_get_ntohs(tvb, offset2+2));
+		  proto_tree_add_uint(lmp_object_tree, 
+				      lmp_filter[LMPF_VAL_CONFIG_HELLO],
+				      tvb, offset2, 2, tvb_get_ntohs(tvb, offset2));
+		  proto_tree_add_uint(lmp_object_tree, 
+				      lmp_filter[LMPF_VAL_CONFIG_HELLO_DEAD],
+				      tvb, offset2+2, 2, 
+				      tvb_get_ntohs(tvb, offset2+2));
+		  break;
+		  
+	      default:
+		  proto_tree_add_text(lmp_object_tree, tvb, offset2, mylen,
+				      "Data (%d bytes)", mylen);
+		  break;
+	      }
+	      break;
+	      
+	  case LMP_CLASS_HELLO:
+
+	      switch(type) {
+		  
+	      case 1:
+		  proto_item_append_text(ti, ": TxSeq %d, RxSeq: %d",
+					 tvb_get_ntohl(tvb, offset2),
+					 tvb_get_ntohl(tvb, offset2+4));
+		  proto_tree_add_uint(lmp_object_tree, 
+				      lmp_filter[LMPF_VAL_HELLO_TXSEQ],
+				      tvb, offset2, 4, 
+				      tvb_get_ntohl(tvb, offset2));
+		  proto_tree_add_uint(lmp_object_tree, 
+				      lmp_filter[LMPF_VAL_HELLO_RXSEQ],
+				      tvb, offset2+4, 4, 
+				      tvb_get_ntohl(tvb, offset2+4));
+		  break;
 
-	    case LMP_09_CLASS_INTERFACE_ID:
-		switch(type) {
-		case 1:
-		case 2:
-		    l = (type == 1)? LMPF_VAL_LOCAL_INTERFACE_ID_IPV4:
-			LMPF_VAL_REMOTE_INTERFACE_ID_IPV4;
-		    proto_item_append_text(ti, ": IPv4 %s",
-					   ip_to_str(tvb_get_ptr(tvb, offset2, 4)));
-		    proto_tree_add_item(lmp_object_tree, lmp_filter[l], tvb, offset2, 4,
-					FALSE);
-		    break;
-		case 3:
-		case 4:
-		    l = (type == 3)? LMPF_VAL_LOCAL_INTERFACE_ID_IPV6:
-			LMPF_VAL_REMOTE_INTERFACE_ID_IPV6;
-		    proto_item_append_text(ti, ": IPv6 %s",
-					   ip6_to_str((const struct e_in6_addr *)tvb_get_ptr(tvb, offset2, 16)));
-		    proto_tree_add_text(lmp_object_tree, tvb, offset2, 16, "IPv6: %s",
-					ip6_to_str((const struct e_in6_addr *)tvb_get_ptr(tvb, offset2, 16)));
-		    break;
-		case 5:
-		case 6:
-		    l = (type == 5)? LMPF_VAL_LOCAL_INTERFACE_ID_UNNUM:
-			LMPF_VAL_REMOTE_INTERFACE_ID_UNNUM;
-		    proto_item_append_text(ti, ": Unnumbered %d", tvb_get_ntohl(tvb, offset2));
-		    proto_tree_add_item(lmp_object_tree, lmp_filter[l], tvb, offset2, 4,
-					FALSE);
-		    break;
-		default:
-		    proto_tree_add_text(lmp_object_tree, tvb, offset2, mylen,
-					"Data (%d bytes)", mylen);
-		    break;
-		}
-		break;
-
-	    case LMP_09_CLASS_MESSAGE_ID:
-		switch(type) {
-		case 1:
-		    l = LMPF_VAL_MESSAGE_ID;
-		    proto_item_append_text(ti, ": %d", tvb_get_ntohl(tvb, offset2));
-		    proto_tree_add_uint(lmp_object_tree, lmp_filter[l], tvb, offset2, 4,
-					tvb_get_ntohl(tvb, offset2));
-		    break;
-		case 2:
-		    l = LMPF_VAL_MESSAGE_ID_ACK;
-		    proto_item_append_text(ti, ": %d", tvb_get_ntohl(tvb, offset2));
-		    proto_tree_add_uint(lmp_object_tree, lmp_filter[l], tvb, offset2, 4,
-					tvb_get_ntohl(tvb, offset2));
-		    break;
+	      default:
+		  proto_tree_add_text(lmp_object_tree, tvb, offset2, mylen,
+				      "Data (%d bytes)", mylen);
+		  break;
+	      }
+	      break;
+	      
+	  case LMP_CLASS_BEGIN_VERIFY:
+
+	      switch(type) {
+
+	      case 1:
+		  l = tvb_get_ntohs(tvb, offset2);
+		  ti2 = proto_tree_add_item(lmp_object_tree, 
+					    lmp_filter[LMPF_VAL_BEGIN_VERIFY_FLAGS],
+					    tvb, offset2, 2, FALSE);
+		  
+		  lmp_flags_tree = proto_item_add_subtree(ti2, 
+							  lmp_subtree[LMP_TREE_BEGIN_VERIFY_FLAGS]);
+		  proto_tree_add_boolean(lmp_flags_tree, 
+					 lmp_filter[LMPF_VAL_BEGIN_VERIFY_FLAGS_ALL_LINKS],
+					 tvb, offset2, 2, l);
+		  proto_tree_add_boolean(lmp_flags_tree, 
+					 lmp_filter[LMPF_VAL_BEGIN_VERIFY_FLAGS_LINK_TYPE],
+					 tvb, offset2, 2, l);
+		  proto_tree_add_text(lmp_object_tree, tvb, offset2+2, 2,
+				      "Verify Interval: %d ms", 
+				      tvb_get_ntohs(tvb, offset2+2));
+		  proto_tree_add_text(lmp_object_tree, tvb, offset2+4, 4,
+				      "Number of Data Links: %d", 
+				      tvb_get_ntohl(tvb, offset2+4));
+		  proto_tree_add_item(lmp_object_tree, 
+				      lmp_filter[LMPF_VAL_BEGIN_VERIFY_ENCTYPE],
+				      tvb, offset2+8, 1, FALSE);
+		  proto_tree_add_text(lmp_object_tree, tvb, offset2+10, 2,
+				      "Verify Transport Mechanism: 0x%0x", 
+				      tvb_get_ntohs(tvb, offset2+10));
+		  proto_tree_add_text(lmp_object_tree, tvb, offset2+12, 4,
+				      "Transmission Rate: %.10g", 
+				      tvb_get_ntohieee_float(tvb, offset2+12));
+		  proto_tree_add_text(lmp_object_tree, tvb, offset2+16, 4,
+				      "Wavelength: %d", 
+				      tvb_get_ntohl(tvb, offset2+16));
+		  break;
 
-		default:
-		    proto_tree_add_text(lmp_object_tree, tvb, offset2, mylen,
-					"Data (%d bytes)", mylen);
-		    break;
-		}
-		break;
-
-	    case LMP_09_CLASS_CONFIG:
-		switch(type) {
-		case 1:
-		    proto_item_append_text(ti, ": HelloInterval: %d, HelloDeadInterval: %d",
-					   tvb_get_ntohs(tvb, offset2), tvb_get_ntohs(tvb, offset2+2));
-		    proto_tree_add_uint(lmp_object_tree, lmp_filter[LMPF_VAL_CONFIG_HELLO],
-					tvb, offset2, 2, tvb_get_ntohs(tvb, offset2));
-		    proto_tree_add_uint(lmp_object_tree, lmp_filter[LMPF_VAL_CONFIG_HELLO_DEAD],
-					tvb, offset2+2, 2, tvb_get_ntohs(tvb, offset2+2));
-		    break;
-		default:
-		    proto_tree_add_text(lmp_object_tree, tvb, offset2, mylen,
-					"Data (%d bytes)", mylen);
-		    break;
-		}
-		break;
-
-	    case LMP_09_CLASS_HELLO:
-		switch(type) {
-		case 1:
-		    proto_item_append_text(ti, ": TxSeq %d, RxSeq: %d",
-					   tvb_get_ntohl(tvb, offset2),
-					   tvb_get_ntohl(tvb, offset2+4));
-		    proto_tree_add_uint(lmp_object_tree, lmp_filter[LMPF_VAL_HELLO_TXSEQ],
-					tvb, offset2, 4, tvb_get_ntohl(tvb, offset2));
-		    proto_tree_add_uint(lmp_object_tree, lmp_filter[LMPF_VAL_HELLO_RXSEQ],
-					tvb, offset2+4, 4, tvb_get_ntohl(tvb, offset2+4));
-		    break;
-		default:
-		    proto_tree_add_text(lmp_object_tree, tvb, offset2, mylen,
-					"Data (%d bytes)", mylen);
-		    break;
-		}
-		break;
-
-	    case LMP_09_CLASS_BEGIN_VERIFY:
-		switch(type) {
-		case 1:
-		    l = tvb_get_ntohs(tvb, offset2);
-		    ti2 = proto_tree_add_item(lmp_object_tree, lmp_filter[LMPF_VAL_BEGIN_VERIFY_FLAGS],
-					      tvb, offset2, 2, FALSE);
-
-		    lmp_flags_tree = proto_item_add_subtree(ti2, lmp_09_subtree[LMP_TREE_BEGIN_VERIFY_FLAGS]);
-		    proto_tree_add_boolean(lmp_flags_tree, lmp_filter[LMPF_VAL_BEGIN_VERIFY_FLAGS_ALL_LINKS],
-					   tvb, offset2, 2, l);
-		    proto_tree_add_boolean(lmp_flags_tree, lmp_filter[LMPF_VAL_BEGIN_VERIFY_FLAGS_LINK_TYPE],
-					   tvb, offset2, 2, l);
-		    proto_tree_add_text(lmp_object_tree, tvb, offset2+2, 2,
-					"Verify Interval: %d ms", tvb_get_ntohs(tvb, offset2+2));
-		    proto_tree_add_text(lmp_object_tree, tvb, offset2+4, 4,
-					"Number of Data Links: %d", tvb_get_ntohl(tvb, offset2+4));
-		    proto_tree_add_item(lmp_object_tree, lmp_filter[LMPF_VAL_BEGIN_VERIFY_ENCTYPE],
-					tvb, offset2+8, 1, FALSE);
-		    proto_tree_add_text(lmp_object_tree, tvb, offset2+10, 2,
-					"Verify Transport Mechanism: 0x%0x", tvb_get_ntohs(tvb, offset2+10));
-		    proto_tree_add_text(lmp_object_tree, tvb, offset2+12, 4,
-					"Transmission Rate: %.10g", tvb_get_ntohieee_float(tvb, offset2+12));
-		    proto_tree_add_text(lmp_object_tree, tvb, offset2+16, 4,
-					"Wavelength: %d", tvb_get_ntohl(tvb, offset2+16));
-		    break;
-		default:
-		    proto_tree_add_text(lmp_object_tree, tvb, offset2, mylen,
-					"Data (%d bytes)", mylen);
-		    break;
-		}
-		break;
-
-	    case LMP_09_CLASS_BEGIN_VERIFY_ACK:
-		switch(type) {
-		case 1:
-		    proto_item_append_text(ti, ": VerifyDeadInterval: %d, TransportResponse: 0x%0x",
-					   tvb_get_ntohs(tvb, offset2), tvb_get_ntohs(tvb, offset2+2));
-		    proto_tree_add_text(lmp_object_tree, tvb, offset2, 2,
-					"VerifyDeadInterval: %d ms", tvb_get_ntohs(tvb, offset2));
-		    proto_tree_add_text(lmp_object_tree, tvb, offset2+2, 2,
-					"Verify Transport Response: 0x%0x", tvb_get_ntohs(tvb, offset2+2));
-		    break;
-		default:
-		    proto_tree_add_text(lmp_object_tree, tvb, offset2, mylen,
-					"Data (%d bytes)", mylen);
-		    break;
-		}
-		break;
-
-	    case LMP_09_CLASS_VERIFY_ID:
-		switch(type) {
-		case 1:
-		    proto_item_append_text(ti, ": %d", tvb_get_ntohl(tvb, offset2));
-		    proto_tree_add_uint(lmp_object_tree, lmp_filter[LMPF_VAL_VERIFY_ID], tvb, offset2, 4,
-					tvb_get_ntohl(tvb, offset2));
-		    break;
-		default:
-		    proto_tree_add_text(lmp_object_tree, tvb, offset2, mylen,
-					"Data (%d bytes)", mylen);
-		    break;
-		}
-		break;
-
-	    case LMP_09_CLASS_TE_LINK:
-		l = tvb_get_guint8(tvb, offset2);
-		ti2 = proto_tree_add_uint(lmp_object_tree, lmp_filter[LMPF_VAL_TE_LINK_FLAGS],
-					  tvb, offset2, 1, l);
-		proto_item_append_text(ti2, ": %s%s",
-				       (l&0x01) ? "Fault-Mgmt-Supported " : "",
-				       (l&0x02) ? "Link-Verification-Supported " : "");
-		lmp_flags_tree = proto_item_add_subtree(ti2, lmp_09_subtree[LMP_TREE_TE_LINK_FLAGS]);
-		proto_tree_add_boolean(lmp_flags_tree,
-				       lmp_filter[LMPF_VAL_TE_LINK_FLAGS_FAULT_MGMT],
-				       tvb, offset2, 1, l);
-		proto_tree_add_boolean(lmp_flags_tree,
-				       lmp_filter[LMPF_VAL_TE_LINK_FLAGS_LINK_VERIFY],
-				       tvb, offset2, 1, l);
-		switch(type) {
-		case 1:
-		    proto_item_append_text(ti, ": IPv4: Local %s, Remote %s",
-					   ip_to_str(tvb_get_ptr(tvb, offset2+4, 4)),
-					   ip_to_str(tvb_get_ptr(tvb, offset2+8, 4)));
-		    proto_tree_add_item(lmp_object_tree, lmp_filter[LMPF_VAL_TE_LINK_LOCAL_IPV4],
-					tvb, offset2+4, 4, FALSE);
-		    proto_tree_add_item(lmp_object_tree, lmp_filter[LMPF_VAL_TE_LINK_REMOTE_IPV4],
-					tvb, offset2+8, 4, FALSE);
-		    break;
-		case 2:
-		    proto_item_append_text(ti, ": IPv6: Local %s, Remote %s",
-					   ip6_to_str((const struct e_in6_addr *)tvb_get_ptr(tvb, offset2+4, 16)),
-					   ip6_to_str((const struct e_in6_addr *)tvb_get_ptr(tvb, offset2+8, 16)));
-		    proto_tree_add_text(lmp_object_tree, tvb, offset2+4, 16, "TE-Link Local ID - IPv6: %s",
-					ip6_to_str((const struct e_in6_addr *)tvb_get_ptr(tvb, offset2, 16)));
-		    proto_tree_add_text(lmp_object_tree, tvb, offset2+20,16, "TE-Link Remote ID - IPv6: %s",
-					ip6_to_str((const struct e_in6_addr *)tvb_get_ptr(tvb, offset2+4, 16)));
-		    break;
-		case 3:
-		    proto_item_append_text(ti, ": Unnumbered: Local %d, Remote %d",
-					   tvb_get_ntohl(tvb, offset2+4), tvb_get_ntohl(tvb, offset2+8));
-		    proto_tree_add_item(lmp_object_tree, lmp_filter[LMPF_VAL_TE_LINK_LOCAL_UNNUM],
-					tvb, offset2+4, 4, FALSE);
-		    proto_tree_add_item(lmp_object_tree, lmp_filter[LMPF_VAL_TE_LINK_REMOTE_UNNUM],
-					tvb, offset2+8, 4, FALSE);
-		    break;
-		default:
-		    proto_tree_add_text(lmp_object_tree, tvb, offset2, mylen,
-					"Data (%d bytes)", mylen);
-		    break;
-		}
-		break;
-
-	    case LMP_09_CLASS_DATA_LINK:
-		l = tvb_get_guint8(tvb, offset2);
-		ti2 = proto_tree_add_uint(lmp_object_tree, lmp_filter[LMPF_VAL_DATA_LINK_FLAGS],
-					  tvb, offset2, 1, l);
-		proto_item_append_text(ti2, ": %s%s",
-				       (l&0x01) ? "Interface-Type-Port " : "Interface-Type-Component-Link ",
-				       (l&0x02) ? "Allocated " : "Unallocated ");
-		lmp_flags_tree = proto_item_add_subtree(ti2, lmp_09_subtree[LMP_TREE_DATA_LINK_FLAGS]);
-		proto_tree_add_boolean(lmp_flags_tree,
-				       lmp_filter[LMPF_VAL_DATA_LINK_FLAGS_PORT],
-				       tvb, offset2, 1, l);
-		proto_tree_add_boolean(lmp_flags_tree,
-				       lmp_filter[LMPF_VAL_DATA_LINK_FLAGS_ALLOCATED],
-				       tvb, offset2, 1, l);
-		switch(type) {
-		case 1:
-		    proto_item_append_text(ti, ": IPv4: Local %s, Remote %s",
-					   ip_to_str(tvb_get_ptr(tvb, offset2+4, 4)),
-					   ip_to_str(tvb_get_ptr(tvb, offset2+8, 4)));
-		    proto_tree_add_item(lmp_object_tree, lmp_filter[LMPF_VAL_DATA_LINK_LOCAL_IPV4],
-					tvb, offset2+4, 4, FALSE);
-		    proto_tree_add_item(lmp_object_tree, lmp_filter[LMPF_VAL_DATA_LINK_REMOTE_IPV4],
-					tvb, offset2+8, 4, FALSE);
-		    l = 12;
-		    break;
-		case 2:
-		    proto_item_append_text(ti, ": IPv6: Local %s, Remote %s",
-					   ip6_to_str((const struct e_in6_addr *)tvb_get_ptr(tvb, offset2+4, 16)),
-					   ip6_to_str((const struct e_in6_addr *)tvb_get_ptr(tvb, offset2+8, 16)));
-		    proto_tree_add_text(lmp_object_tree, tvb, offset2+4, 16,
-					"Data-Link Local ID - IPv6: %s",
-					ip6_to_str((const struct e_in6_addr *)tvb_get_ptr(tvb, offset2, 16)));
-		    proto_tree_add_text(lmp_object_tree, tvb, offset2+20,16,
-					"Data-Link Remote ID - IPv6: %s",
-					ip6_to_str((const struct e_in6_addr *)tvb_get_ptr(tvb, offset2+4, 16)));
-		    l = 36;
-		    break;
-		case 3:
-		    proto_item_append_text(ti, ": Unnumbered: Local %d, Remote %d",
-					   tvb_get_ntohl(tvb, offset2+4), tvb_get_ntohl(tvb, offset2+8));
-		    proto_tree_add_item(lmp_object_tree, lmp_filter[LMPF_VAL_DATA_LINK_LOCAL_UNNUM],
-					tvb, offset2+4, 4, FALSE);
-		    proto_tree_add_item(lmp_object_tree, lmp_filter[LMPF_VAL_DATA_LINK_REMOTE_UNNUM],
-					tvb, offset2+8, 4, FALSE);
-		    l = 12;
-		    break;
-		default:
-		    proto_tree_add_text(lmp_object_tree, tvb, offset2, mylen,
-					"Data (%d bytes)", mylen);
-		    break;
-		}
-
-		while (l < obj_length - 4) {
-		    mylen = tvb_get_guint8(tvb, offset2+l+1);
-		    ti2 = proto_tree_add_item(lmp_object_tree, lmp_filter[LMPF_VAL_DATA_LINK_SUBOBJ],
-					      tvb, offset2+l, mylen, FALSE);
-		    lmp_subobj_tree = proto_item_add_subtree(ti2, lmp_09_subtree[LMP_TREE_DATA_LINK_SUBOBJ]);
-		    proto_tree_add_text(lmp_subobj_tree, tvb, offset2+l, 1,
-					"Subobject Type: %d", tvb_get_guint8(tvb, offset2+l));
-		    if (mylen < 2) {
-			proto_tree_add_text(lmp_subobj_tree, tvb, offset2+l+1, 1,
-					    "Subobject Length: %d (bogus, must be >= 2)", mylen);
-			break;
-		    }
-		    proto_tree_add_text(lmp_subobj_tree, tvb, offset2+l+1, 1,
-					"Subobject Length: %d", mylen);
-		    switch(tvb_get_guint8(tvb, offset2+l)) {
-		    case 1:
-			proto_item_set_text(ti2, "Interface Switching Capability: "
-					    "Switching Cap: %s, Encoding Type: %s, Min BW: %.10g, Max BW: %.10g",
-					    val_to_str(tvb_get_guint8(tvb, offset2+l+2),
-						       gmpls_switching_type_str, "Unknown (%d)"),
-					    val_to_str(tvb_get_guint8(tvb, offset2+l+3),
-						       gmpls_lsp_enc_str, "Unknown (%d)"),
-					    tvb_get_ntohieee_float(tvb, offset2+l+4),
-					    tvb_get_ntohieee_float(tvb, offset2+l+8));
-			proto_tree_add_item(lmp_subobj_tree,
-					    lmp_filter[LMPF_VAL_DATA_LINK_SUBOBJ_SWITCHING_TYPE],
-					    tvb, offset2+l+2, 1, FALSE);
-			proto_tree_add_item(lmp_subobj_tree,
-					    lmp_filter[LMPF_VAL_DATA_LINK_SUBOBJ_LSP_ENCODING],
-					    tvb, offset2+l+3, 1, FALSE);
-			proto_tree_add_text(lmp_subobj_tree, tvb, offset2+l+4, 4,
-					    "Minimum Reservable Bandwidth: %.10g bytes/s",
-					    tvb_get_ntohieee_float(tvb, offset2+l+4));
-			proto_tree_add_text(lmp_subobj_tree, tvb, offset2+l+8, 4,
-					    "Maximum Reservable Bandwidth: %.10g bytes/s",
-					    tvb_get_ntohieee_float(tvb, offset2+l+8));
-			break;
-
-		    case 2:
-			proto_item_set_text(ti2, "Wavelength: %d",
-					    tvb_get_ntohl(tvb, offset2+l+4));
-			proto_tree_add_text(lmp_subobj_tree, tvb, offset2+l+4, 4,
-					    "Wavelength: %d",
-					    tvb_get_ntohl(tvb, offset2+l+4));
-			break;
-
-		    default:
-			proto_tree_add_text(lmp_subobj_tree, tvb, offset2+l+2,
-					    mylen-2,
-					    "Data (%d bytes)", mylen-2);
-			break;
-		    }
-		    l += mylen;
-		}
-		break;
-
-	    case LMP_09_CLASS_CHANNEL_STATUS:
-		k = 0; j = 0;
-		switch(type) {
-		case 1:
-		case 3:
-		    k = 8; break;
-		case 2:
-		    k = 20; break;
-		}
-		if (!k)
-		    break;
-		for (l=0; l<obj_length - 4; ) {
-		    ti2 = proto_tree_add_text(lmp_object_tree, tvb, offset2+l, k,
-					      "Interface-Id");
-		    lmp_subobj_tree = proto_item_add_subtree(ti2, lmp_09_subtree[LMP_TREE_CHANNEL_STATUS_ID]);
-		    switch(type) {
-		    case 1:
-			if (j < 4)
-			    proto_item_append_text(ti, ": [IPv4-%s",
-						   ip_to_str(tvb_get_ptr(tvb, offset2+l, 4)));
-			proto_item_append_text(ti2, ": IPv4 %s",
-					       ip_to_str(tvb_get_ptr(tvb, offset2+l, 4)));
-			proto_tree_add_text(lmp_subobj_tree, tvb, offset2+l, 4,
-					    "Interface ID: IPv4: %s",
-					    ip_to_str(tvb_get_ptr(tvb, offset2+l, 4)));
-			l += 4;
-			break;
-		    case 2:
-			if (j < 4)
-			    proto_item_append_text(ti, ": [IPv6-%s",
-						   ip6_to_str((const struct e_in6_addr *)tvb_get_ptr(tvb, offset2+l, 16)));
-			proto_item_append_text(ti2, ": IPv6 %s",
-					       ip6_to_str((const struct e_in6_addr *)tvb_get_ptr(tvb, offset2+l, 16)));
-			proto_tree_add_text(lmp_subobj_tree, tvb, offset2, 16, "Interface ID: IPv6: %s",
-					    ip6_to_str((const struct e_in6_addr *)tvb_get_ptr(tvb, offset2+l, 16)));
-			l += 16;
-			break;
-		    case 3:
-			if (j < 4)
-			    proto_item_append_text(ti, ": [Unnum-%d", tvb_get_ntohl(tvb, offset2+l));
-			proto_item_append_text(ti, ": Unnumbered %d", tvb_get_ntohl(tvb, offset2+l));
-			proto_tree_add_text(lmp_subobj_tree, tvb, offset2+l, 4,
-					    "Interface ID: Unnumbered: %d",
-					    tvb_get_ntohl(tvb, offset2+l));
-			l += 4;
-			break;
-		    default:
-			proto_tree_add_text(lmp_object_tree, tvb, offset2+l, obj_length-4-l,
-					    "Data (%d bytes)", obj_length-4-l);
-			l = obj_length - 4;
-			break;
-		    }
-		    if (l == obj_length - 4) break;
-
-		    proto_tree_add_text(lmp_subobj_tree, tvb, offset2+l, 1,
-					tvb_get_guint8(tvb, offset2+l) & 0x80 ?
-					"Link Allocated - Active Monitoring" :
-					"Link Not Allocated");
-		    if (j < 4)
-			proto_item_append_text(ti, "-%s,%s], ",
-					       tvb_get_guint8(tvb, offset2+l) & 0x80 ? "Act" : "NA",
-					       val_to_str(tvb_get_ntohl(tvb, offset2+l) & 0x7fffffff,
-							  channel_status_short_str, "UNK (%u)."));
-		    proto_item_append_text(ti2, ": %s, ",
-					   tvb_get_guint8(tvb, offset2+l) & 0x80 ? "Active" : "Not Active");
-		    proto_tree_add_text(lmp_subobj_tree, tvb, offset2+l, 4,
-					"Channel Status: %s",
-					val_to_str(tvb_get_ntohl(tvb, offset2+l) & 0x7fffffff,
-						   channel_status_str, "Unknown (%u). "));
-		    proto_item_append_text(ti2, val_to_str(tvb_get_ntohl(tvb, offset2+l) & 0x7fffffff,
-							   channel_status_str, "Unknown (%u). "));
-		    j++;
-		    l += 4;
-		    if (j==4 && l < obj_length - 4)
-			proto_item_append_text(ti, " ...");
-		}
-		break;
-
-	    case LMP_09_CLASS_CHANNEL_STATUS_REQUEST:
-		for (l=0; l<obj_length - 4; ) {
-		    switch(type) {
-		    case 1:
-			proto_tree_add_text(lmp_object_tree, tvb, offset2+l, 4,
-					    "Interface ID: IPv4: %s",
-					    ip_to_str(tvb_get_ptr(tvb, offset2+l, 4)));
-			l += 4;
-			break;
-		    case 2:
-			proto_tree_add_text(lmp_object_tree, tvb, offset2+l, 16, "Interface ID: IPv6: %s",
-					    ip6_to_str((const struct e_in6_addr *)tvb_get_ptr(tvb, offset2+l,16)));
-			l += 16;
-			break;
-		    case 3:
-			proto_tree_add_text(lmp_object_tree, tvb, offset2+l, 4,
-					    "Interface ID: Unnumbered: %d",
-					    tvb_get_ntohl(tvb, offset2+l));
-			l += 4;
-			break;
-		    default:
-			proto_tree_add_text(lmp_object_tree, tvb, offset2+l, obj_length-4-l,
-					    "Data (%d bytes)", obj_length-4-l);
-			l = obj_length - 4;
-			break;
-		    }
-		}
-		break;
-
-	    case LMP_09_CLASS_ERROR:
-		l = tvb_get_ntohl(tvb, offset2);
-		ti2 = proto_tree_add_uint(lmp_object_tree, lmp_filter[LMPF_VAL_ERROR],
-					  tvb, offset2, 4, l);
-
-		switch(type) {
-		case 1:
-			proto_item_append_text(ti, ": BEGIN_VERIFY_ERROR: %s%s%s%s",
-					       (l&0x01) ? "Unsupported-Link " : "",
-					       (l&0x02) ? "Unwilling" : "",
-					       (l&0x04) ? "Unsupported-Transport" : "",
-					       (l&0x08) ? "TE-Link-ID" : "");
-			lmp_flags_tree = proto_item_add_subtree(ti2, lmp_09_subtree[LMP_TREE_ERROR_FLAGS]);
-			proto_tree_add_boolean(lmp_flags_tree,
-					       lmp_filter[LMPF_VAL_ERROR_VERIFY_UNSUPPORTED_LINK],
-					       tvb, offset, 4, l);
-			proto_tree_add_boolean(lmp_flags_tree,
-					       lmp_filter[LMPF_VAL_ERROR_VERIFY_UNWILLING],
-					       tvb, offset, 4, l);
-			proto_tree_add_boolean(lmp_flags_tree,
-					       lmp_filter[LMPF_VAL_ERROR_VERIFY_TRANSPORT],
-					       tvb, offset, 4, l);
-			proto_tree_add_boolean(lmp_flags_tree,
-					       lmp_filter[LMPF_VAL_ERROR_VERIFY_TE_LINK_ID],
-					       tvb, offset, 4, l);
-			break;
-		case 2:
-			proto_item_append_text(ti, ": LINK_SUMMARY_ERROR: %s%s%s%s%s%s",
-					       (l&0x01) ? "Unacceptable-Params " : "",
-					       (l&0x02) ? "Renegotiate" : "",
-					       (l&0x04) ? "Bad-TE-Link" : "",
-					       (l&0x08) ? "Bad-Data-Link" : "",
-					       (l&0x10) ? "Bad-TE-Link-CType" : "",
-					       (l&0x20) ? "Bad-Data-Link-CType" : "");
-			lmp_flags_tree = proto_item_add_subtree(ti2, lmp_09_subtree[LMP_TREE_ERROR_FLAGS]);
-			proto_tree_add_boolean(lmp_flags_tree,
-					       lmp_filter[LMPF_VAL_ERROR_SUMMARY_BAD_PARAMETERS],
-					       tvb, offset, 4, l);
-			proto_tree_add_boolean(lmp_flags_tree,
-					       lmp_filter[LMPF_VAL_ERROR_SUMMARY_RENEGOTIATE],
-					       tvb, offset, 4, l);
-			proto_tree_add_boolean(lmp_flags_tree,
-					       lmp_filter[LMPF_VAL_ERROR_SUMMARY_BAD_TE_LINK],
-					       tvb, offset, 4, l);
-			proto_tree_add_boolean(lmp_flags_tree,
-					       lmp_filter[LMPF_VAL_ERROR_SUMMARY_BAD_DATA_LINK],
-					       tvb, offset, 4, l);
-			proto_tree_add_boolean(lmp_flags_tree,
-					       lmp_filter[LMPF_VAL_ERROR_SUMMARY_UNKNOWN_TEL_CTYPE],
-					       tvb, offset, 4, l);
-			proto_tree_add_boolean(lmp_flags_tree,
-					       lmp_filter[LMPF_VAL_ERROR_SUMMARY_UNKNOWN_DL_CTYPE],
-					       tvb, offset, 4, l);
-			break;
-		default:
-			proto_item_append_text(ti, ": UNKNOWN_ERROR (%d): 0x%04x", type, l);
-			proto_tree_add_text(lmp_object_tree, tvb, offset2, mylen,
-					    "Data (%d bytes)", mylen);
-			break;
-		}
-		break;
-		
-	    default:
-		proto_tree_add_text(lmp_object_tree, tvb, offset2, mylen,
-					    "Data (%d bytes)", mylen);
-		break;
-	    }
-	  } else {
-	    /* LMP 03 or LMP 02 */
-	    switch (class) {
-	    case LMP_CLASS_NULL:
-		break;
-
-	    case LMP_CLASS_LOCAL_CCID:
-	    case LMP_CLASS_REMOTE_CCID:
-		switch(type) {
-		case 1:
-		    l = (class == LMP_CLASS_LOCAL_CCID) ?
-			LMPF_VAL_LOCAL_CCID : LMPF_VAL_REMOTE_CCID;
-		    proto_item_append_text(ti, ": %d", tvb_get_ntohl(tvb, offset2));
-		    proto_tree_add_uint(lmp_object_tree, lmp_filter[l], tvb, offset2, 4,
-					tvb_get_ntohl(tvb, offset2));
-		    break;
-		default:
-		    proto_tree_add_text(lmp_object_tree, tvb, offset2, mylen,
-					"Data (%d bytes)", mylen);
-		    break;
-		}
-		break;
-
-	    case LMP_CLASS_LOCAL_NODE_ID:
-	    case LMP_CLASS_REMOTE_NODE_ID:
-		switch(type) {
-		case 1:
-		    l = (class == LMP_CLASS_LOCAL_NODE_ID) ?
-			LMPF_VAL_LOCAL_NODE_ID : LMPF_VAL_REMOTE_NODE_ID;
-		    proto_item_append_text(ti, ": %s",
-					   ip_to_str(tvb_get_ptr(tvb, offset2, 4)));
-		    proto_tree_add_item(lmp_object_tree, lmp_filter[l], tvb, offset2, 4,
-					FALSE);
-		    break;
-		default:
-		    proto_tree_add_text(lmp_object_tree, tvb, offset2, mylen,
-					"Data (%d bytes)", mylen);
-		    break;
-		}
-		break;
-
-	    case LMP_CLASS_LOCAL_LINK_ID:
-	    case LMP_CLASS_REMOTE_LINK_ID:
-		switch(type) {
-		case 1:
-		    l = (class == LMP_CLASS_LOCAL_LINK_ID) ?
-			LMPF_VAL_LOCAL_LINK_ID_IPV4 : LMPF_VAL_REMOTE_LINK_ID_IPV4;
-		    proto_item_append_text(ti, ": IPv4 %s",
-					   ip_to_str(tvb_get_ptr(tvb, offset2, 4)));
-		    proto_tree_add_item(lmp_object_tree, lmp_filter[l], tvb, offset2, 4,
-					FALSE);
-		    break;
-		case 2:
-		    proto_item_append_text(ti, ": IPv6 %s",
-					   ip6_to_str((const struct e_in6_addr *)tvb_get_ptr(tvb, offset2, 16)));
-		    proto_tree_add_text(lmp_object_tree, tvb, offset2, 16, "IPv6: %s",
-					ip6_to_str((const struct e_in6_addr *)tvb_get_ptr(tvb, offset2, 16)));
-		    break;
-		case 3:
-		    l = (class == LMP_CLASS_LOCAL_LINK_ID) ?
-			LMPF_VAL_LOCAL_LINK_ID_UNNUM : LMPF_VAL_REMOTE_LINK_ID_UNNUM;
-		    proto_item_append_text(ti, ": Unnumbered %d", tvb_get_ntohl(tvb, offset2));
-		    proto_tree_add_item(lmp_object_tree, lmp_filter[l], tvb, offset2, 4,
-					FALSE);
-		    break;
-		default:
-		    proto_tree_add_text(lmp_object_tree, tvb, offset2, mylen,
-					"Data (%d bytes)", mylen);
-		    break;
-		}
-		break;
-
-	    case LMP_CLASS_LOCAL_INTERFACE_ID:
-	    case LMP_CLASS_REMOTE_INTERFACE_ID:
-		switch(type) {
-		case 1:
-		    l = (class == LMP_CLASS_LOCAL_INTERFACE_ID) ?
-			LMPF_VAL_LOCAL_INTERFACE_ID_IPV4 : LMPF_VAL_REMOTE_INTERFACE_ID_IPV4;
-		    proto_item_append_text(ti, ": IPv4 %s",
-					   ip_to_str(tvb_get_ptr(tvb, offset2, 4)));
-		    proto_tree_add_item(lmp_object_tree, lmp_filter[l], tvb, offset2, 4,
-					FALSE);
-		    break;
-		case 2:
-		    proto_item_append_text(ti, ": IPv6 %s",
-					   ip6_to_str((const struct e_in6_addr *)tvb_get_ptr(tvb, offset2, 16)));
-		    proto_tree_add_text(lmp_object_tree, tvb, offset2, 16, "IPv6: %s",
-					ip6_to_str((const struct e_in6_addr *)tvb_get_ptr(tvb, offset2, 16)));
-		    break;
-		case 3:
-		    l = (class == LMP_CLASS_LOCAL_INTERFACE_ID) ?
-			LMPF_VAL_LOCAL_INTERFACE_ID_UNNUM : LMPF_VAL_REMOTE_INTERFACE_ID_UNNUM;
-		    proto_item_append_text(ti, ": Unnumbered %d", tvb_get_ntohl(tvb, offset2));
-		    proto_tree_add_item(lmp_object_tree, lmp_filter[l], tvb, offset2, 4,
-					FALSE);
-		    break;
-		default:
-		    proto_tree_add_text(lmp_object_tree, tvb, offset2, mylen,
-					"Data (%d bytes)", mylen);
-		    break;
-		}
-		break;
-
-	    case LMP_CLASS_MESSAGE_ID:
-	    case LMP_CLASS_MESSAGE_ID_ACK:
-		switch(type) {
-		case 1:
-		    l = (class == LMP_CLASS_MESSAGE_ID) ?
-			LMPF_VAL_MESSAGE_ID : LMPF_VAL_MESSAGE_ID_ACK;
-		    proto_item_append_text(ti, ": %d", tvb_get_ntohl(tvb, offset2));
-		    proto_tree_add_uint(lmp_object_tree, lmp_filter[l], tvb, offset2, 4,
-					tvb_get_ntohl(tvb, offset2));
-		    break;
-		default:
-		    proto_tree_add_text(lmp_object_tree, tvb, offset2, mylen,
-					"Data (%d bytes)", mylen);
-		    break;
-		}
-		break;
-
-	    case LMP_CLASS_CONFIG:
-		switch(type) {
-		case 1:
-		    proto_item_append_text(ti, ": HelloInterval: %d, HelloDeadInterval: %d",
-					   tvb_get_ntohs(tvb, offset2), tvb_get_ntohs(tvb, offset2+2));
-		    proto_tree_add_uint(lmp_object_tree, lmp_filter[LMPF_VAL_CONFIG_HELLO],
-					tvb, offset2, 2, tvb_get_ntohs(tvb, offset2));
-		    proto_tree_add_uint(lmp_object_tree, lmp_filter[LMPF_VAL_CONFIG_HELLO_DEAD],
-					tvb, offset2+2, 2, tvb_get_ntohs(tvb, offset2+2));
-		    break;
-		default:
-		    proto_tree_add_text(lmp_object_tree, tvb, offset2, mylen,
-					"Data (%d bytes)", mylen);
-		    break;
-		}
-		break;
-
-	    case LMP_CLASS_HELLO:
-		switch(type) {
-		case 1:
-		    proto_item_append_text(ti, ": TxSeq %d, RxSeq: %d",
-					   tvb_get_ntohl(tvb, offset2),
-					   tvb_get_ntohl(tvb, offset2+4));
-		    proto_tree_add_uint(lmp_object_tree, lmp_filter[LMPF_VAL_HELLO_TXSEQ],
-					tvb, offset2, 4, tvb_get_ntohl(tvb, offset2));
-		    proto_tree_add_uint(lmp_object_tree, lmp_filter[LMPF_VAL_HELLO_RXSEQ],
-					tvb, offset2+4, 4, tvb_get_ntohl(tvb, offset2+4));
-		    break;
-		default:
-		    proto_tree_add_text(lmp_object_tree, tvb, offset2, mylen,
-					"Data (%d bytes)", mylen);
-		    break;
-		}
-		break;
-	    case LMP_CLASS_BEGIN_VERIFY:
-		switch(type) {
-		case 1:
-		    l = tvb_get_ntohs(tvb, offset2);
-		    ti2 = proto_tree_add_item(lmp_object_tree, lmp_filter[LMPF_VAL_BEGIN_VERIFY_FLAGS],
-					      tvb, offset2, 2, FALSE);
-			
-		    lmp_flags_tree = proto_item_add_subtree(ti2, lmp_subtree[LMP_TREE_BEGIN_VERIFY_FLAGS]);
-		    proto_tree_add_boolean(lmp_flags_tree, lmp_filter[LMPF_VAL_BEGIN_VERIFY_FLAGS_ALL_LINKS],
-					   tvb, offset2, 2, l);
-		    proto_tree_add_boolean(lmp_flags_tree, lmp_filter[LMPF_VAL_BEGIN_VERIFY_FLAGS_LINK_TYPE],
-					   tvb, offset2, 2, l);
-		    proto_tree_add_text(lmp_object_tree, tvb, offset2+2, 2,
-					"Verify Interval: %d ms", tvb_get_ntohs(tvb, offset2+2));
-		    proto_tree_add_text(lmp_object_tree, tvb, offset2+4, 4,
-					"Number of Data Links: %d", tvb_get_ntohl(tvb, offset2+4));
-		    proto_tree_add_item(lmp_object_tree, lmp_filter[LMPF_VAL_BEGIN_VERIFY_ENCTYPE],
-					tvb, offset2+8, 1, FALSE);
-		    proto_tree_add_text(lmp_object_tree, tvb, offset2+10, 2,
-					"Verify Transport Mechanism: 0x%0x", tvb_get_ntohs(tvb, offset2+10));
-		    proto_tree_add_text(lmp_object_tree, tvb, offset2+12, 4,
-					"Transmission Rate: %.10g", tvb_get_ntohieee_float(tvb, offset2+12));
-		    proto_tree_add_text(lmp_object_tree, tvb, offset2+16, 4,
-					"Wavelength: %d", tvb_get_ntohl(tvb, offset2+16));
-		    break;
-		default:
-		    proto_tree_add_text(lmp_object_tree, tvb, offset2, mylen,
-					"Data (%d bytes)", mylen);
-		    break;
-		}
-		break;
-
-	    case LMP_CLASS_BEGIN_VERIFY_ACK:
-		switch(type) {
-		case 1:
-		    proto_item_append_text(ti, ": VerifyDeadInterval: %d, TransportResponse: 0x%0x",
-					   tvb_get_ntohs(tvb, offset2), tvb_get_ntohs(tvb, offset2+2));
-		    proto_tree_add_text(lmp_object_tree, tvb, offset2, 2,
-					"VerifyDeadInterval: %d ms", tvb_get_ntohs(tvb, offset2));
-		    proto_tree_add_text(lmp_object_tree, tvb, offset2+2, 2,
-					"Verify Transport Response: 0x%0x", tvb_get_ntohs(tvb, offset2+2));
-		    break;
-		default:
-		    proto_tree_add_text(lmp_object_tree, tvb, offset2, mylen,
-					"Data (%d bytes)", mylen);
-		    break;
-		}
-		break;
-
-	    case LMP_CLASS_VERIFY_ID:
-		switch(type) {
-		case 1:
-		    proto_item_append_text(ti, ": %d", tvb_get_ntohl(tvb, offset2));
-		    proto_tree_add_uint(lmp_object_tree, lmp_filter[LMPF_VAL_VERIFY_ID], tvb, offset2, 4,
-					tvb_get_ntohl(tvb, offset2));
-		    break;
-		default:
-		    proto_tree_add_text(lmp_object_tree, tvb, offset2, mylen,
-					"Data (%d bytes)", mylen);
-		    break;
-		}
-		break;
-
-	    case LMP_CLASS_TE_LINK:
-		l = tvb_get_guint8(tvb, offset2);
-		ti2 = proto_tree_add_uint(lmp_object_tree, lmp_filter[LMPF_VAL_TE_LINK_FLAGS],
-					  tvb, offset2, 1, l);
-		proto_item_append_text(ti2, ": %s%s",
-				       (l&0x01) ? "Fault-Mgmt-Supported " : "",
-				       (l&0x02) ? "Link-Verification-Supported " : "");
-		lmp_flags_tree = proto_item_add_subtree(ti2, lmp_subtree[LMP_TREE_TE_LINK_FLAGS]);
-		proto_tree_add_boolean(lmp_flags_tree,
-				       lmp_filter[LMPF_VAL_TE_LINK_FLAGS_FAULT_MGMT],
-				       tvb, offset2, 1, l);
-		proto_tree_add_boolean(lmp_flags_tree,
-				       lmp_filter[LMPF_VAL_TE_LINK_FLAGS_LINK_VERIFY],
-				       tvb, offset2, 1, l);
-		switch(type) {
-		case 1:
-		    proto_item_append_text(ti, ": IPv4: Local %s, Remote %s",
-					   ip_to_str(tvb_get_ptr(tvb, offset2+4, 4)),
-					   ip_to_str(tvb_get_ptr(tvb, offset2+8, 4)));
-		    proto_tree_add_item(lmp_object_tree, lmp_filter[LMPF_VAL_TE_LINK_LOCAL_IPV4],
-					tvb, offset2+4, 4, FALSE);
-		    proto_tree_add_item(lmp_object_tree, lmp_filter[LMPF_VAL_TE_LINK_REMOTE_IPV4],
-					tvb, offset2+8, 4, FALSE);
-		    break;
-		case 2:
-		    proto_item_append_text(ti, ": IPv6: Local %s, Remote %s",
-					   ip6_to_str((const struct e_in6_addr *)tvb_get_ptr(tvb, offset2+4, 16)),
-					   ip6_to_str((const struct e_in6_addr *)tvb_get_ptr(tvb, offset2+8, 16)));
-		    proto_tree_add_text(lmp_object_tree, tvb, offset2+4, 16, "TE-Link Local ID - IPv6: %s",
-					ip6_to_str((const struct e_in6_addr *)tvb_get_ptr(tvb, offset2, 16)));
-		    proto_tree_add_text(lmp_object_tree, tvb, offset2+20,16, "TE-Link Remote ID - IPv6: %s",
-					ip6_to_str((const struct e_in6_addr *)tvb_get_ptr(tvb, offset2+4, 16)));
-		    break;
-		case 3:
-		    proto_item_append_text(ti, ": Unnumbered: Local %d, Remote %d",
-					   tvb_get_ntohl(tvb, offset2+4), tvb_get_ntohl(tvb, offset2+8));
-		    proto_tree_add_item(lmp_object_tree, lmp_filter[LMPF_VAL_TE_LINK_LOCAL_UNNUM],
-					tvb, offset2+4, 4, FALSE);
-		    proto_tree_add_item(lmp_object_tree, lmp_filter[LMPF_VAL_TE_LINK_REMOTE_UNNUM],
-					tvb, offset2+8, 4, FALSE);
-		    break;
-		default:
-		    proto_tree_add_text(lmp_object_tree, tvb, offset2, mylen,
-					"Data (%d bytes)", mylen);
-		    break;
-		}
-		break;
-
-	    case LMP_CLASS_DATA_LINK:
-		l = tvb_get_guint8(tvb, offset2);
-		ti2 = proto_tree_add_uint(lmp_object_tree, lmp_filter[LMPF_VAL_DATA_LINK_FLAGS],
-					  tvb, offset2, 1, l);
-		proto_item_append_text(ti2, ": %s%s",
-				       (l&0x01) ? "Interface-Type-Port " : "Interface-Type-Component-Link ",
-				       (l&0x02) ? "Allocated " : "Unallocated ");
-		lmp_flags_tree = proto_item_add_subtree(ti2, lmp_subtree[LMP_TREE_DATA_LINK_FLAGS]);
-		proto_tree_add_boolean(lmp_flags_tree,
-				       lmp_filter[LMPF_VAL_DATA_LINK_FLAGS_PORT],
-				       tvb, offset2, 1, l);
-		proto_tree_add_boolean(lmp_flags_tree,
-				       lmp_filter[LMPF_VAL_DATA_LINK_FLAGS_ALLOCATED],
-				       tvb, offset2, 1, l);
-		switch(type) {
-		case 1:
-		    proto_item_append_text(ti, ": IPv4: Local %s, Remote %s",
-					   ip_to_str(tvb_get_ptr(tvb, offset2+4, 4)),
-					   ip_to_str(tvb_get_ptr(tvb, offset2+8, 4)));
-		    proto_tree_add_item(lmp_object_tree, lmp_filter[LMPF_VAL_DATA_LINK_LOCAL_IPV4],
-					tvb, offset2+4, 4, FALSE);
-		    proto_tree_add_item(lmp_object_tree, lmp_filter[LMPF_VAL_DATA_LINK_REMOTE_IPV4],
-					tvb, offset2+8, 4, FALSE);
-		    l = 12;
-		    break;
-		case 2:
-		    proto_item_append_text(ti, ": IPv6: Local %s, Remote %s",
-					   ip6_to_str((const struct e_in6_addr *)tvb_get_ptr(tvb, offset2+4, 16)),
-					   ip6_to_str((const struct e_in6_addr *)tvb_get_ptr(tvb, offset2+8, 16)));
-		    proto_tree_add_text(lmp_object_tree, tvb, offset2+4, 16,
-					"Data-Link Local ID - IPv6: %s",
-					ip6_to_str((const struct e_in6_addr *)tvb_get_ptr(tvb, offset2, 16)));
-		    proto_tree_add_text(lmp_object_tree, tvb, offset2+20,16,
-					"Data-Link Remote ID - IPv6: %s",
-					ip6_to_str((const struct e_in6_addr *)tvb_get_ptr(tvb, offset2+4, 16)));
-		    l = 36;
-		    break;
-		case 3:
-		    proto_item_append_text(ti, ": Unnumbered: Local %d, Remote %d",
-					   tvb_get_ntohl(tvb, offset2+4), tvb_get_ntohl(tvb, offset2+8));
-		    proto_tree_add_item(lmp_object_tree, lmp_filter[LMPF_VAL_DATA_LINK_LOCAL_UNNUM],
-					tvb, offset2+4, 4, FALSE);
-		    proto_tree_add_item(lmp_object_tree, lmp_filter[LMPF_VAL_DATA_LINK_REMOTE_UNNUM],
-					tvb, offset2+8, 4, FALSE);
-		    l = 12;
-		    break;
-		default:
-		    proto_tree_add_text(lmp_object_tree, tvb, offset2, mylen,
-					"Data (%d bytes)", mylen);
-		    break;
-		}
-
-		while (l < obj_length - 4) {
-		    mylen = tvb_get_guint8(tvb, offset2+l+1);
-		    ti2 = proto_tree_add_item(lmp_object_tree, lmp_filter[LMPF_VAL_DATA_LINK_SUBOBJ],
-					      tvb, offset2+l, mylen, FALSE);
-		    lmp_subobj_tree = proto_item_add_subtree(ti2, lmp_subtree[LMP_TREE_DATA_LINK_SUBOBJ]);
-		    proto_tree_add_text(lmp_subobj_tree, tvb, offset2+l, 1,
-					"Subobject Type: %d", tvb_get_guint8(tvb, offset2+l));
-		    if (mylen < 2) {
-			proto_tree_add_text(lmp_subobj_tree, tvb, offset2+l+1, 1,
-					    "Subobject Length: %d (bogus, must be >= 2)", mylen);
-			break;
-		    }
-		    proto_tree_add_text(lmp_subobj_tree, tvb, offset2+l+1, 1,
-					"Subobject Length: %d", mylen);
-		    switch(tvb_get_guint8(tvb, offset2+l)) {
-		    case 1:
-			proto_item_set_text(ti2, "Interface Switching Capability: "
-					    "Switching Cap: %s, Encoding Type: %s, Min BW: %.10g, Max BW: %.10g",
-					    val_to_str(tvb_get_guint8(tvb, offset2+l+2),
-						       gmpls_switching_type_str, "Unknown (%d)"),
-					    val_to_str(tvb_get_guint8(tvb, offset2+l+3),
-						       gmpls_lsp_enc_str, "Unknown (%d)"),
-					    tvb_get_ntohieee_float(tvb, offset2+l+4),
-					    tvb_get_ntohieee_float(tvb, offset2+l+8));
-			proto_tree_add_item(lmp_subobj_tree,
-					    lmp_filter[LMPF_VAL_DATA_LINK_SUBOBJ_SWITCHING_TYPE],
-					    tvb, offset2+l+2, 1, FALSE);
-			proto_tree_add_item(lmp_subobj_tree,
-					    lmp_filter[LMPF_VAL_DATA_LINK_SUBOBJ_LSP_ENCODING],
-					    tvb, offset2+l+3, 1, FALSE);
-			proto_tree_add_text(lmp_subobj_tree, tvb, offset2+l+4, 4,
-					    "Minimum Reservable Bandwidth: %.10g bytes/s",
-					    tvb_get_ntohieee_float(tvb, offset2+l+4));
-			proto_tree_add_text(lmp_subobj_tree, tvb, offset2+l+8, 4,
-					    "Maximum Reservable Bandwidth: %.10g bytes/s",
-					    tvb_get_ntohieee_float(tvb, offset2+l+8));
-			break;
-
-		    case 2:
-			proto_item_set_text(ti2, "Wavelength: %d",
-					    tvb_get_ntohl(tvb, offset2+l+4));
-			proto_tree_add_text(lmp_subobj_tree, tvb, offset2+l+4, 4,
-					    "Wavelength: %d",
-					    tvb_get_ntohl(tvb, offset2+l+4));
-			break;
-			    
-		    default:
-			proto_tree_add_text(lmp_subobj_tree, tvb, offset2+l+2,
-					    mylen,
-					    "Data (%d bytes)", mylen-2);
-			break;
-		    }
-		    l += mylen;
-		}
-		break;
-
-	    case LMP_CLASS_CHANNEL_STATUS:
-		k = 0; j = 0;
-		switch(type) {
-		case 1:
-		case 3:
-		    k = 8; break;
-		case 2:
-		    k = 20; break;
-		}
-		if (!k)
-		    break;
-		for (l=0; l<obj_length - 4; ) {
-		    ti2 = proto_tree_add_text(lmp_object_tree, tvb, offset2+l, k,
-					      "Interface-Id");
-		    lmp_subobj_tree = proto_item_add_subtree(ti2, lmp_subtree[LMP_TREE_CHANNEL_STATUS_ID]);
-		    switch(type) {
-		    case 1:
-			if (j < 4)
-			    proto_item_append_text(ti, ": [IPv4-%s",
-						   ip_to_str(tvb_get_ptr(tvb, offset2+l, 4)));
-			proto_item_append_text(ti2, ": IPv4 %s",
-					       ip_to_str(tvb_get_ptr(tvb, offset2+l, 4)));
-			proto_tree_add_text(lmp_subobj_tree, tvb, offset2+l, 4,
-					    "Interface ID: IPv4: %s",
-					    ip_to_str(tvb_get_ptr(tvb, offset2+l, 4)));
-			l += 4;
-			break;
-		    case 2:
-			if (j < 4)
-			    proto_item_append_text(ti, ": [IPv6-%s",
-						   ip6_to_str((const struct e_in6_addr *)tvb_get_ptr(tvb, offset2+l, 16)));
-			proto_item_append_text(ti2, ": IPv6 %s",
-					       ip6_to_str((const struct e_in6_addr *)tvb_get_ptr(tvb, offset2+l, 16)));
-			proto_tree_add_text(lmp_subobj_tree, tvb, offset2, 16, "Interface ID: IPv6: %s",
-					    ip6_to_str((const struct e_in6_addr *)tvb_get_ptr(tvb, offset2+l, 16)));
-			l += 16;
-			break;
-		    case 3:
-			if (j < 4)
-			    proto_item_append_text(ti, ": [Unnum-%d", tvb_get_ntohl(tvb, offset2+l));
-			proto_item_append_text(ti, ": Unnumbered %d", tvb_get_ntohl(tvb, offset2+l));
-			proto_tree_add_text(lmp_subobj_tree, tvb, offset2+l, 4,
-					    "Interface ID: Unnumbered: %d",
-					    tvb_get_ntohl(tvb, offset2+l));
-			l += 4;
-			break;
-		    default:
-			proto_tree_add_text(lmp_object_tree, tvb, offset2+l, obj_length-4-l,
-					    "Data (%d bytes)", obj_length-4-l);
-			l = obj_length - 4;
-			break;
-		    }
-		    if (l == obj_length - 4) break;
-
-		    proto_tree_add_text(lmp_subobj_tree, tvb, offset2+l, 1,
-					tvb_get_guint8(tvb, offset2+l) & 0x80 ?
-					"Link Allocated - Active Monitoring" :
-					"Link Not Allocated");
-		    if (j < 4)
-			proto_item_append_text(ti, "-%s,%s], ",
-					       tvb_get_guint8(tvb, offset2+l) & 0x80 ? "Act" : "NA",
-					       val_to_str(tvb_get_ntohl(tvb, offset2+l) & 0x7fffffff,
-							  channel_status_short_str, "UNK (%u)."));
-		    proto_item_append_text(ti2, ": %s, ",
-					   tvb_get_guint8(tvb, offset2+l) & 0x80 ? "Active" : "Not Active");
-		    proto_tree_add_text(lmp_subobj_tree, tvb, offset2+l, 4,
-					"Channel Status: %s",
-					val_to_str(tvb_get_ntohl(tvb, offset2+l) & 0x7fffffff,
-						   channel_status_str, "Unknown (%u). "));
-		    proto_item_append_text(ti2, val_to_str(tvb_get_ntohl(tvb, offset2+l) & 0x7fffffff,
-							   channel_status_str, "Unknown (%u). "));
-		    j++;
-		    l += 4;
-		    if (j==4 && l < obj_length - 4)
-			proto_item_append_text(ti, " ...");
-		}
-		break;
-
-	    case LMP_CLASS_CHANNEL_STATUS_REQUEST:
-		for (l=0; l<obj_length - 4; ) {
-		    switch(type) {
-		    case 1:
-			proto_tree_add_text(lmp_object_tree, tvb, offset2+l, 4,
-					    "Interface ID: IPv4: %s",
-					    ip_to_str(tvb_get_ptr(tvb, offset2+l, 4)));
-			l += 4;
-			break;
-		    case 2:
-			proto_tree_add_text(lmp_object_tree, tvb, offset2+l, 16, "Interface ID: IPv6: %s",
-					    ip6_to_str((const struct e_in6_addr *)tvb_get_ptr(tvb, offset2+l,16)));
-			l += 16;
-			break;
-		    case 3:
-			proto_tree_add_text(lmp_object_tree, tvb, offset2+l, 4,
-					    "Interface ID: Unnumbered: %d",
-					    tvb_get_ntohl(tvb, offset2+l));
-			l += 4;
-			break;
-		    default:
-			proto_tree_add_text(lmp_object_tree, tvb, offset2+l, obj_length-4-l,
-					    "Data (%d bytes)", obj_length-4-l);
-			l = obj_length - 4;
-			break;
-		    }
-		}
-		break;
-
-	    case LMP_CLASS_ERROR:
-		l = tvb_get_ntohl(tvb, offset2);
-		ti2 = proto_tree_add_uint(lmp_object_tree, lmp_filter[LMPF_VAL_ERROR],
-					  tvb, offset2, 4, l);
-
-		/* Errors are different in draft-02 and draft-03 */
-		switch(lmp_draft_ver) {
-		case LMP_VER_DRAFT_CCAMP_02:
-		    switch(type) {
-		    case 1:
-			proto_item_append_text(ti, ": CONFIG_ERROR: %s%s%s",
-					       (l&0x01) ? "Unacceptable-Params " : "",
-					       (l&0x02) ? "Renegotiate" : "",
-					       (l&0x04) ? "Bad Received CCID" : "");
-			lmp_flags_tree = proto_item_add_subtree(ti2, lmp_subtree[LMP_TREE_ERROR_FLAGS]);
-			proto_tree_add_boolean(lmp_flags_tree,
-					       lmp_filter[LMPF_VAL_ERROR_CONFIG_BAD_PARAMETERS],
-					       tvb, offset, 4, l);
-			proto_tree_add_boolean(lmp_flags_tree,
-					       lmp_filter[LMPF_VAL_ERROR_CONFIG_RENEGOTIATE],
-					       tvb, offset, 4, l);
-			proto_tree_add_boolean(lmp_flags_tree,
-					       lmp_filter[LMPF_VAL_ERROR_CONFIG_BAD_CCID],
-					       tvb, offset, 4, l);
-			break;
-		    case 2:
-			proto_item_append_text(ti, ": BEGIN_VERIFY_ERROR: %s%s%s%s",
-					       (l&0x01) ? "Unsupported-Link " : "",
-					       (l&0x02) ? "Unwilling" : "",
-					       (l&0x04) ? "Unsupported-Transport" : "",
-					       (l&0x08) ? "TE-Link-ID" : "");
-			lmp_flags_tree = proto_item_add_subtree(ti2, lmp_subtree[LMP_TREE_ERROR_FLAGS]);
-			proto_tree_add_boolean(lmp_flags_tree,
-					       lmp_filter[LMPF_VAL_ERROR_VERIFY_UNSUPPORTED_LINK],
-					       tvb, offset, 4, l);
-			proto_tree_add_boolean(lmp_flags_tree,
-					       lmp_filter[LMPF_VAL_ERROR_VERIFY_UNWILLING],
-					       tvb, offset, 4, l);
-			proto_tree_add_boolean(lmp_flags_tree,
-					       lmp_filter[LMPF_VAL_ERROR_VERIFY_TRANSPORT],
-					       tvb, offset, 4, l);
-			proto_tree_add_boolean(lmp_flags_tree,
-					       lmp_filter[LMPF_VAL_ERROR_VERIFY_TE_LINK_ID],
-					       tvb, offset, 4, l);
-			break;
-		    case 3:
-			proto_item_append_text(ti, ": LINK_SUMMARY_ERROR: %s%s%s",
-					       (l&0x01) ? "Unacceptable-Params " : "",
-					       (l&0x02) ? "Renegotiate" : "",
-					       (l&0x04) ? "Remote-Link-ID" : "");
-
-
-			lmp_flags_tree = proto_item_add_subtree(ti2, lmp_subtree[LMP_TREE_ERROR_FLAGS]);
-			proto_tree_add_boolean(lmp_flags_tree,
-					       lmp_filter[LMPF_VAL_ERROR_SUMMARY_BAD_PARAMETERS],
-					       tvb, offset, 4, l);
-			proto_tree_add_boolean(lmp_flags_tree,
-					       lmp_filter[LMPF_VAL_ERROR_SUMMARY_RENEGOTIATE],
-					       tvb, offset, 4, l);
-			proto_tree_add_boolean(lmp_flags_tree,
-					       lmp_filter[LMPF_VAL_ERROR_SUMMARY_BAD_REMOTE_LINK_ID],
-					       tvb, offset, 4, l);
-			break;
-
-		    default:
-			proto_item_append_text(ti, ": UNKNOWN_ERROR (%d): 0x%04x", type, l);
-			proto_tree_add_text(lmp_object_tree, tvb, offset2, mylen,
-					    "Data (%d bytes)", mylen);
-			break;
-		    }
-		    break;
-		default:
-		case LMP_VER_DRAFT_CCAMP_03:
-		    switch(type) {
-		    case 1:
-			proto_item_append_text(ti, ": BEGIN_VERIFY_ERROR: %s%s%s%s",
-					       (l&0x01) ? "Unsupported-Link " : "",
-					       (l&0x02) ? "Unwilling" : "",
-					       (l&0x04) ? "Unsupported-Transport" : "",
-					       (l&0x08) ? "TE-Link-ID" : "");
-			lmp_flags_tree = proto_item_add_subtree(ti2, lmp_09_subtree[LMP_TREE_ERROR_FLAGS]);
-			proto_tree_add_boolean(lmp_flags_tree,
-					       lmp_filter[LMPF_VAL_ERROR_VERIFY_UNSUPPORTED_LINK],
-					       tvb, offset, 4, l);
-			proto_tree_add_boolean(lmp_flags_tree,
-					       lmp_filter[LMPF_VAL_ERROR_VERIFY_UNWILLING],
-					       tvb, offset, 4, l);
-			proto_tree_add_boolean(lmp_flags_tree,
-					       lmp_filter[LMPF_VAL_ERROR_VERIFY_TRANSPORT],
-					       tvb, offset, 4, l);
-			proto_tree_add_boolean(lmp_flags_tree,
-					       lmp_filter[LMPF_VAL_ERROR_VERIFY_TE_LINK_ID],
-					       tvb, offset, 4, l);
-			break;
-		    case 2:
-			proto_item_append_text(ti, ": LINK_SUMMARY_ERROR: %s%s%s%s%s",
-					       (l&0x01) ? "Unacceptable-Params " : "",
-					       (l&0x02) ? "Renegotiate" : "",
-					       (l&0x04) ? "Remote-Link-ID" : "",
-					       (l&0x08) ? "TE-Link" : "",
-					       (l&0x10) ? "Data-Link" : "");
-
-			lmp_flags_tree = proto_item_add_subtree(ti2, lmp_09_subtree[LMP_TREE_ERROR_FLAGS]);
-			proto_tree_add_boolean(lmp_flags_tree,
-					       lmp_filter[LMPF_VAL_ERROR_SUMMARY_BAD_PARAMETERS],
-					       tvb, offset, 4, l);
-			proto_tree_add_boolean(lmp_flags_tree,
-					       lmp_filter[LMPF_VAL_ERROR_SUMMARY_RENEGOTIATE],
-					       tvb, offset, 4, l);
-			proto_tree_add_boolean(lmp_flags_tree,
-					       lmp_filter[LMPF_VAL_ERROR_SUMMARY_BAD_REMOTE_LINK_ID],
-					       tvb, offset, 4, l);
-			proto_tree_add_boolean(lmp_flags_tree,
-					       lmp_filter[LMPF_VAL_ERROR_SUMMARY_BAD_TE_LINK],
-					       tvb, offset, 4, l);
-			proto_tree_add_boolean(lmp_flags_tree,
-					       lmp_filter[LMPF_VAL_ERROR_SUMMARY_BAD_DATA_LINK],
-					       tvb, offset, 4, l);
-			break;
-		    default:
-			proto_item_append_text(ti, ": UNKNOWN_ERROR (%d): 0x%04x", type, l);
-			proto_tree_add_text(lmp_object_tree, tvb, offset2, mylen,
-					    "Data (%d bytes)", mylen);
-			break;
-		    } /* switch type */
-		    break;
-		  } /* default case in ERROR object switch */
+	      default:
+		  proto_tree_add_text(lmp_object_tree, tvb, offset2, mylen,
+				      "Data (%d bytes)", mylen);
+		  break;
+	      }
+	      break;
+
+	  case LMP_CLASS_BEGIN_VERIFY_ACK:
+
+	      switch(type) {
+
+	      case 1:
+		  proto_item_append_text(ti, ": VerifyDeadInterval: %d, TransportResponse: 0x%0x",
+					 tvb_get_ntohs(tvb, offset2), 
+					 tvb_get_ntohs(tvb, offset2+2));
+		  proto_tree_add_text(lmp_object_tree, tvb, offset2, 2,
+				      "VerifyDeadInterval: %d ms", 
+				      tvb_get_ntohs(tvb, offset2));
+		  proto_tree_add_text(lmp_object_tree, tvb, offset2+2, 2,
+				      "Verify Transport Response: 0x%0x", 
+				      tvb_get_ntohs(tvb, offset2+2));
+		  break;
 
 	      default:
-		proto_tree_add_text(lmp_object_tree, tvb, offset2, mylen,
-				    "Data (%d bytes)", mylen);
-		break;
-	    }
+		  proto_tree_add_text(lmp_object_tree, tvb, offset2, mylen,
+				      "Data (%d bytes)", mylen);
+		  break;
+	      }
+	      break;
+	      
+	  case LMP_CLASS_VERIFY_ID:
+
+	      switch(type) {
+
+	      case 1:
+		  proto_item_append_text(ti, ": %d", 
+					 tvb_get_ntohl(tvb, offset2));
+		  proto_tree_add_uint(lmp_object_tree, 
+				      lmp_filter[LMPF_VAL_VERIFY_ID], 
+				      tvb, offset2, 4,
+				      tvb_get_ntohl(tvb, offset2));
+		  break;
+	      default:
+		  proto_tree_add_text(lmp_object_tree, tvb, offset2, mylen,
+				      "Data (%d bytes)", mylen);
+		  break;
+	      }
+	      break;
+
+	  case LMP_CLASS_TE_LINK:
+	      l = tvb_get_guint8(tvb, offset2);
+	      ti2 = proto_tree_add_uint(lmp_object_tree, 
+					lmp_filter[LMPF_VAL_TE_LINK_FLAGS],
+					tvb, offset2, 1, l);
+	      
+	      proto_item_append_text(ti2, ": %s%s",
+				     (l&0x01) ? "Fault-Mgmt-Supported " : "",
+				     (l&0x02) ? "Link-Verification-Supported " : "");
+	      
+	      lmp_flags_tree = proto_item_add_subtree(ti2, 
+						      lmp_subtree[LMP_TREE_TE_LINK_FLAGS]);
+	      proto_tree_add_boolean(lmp_flags_tree,
+				     lmp_filter[LMPF_VAL_TE_LINK_FLAGS_FAULT_MGMT],
+				     tvb, offset2, 1, l);
+	      proto_tree_add_boolean(lmp_flags_tree,
+				     lmp_filter[LMPF_VAL_TE_LINK_FLAGS_LINK_VERIFY],
+				     tvb, offset2, 1, l);
+	      switch(type) {
+
+	      case 1:
+		  proto_item_append_text(ti, ": IPv4: Local %s, Remote %s",
+					 ip_to_str(tvb_get_ptr(tvb, offset2+4, 4)),
+					 ip_to_str(tvb_get_ptr(tvb, offset2+8, 4)));
+		  proto_tree_add_item(lmp_object_tree, 
+				      lmp_filter[LMPF_VAL_TE_LINK_LOCAL_IPV4],
+				      tvb, offset2+4, 4, FALSE);
+		  proto_tree_add_item(lmp_object_tree, 
+				      lmp_filter[LMPF_VAL_TE_LINK_REMOTE_IPV4],
+				      tvb, offset2+8, 4, FALSE);
+		  break;
+		  
+	      case 2:
+		  proto_item_append_text(ti, ": IPv6: Local %s, Remote %s",
+					 ip6_to_str((const struct e_in6_addr *)tvb_get_ptr(tvb, offset2+4, 16)),
+					 ip6_to_str((const struct e_in6_addr *)tvb_get_ptr(tvb, offset2+8, 16)));
+		  proto_tree_add_text(lmp_object_tree, tvb, offset2+4, 16, 
+				      "TE-Link Local ID - IPv6: %s",
+				      ip6_to_str((const struct e_in6_addr *)tvb_get_ptr(tvb, offset2, 16)));
+		  proto_tree_add_text(lmp_object_tree, tvb, offset2+20,16, 
+				      "TE-Link Remote ID - IPv6: %s",
+				      ip6_to_str((const struct e_in6_addr *)tvb_get_ptr(tvb, offset2+4, 16)));
+		  break;
+
+	      case 3:
+		  proto_item_append_text(ti, ": Unnumbered: Local %d, Remote %d",
+					 tvb_get_ntohl(tvb, offset2+4), 
+					 tvb_get_ntohl(tvb, offset2+8));
+		  
+		  proto_tree_add_item(lmp_object_tree, 
+				      lmp_filter[LMPF_VAL_TE_LINK_LOCAL_UNNUM],
+				      tvb, offset2+4, 4, FALSE);
+		  
+		  proto_tree_add_item(lmp_object_tree, 
+				      lmp_filter[LMPF_VAL_TE_LINK_REMOTE_UNNUM],
+				      tvb, offset2+8, 4, FALSE);
+		  break;
+	      default:
+		  proto_tree_add_text(lmp_object_tree, tvb, offset2, mylen,
+				      "Data (%d bytes)", mylen);
+		  break;
+	      }
+	      break;
+	      
+	  case LMP_CLASS_DATA_LINK:
+
+	      l = tvb_get_guint8(tvb, offset2);
+	      ti2 = proto_tree_add_uint(lmp_object_tree, 
+					lmp_filter[LMPF_VAL_DATA_LINK_FLAGS],
+					tvb, offset2, 1, l);
+	      proto_item_append_text(ti2, ": %s%s",
+				     (l&0x01) ? "Interface-Type-Port " : "Interface-Type-Component-Link ",
+				     (l&0x02) ? "Allocated " : "Unallocated ");
+
+	      lmp_flags_tree = proto_item_add_subtree(ti2, 
+						      lmp_subtree[LMP_TREE_DATA_LINK_FLAGS]);
+	      proto_tree_add_boolean(lmp_flags_tree,
+				     lmp_filter[LMPF_VAL_DATA_LINK_FLAGS_PORT],
+				     tvb, offset2, 1, l);
+	      proto_tree_add_boolean(lmp_flags_tree,
+				     lmp_filter[LMPF_VAL_DATA_LINK_FLAGS_ALLOCATED],
+				     tvb, offset2, 1, l);
+	      switch(type) {
+
+	      case 1:
+		  proto_item_append_text(ti, ": IPv4: Local %s, Remote %s",
+					 ip_to_str(tvb_get_ptr(tvb, offset2+4, 4)),
+					 ip_to_str(tvb_get_ptr(tvb, offset2+8, 4)));
+
+		  proto_tree_add_item(lmp_object_tree, 
+				      lmp_filter[LMPF_VAL_DATA_LINK_LOCAL_IPV4],
+				      tvb, offset2+4, 4, FALSE);
+
+		  proto_tree_add_item(lmp_object_tree, 
+				      lmp_filter[LMPF_VAL_DATA_LINK_REMOTE_IPV4],
+				      tvb, offset2+8, 4, FALSE);
+		  l = 12;
+		  break;
+
+	      case 2:
+		  proto_item_append_text(ti, ": IPv6: Local %s, Remote %s",
+					 ip6_to_str((const struct e_in6_addr *)tvb_get_ptr(tvb, offset2+4, 16)),
+					 ip6_to_str((const struct e_in6_addr *)tvb_get_ptr(tvb, offset2+8, 16)));
+		  proto_tree_add_text(lmp_object_tree, tvb, offset2+4, 16,
+				      "Data-Link Local ID - IPv6: %s",
+				      ip6_to_str((const struct e_in6_addr *)tvb_get_ptr(tvb, offset2, 16)));
+		  proto_tree_add_text(lmp_object_tree, tvb, offset2+20,16,
+				      "Data-Link Remote ID - IPv6: %s",
+				      ip6_to_str((const struct e_in6_addr *)tvb_get_ptr(tvb, offset2+4, 16)));
+		  l = 36;
+		  break;
+
+	      case 3:
+		  proto_item_append_text(ti, ": Unnumbered: Local %d, Remote %d",
+					 tvb_get_ntohl(tvb, offset2+4), 
+					 tvb_get_ntohl(tvb, offset2+8));
+		  proto_tree_add_item(lmp_object_tree, 
+				      lmp_filter[LMPF_VAL_DATA_LINK_LOCAL_UNNUM],
+				      tvb, offset2+4, 4, FALSE);
+		  proto_tree_add_item(lmp_object_tree, lmp_filter[LMPF_VAL_DATA_LINK_REMOTE_UNNUM],
+				      tvb, offset2+8, 4, FALSE);
+		  l = 12;
+		  break;
 
-	  } /* LMP_VER_DRAFT_CCAMP_03 */
+	      default:
+		  proto_tree_add_text(lmp_object_tree, tvb, offset2, mylen,
+				      "Data (%d bytes)", mylen);
+		  break;
+	      }
+	      
+	      while (l < obj_length - 4) {
+		  mylen = tvb_get_guint8(tvb, offset2+l+1);
+		  ti2 = proto_tree_add_item(lmp_object_tree, 
+					    lmp_filter[LMPF_VAL_DATA_LINK_SUBOBJ],
+					    tvb, offset2+l, mylen, FALSE);
+		  lmp_subobj_tree = proto_item_add_subtree(ti2, 
+							   lmp_subtree[LMP_TREE_DATA_LINK_SUBOBJ]);
+		  proto_tree_add_text(lmp_subobj_tree, tvb, offset2+l, 1,
+				      "Subobject Type: %d", 
+				      tvb_get_guint8(tvb, offset2+l));
+
+		  proto_tree_add_text(lmp_subobj_tree, tvb, offset2+l+1, 1,
+				      "Subobject Length: %d", mylen);
+		  switch(tvb_get_guint8(tvb, offset2+l)) {
+
+		  case 1:
+
+		      proto_item_set_text(ti2, "Interface Switching Capability: "
+					  "Switching Cap: %s, Encoding Type: %s, "
+					  "Min BW: %.10g, Max BW: %.10g",
+					  val_to_str(tvb_get_guint8(tvb, offset2+l+2),
+						     gmpls_switching_type_str, "Unknown (%d)"),
+					  val_to_str(tvb_get_guint8(tvb, offset2+l+3),
+						     gmpls_lsp_enc_str, "Unknown (%d)"),
+					  tvb_get_ntohieee_float(tvb, offset2+l+4),
+					  tvb_get_ntohieee_float(tvb, offset2+l+8));
+		      proto_tree_add_item(lmp_subobj_tree,
+					  lmp_filter[LMPF_VAL_DATA_LINK_SUBOBJ_SWITCHING_TYPE],
+					  tvb, offset2+l+2, 1, FALSE);
+		      proto_tree_add_item(lmp_subobj_tree,
+					  lmp_filter[LMPF_VAL_DATA_LINK_SUBOBJ_LSP_ENCODING],
+					  tvb, offset2+l+3, 1, FALSE);
+		      proto_tree_add_text(lmp_subobj_tree, tvb, offset2+l+4, 4,
+					  "Minimum Reservable Bandwidth: %.10g bytes/s",
+					  tvb_get_ntohieee_float(tvb, offset2+l+4));
+		      proto_tree_add_text(lmp_subobj_tree, tvb, offset2+l+8, 4,
+					  "Maximum Reservable Bandwidth: %.10g bytes/s",
+					  tvb_get_ntohieee_float(tvb, offset2+l+8));
+		      break;
+		      
+		  case 2:
+		      proto_item_set_text(ti2, "Wavelength: %d",
+					  tvb_get_ntohl(tvb, offset2+l+2));
+		      proto_tree_add_text(lmp_subobj_tree, tvb, offset2+l+4, 4,
+					  "Wavelength: %d",
+					  tvb_get_ntohl(tvb, offset2+l+4));
+		      break;
+		      
+		  default:
+		      proto_tree_add_text(lmp_subobj_tree, tvb, offset2+l,
+					  tvb_get_guint8(tvb, offset2+l+1),
+					  "Data (%d bytes)", tvb_get_guint8(tvb, offset2+l+1));
+		      break;
+		  }
+		  l += tvb_get_guint8(tvb, offset2+l+1);
+	      }
+	      
+	      break;
+	      
+	  case LMP_CLASS_CHANNEL_STATUS:
+
+	      k = 0; j = 0;
+
+	      switch(type) {
+
+	      case 1:
+	      case 3:
+		  k = 8; break;
+
+	      case 2:
+		  k = 20; break;
+	      }
+
+	      if (!k)
+		  break;
+
+	      for (l=0; l<obj_length - 4; ) {
+
+		  ti2 = proto_tree_add_text(lmp_object_tree, tvb, offset2+l, k,
+					    "Interface-Id");
+		  lmp_subobj_tree = proto_item_add_subtree(ti2, 
+							   lmp_subtree[LMP_TREE_CHANNEL_STATUS_ID]);
+		  switch(type) {
+
+		  case 1:
+		      if (j < 4)
+			  proto_item_append_text(ti, ": [IPv4-%s",
+						 ip_to_str(tvb_get_ptr(tvb, offset2+l, 4)));
+		      proto_item_append_text(ti2, ": IPv4 %s",
+					     ip_to_str(tvb_get_ptr(tvb, offset2+l, 4)));
+		      proto_tree_add_text(lmp_subobj_tree, tvb, offset2+l, 4,
+					  "Interface ID: IPv4: %s",
+					  ip_to_str(tvb_get_ptr(tvb, offset2+l, 4)));
+		      l += 4;
+		      break;
+
+		  case 2:
+		      if (j < 4)
+			  proto_item_append_text(ti, ": [IPv6-%s",
+						 ip6_to_str((const struct e_in6_addr *)tvb_get_ptr(tvb, offset2+l, 16)));
+		      proto_item_append_text(ti2, ": IPv6 %s",
+					     ip6_to_str((const struct e_in6_addr *)tvb_get_ptr(tvb, offset2+l, 16)));
+		      proto_tree_add_text(lmp_subobj_tree, tvb, offset2, 16, "Interface ID: IPv6: %s",
+					  ip6_to_str((const struct e_in6_addr *)tvb_get_ptr(tvb, offset2+l, 16)));
+		      l += 16;
+		      break;
+
+		  case 3:
+		      if (j < 4)
+			  proto_item_append_text(ti, ": [Unnum-%d", 
+						 tvb_get_ntohl(tvb, offset2+l));
+		      proto_item_append_text(ti, ": Unnumbered %d", 
+					     tvb_get_ntohl(tvb, offset2+l));
+		      proto_tree_add_text(lmp_subobj_tree, tvb, offset2+l, 4,
+					  "Interface ID: Unnumbered: %d",
+					  tvb_get_ntohl(tvb, offset2+l));
+		      l += 4;
+		      break;
+
+		  default:
+		      proto_tree_add_text(lmp_object_tree, tvb, offset2+l, obj_length-4-l,
+					  "Data (%d bytes)", obj_length-4-l);
+		      l = obj_length - 4;
+		      break;
+		  }
+		  if (l == obj_length - 4) break;
+		  
+		  proto_tree_add_text(lmp_subobj_tree, tvb, offset2+l, 1,
+				      tvb_get_guint8(tvb, offset2+l) & 0x80 ?
+				      "Link Allocated - Active Monitoring" :
+				      "Link Not Allocated");
+		  if (j < 4)
+		      proto_item_append_text(ti, "-%s,%s], ",
+					     tvb_get_guint8(tvb, offset2+l) & 0x80 ? "Act" : "NA",
+					     val_to_str(tvb_get_ntohl(tvb, offset2+l) & 0x7fffffff,
+							channel_status_short_str, "UNK (%u)."));
+		  proto_item_append_text(ti2, ": %s, ",
+					 tvb_get_guint8(tvb, offset2+l) & 0x80 ? "Active" : "Not Active");
+		  proto_tree_add_text(lmp_subobj_tree, tvb, offset2+l, 4,
+				      "Channel Status: %s",
+				      val_to_str(tvb_get_ntohl(tvb, offset2+l) & 0x7fffffff,
+						 channel_status_str, "Unknown (%u). "));
+		  proto_item_append_text(ti2, val_to_str(tvb_get_ntohl(tvb, offset2+l) & 0x7fffffff,
+							 channel_status_str, "Unknown (%u). "));
+		  j++;
+		  l += 4;
+		  if (j==4 && l < obj_length - 4)
+		      proto_item_append_text(ti, " ...");
+	      }
+	      break;
+
+	  case LMP_CLASS_CHANNEL_STATUS_REQUEST:
+	      for (l=0; l<obj_length - 4; ) {
+		  switch(type) {
+		  case 1:
+		      proto_tree_add_text(lmp_object_tree, tvb, offset2+l, 4,
+					  "Interface ID: IPv4: %s",
+					  ip_to_str(tvb_get_ptr(tvb, offset2+l, 4)));
+		      l += 4;
+		      break;
+
+		  case 2:
+		      proto_tree_add_text(lmp_object_tree, tvb, offset2+l, 16, "Interface ID: IPv6: %s",
+					  ip6_to_str((const struct e_in6_addr *)tvb_get_ptr(tvb, offset2+l,16)));
+		      l += 16;
+		      break;
+
+		  case 3:
+		      proto_tree_add_text(lmp_object_tree, tvb, offset2+l, 4,
+					  "Interface ID: Unnumbered: %d",
+					  tvb_get_ntohl(tvb, offset2+l));
+		      l += 4;
+		      break;
+
+		  default:
+		      proto_tree_add_text(lmp_object_tree, tvb, offset2+l, 
+					  obj_length-4-l,
+					  "Data (%d bytes)", obj_length-4-l);
+		      l = obj_length - 4;
+		      break;
+		  }
+	      }
+	      break;
+	      
+	  case LMP_CLASS_ERROR:
+	      l = tvb_get_ntohl(tvb, offset2);
+	      ti2 = proto_tree_add_uint(lmp_object_tree, lmp_filter[LMPF_VAL_ERROR],
+					tvb, offset2, 4, l);
+
+	      switch(type) {
+
+	      case 1:
+		  proto_item_append_text(ti, ": BEGIN_VERIFY_ERROR: %s%s%s%s",
+					 (l&0x01) ? "Unsupported-Link " : "",
+					 (l&0x02) ? "Unwilling" : "",
+					 (l&0x04) ? "Unsupported-Transport" : "",
+					 (l&0x08) ? "TE-Link-ID" : "");
+		  lmp_flags_tree = proto_item_add_subtree(ti2, 
+							  lmp_subtree[LMP_TREE_ERROR_FLAGS]);
+		  proto_tree_add_boolean(lmp_flags_tree,
+					 lmp_filter[LMPF_VAL_ERROR_VERIFY_UNSUPPORTED_LINK],
+					 tvb, offset, 4, l);
+		  proto_tree_add_boolean(lmp_flags_tree,
+					 lmp_filter[LMPF_VAL_ERROR_VERIFY_UNWILLING],
+					 tvb, offset, 4, l);
+		  proto_tree_add_boolean(lmp_flags_tree,
+					 lmp_filter[LMPF_VAL_ERROR_VERIFY_TRANSPORT],
+					 tvb, offset, 4, l);
+		  proto_tree_add_boolean(lmp_flags_tree,
+					 lmp_filter[LMPF_VAL_ERROR_VERIFY_TE_LINK_ID],
+					 tvb, offset, 4, l);
+		  break;
 
+		case 2:
+		    proto_item_append_text(ti, ": LINK_SUMMARY_ERROR: %s%s%s%s%s%s",
+					   (l&0x01) ? "Unacceptable-Params " : "",
+					   (l&0x02) ? "Renegotiate" : "",
+					   (l&0x04) ? "Bad-TE-Link" : "",
+					   (l&0x08) ? "Bad-Data-Link" : "",
+					   (l&0x10) ? "Bad-TE-Link-CType" : "",
+					   (l&0x20) ? "Bad-Data-Link-CType" : "");
+		    lmp_flags_tree = proto_item_add_subtree(ti2, 
+							    lmp_subtree[LMP_TREE_ERROR_FLAGS]);
+		    proto_tree_add_boolean(lmp_flags_tree,
+					   lmp_filter[LMPF_VAL_ERROR_SUMMARY_BAD_PARAMETERS],
+					   tvb, offset, 4, l);
+		    proto_tree_add_boolean(lmp_flags_tree,
+					   lmp_filter[LMPF_VAL_ERROR_SUMMARY_RENEGOTIATE],
+					   tvb, offset, 4, l);
+		    proto_tree_add_boolean(lmp_flags_tree,
+					   lmp_filter[LMPF_VAL_ERROR_SUMMARY_BAD_TE_LINK],
+					   tvb, offset, 4, l);
+		    proto_tree_add_boolean(lmp_flags_tree,
+					   lmp_filter[LMPF_VAL_ERROR_SUMMARY_BAD_DATA_LINK],
+					   tvb, offset, 4, l);
+		    proto_tree_add_boolean(lmp_flags_tree,
+					   lmp_filter[LMPF_VAL_ERROR_SUMMARY_UNKNOWN_TEL_CTYPE],
+					   tvb, offset, 4, l);
+		    proto_tree_add_boolean(lmp_flags_tree,
+					   lmp_filter[LMPF_VAL_ERROR_SUMMARY_UNKNOWN_DL_CTYPE],
+					   tvb, offset, 4, l);
+		    break;
+		    
+	      default:
+		  proto_item_append_text(ti, ": UNKNOWN_ERROR (%d): 0x%04x", type, l);
+		  proto_tree_add_text(lmp_object_tree, tvb, offset2, mylen,
+				      "Data (%d bytes)", mylen);
+		  break;
+	      }
+	      break;
+	      
+	  case LMP_CLASS_SERVICE_CONFIG:
+
+	      /* Support for the ServiceConfig object defined in the UNI 1.0 spec */
+	      switch (type) {
+
+	      case 1:
+		  /* Supported Signaling Protocols Object */
+		  
+		  /* Signaling Protocols */
+		  l = tvb_get_guint8(tvb, offset2);
+		  
+		  ti2 = proto_tree_add_uint(lmp_object_tree, 
+					    lmp_filter[LMPF_VAL_SERVICE_CONFIG_SP_FLAGS],
+					    tvb, offset2, 1, l);
+		  proto_item_append_text(ti2, ": %s %s",
+					 (l & 0x01) ? "RSVP-based UNI signaling supported " : "",
+					 (l & 0x02) ? "LDP-based UNI signaling supported " : "");
+		  
+		  lmp_flags_tree = proto_item_add_subtree(ti2, 
+							  lmp_subtree[LMP_TREE_SERVICE_CONFIG_SP_FLAGS]);
+		  
+		  proto_tree_add_boolean(lmp_flags_tree,
+					 lmp_filter[LMPF_VAL_SERVICE_CONFIG_SP_FLAGS_RSVP],
+					 tvb, offset2, 1, l);
+		  
+		  proto_tree_add_boolean(lmp_flags_tree,
+					 lmp_filter[LMPF_VAL_SERVICE_CONFIG_SP_FLAGS_LDP],
+					 tvb, offset2, 1, l);
+		  
+		  /* UNI version */
+		  proto_tree_add_text(lmp_object_tree, tvb, offset2+1, 1, 
+				      "UNI Version: %u", 
+				      tvb_get_guint8(tvb, offset2+1));
+		  break;
+		  
+	      case 2:
+		  /* Client Port-Level Service Attributes Object */
+		  
+		  /* Link Type */
+		  proto_tree_add_text(lmp_object_tree, tvb, offset2, 1,
+				      "Link Type: %s",
+				      val_to_str(tvb_get_guint8(tvb, offset2),
+						 service_attribute_link_type_str, 
+						 "UNK (%u). "));
+		  
+		  proto_item_append_text(lmp_object_tree, 
+					 val_to_str(tvb_get_guint8(tvb, offset2),
+						    service_attribute_link_type_str,
+						    "Unknown (%u). "));
+		  
+		  l = tvb_get_guint8(tvb, offset2+1);
+		  /* Signal type for SDH */
+		  if (l == LMP_CLASS_SERVICE_CONFIG_CPSA_SIGNAL_TYPES_SDH) {
+		      /* Signal types for an SDH link */
+		      proto_tree_add_text(lmp_object_tree, tvb, offset2+1, 1,
+					  "Signal Types: %s",
+					  val_to_str(tvb_get_guint8(tvb, offset2+1),
+						     service_attribute_signal_types_sdh_str,
+						     "Unknown (%u).  "));
+		      
+		      proto_item_append_text(lmp_object_tree,
+					     val_to_str(tvb_get_guint8(tvb, offset2+1),
+							service_attribute_signal_types_sdh_str,
+							"Unknown (%u).   "));
+		  }
+		  
+		  if (l == LMP_CLASS_SERVICE_CONFIG_CPSA_SIGNAL_TYPES_SONET) {
+		      /* Signal types for a SONET link */
+		      proto_tree_add_text(lmp_object_tree, tvb, offset2+1, 1,
+					  "Signal Types: %s",
+					  val_to_str(tvb_get_guint8(tvb, offset2+1),
+						     service_attribute_signal_types_sonet_str,
+						     "Unknown (%u).  "));
+		      
+		      proto_item_append_text(lmp_object_tree,
+					     val_to_str(tvb_get_guint8(tvb, offset2+1),
+							service_attribute_signal_types_sonet_str,
+							"Unknown (%u).   "));
+		  }
+		  
+		  /* TP Transparency */
+		  l = tvb_get_guint8(tvb, offset2+2);
+		  ti2 = proto_tree_add_uint(lmp_object_tree, 
+					    lmp_filter[LMPF_VAL_SERVICE_CONFIG_CPSA_TP_FLAGS],
+					    tvb, offset2+2, 1, l);
+		  
+		  proto_item_append_text(ti2, ": %s%s%s",
+					 (l & 0x01) ? "Path/VC Overhead Transparency " : "",
+					 (l & 0x02) ? "Line/MS Overhead Transparency " : "",
+					 (l & 0x04) ? "Section/RS Overhead Transparency " : "");
+		  
+		  lmp_flags_tree = proto_item_add_subtree(ti2, 
+							  lmp_subtree[LMP_TREE_SERVICE_CONFIG_CPSA_TP_FLAGS]);
+		  
+		  proto_tree_add_boolean(lmp_flags_tree,
+					 lmp_filter[LMPF_VAL_SERVICE_CONFIG_CPSA_TP_FLAGS_PATH_OVERHEAD],
+					 tvb, offset2+2, 1, l);
+		  
+		  proto_tree_add_boolean(lmp_flags_tree,
+					 lmp_filter[LMPF_VAL_SERVICE_CONFIG_CPSA_TP_FLAGS_LINE_OVERHEAD],
+					 tvb, offset2+2, 1, l);
+		  
+		  proto_tree_add_boolean(lmp_flags_tree,
+					 lmp_filter[LMPF_VAL_SERVICE_CONFIG_CPSA_TP_FLAGS_SECTION_OVERHEAD],
+					 tvb, offset2+2, 1, l);
+		  
+		  /* Contiguous Concatentation Types */
+		  l = tvb_get_guint8(tvb, offset2+3);
+		  ti2 = proto_tree_add_uint(lmp_object_tree, 
+					    lmp_filter[LMPF_VAL_SERVICE_CONFIG_CPSA_CCT_FLAGS],
+					    tvb, offset2+3, 1, l);
+		  
+		  lmp_flags_tree = proto_item_add_subtree(ti2, 
+							  lmp_subtree[LMP_TREE_SERVICE_CONFIG_CPSA_CCT_FLAGS]);
+		  
+		  proto_tree_add_boolean(lmp_flags_tree,
+					 lmp_filter[LMPF_VAL_SERVICE_CONFIG_CPSA_CCT_FLAGS_CC_SUPPORTED],
+					 tvb, offset2+3, 1, l);
+		  
+		  /* Min and Max NCC */
+		  proto_item_append_text(ti, ": Minimum NCC: %d, Maximum NCC: %d",
+					 tvb_get_ntohs(tvb, offset2+4), 
+					 tvb_get_ntohs(tvb, offset2+6));
+		  
+		  proto_tree_add_uint(lmp_object_tree, 
+				      lmp_filter[LMPF_VAL_SERVICE_CONFIG_CPSA_MIN_NCC],
+				      tvb, offset2+4, 2, 
+				      tvb_get_ntohs(tvb, offset2+4));
+		  
+		  proto_tree_add_uint(lmp_object_tree, 
+				      lmp_filter[LMPF_VAL_SERVICE_CONFIG_CPSA_MAX_NCC],
+				      tvb, offset2+6, 2, 
+				      tvb_get_ntohs(tvb, offset2+6));
+		  
+		  /* Min and Max NVC */
+		  proto_item_append_text(ti, ": Minimum NVC: %d, Maximum NVC: %d",
+					 tvb_get_ntohs(tvb, offset2+8), 
+					 tvb_get_ntohs(tvb, offset2+10));
+		  
+		  proto_tree_add_uint(lmp_object_tree, 
+				      lmp_filter[LMPF_VAL_SERVICE_CONFIG_CPSA_MIN_NVC],
+				      tvb, offset2+8, 2, 
+				      tvb_get_ntohs(tvb, offset2+8));
+		  
+		  proto_tree_add_uint(lmp_object_tree, 
+				      lmp_filter[LMPF_VAL_SERVICE_CONFIG_CPSA_MAX_NVC],
+				      tvb, offset2+10, 2, 
+				      tvb_get_ntohs(tvb, offset2+10));
+		  
+		  /* Local interface ID */
+		  proto_item_append_text(ti, ": Local Interface ID %s",
+					 ip_to_str(tvb_get_ptr(tvb, offset2+12, 4)));
+		  
+		  proto_tree_add_item(lmp_object_tree, 
+				      lmp_filter[LMPF_VAL_SERVICE_CONFIG_CPSA_INTERFACE_ID],
+				      tvb, offset2+12, 4, FALSE);
+		  
+		  break;
+		  
+	      case 3:
+
+		  /* Network Transparency Support and TCM Monitoring Object */
+		  
+		  /* Transparency */
+		  l = tvb_get_ntohl(tvb, offset2);
+		  ti2 = proto_tree_add_uint(lmp_object_tree, 
+					    lmp_filter[LMPF_VAL_SERVICE_CONFIG_NSA_TRANSPARENCY_FLAGS],
+					    tvb, offset2, 4, l);
+		  
+		  proto_item_append_text(ti2, ": %s %s",
+					 (l & 0x01) ? "Standard SOH/RSOH transparency supported " : "",
+					 (l & 0x02) ? "Standard LOH/MSOH transparency supported " : "");
+		  
+		  lmp_flags_tree = proto_item_add_subtree(ti2, 
+							  lmp_subtree[LMP_TREE_SERVICE_CONFIG_NSA_TRANSPARENCY_FLAGS]);
+		  
+		  proto_tree_add_boolean(lmp_flags_tree,
+					 lmp_filter[LMPF_VAL_SERVICE_CONFIG_NSA_TRANSPARENCY_FLAGS_SOH],
+					 tvb, offset2, 4, l);
+		  
+		  proto_tree_add_boolean(lmp_flags_tree,
+					 lmp_filter[LMPF_VAL_SERVICE_CONFIG_NSA_TRANSPARENCY_FLAGS_LOH],
+					 tvb, offset2, 4, l);
+		  
+		  /* TCM Monitoring */
+		  l = tvb_get_guint8(tvb, offset2+7);
+		  
+		  ti2 = proto_tree_add_uint(lmp_object_tree,
+					    lmp_filter[LMPF_VAL_SERVICE_CONFIG_NSA_TCM_FLAGS],
+					    tvb, offset2+7, 1, l);
+		  
+		  proto_item_append_text(ti2, ": %s",
+					 (l & 0x01) ? "Transparent Support of TCM available " :  "");
+		  
+		  proto_tree_add_boolean(lmp_flags_tree,
+					 lmp_filter[LMPF_VAL_SERVICE_CONFIG_NSA_TCM_FLAGS_TCM_SUPPORTED],
+					 tvb, offset2+7, 1, l);
+		  
+		  break;
+		  
+	      case 4:
+		  
+		  /* Network Diversity Object */
+		  l = tvb_get_guint8(tvb,offset2+3);
+		  
+		  ti2 = proto_tree_add_uint(lmp_object_tree, 
+					    lmp_filter[LMPF_VAL_SERVICE_CONFIG_NSA_NETWORK_DIVERSITY_FLAGS],
+					    tvb, offset2+3, 1, l);
+		  
+		  proto_item_append_text(ti2, ": %s%s%s",
+					 (l & 0x01) ? "Node Diversity is supported " :  "",
+					 (l & 0x02) ? "Link Diversity is supported " : "",
+					 (l & 0x04) ? "SRLG Diversity is supported " : "");
+		  
+		  
+		  lmp_flags_tree = proto_item_add_subtree(ti2, 
+							  lmp_subtree[LMP_TREE_SERVICE_CONFIG_NSA_NETWORK_DIVERSITY_FLAGS]);
+		  
+		  proto_tree_add_boolean(lmp_flags_tree,
+					 lmp_filter[LMPF_VAL_SERVICE_CONFIG_NSA_NETWORK_DIVERSITY_FLAGS_NODE],
+					 tvb, offset2+3, 1, l);
+		  
+		  proto_tree_add_boolean(lmp_flags_tree,
+					 lmp_filter[LMPF_VAL_SERVICE_CONFIG_NSA_NETWORK_DIVERSITY_FLAGS_LINK],
+					 tvb, offset2+3, 1, l);
+		  
+		  proto_tree_add_boolean(lmp_flags_tree,
+					 lmp_filter[LMPF_VAL_SERVICE_CONFIG_NSA_NETWORK_DIVERSITY_FLAGS_SRLG],
+					 tvb, offset2+3, 1, l);
+		  break;
+		  
+	      default:
+		  /* Unknown type in Service Config object */
+		  proto_tree_add_text(lmp_object_tree, tvb, offset2, mylen,
+				      "Data (%d bytes)", mylen);
+		  break;
+	      }
+	      
+	  default:
+	      proto_tree_add_text(lmp_object_tree, tvb, offset2, mylen,
+				  "Data (%d bytes)", mylen);
+	      break;
+	  }
+	  
 	  offset += obj_length;
 	  len += obj_length;
-
+	  
 	} /* while */
     } /* tree */
-
+    
     return tvb_length(tvb);
 }
-
 static void
 lmp_prefs_applied (void)
 {
@@ -2283,28 +2044,18 @@ lmp_prefs_applied (void)
 	lmp_udp_port = lmp_udp_port_config;
 	dissector_add("udp.port", lmp_udp_port, lmp_handle);
     }
-}    
+}
 
 static void
 register_lmp_prefs (void)
 {
     module_t *lmp_module;
-    static enum_val_t lmp_ver[] = {
-	{"draft-ietf-ccamp-lmp-09", "draft-ietf-ccamp-lmp-09", LMP_VER_DRAFT_CCAMP_09},
-	{"draft-ietf-ccamp-lmp-03", "draft-ietf-ccamp-lmp-03", LMP_VER_DRAFT_CCAMP_03},
-	{"draft-ietf-ccamp-lmp-02", "draft-ietf-ccamp-lmp-02", LMP_VER_DRAFT_CCAMP_02},
-	{NULL, NULL, -1}
-    };
 
     lmp_module = prefs_register_protocol(proto_lmp, lmp_prefs_applied);
-    prefs_register_enum_preference(
-	lmp_module, "version",
-	"Draft version of LMP",
-	"Specifies the IETF CCAMP draft version of LMP to interpret",
-	&lmp_draft_ver, lmp_ver, FALSE);
+
     prefs_register_uint_preference(
-	lmp_module, "udp_port", "LMP UDP Port (draft-09 ONLY)",
-	"UDP port number to use for LMP (draft-09 only)", 10, &lmp_udp_port_config);
+	lmp_module, "udp_port", "LMP UDP Port",
+	"UDP port number to use for LMP", 10, &lmp_udp_port_config);
 }
 
 void
@@ -2312,14 +2063,14 @@ proto_register_lmp(void)
 {
     static gint *ett[NUM_LMP_SUBTREES];
     int i;
-
+    
     for (i=0; i<NUM_LMP_SUBTREES; i++) {
 	lmp_subtree[i] = -1;
 	ett[i] = &lmp_subtree[i];
     }
-
+    
     proto_lmp = proto_register_protocol("Link Management Protocol (LMP)",
-					    "LMP", "lmp");
+					"LMP", "lmp");
     proto_register_field_array(proto_lmp, lmpf_info, array_length(lmpf_info));
     proto_register_subtree_array(ett, array_length(ett));
 
@@ -2331,5 +2082,4 @@ proto_reg_handoff_lmp(void)
 {
     lmp_handle = new_create_dissector_handle(dissect_lmp, proto_lmp);
     dissector_add("udp.port", lmp_udp_port, lmp_handle);
-    dissector_add("ip.proto", IP_PROTO_LMP, lmp_handle);
 }