Don't do fcn calls in arg of g_?to??(); Macro may very well eval args multiple times.
[obnox/wireshark/wip.git] / epan / dissectors / packet-cmip.c
index d3da0a4380dd9657a7434d9c50b81ff04066f4fb..31cefc9ec4fc6c88d9b8e808e6bd8f346ae82c15 100644 (file)
@@ -1,11 +1,11 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Wireshark dissector compiler   */
 /* packet-cmip.c                                                              */
-/* ../../tools/asn2wrs.py -b -X -T -e -p cmip -c cmip.cnf -s packet-cmip-template CMIP-1.asn CMIP-A-ABORT-Information.asn CMIP-A-ASSOCIATE-Information.asn ../x721/Attribute-ASN1Module.asn ../ros/Remote-Operations-Information-Objects.asn ../ros/Remote-Operations-Generic-ROS-PDUs.asn */
+/* ../../tools/asn2wrs.py -b -p cmip -c ./cmip.cnf -s ./packet-cmip-template -D . -O ../../epan/dissectors CMIP-1.asn CMIP-A-ABORT-Information.asn CMIP-A-ASSOCIATE-Information.asn ../x721/Attribute-ASN1Module.asn ../ros/Remote-Operations-Information-Objects.asn ../ros/Remote-Operations-Generic-ROS-PDUs.asn */
 
 /* Input file: packet-cmip-template.c */
 
-#line 1 "packet-cmip-template.c"
+#line 1 "../../asn1/cmip/packet-cmip-template.c"
 /* packet-cmip.c
  * Routines for X.711 CMIP packet dissection
  *   Ronnie Sahlberg 2004
 
 #include <glib.h>
 #include <epan/packet.h>
-#include <epan/conversation.h>
 #include <epan/oids.h>
 #include <epan/asn1.h>
 
-#include <stdio.h>
-#include <string.h>
-
 #include "packet-ber.h"
 #include "packet-acse.h"
 #include "packet-x509if.h"
@@ -58,7 +54,7 @@
 #include "packet-pres.h"
 
 /* Initialize the protocol and registered fields */
-int proto_cmip = -1;
+static int proto_cmip = -1;
 static int hf_cmip_actionType_OID = -1;
 static int hf_cmip_eventType_OID = -1;
 static int hf_cmip_attributeId_OID = -1;
@@ -69,7 +65,7 @@ static int hf_NameBinding = -1;
 static int hf_ObjectClass = -1;
 
 /*--- Included file: packet-cmip-hf.c ---*/
-#line 1 "packet-cmip-hf.c"
+#line 1 "../../asn1/cmip/packet-cmip-hf.c"
 static int hf_cmip_BaseManagedObjectId_PDU = -1;  /* BaseManagedObjectId */
 static int hf_cmip_EventTypeId_PDU = -1;          /* EventTypeId */
 static int hf_cmip_ObjectClass_PDU = -1;          /* ObjectClass */
@@ -348,13 +344,13 @@ static int hf_cmip_T_daysOfWeek_friday = -1;
 static int hf_cmip_T_daysOfWeek_saturday = -1;
 
 /*--- End of included file: packet-cmip-hf.c ---*/
-#line 63 "packet-cmip-template.c"
+#line 59 "../../asn1/cmip/packet-cmip-template.c"
 
 /* Initialize the subtree pointers */
 static gint ett_cmip = -1;
 
 /*--- Included file: packet-cmip-ett.c ---*/
-#line 1 "packet-cmip-ett.c"
+#line 1 "../../asn1/cmip/packet-cmip-ett.c"
 static gint ett_cmip_PAR_missingAttributeValue = -1;
 static gint ett_cmip_ActionArgument = -1;
 static gint ett_cmip_ActionError = -1;
@@ -478,13 +474,16 @@ static gint ett_cmip_T_modificationList = -1;
 static gint ett_cmip_T_modificationList_item = -1;
 
 /*--- End of included file: packet-cmip-ett.c ---*/
-#line 67 "packet-cmip-template.c"
+#line 63 "../../asn1/cmip/packet-cmip-template.c"
 
 static guint32 opcode;
 
+/* Dissector table */
+static dissector_table_t attribute_id_dissector_table;
+
 
 /*--- Included file: packet-cmip-table.c ---*/
-#line 1 "packet-cmip-table.c"
+#line 1 "../../asn1/cmip/packet-cmip-table.c"
 
 /* CMIP OPERATIONS */
 static const value_string cmip_Opcode_vals[] = {
@@ -534,7 +533,7 @@ static const value_string cmip_error_code_vals[] = {
 
 
 /*--- End of included file: packet-cmip-table.c ---*/
-#line 71 "packet-cmip-template.c"
+#line 70 "../../asn1/cmip/packet-cmip-template.c"
 
 static int opcode_type;
 #define OPCODE_INVOKE        1
@@ -545,6 +544,7 @@ static int opcode_type;
 static int attributeform;
 #define ATTRIBUTE_LOCAL_FORM  0
 #define ATTRIBUTE_GLOBAL_FORM 1
+static int attribute_local_id;
 static const char *attribute_identifier_id;
 
 static const char *attributevalueassertion_id;
@@ -558,7 +558,7 @@ static const char *objectclass_identifier_id;
 
 
 /*--- Included file: packet-cmip-val.h ---*/
-#line 1 "packet-cmip-val.h"
+#line 1 "../../asn1/cmip/packet-cmip-val.h"
 #define smi2AttributeID                "2.9.3.2.7"
 #define smi2AttributeGroup             "2.9.3.2.8"
 #define arfProbableCause               "2.9.3.2.0.0"
@@ -645,10 +645,10 @@ static const char *objectclass_identifier_id;
 #define noInvokeId                     NULL
 
 /*--- End of included file: packet-cmip-val.h ---*/
-#line 93 "packet-cmip-template.c"
+#line 93 "../../asn1/cmip/packet-cmip-template.c"
 
 /*--- Included file: packet-cmip-fn.c ---*/
-#line 1 "packet-cmip-fn.c"
+#line 1 "../../asn1/cmip/packet-cmip-fn.c"
 /*--- Cyclic dependencies ---*/
 
 /* CMISFilter -> CMISFilter/and -> CMISFilter */
@@ -660,7 +660,7 @@ static int dissect_cmip_CMISFilter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
 
 static int
 dissect_cmip_T_attributeId_globalForm(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 284 "cmip.cnf"
+#line 266 "../../asn1/cmip/cmip.cnf"
   attributeform = ATTRIBUTE_GLOBAL_FORM;
     offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_index, &attribute_identifier_id);
 
@@ -674,9 +674,11 @@ dissect_cmip_T_attributeId_globalForm(gboolean implicit_tag _U_, tvbuff_t *tvb _
 
 static int
 dissect_cmip_T_attributeIdlocalForm(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 288 "cmip.cnf"
+#line 270 "../../asn1/cmip/cmip.cnf"
   attributeform = ATTRIBUTE_LOCAL_FORM;
-  offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_cmip_localForm, NULL);
+    offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
+                                                &attribute_local_id);
+
 
 
 
@@ -731,7 +733,7 @@ dissect_cmip_AccessControl(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off
 
 static int
 dissect_cmip_T_objectClass_globalForm(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 444 "cmip.cnf"
+#line 430 "../../asn1/cmip/cmip.cnf"
   objectclassform = OBJECTCLASS_GLOBAL_FORM;
 
   offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_index, &objectclass_identifier_id);
@@ -743,12 +745,12 @@ dissect_cmip_T_objectClass_globalForm(gboolean implicit_tag _U_, tvbuff_t *tvb _
 
 static int
 dissect_cmip_T_objectClasslocalForm(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 449 "cmip.cnf"
+#line 435 "../../asn1/cmip/cmip.cnf"
   objectclassform = OBJECTCLASS_LOCAL_FORM;
 
 
   offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
-                                  NULL);
+                                                NULL);
 
   return offset;
 }
@@ -788,7 +790,7 @@ dissect_cmip_T_id(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_,
 
 static int
 dissect_cmip_T_attributeValueAssertionvalue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 300 "cmip.cnf"
+#line 286 "../../asn1/cmip/cmip.cnf"
     offset=call_ber_oid_callback(attributevalueassertion_id, tvb, offset, actx->pinfo, tree);
 
 
@@ -908,7 +910,7 @@ static const value_string cmip_T_namedNumbers_vals[] = {
 static int
 dissect_cmip_T_namedNumbers(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
-                                  NULL);
+                                                NULL);
 
   return offset;
 }
@@ -918,7 +920,7 @@ dissect_cmip_T_namedNumbers(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of
 static int
 dissect_cmip_INTEGER(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
-                                  NULL);
+                                                NULL);
 
   return offset;
 }
@@ -951,13 +953,17 @@ dissect_cmip_Scope(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_,
 
 static int
 dissect_cmip_AttributeValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 292 "cmip.cnf"
-  /*XXX handle local form here */
+#line 274 "../../asn1/cmip/cmip.cnf"
   if(attributeform==ATTRIBUTE_GLOBAL_FORM){
     offset=call_ber_oid_callback(attribute_identifier_id, tvb, offset, actx->pinfo, tree);
+  } else if (dissector_try_uint(attribute_id_dissector_table, attribute_local_id, tvb, actx->pinfo, tree)) {
+    offset=tvb_length (tvb);
+  } else {
+    offset=dissect_unknown_ber(actx->pinfo, tvb, offset, tree);
   }
 
 
+
   return offset;
 }
 
@@ -1121,7 +1127,7 @@ dissect_cmip_ActionTypeId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs
 
 static int
 dissect_cmip_T_actionInfoArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 455 "cmip.cnf"
+#line 441 "../../asn1/cmip/cmip.cnf"
   offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree);
 
 
@@ -1278,11 +1284,11 @@ dissect_cmip_NoSuchArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of
 
 static int
 dissect_cmip_T_eventInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 479 "cmip.cnf"
-
+#line 471 "../../asn1/cmip/cmip.cnf"
   offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree);
 
 
+
   return offset;
 }
 
@@ -1383,7 +1389,7 @@ dissect_cmip_ActionError(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse
 
 static int
 dissect_cmip_T_actionReplyInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 482 "cmip.cnf"
+#line 474 "../../asn1/cmip/cmip.cnf"
   offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree);
 
 
@@ -1456,7 +1462,7 @@ static const value_string cmip_ModifyOperator_vals[] = {
 static int
 dissect_cmip_ModifyOperator(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
-                                  NULL);
+                                                NULL);
 
   return offset;
 }
@@ -1465,7 +1471,7 @@ dissect_cmip_ModifyOperator(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of
 
 static int
 dissect_cmip_T_attributeValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 476 "cmip.cnf"
+#line 468 "../../asn1/cmip/cmip.cnf"
   offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree);
 
 
@@ -1693,7 +1699,7 @@ dissect_cmip_DeleteResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs
 
 static int
 dissect_cmip_T_eventReplyInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 464 "cmip.cnf"
+#line 450 "../../asn1/cmip/cmip.cnf"
   offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree);
 
 
@@ -1720,7 +1726,7 @@ dissect_cmip_EventReply(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
 
 static int
 dissect_cmip_EventReportArgumentEventInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 461 "cmip.cnf"
+#line 447 "../../asn1/cmip/cmip.cnf"
   offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree);
 
 
@@ -1987,7 +1993,7 @@ dissect_cmip_T_errorId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
 
 static int
 dissect_cmip_T_errorInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 473 "cmip.cnf"
+#line 465 "../../asn1/cmip/cmip.cnf"
   offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree);
 
 
@@ -2096,9 +2102,15 @@ dissect_cmip_NoSuchEventType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o
 
 static int
 dissect_cmip_T_attributevalue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 467 "cmip.cnf"
-  offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree);
-
+#line 453 "../../asn1/cmip/cmip.cnf"
+  if(attributeform==ATTRIBUTE_GLOBAL_FORM){
+    offset=call_ber_oid_callback(attribute_identifier_id, tvb, offset, actx->pinfo, tree);
+  } else if (dissector_try_uint(attribute_id_dissector_table, attribute_local_id, tvb, actx->pinfo, tree)) {
+    offset=tvb_length (tvb);
+  } else {
+    offset=dissect_unknown_ber(actx->pinfo, tvb, offset, tree);
+  }
+  
 
 
   return offset;
@@ -2163,15 +2175,13 @@ static const value_string cmip_CMIPAbortSource_vals[] = {
 
 static int
 dissect_cmip_CMIPAbortSource(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 234 "cmip.cnf"
+#line 230 "../../asn1/cmip/cmip.cnf"
   guint32 value;
 
     offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
                                   &value);
 
-  if(check_col(actx->pinfo->cinfo, COL_INFO)){
-    col_append_fstr(actx->pinfo->cinfo, COL_INFO, " AbortSource:%s", val_to_str(value, cmip_CMIPAbortSource_vals, " Unknown AbortSource:%d"));
-  }
+  col_append_fstr(actx->pinfo->cinfo, COL_INFO, " AbortSource:%s", val_to_str(value, cmip_CMIPAbortSource_vals, " Unknown AbortSource:%d"));
 
 
   return offset;
@@ -2195,10 +2205,8 @@ static const ber_sequence_t CMIPAbortInfo_sequence[] = {
 
 int
 dissect_cmip_CMIPAbortInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 222 "cmip.cnf"
-  if(check_col(actx->pinfo->cinfo, COL_INFO)){
-    col_append_str(actx->pinfo->cinfo, COL_INFO, "CMIP-A-ABORT");
-  }
+#line 222 "../../asn1/cmip/cmip.cnf"
+  col_append_str(actx->pinfo->cinfo, COL_INFO, "CMIP-A-ABORT");
 
   offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
                                    CMIPAbortInfo_sequence, hf_index, ett_cmip_CMIPAbortInfo);
@@ -2252,10 +2260,8 @@ static const ber_sequence_t CMIPUserInfo_sequence[] = {
 
 int
 dissect_cmip_CMIPUserInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 228 "cmip.cnf"
-  if(check_col(actx->pinfo->cinfo, COL_INFO)){
-    col_append_str(actx->pinfo->cinfo, COL_INFO, "CMIP-A-ASSOCIATE");
-  }
+#line 226 "../../asn1/cmip/cmip.cnf"
+  col_append_str(actx->pinfo->cinfo, COL_INFO, "CMIP-A-ASSOCIATE");
 
   offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
                                    CMIPUserInfo_sequence, hf_index, ett_cmip_CMIPUserInfo);
@@ -2331,7 +2337,7 @@ dissect_cmip_T_managementExtensionidentifier(gboolean implicit_tag _U_, tvbuff_t
 
 static int
 dissect_cmip_BOOLEAN(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_boolean(implicit_tag, actx, tree, tvb, offset, hf_index);
+  offset = dissect_ber_boolean(implicit_tag, actx, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -2340,7 +2346,7 @@ dissect_cmip_BOOLEAN(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U
 
 static int
 dissect_cmip_T_information(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 489 "cmip.cnf"
+#line 481 "../../asn1/cmip/cmip.cnf"
   offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree);
 
 
@@ -2437,7 +2443,7 @@ dissect_cmip_AttributeList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off
 
 static int
 dissect_cmip_T_oldAttributeValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 492 "cmip.cnf"
+#line 484 "../../asn1/cmip/cmip.cnf"
   offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree);
 
 
@@ -2449,7 +2455,7 @@ dissect_cmip_T_oldAttributeValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i
 
 static int
 dissect_cmip_T_newAttributeValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 495 "cmip.cnf"
+#line 487 "../../asn1/cmip/cmip.cnf"
   offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree);
 
 
@@ -2500,7 +2506,7 @@ static const value_string cmip_AlarmStatus_item_vals[] = {
 static int
 dissect_cmip_AlarmStatus_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
-                                  NULL);
+                                                NULL);
 
   return offset;
 }
@@ -2536,7 +2542,7 @@ static const value_string cmip_AvailabilityStatus_item_vals[] = {
 static int
 dissect_cmip_AvailabilityStatus_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
-                                  NULL);
+                                                NULL);
 
   return offset;
 }
@@ -2558,7 +2564,7 @@ dissect_cmip_AvailabilityStatus(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in
 
 static int
 dissect_cmip_BackedUpStatus(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_boolean(implicit_tag, actx, tree, tvb, offset, hf_index);
+  offset = dissect_ber_boolean(implicit_tag, actx, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -2603,7 +2609,7 @@ dissect_cmip_BackUpRelationshipObject(gboolean implicit_tag _U_, tvbuff_t *tvb _
 static int
 dissect_cmip_INTEGER_0_100(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
-                                  NULL);
+                                                NULL);
 
   return offset;
 }
@@ -2625,7 +2631,7 @@ dissect_cmip_CapacityAlarmThreshold(gboolean implicit_tag _U_, tvbuff_t *tvb _U_
 
 static int
 dissect_cmip_ConfirmedMode(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_boolean(implicit_tag, actx, tree, tvb, offset, hf_index);
+  offset = dissect_ber_boolean(implicit_tag, actx, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -2643,7 +2649,7 @@ static const value_string cmip_ControlStatus_item_vals[] = {
 static int
 dissect_cmip_ControlStatus_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
-                                  NULL);
+                                                NULL);
 
   return offset;
 }
@@ -2666,7 +2672,7 @@ dissect_cmip_ControlStatus(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off
 static int
 dissect_cmip_NotificationIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
-                                  NULL);
+                                                NULL);
 
   return offset;
 }
@@ -2717,7 +2723,7 @@ dissect_cmip_CorrelatedNotifications(gboolean implicit_tag _U_, tvbuff_t *tvb _U
 static int
 dissect_cmip_CurrentLogSize(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
-                                  NULL);
+                                                NULL);
 
   return offset;
 }
@@ -2758,7 +2764,7 @@ dissect_cmip_GroupObjects(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs
 static int
 dissect_cmip_INTEGER_0_23(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
-                                  NULL);
+                                                NULL);
 
   return offset;
 }
@@ -2768,7 +2774,7 @@ dissect_cmip_INTEGER_0_23(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs
 static int
 dissect_cmip_INTEGER_0_59(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
-                                  NULL);
+                                                NULL);
 
   return offset;
 }
@@ -2910,7 +2916,7 @@ static const value_string cmip_MaxLogSize_vals[] = {
 static int
 dissect_cmip_MaxLogSize(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
-                                  NULL);
+                                                NULL);
 
   return offset;
 }
@@ -2942,7 +2948,7 @@ dissect_cmip_NameBinding(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse
 static int
 dissect_cmip_NumberOfRecords(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
-                                  NULL);
+                                                NULL);
 
   return offset;
 }
@@ -3048,7 +3054,7 @@ static const value_string cmip_T_priority_vals[] = {
 static int
 dissect_cmip_T_priority(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
-                                  NULL);
+                                                NULL);
 
   return offset;
 }
@@ -3117,7 +3123,7 @@ static const value_string cmip_ProceduralStatus_item_vals[] = {
 static int
 dissect_cmip_ProceduralStatus_item(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
-                                  NULL);
+                                                NULL);
 
   return offset;
 }
@@ -3225,7 +3231,7 @@ dissect_cmip_T_serviceUseridentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U
 
 static int
 dissect_cmip_T_details(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 500 "cmip.cnf"
+#line 492 "../../asn1/cmip/cmip.cnf"
   offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree);
 
 
@@ -3299,7 +3305,7 @@ static const value_string cmip_StandbyStatus_vals[] = {
 static int
 dissect_cmip_StandbyStatus(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
-                                  NULL);
+                                                NULL);
 
   return offset;
 }
@@ -3348,7 +3354,7 @@ dissect_cmip_T_featureIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i
 
 static int
 dissect_cmip_T_featureInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 505 "cmip.cnf"
+#line 497 "../../asn1/cmip/cmip.cnf"
   offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree);
 
 
@@ -3523,7 +3529,7 @@ dissect_cmip_TrendIndication(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o
 
 static int
 dissect_cmip_UnknownStatus(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_boolean(implicit_tag, actx, tree, tvb, offset, hf_index);
+  offset = dissect_ber_boolean(implicit_tag, actx, tree, tvb, offset, hf_index, NULL);
 
   return offset;
 }
@@ -3598,18 +3604,14 @@ dissect_cmip_WeekMask(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _
 
 static int
 dissect_cmip_T_local(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 243 "cmip.cnf"
+#line 237 "../../asn1/cmip/cmip.cnf"
     offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
-                                  &opcode);
+                                                &opcode);
 
   if(opcode_type== OPCODE_RETURN_ERROR){
-       if(check_col(actx->pinfo->cinfo, COL_INFO)){
-               col_prepend_fstr(actx->pinfo->cinfo, COL_INFO, "%s", val_to_str(opcode, cmip_Opcode_vals, " Unknown Opcode:%d"));
-       }
+       col_append_fstr(actx->pinfo->cinfo, COL_INFO, "%s", val_to_str(opcode, cmip_error_code_vals, " Unknown Opcode:%d"));
   }else{
-       if(check_col(actx->pinfo->cinfo, COL_INFO)){
-               col_prepend_fstr(actx->pinfo->cinfo, COL_INFO, "%s", val_to_str(opcode, cmip_error_code_vals, " Unknown Opcode:%d"));
-       }
+       col_append_fstr(actx->pinfo->cinfo, COL_INFO, "%s", val_to_str(opcode, cmip_Opcode_vals, " Unknown Opcode:%d"));
   }
 
 
@@ -3643,7 +3645,7 @@ dissect_cmip_Code(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_,
 static int
 dissect_cmip_InvokeId_present(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
-                                  NULL);
+                                                NULL);
 
   return offset;
 }
@@ -3683,7 +3685,7 @@ dissect_cmip_T_linkedId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
 
 static int
 dissect_cmip_InvokeArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 303 "cmip.cnf"
+#line 289 "../../asn1/cmip/cmip.cnf"
     switch(opcode){
     case 0: /* M-eventreport */
       offset = dissect_cmip_EventReportArgument(FALSE, tvb, offset, actx, tree, -1);
@@ -3737,11 +3739,9 @@ static const ber_sequence_t Invoke_sequence[] = {
 
 static int
 dissect_cmip_Invoke(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 256 "cmip.cnf"
+#line 246 "../../asn1/cmip/cmip.cnf"
   opcode_type=OPCODE_INVOKE;
-  if(check_col(actx->pinfo->cinfo, COL_INFO)){
-    col_prepend_fstr(actx->pinfo->cinfo, COL_INFO, "Invoke ");
-  }
+  col_prepend_fstr(actx->pinfo->cinfo, COL_INFO, "Invoke ");
 
   offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
                                    Invoke_sequence, hf_index, ett_cmip_Invoke);
@@ -3753,7 +3753,7 @@ dissect_cmip_Invoke(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_
 
 static int
 dissect_cmip_ResultArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 341 "cmip.cnf"
+#line 327 "../../asn1/cmip/cmip.cnf"
 
     switch(opcode){
     case 0: /* M-eventreport*/
@@ -3816,11 +3816,9 @@ static const ber_sequence_t ReturnResult_sequence[] = {
 
 static int
 dissect_cmip_ReturnResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 263 "cmip.cnf"
+#line 251 "../../asn1/cmip/cmip.cnf"
   opcode_type=OPCODE_RETURN_RESULT;
-  if(check_col(actx->pinfo->cinfo, COL_INFO)){
-    col_prepend_fstr(actx->pinfo->cinfo, COL_INFO, "ReturnResult ");
-  }
+  col_prepend_fstr(actx->pinfo->cinfo, COL_INFO, "ReturnResult ");
 
   offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
                                    ReturnResult_sequence, hf_index, ett_cmip_ReturnResult);
@@ -3832,7 +3830,7 @@ dissect_cmip_ReturnResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs
 
 static int
 dissect_cmip_T_parameter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 375 "cmip.cnf"
+#line 361 "../../asn1/cmip/cmip.cnf"
 
     switch(opcode){
        case 19: /* classInstanceConflict */
@@ -3864,7 +3862,7 @@ dissect_cmip_T_parameter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse
                break;
        case 18: /* missingAttributeValue */
                /* Hmmm  SET OF AttributeId */
-               dissect_cmip_AttributeId(FALSE, tvb,  offset, actx, tree, -1);
+               dissect_cmip_PAR_missingAttributeValue(FALSE, tvb,  offset, actx, tree, -1);
                break;
        case 9: /* noSuchAction */ 
                dissect_cmip_NoSuchAction(FALSE, tvb,  offset, actx, tree, -1);
@@ -3916,11 +3914,9 @@ static const ber_sequence_t ReturnError_sequence[] = {
 
 static int
 dissect_cmip_ReturnError(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 270 "cmip.cnf"
+#line 256 "../../asn1/cmip/cmip.cnf"
   opcode_type=OPCODE_RETURN_ERROR;
-  if(check_col(actx->pinfo->cinfo, COL_INFO)){
-    col_prepend_fstr(actx->pinfo->cinfo, COL_INFO, "ReturnError ");
-  }
+  col_prepend_fstr(actx->pinfo->cinfo, COL_INFO, "ReturnError ");
 
   offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
                                    ReturnError_sequence, hf_index, ett_cmip_ReturnError);
@@ -3940,7 +3936,7 @@ static const value_string cmip_GeneralProblem_vals[] = {
 static int
 dissect_cmip_GeneralProblem(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
-                                  NULL);
+                                                NULL);
 
   return offset;
 }
@@ -3962,7 +3958,7 @@ static const value_string cmip_InvokeProblem_vals[] = {
 static int
 dissect_cmip_InvokeProblem(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
-                                  NULL);
+                                                NULL);
 
   return offset;
 }
@@ -3979,7 +3975,7 @@ static const value_string cmip_ReturnResultProblem_vals[] = {
 static int
 dissect_cmip_ReturnResultProblem(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
-                                  NULL);
+                                                NULL);
 
   return offset;
 }
@@ -3998,7 +3994,7 @@ static const value_string cmip_ReturnErrorProblem_vals[] = {
 static int
 dissect_cmip_ReturnErrorProblem(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
-                                  NULL);
+                                                NULL);
 
   return offset;
 }
@@ -4038,11 +4034,9 @@ static const ber_sequence_t Reject_sequence[] = {
 
 static int
 dissect_cmip_Reject(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 277 "cmip.cnf"
+#line 261 "../../asn1/cmip/cmip.cnf"
   opcode_type=OPCODE_REJECT;
-  if(check_col(actx->pinfo->cinfo, COL_INFO)){
-    col_prepend_fstr(actx->pinfo->cinfo, COL_INFO, "Reject ");
-  }
+  col_prepend_fstr(actx->pinfo->cinfo, COL_INFO, "Reject ");
 
   offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
                                    Reject_sequence, hf_index, ett_cmip_Reject);
@@ -4386,7 +4380,7 @@ static void dissect_WeekMask_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, prot
 
 
 /*--- End of included file: packet-cmip-fn.c ---*/
-#line 94 "packet-cmip-template.c"
+#line 94 "../../asn1/cmip/packet-cmip-template.c"
 
 
 
@@ -4395,40 +4389,34 @@ static void dissect_WeekMask_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, prot
 static void
 dissect_cmip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
 {
-       static struct SESSION_DATA_STRUCTURE* session = NULL;
+       static struct SESSION_DATA_STRUCTURE* session;
        proto_item *item = NULL;
        proto_tree *tree = NULL;
        asn1_ctx_t asn1_ctx;
        asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
 
+       session = (struct SESSION_DATA_STRUCTURE*)pinfo->private_data;
 
        /* do we have spdu type from the session dissector?  */
-       if( !pinfo->private_data ){
-               if(tree){
+       if( !session ){
+               proto_tree_add_text(tree, tvb, 0, -1,
+                       "Internal error:can't get spdu type from session dissector.");
+               return;
+       } else {
+               if(session->spdu_type == 0 ) {
                        proto_tree_add_text(tree, tvb, 0, -1,
-                               "Internal error:can't get spdu type from session dissector.");
+                               "Internal error:wrong spdu type %x from session dissector.",session->spdu_type);
                        return;
                }
-       } else {
-               session  = ( (struct SESSION_DATA_STRUCTURE*)(pinfo->private_data) );
-               if(session->spdu_type == 0 ){
-                       if(tree){
-                               proto_tree_add_text(tree, tvb, 0, -1,
-                                       "Internal error:wrong spdu type %x from session dissector.",session->spdu_type);
-                               return;
-                       }
-               }
        }
 
        if(parent_tree){
-               item = proto_tree_add_item(parent_tree, proto_cmip, tvb, 0, -1, FALSE);
+               item = proto_tree_add_item(parent_tree, proto_cmip, tvb, 0, -1, ENC_NA);
                tree = proto_item_add_subtree(item, ett_cmip);
        }
 
-       if (check_col(pinfo->cinfo, COL_PROTOCOL))
-               col_set_str(pinfo->cinfo, COL_PROTOCOL, "CMIP");
-       if (check_col(pinfo->cinfo, COL_INFO))
-               col_clear(pinfo->cinfo, COL_INFO);
+       col_set_str(pinfo->cinfo, COL_PROTOCOL, "CMIP");
+       col_clear(pinfo->cinfo, COL_INFO);
        switch(session->spdu_type){
                case SES_CONNECTION_REQUEST:
                case SES_CONNECTION_ACCEPT:
@@ -4456,1142 +4444,1142 @@ void proto_register_cmip(void) {
     { &hf_cmip_actionType_OID,
       { "actionType", "cmip.actionType_OID",
         FT_STRING, BASE_NONE, NULL, 0,
-        "actionType", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_eventType_OID,
       { "eventType", "cmip.eventType_OID",
         FT_STRING, BASE_NONE, NULL, 0,
-        "eventType", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_attributeId_OID,
       { "attributeId", "cmip.attributeId_OID",
         FT_STRING, BASE_NONE, NULL, 0,
-        "attributeId", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_errorId_OID,
       { "errorId", "cmip.errorId_OID",
         FT_STRING, BASE_NONE, NULL, 0,
-        "errorId", HFILL }},
+        NULL, HFILL }},
    { &hf_DiscriminatorConstruct,
       { "DiscriminatorConstruct", "cmip.DiscriminatorConstruct",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_Destination,
       { "Destination", "cmip.Destination",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_NameBinding,
       { "NameBinding", "cmip.NameBinding",
         FT_STRING, BASE_NONE, NULL, 0,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ObjectClass,
       { "ObjectClass", "cmip.ObjectClass",
         FT_UINT32, BASE_DEC, VALS(cmip_ObjectClass_vals), 0,
-        "", HFILL }},
+        NULL, HFILL }},
 
 
 /*--- Included file: packet-cmip-hfarr.c ---*/
-#line 1 "packet-cmip-hfarr.c"
+#line 1 "../../asn1/cmip/packet-cmip-hfarr.c"
     { &hf_cmip_BaseManagedObjectId_PDU,
       { "BaseManagedObjectId", "cmip.BaseManagedObjectId",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.BaseManagedObjectId", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_EventTypeId_PDU,
       { "EventTypeId", "cmip.EventTypeId",
         FT_UINT32, BASE_DEC, VALS(cmip_EventTypeId_vals), 0,
-        "cmip.EventTypeId", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_ObjectClass_PDU,
       { "ObjectClass", "cmip.ObjectClass",
         FT_UINT32, BASE_DEC, VALS(cmip_ObjectClass_vals), 0,
-        "cmip.ObjectClass", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_ActiveDestination_PDU,
       { "ActiveDestination", "cmip.ActiveDestination",
         FT_UINT32, BASE_DEC, VALS(cmip_Destination_vals), 0,
-        "cmip.ActiveDestination", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_AdditionalText_PDU,
       { "AdditionalText", "cmip.AdditionalText",
         FT_STRING, BASE_NONE, NULL, 0,
-        "cmip.AdditionalText", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_AdditionalInformation_PDU,
       { "AdditionalInformation", "cmip.AdditionalInformation",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "cmip.AdditionalInformation", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_Allomorphs_PDU,
       { "Allomorphs", "cmip.Allomorphs",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "cmip.Allomorphs", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_AdministrativeState_PDU,
       { "AdministrativeState", "cmip.AdministrativeState",
         FT_UINT32, BASE_DEC, VALS(cmip_AdministrativeState_vals), 0,
-        "cmip.AdministrativeState", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_AttributeIdentifierList_PDU,
       { "AttributeIdentifierList", "cmip.AttributeIdentifierList",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "cmip.AttributeIdentifierList", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_AttributeList_PDU,
       { "AttributeList", "cmip.AttributeList",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "cmip.AttributeList", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_AttributeValueChangeDefinition_PDU,
       { "AttributeValueChangeDefinition", "cmip.AttributeValueChangeDefinition",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "cmip.AttributeValueChangeDefinition", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_AlarmStatus_PDU,
       { "AlarmStatus", "cmip.AlarmStatus",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "cmip.AlarmStatus", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_AvailabilityStatus_PDU,
       { "AvailabilityStatus", "cmip.AvailabilityStatus",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "cmip.AvailabilityStatus", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_BackedUpStatus_PDU,
       { "BackedUpStatus", "cmip.BackedUpStatus",
-        FT_BOOLEAN, 8, NULL, 0,
-        "cmip.BackedUpStatus", HFILL }},
+        FT_BOOLEAN, BASE_NONE, NULL, 0,
+        NULL, HFILL }},
     { &hf_cmip_BackUpDestinationList_PDU,
       { "BackUpDestinationList", "cmip.BackUpDestinationList",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "cmip.BackUpDestinationList", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_BackUpRelationshipObject_PDU,
       { "BackUpRelationshipObject", "cmip.BackUpRelationshipObject",
         FT_UINT32, BASE_DEC, VALS(cmip_BackUpRelationshipObject_vals), 0,
-        "cmip.BackUpRelationshipObject", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_CapacityAlarmThreshold_PDU,
       { "CapacityAlarmThreshold", "cmip.CapacityAlarmThreshold",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "cmip.CapacityAlarmThreshold", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_ConfirmedMode_PDU,
       { "ConfirmedMode", "cmip.ConfirmedMode",
-        FT_BOOLEAN, 8, NULL, 0,
-        "cmip.ConfirmedMode", HFILL }},
+        FT_BOOLEAN, BASE_NONE, NULL, 0,
+        NULL, HFILL }},
     { &hf_cmip_ControlStatus_PDU,
       { "ControlStatus", "cmip.ControlStatus",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "cmip.ControlStatus", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_CorrelatedNotifications_PDU,
       { "CorrelatedNotifications", "cmip.CorrelatedNotifications",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "cmip.CorrelatedNotifications", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_CurrentLogSize_PDU,
       { "CurrentLogSize", "cmip.CurrentLogSize",
         FT_INT32, BASE_DEC, NULL, 0,
-        "cmip.CurrentLogSize", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_Destination_PDU,
       { "Destination", "cmip.Destination",
         FT_UINT32, BASE_DEC, VALS(cmip_Destination_vals), 0,
-        "cmip.Destination", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_DiscriminatorConstruct_PDU,
       { "DiscriminatorConstruct", "cmip.DiscriminatorConstruct",
         FT_UINT32, BASE_DEC, VALS(cmip_CMISFilter_vals), 0,
-        "cmip.DiscriminatorConstruct", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_EventTime_PDU,
       { "EventTime", "cmip.EventTime",
         FT_STRING, BASE_NONE, NULL, 0,
-        "cmip.EventTime", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_GroupObjects_PDU,
       { "GroupObjects", "cmip.GroupObjects",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "cmip.GroupObjects", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_IntervalsOfDay_PDU,
       { "IntervalsOfDay", "cmip.IntervalsOfDay",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "cmip.IntervalsOfDay", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_LifecycleState_PDU,
       { "LifecycleState", "cmip.LifecycleState",
         FT_UINT32, BASE_DEC, VALS(cmip_LifecycleState_vals), 0,
-        "cmip.LifecycleState", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_LogFullAction_PDU,
       { "LogFullAction", "cmip.LogFullAction",
         FT_UINT32, BASE_DEC, VALS(cmip_LogFullAction_vals), 0,
-        "cmip.LogFullAction", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_LoggingTime_PDU,
       { "LoggingTime", "cmip.LoggingTime",
         FT_STRING, BASE_NONE, NULL, 0,
-        "cmip.LoggingTime", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_LogRecordId_PDU,
       { "LogRecordId", "cmip.LogRecordId",
         FT_UINT32, BASE_DEC, VALS(cmip_SimpleNameType_vals), 0,
-        "cmip.LogRecordId", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_MaxLogSize_PDU,
       { "MaxLogSize", "cmip.MaxLogSize",
         FT_INT32, BASE_DEC, VALS(cmip_MaxLogSize_vals), 0,
-        "cmip.MaxLogSize", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_MonitoredAttributes_PDU,
       { "MonitoredAttributes", "cmip.MonitoredAttributes",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "cmip.MonitoredAttributes", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_NameBinding_PDU,
       { "NameBinding", "cmip.NameBinding",
         FT_OID, BASE_NONE, NULL, 0,
-        "cmip.NameBinding", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_NotificationIdentifier_PDU,
       { "NotificationIdentifier", "cmip.NotificationIdentifier",
         FT_INT32, BASE_DEC, NULL, 0,
-        "cmip.NotificationIdentifier", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_NumberOfRecords_PDU,
       { "NumberOfRecords", "cmip.NumberOfRecords",
         FT_INT32, BASE_DEC, NULL, 0,
-        "cmip.NumberOfRecords", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_OperationalState_PDU,
       { "OperationalState", "cmip.OperationalState",
         FT_UINT32, BASE_DEC, VALS(cmip_OperationalState_vals), 0,
-        "cmip.OperationalState", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_Packages_PDU,
       { "Packages", "cmip.Packages",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "cmip.Packages", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_PerceivedSeverity_PDU,
       { "PerceivedSeverity", "cmip.PerceivedSeverity",
         FT_UINT32, BASE_DEC, VALS(cmip_PerceivedSeverity_vals), 0,
-        "cmip.PerceivedSeverity", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_PrioritisedObject_PDU,
       { "PrioritisedObject", "cmip.PrioritisedObject",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "cmip.PrioritisedObject", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_ProbableCause_PDU,
       { "ProbableCause", "cmip.ProbableCause",
         FT_UINT32, BASE_DEC, VALS(cmip_ProbableCause_vals), 0,
-        "cmip.ProbableCause", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_ProceduralStatus_PDU,
       { "ProceduralStatus", "cmip.ProceduralStatus",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "cmip.ProceduralStatus", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_ProposedRepairActions_PDU,
       { "ProposedRepairActions", "cmip.ProposedRepairActions",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "cmip.ProposedRepairActions", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_SecurityAlarmCause_PDU,
       { "SecurityAlarmCause", "cmip.SecurityAlarmCause",
         FT_OID, BASE_NONE, NULL, 0,
-        "cmip.SecurityAlarmCause", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_SecurityAlarmSeverity_PDU,
       { "SecurityAlarmSeverity", "cmip.SecurityAlarmSeverity",
         FT_UINT32, BASE_DEC, VALS(cmip_PerceivedSeverity_vals), 0,
-        "cmip.SecurityAlarmSeverity", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_SecurityAlarmDetector_PDU,
       { "SecurityAlarmDetector", "cmip.SecurityAlarmDetector",
         FT_UINT32, BASE_DEC, VALS(cmip_SecurityAlarmDetector_vals), 0,
-        "cmip.SecurityAlarmDetector", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_ServiceProvider_PDU,
       { "ServiceProvider", "cmip.ServiceProvider",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.ServiceProvider", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_ServiceUser_PDU,
       { "ServiceUser", "cmip.ServiceUser",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.ServiceUser", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_SimpleNameType_PDU,
       { "SimpleNameType", "cmip.SimpleNameType",
         FT_UINT32, BASE_DEC, VALS(cmip_SimpleNameType_vals), 0,
-        "cmip.SimpleNameType", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_SourceIndicator_PDU,
       { "SourceIndicator", "cmip.SourceIndicator",
         FT_UINT32, BASE_DEC, VALS(cmip_SourceIndicator_vals), 0,
-        "cmip.SourceIndicator", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_SpecificProblems_PDU,
       { "SpecificProblems", "cmip.SpecificProblems",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "cmip.SpecificProblems", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_StandbyStatus_PDU,
       { "StandbyStatus", "cmip.StandbyStatus",
         FT_INT32, BASE_DEC, VALS(cmip_StandbyStatus_vals), 0,
-        "cmip.StandbyStatus", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_StartTime_PDU,
       { "StartTime", "cmip.StartTime",
         FT_STRING, BASE_NONE, NULL, 0,
-        "cmip.StartTime", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_StopTime_PDU,
       { "StopTime", "cmip.StopTime",
         FT_UINT32, BASE_DEC, VALS(cmip_StopTime_vals), 0,
-        "cmip.StopTime", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_SupportedFeatures_PDU,
       { "SupportedFeatures", "cmip.SupportedFeatures",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "cmip.SupportedFeatures", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_SystemId_PDU,
       { "SystemId", "cmip.SystemId",
         FT_UINT32, BASE_DEC, VALS(cmip_SystemId_vals), 0,
-        "cmip.SystemId", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_SystemTitle_PDU,
       { "SystemTitle", "cmip.SystemTitle",
         FT_UINT32, BASE_DEC, VALS(cmip_SystemTitle_vals), 0,
-        "cmip.SystemTitle", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_ThresholdInfo_PDU,
       { "ThresholdInfo", "cmip.ThresholdInfo",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.ThresholdInfo", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_TrendIndication_PDU,
       { "TrendIndication", "cmip.TrendIndication",
         FT_UINT32, BASE_DEC, VALS(cmip_TrendIndication_vals), 0,
-        "cmip.TrendIndication", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_UnknownStatus_PDU,
       { "UnknownStatus", "cmip.UnknownStatus",
-        FT_BOOLEAN, 8, NULL, 0,
-        "cmip.UnknownStatus", HFILL }},
+        FT_BOOLEAN, BASE_NONE, NULL, 0,
+        NULL, HFILL }},
     { &hf_cmip_UsageState_PDU,
       { "UsageState", "cmip.UsageState",
         FT_UINT32, BASE_DEC, VALS(cmip_UsageState_vals), 0,
-        "cmip.UsageState", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_WeekMask_PDU,
       { "WeekMask", "cmip.WeekMask",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "cmip.WeekMask", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_PAR_missingAttributeValue_item,
-      { "Item", "cmip.PAR_missingAttributeValue_item",
+      { "AttributeId", "cmip.AttributeId",
         FT_UINT32, BASE_DEC, VALS(cmip_AttributeId_vals), 0,
-        "cmip.AttributeId", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_managedObjectClass,
       { "managedObjectClass", "cmip.managedObjectClass",
         FT_UINT32, BASE_DEC, VALS(cmip_ObjectClass_vals), 0,
-        "cmip.ObjectClass", HFILL }},
+        "ObjectClass", HFILL }},
     { &hf_cmip_managedObjectInstance,
       { "managedObjectInstance", "cmip.managedObjectInstance",
         FT_UINT32, BASE_DEC, VALS(cmip_ObjectInstance_vals), 0,
-        "cmip.ObjectInstance", HFILL }},
+        "ObjectInstance", HFILL }},
     { &hf_cmip_currentTime,
       { "currentTime", "cmip.currentTime",
         FT_STRING, BASE_NONE, NULL, 0,
-        "cmip.GeneralizedTime", HFILL }},
+        "GeneralizedTime", HFILL }},
     { &hf_cmip_actionErroractionErrorInfo,
       { "actionErrorInfo", "cmip.actionErrorInfo",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.ActionErrorInfo", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_actionErrorInfo_errorStatus,
       { "errorStatus", "cmip.errorStatus",
         FT_UINT32, BASE_DEC, VALS(cmip_T_actionErrorInfo_errorStatus_vals), 0,
-        "cmip.T_actionErrorInfo_errorStatus", HFILL }},
+        "T_actionErrorInfo_errorStatus", HFILL }},
     { &hf_cmip_actionErrorInfo,
       { "errorInfo", "cmip.errorInfo",
         FT_UINT32, BASE_DEC, VALS(cmip_T_actionErrorInfo_vals), 0,
-        "cmip.T_actionErrorInfo", HFILL }},
+        "T_actionErrorInfo", HFILL }},
     { &hf_cmip_actionType,
       { "actionType", "cmip.actionType",
         FT_UINT32, BASE_DEC, VALS(cmip_ActionTypeId_vals), 0,
-        "cmip.ActionTypeId", HFILL }},
+        "ActionTypeId", HFILL }},
     { &hf_cmip_actionArgument,
       { "actionArgument", "cmip.actionArgument",
         FT_UINT32, BASE_DEC, VALS(cmip_NoSuchArgument_vals), 0,
-        "cmip.NoSuchArgument", HFILL }},
+        "NoSuchArgument", HFILL }},
     { &hf_cmip_argumentValue,
       { "argumentValue", "cmip.argumentValue",
         FT_UINT32, BASE_DEC, VALS(cmip_InvalidArgumentValue_vals), 0,
-        "cmip.InvalidArgumentValue", HFILL }},
+        "InvalidArgumentValue", HFILL }},
     { &hf_cmip_actionInfoArg,
       { "actionInfoArg", "cmip.actionInfoArg",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.T_actionInfoArg", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_actionReplyInfo,
       { "actionReplyInfo", "cmip.actionReplyInfo",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.T_actionReplyInfo", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_actionReply,
       { "actionReply", "cmip.actionReply",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.ActionReply", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_actionTypeId_globalForm,
       { "globalForm", "cmip.globalForm",
         FT_OID, BASE_NONE, NULL, 0,
-        "cmip.T_actionTypeId_globalForm", HFILL }},
+        "T_actionTypeId_globalForm", HFILL }},
     { &hf_cmip_localForm,
       { "localForm", "cmip.localForm",
         FT_INT32, BASE_DEC, NULL, 0,
-        "cmip.INTEGER", HFILL }},
+        "INTEGER", HFILL }},
     { &hf_cmip_attributeid,
       { "id", "cmip.id",
         FT_UINT32, BASE_DEC, VALS(cmip_AttributeId_vals), 0,
-        "cmip.AttributeId", HFILL }},
+        "AttributeId", HFILL }},
     { &hf_cmip_value,
       { "value", "cmip.value",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.AttributeValue", HFILL }},
+        "AttributeValue", HFILL }},
     { &hf_cmip_attributeError_errorStatus,
       { "errorStatus", "cmip.errorStatus",
         FT_UINT32, BASE_DEC, VALS(cmip_T_attributeError_errorStatus_vals), 0,
-        "cmip.T_attributeError_errorStatus", HFILL }},
+        "T_attributeError_errorStatus", HFILL }},
     { &hf_cmip_modifyOperator,
       { "modifyOperator", "cmip.modifyOperator",
         FT_INT32, BASE_DEC, VALS(cmip_ModifyOperator_vals), 0,
-        "cmip.ModifyOperator", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_attributeId,
       { "attributeId", "cmip.attributeId",
         FT_UINT32, BASE_DEC, VALS(cmip_AttributeId_vals), 0,
-        "cmip.AttributeId", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_attributeValue,
       { "attributeValue", "cmip.attributeValue",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.T_attributeValue", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_attributeId_globalForm,
       { "globalForm", "cmip.globalForm",
         FT_OID, BASE_NONE, NULL, 0,
-        "cmip.T_attributeId_globalForm", HFILL }},
+        "T_attributeId_globalForm", HFILL }},
     { &hf_cmip_attributeIdlocalForm,
       { "localForm", "cmip.localForm",
         FT_INT32, BASE_DEC, NULL, 0,
-        "cmip.T_attributeIdlocalForm", HFILL }},
+        "T_attributeIdlocalForm", HFILL }},
     { &hf_cmip_attributeIdError_errorStatus,
       { "errorStatus", "cmip.errorStatus",
         FT_UINT32, BASE_DEC, VALS(cmip_T_attributeIdError_errorStatus_vals), 0,
-        "cmip.T_attributeIdError_errorStatus", HFILL }},
+        "T_attributeIdError_errorStatus", HFILL }},
     { &hf_cmip_id,
       { "id", "cmip.id",
         FT_OID, BASE_NONE, NULL, 0,
-        "cmip.T_id", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_attributeValueAssertionvalue,
       { "value", "cmip.value",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.T_attributeValueAssertionvalue", HFILL }},
+        "T_attributeValueAssertionvalue", HFILL }},
     { &hf_cmip_baseManagedObjectClass,
       { "baseManagedObjectClass", "cmip.baseManagedObjectClass",
         FT_UINT32, BASE_DEC, VALS(cmip_ObjectClass_vals), 0,
-        "cmip.ObjectClass", HFILL }},
+        "ObjectClass", HFILL }},
     { &hf_cmip_baseManagedObjectInstance,
       { "baseManagedObjectInstance", "cmip.baseManagedObjectInstance",
         FT_UINT32, BASE_DEC, VALS(cmip_ObjectInstance_vals), 0,
-        "cmip.ObjectInstance", HFILL }},
+        "ObjectInstance", HFILL }},
     { &hf_cmip_item,
       { "item", "cmip.item",
         FT_UINT32, BASE_DEC, VALS(cmip_FilterItem_vals), 0,
-        "cmip.FilterItem", HFILL }},
+        "FilterItem", HFILL }},
     { &hf_cmip_and,
       { "and", "cmip.and",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "cmip.SET_OF_CMISFilter", HFILL }},
+        "SET_OF_CMISFilter", HFILL }},
     { &hf_cmip_and_item,
-      { "Item", "cmip.and_item",
+      { "CMISFilter", "cmip.CMISFilter",
         FT_UINT32, BASE_DEC, VALS(cmip_CMISFilter_vals), 0,
-        "cmip.CMISFilter", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_or,
       { "or", "cmip.or",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "cmip.SET_OF_CMISFilter", HFILL }},
+        "SET_OF_CMISFilter", HFILL }},
     { &hf_cmip_or_item,
-      { "Item", "cmip.or_item",
+      { "CMISFilter", "cmip.CMISFilter",
         FT_UINT32, BASE_DEC, VALS(cmip_CMISFilter_vals), 0,
-        "cmip.CMISFilter", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_not,
       { "not", "cmip.not",
         FT_UINT32, BASE_DEC, VALS(cmip_CMISFilter_vals), 0,
-        "cmip.CMISFilter", HFILL }},
+        "CMISFilter", HFILL }},
     { &hf_cmip_scope,
       { "scope", "cmip.scope",
         FT_UINT32, BASE_DEC, VALS(cmip_Scope_vals), 0,
-        "cmip.Scope", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_filter,
       { "filter", "cmip.filter",
         FT_UINT32, BASE_DEC, VALS(cmip_CMISFilter_vals), 0,
-        "cmip.CMISFilter", HFILL }},
+        "CMISFilter", HFILL }},
     { &hf_cmip_sync,
       { "sync", "cmip.sync",
         FT_UINT32, BASE_DEC, VALS(cmip_CMISSync_vals), 0,
-        "cmip.CMISSync", HFILL }},
+        "CMISSync", HFILL }},
     { &hf_cmip_managedOrSuperiorObjectInstance,
       { "managedOrSuperiorObjectInstance", "cmip.managedOrSuperiorObjectInstance",
         FT_UINT32, BASE_DEC, VALS(cmip_T_managedOrSuperiorObjectInstance_vals), 0,
-        "cmip.T_managedOrSuperiorObjectInstance", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_superiorObjectInstance,
       { "superiorObjectInstance", "cmip.superiorObjectInstance",
         FT_UINT32, BASE_DEC, VALS(cmip_ObjectInstance_vals), 0,
-        "cmip.ObjectInstance", HFILL }},
+        "ObjectInstance", HFILL }},
     { &hf_cmip_accessControl,
       { "accessControl", "cmip.accessControl",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.AccessControl", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_referenceObjectInstance,
       { "referenceObjectInstance", "cmip.referenceObjectInstance",
         FT_UINT32, BASE_DEC, VALS(cmip_ObjectInstance_vals), 0,
-        "cmip.ObjectInstance", HFILL }},
+        "ObjectInstance", HFILL }},
     { &hf_cmip_attributeList,
       { "attributeList", "cmip.attributeList",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "cmip.SET_OF_Attribute", HFILL }},
+        "SET_OF_Attribute", HFILL }},
     { &hf_cmip_attributeList_item,
-      { "Item", "cmip.attributeList_item",
+      { "Attribute", "cmip.Attribute",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.Attribute", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_deleteErrorInfo,
       { "deleteErrorInfo", "cmip.deleteErrorInfo",
         FT_UINT32, BASE_DEC, VALS(cmip_T_deleteErrorInfo_vals), 0,
-        "cmip.T_deleteErrorInfo", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_eventType,
       { "eventType", "cmip.eventType",
         FT_UINT32, BASE_DEC, VALS(cmip_EventTypeId_vals), 0,
-        "cmip.EventTypeId", HFILL }},
+        "EventTypeId", HFILL }},
     { &hf_cmip_eventReplyInfo,
       { "eventReplyInfo", "cmip.eventReplyInfo",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.T_eventReplyInfo", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_eventTime,
       { "eventTime", "cmip.eventTime",
         FT_STRING, BASE_NONE, NULL, 0,
-        "cmip.GeneralizedTime", HFILL }},
+        "GeneralizedTime", HFILL }},
     { &hf_cmip_eventReportArgumenteventInfo,
       { "eventInfo", "cmip.eventInfo",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.EventReportArgumentEventInfo", HFILL }},
+        "EventReportArgumentEventInfo", HFILL }},
     { &hf_cmip_eventReply,
       { "eventReply", "cmip.eventReply",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.EventReply", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_eventTypeId_globalForm,
       { "globalForm", "cmip.globalForm",
         FT_OID, BASE_NONE, NULL, 0,
-        "cmip.T_eventTypeId_globalForm", HFILL }},
+        "T_eventTypeId_globalForm", HFILL }},
     { &hf_cmip_equality,
       { "equality", "cmip.equality",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.Attribute", HFILL }},
+        "Attribute", HFILL }},
     { &hf_cmip_substrings,
       { "substrings", "cmip.substrings",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "cmip.T_substrings", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_substrings_item,
-      { "Item", "cmip.substrings_item",
+      { "substrings item", "cmip.substrings_item",
         FT_UINT32, BASE_DEC, VALS(cmip_T_substrings_item_vals), 0,
-        "cmip.T_substrings_item", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_initialString,
       { "initialString", "cmip.initialString",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.Attribute", HFILL }},
+        "Attribute", HFILL }},
     { &hf_cmip_anyString,
       { "anyString", "cmip.anyString",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.Attribute", HFILL }},
+        "Attribute", HFILL }},
     { &hf_cmip_finalString,
       { "finalString", "cmip.finalString",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.Attribute", HFILL }},
+        "Attribute", HFILL }},
     { &hf_cmip_greaterOrEqual,
       { "greaterOrEqual", "cmip.greaterOrEqual",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.Attribute", HFILL }},
+        "Attribute", HFILL }},
     { &hf_cmip_lessOrEqual,
       { "lessOrEqual", "cmip.lessOrEqual",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.Attribute", HFILL }},
+        "Attribute", HFILL }},
     { &hf_cmip_filterItempresent,
       { "present", "cmip.present",
         FT_UINT32, BASE_DEC, VALS(cmip_AttributeId_vals), 0,
-        "cmip.AttributeId", HFILL }},
+        "AttributeId", HFILL }},
     { &hf_cmip_subsetOf,
       { "subsetOf", "cmip.subsetOf",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.Attribute", HFILL }},
+        "Attribute", HFILL }},
     { &hf_cmip_supersetOf,
       { "supersetOf", "cmip.supersetOf",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.Attribute", HFILL }},
+        "Attribute", HFILL }},
     { &hf_cmip_nonNullSetIntersection,
       { "nonNullSetIntersection", "cmip.nonNullSetIntersection",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.Attribute", HFILL }},
+        "Attribute", HFILL }},
     { &hf_cmip_attributeIdError,
       { "attributeIdError", "cmip.attributeIdError",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.AttributeIdError", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_attribute,
       { "attribute", "cmip.attribute",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.Attribute", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_getInfoList,
       { "getInfoList", "cmip.getInfoList",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "cmip.SET_OF_GetInfoStatus", HFILL }},
+        "SET_OF_GetInfoStatus", HFILL }},
     { &hf_cmip_getInfoList_item,
-      { "Item", "cmip.getInfoList_item",
+      { "GetInfoStatus", "cmip.GetInfoStatus",
         FT_UINT32, BASE_DEC, VALS(cmip_GetInfoStatus_vals), 0,
-        "cmip.GetInfoStatus", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_actionValue,
       { "actionValue", "cmip.actionValue",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.ActionInfo", HFILL }},
+        "ActionInfo", HFILL }},
     { &hf_cmip_eventValue,
       { "eventValue", "cmip.eventValue",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.T_eventValue", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_eventInfo,
       { "eventInfo", "cmip.eventInfo",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.T_eventInfo", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_getResult,
       { "getResult", "cmip.getResult",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.GetResult", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_getListError,
       { "getListError", "cmip.getListError",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.GetListError", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_setResult,
       { "setResult", "cmip.setResult",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.SetResult", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_setListError,
       { "setListError", "cmip.setListError",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.SetListError", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_actionResult,
       { "actionResult", "cmip.actionResult",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.ActionResult", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_processingFailure,
       { "processingFailure", "cmip.processingFailure",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.ProcessingFailure", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_deleteResult,
       { "deleteResult", "cmip.deleteResult",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.DeleteResult", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_actionError,
       { "actionError", "cmip.actionError",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.ActionError", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_deleteError,
       { "deleteError", "cmip.deleteError",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.DeleteError", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_actionId,
       { "actionId", "cmip.actionId",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.T_actionId", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_eventId,
       { "eventId", "cmip.eventId",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.T_eventId", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_objectClass_globalForm,
       { "globalForm", "cmip.globalForm",
         FT_OID, BASE_NONE, NULL, 0,
-        "cmip.T_objectClass_globalForm", HFILL }},
+        "T_objectClass_globalForm", HFILL }},
     { &hf_cmip_objectClasslocalForm,
       { "localForm", "cmip.localForm",
         FT_INT32, BASE_DEC, NULL, 0,
-        "cmip.T_objectClasslocalForm", HFILL }},
+        "T_objectClasslocalForm", HFILL }},
     { &hf_cmip_distinguishedName,
       { "distinguishedName", "cmip.distinguishedName",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "cmip.DistinguishedName", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_nonSpecificForm,
       { "nonSpecificForm", "cmip.nonSpecificForm",
-        FT_BYTES, BASE_HEX, NULL, 0,
-        "cmip.OCTET_STRING", HFILL }},
+        FT_BYTES, BASE_NONE, NULL, 0,
+        "OCTET_STRING", HFILL }},
     { &hf_cmip_localDistinguishedName,
       { "localDistinguishedName", "cmip.localDistinguishedName",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "cmip.RDNSequence", HFILL }},
+        "RDNSequence", HFILL }},
     { &hf_cmip_specificErrorInfo,
       { "specificErrorInfo", "cmip.specificErrorInfo",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.SpecificErrorInfo", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_RDNSequence_item,
-      { "Item", "cmip.RDNSequence_item",
+      { "RelativeDistinguishedName", "cmip.RelativeDistinguishedName",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "cmip.RelativeDistinguishedName", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_RelativeDistinguishedName_item,
-      { "Item", "cmip.RelativeDistinguishedName_item",
+      { "AttributeValueAssertion", "cmip.AttributeValueAssertion",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.AttributeValueAssertion", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_namedNumbers,
       { "namedNumbers", "cmip.namedNumbers",
         FT_INT32, BASE_DEC, VALS(cmip_T_namedNumbers_vals), 0,
-        "cmip.T_namedNumbers", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_individualLevels,
       { "individualLevels", "cmip.individualLevels",
         FT_INT32, BASE_DEC, NULL, 0,
-        "cmip.INTEGER", HFILL }},
+        "INTEGER", HFILL }},
     { &hf_cmip_baseToNthLevel,
       { "baseToNthLevel", "cmip.baseToNthLevel",
         FT_INT32, BASE_DEC, NULL, 0,
-        "cmip.INTEGER", HFILL }},
+        "INTEGER", HFILL }},
     { &hf_cmip_attributeError,
       { "attributeError", "cmip.attributeError",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.AttributeError", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_setInfoList,
       { "setInfoList", "cmip.setInfoList",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "cmip.SET_OF_SetInfoStatus", HFILL }},
+        "SET_OF_SetInfoStatus", HFILL }},
     { &hf_cmip_setInfoList_item,
-      { "Item", "cmip.setInfoList_item",
+      { "SetInfoStatus", "cmip.SetInfoStatus",
         FT_UINT32, BASE_DEC, VALS(cmip_SetInfoStatus_vals), 0,
-        "cmip.SetInfoStatus", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_errorId,
       { "errorId", "cmip.errorId",
         FT_OID, BASE_NONE, NULL, 0,
-        "cmip.T_errorId", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_errorInfo,
       { "errorInfo", "cmip.errorInfo",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.T_errorInfo", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_abortSource,
       { "abortSource", "cmip.abortSource",
         FT_UINT32, BASE_DEC, VALS(cmip_CMIPAbortSource_vals), 0,
-        "cmip.CMIPAbortSource", HFILL }},
+        "CMIPAbortSource", HFILL }},
     { &hf_cmip_userInfo,
       { "userInfo", "cmip.userInfo",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.EXTERNAL", HFILL }},
+        "EXTERNAL", HFILL }},
     { &hf_cmip_protocolVersion,
       { "protocolVersion", "cmip.protocolVersion",
-        FT_BYTES, BASE_HEX, NULL, 0,
-        "cmip.ProtocolVersion", HFILL }},
+        FT_BYTES, BASE_NONE, NULL, 0,
+        NULL, HFILL }},
     { &hf_cmip_functionalUnits,
       { "functionalUnits", "cmip.functionalUnits",
-        FT_BYTES, BASE_HEX, NULL, 0,
-        "cmip.FunctionalUnits", HFILL }},
+        FT_BYTES, BASE_NONE, NULL, 0,
+        NULL, HFILL }},
     { &hf_cmip_cmipUserInfoaccessControl,
       { "accessControl", "cmip.accessControl",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.EXTERNAL", HFILL }},
+        "EXTERNAL", HFILL }},
     { &hf_cmip_AdditionalInformation_item,
-      { "Item", "cmip.AdditionalInformation_item",
+      { "ManagementExtension", "cmip.ManagementExtension",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.ManagementExtension", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_Allomorphs_item,
-      { "Item", "cmip.Allomorphs_item",
+      { "ObjectClass", "cmip.ObjectClass",
         FT_UINT32, BASE_DEC, VALS(cmip_ObjectClass_vals), 0,
-        "cmip.ObjectClass", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_AttributeIdentifierList_item,
-      { "Item", "cmip.AttributeIdentifierList_item",
+      { "AttributeId", "cmip.AttributeId",
         FT_UINT32, BASE_DEC, VALS(cmip_AttributeId_vals), 0,
-        "cmip.AttributeId", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_AttributeList_item,
-      { "Item", "cmip.AttributeList_item",
+      { "Attribute", "cmip.Attribute",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.Attribute", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_AttributeValueChangeDefinition_item,
-      { "Item", "cmip.AttributeValueChangeDefinition_item",
+      { "AttributeValueChangeDefinition item", "cmip.AttributeValueChangeDefinition_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.AttributeValueChangeDefinition_item", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_oldAttributeValue,
       { "oldAttributeValue", "cmip.oldAttributeValue",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.T_oldAttributeValue", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_newAttributeValue,
       { "newAttributeValue", "cmip.newAttributeValue",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.T_newAttributeValue", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_AlarmStatus_item,
-      { "Item", "cmip.AlarmStatus_item",
+      { "AlarmStatus item", "cmip.AlarmStatus_item",
         FT_INT32, BASE_DEC, VALS(cmip_AlarmStatus_item_vals), 0,
-        "cmip.AlarmStatus_item", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_AvailabilityStatus_item,
-      { "Item", "cmip.AvailabilityStatus_item",
+      { "AvailabilityStatus item", "cmip.AvailabilityStatus_item",
         FT_INT32, BASE_DEC, VALS(cmip_AvailabilityStatus_item_vals), 0,
-        "cmip.AvailabilityStatus_item", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_BackUpDestinationList_item,
-      { "Item", "cmip.BackUpDestinationList_item",
+      { "AE-title", "cmip.AE_title",
         FT_UINT32, BASE_DEC, VALS(acse_AE_title_vals), 0,
-        "acse.AE_title", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_objectName,
       { "objectName", "cmip.objectName",
         FT_UINT32, BASE_DEC, VALS(cmip_ObjectInstance_vals), 0,
-        "cmip.ObjectInstance", HFILL }},
+        "ObjectInstance", HFILL }},
     { &hf_cmip_noObject,
       { "noObject", "cmip.noObject",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_CapacityAlarmThreshold_item,
-      { "Item", "cmip.CapacityAlarmThreshold_item",
+      { "CapacityAlarmThreshold item", "cmip.CapacityAlarmThreshold_item",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "cmip.INTEGER_0_100", HFILL }},
+        "INTEGER_0_100", HFILL }},
     { &hf_cmip_ControlStatus_item,
-      { "Item", "cmip.ControlStatus_item",
+      { "ControlStatus item", "cmip.ControlStatus_item",
         FT_INT32, BASE_DEC, VALS(cmip_ControlStatus_item_vals), 0,
-        "cmip.ControlStatus_item", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_CorrelatedNotifications_item,
-      { "Item", "cmip.CorrelatedNotifications_item",
+      { "CorrelatedNotifications item", "cmip.CorrelatedNotifications_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.CorrelatedNotifications_item", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_correlatedNotifications,
       { "correlatedNotifications", "cmip.correlatedNotifications",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "cmip.SET_OF_NotificationIdentifier", HFILL }},
+        "SET_OF_NotificationIdentifier", HFILL }},
     { &hf_cmip_correlatedNotifications_item,
-      { "Item", "cmip.correlatedNotifications_item",
+      { "NotificationIdentifier", "cmip.NotificationIdentifier",
         FT_INT32, BASE_DEC, NULL, 0,
-        "cmip.NotificationIdentifier", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_sourceObjectInst,
       { "sourceObjectInst", "cmip.sourceObjectInst",
         FT_UINT32, BASE_DEC, VALS(cmip_ObjectInstance_vals), 0,
-        "cmip.ObjectInstance", HFILL }},
+        "ObjectInstance", HFILL }},
     { &hf_cmip_single,
       { "single", "cmip.single",
         FT_UINT32, BASE_DEC, VALS(acse_AE_title_vals), 0,
-        "acse.AE_title", HFILL }},
+        "AE_title", HFILL }},
     { &hf_cmip_multiple,
       { "multiple", "cmip.multiple",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "cmip.SET_OF_AE_title", HFILL }},
+        "SET_OF_AE_title", HFILL }},
     { &hf_cmip_multiple_item,
-      { "Item", "cmip.multiple_item",
+      { "AE-title", "cmip.AE_title",
         FT_UINT32, BASE_DEC, VALS(acse_AE_title_vals), 0,
-        "acse.AE_title", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_GroupObjects_item,
-      { "Item", "cmip.GroupObjects_item",
+      { "ObjectInstance", "cmip.ObjectInstance",
         FT_UINT32, BASE_DEC, VALS(cmip_ObjectInstance_vals), 0,
-        "cmip.ObjectInstance", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_IntervalsOfDay_item,
-      { "Item", "cmip.IntervalsOfDay_item",
+      { "IntervalsOfDay item", "cmip.IntervalsOfDay_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.IntervalsOfDay_item", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_intervalStart,
       { "intervalStart", "cmip.intervalStart",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.Time24", HFILL }},
+        "Time24", HFILL }},
     { &hf_cmip_intervalEnd,
       { "intervalEnd", "cmip.intervalEnd",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.Time24", HFILL }},
+        "Time24", HFILL }},
     { &hf_cmip_managementExtensionidentifier,
       { "identifier", "cmip.identifier",
         FT_OID, BASE_NONE, NULL, 0,
-        "cmip.T_managementExtensionidentifier", HFILL }},
+        "T_managementExtensionidentifier", HFILL }},
     { &hf_cmip_significance,
       { "significance", "cmip.significance",
-        FT_BOOLEAN, 8, NULL, 0,
-        "cmip.BOOLEAN", HFILL }},
+        FT_BOOLEAN, BASE_NONE, NULL, 0,
+        "BOOLEAN", HFILL }},
     { &hf_cmip_information,
       { "information", "cmip.information",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.T_information", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_MonitoredAttributes_item,
-      { "Item", "cmip.MonitoredAttributes_item",
+      { "Attribute", "cmip.Attribute",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.Attribute", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_integer,
       { "integer", "cmip.integer",
         FT_INT32, BASE_DEC, NULL, 0,
-        "cmip.INTEGER", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_real,
       { "real", "cmip.real",
         FT_DOUBLE, BASE_NONE, NULL, 0,
-        "cmip.REAL", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_Packages_item,
-      { "Item", "cmip.Packages_item",
+      { "Packages item", "cmip.Packages_item",
         FT_OID, BASE_NONE, NULL, 0,
-        "cmip.OBJECT_IDENTIFIER", HFILL }},
+        "OBJECT_IDENTIFIER", HFILL }},
     { &hf_cmip_PrioritisedObject_item,
-      { "Item", "cmip.PrioritisedObject_item",
+      { "PrioritisedObject item", "cmip.PrioritisedObject_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.PrioritisedObject_item", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_object,
       { "object", "cmip.object",
         FT_UINT32, BASE_DEC, VALS(cmip_ObjectInstance_vals), 0,
-        "cmip.ObjectInstance", HFILL }},
+        "ObjectInstance", HFILL }},
     { &hf_cmip_priority,
       { "priority", "cmip.priority",
         FT_INT32, BASE_DEC, VALS(cmip_T_priority_vals), 0,
-        "cmip.T_priority", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_globalValue,
       { "globalValue", "cmip.globalValue",
         FT_OID, BASE_NONE, NULL, 0,
-        "cmip.OBJECT_IDENTIFIER", HFILL }},
+        "OBJECT_IDENTIFIER", HFILL }},
     { &hf_cmip_localValue,
       { "localValue", "cmip.localValue",
         FT_INT32, BASE_DEC, NULL, 0,
-        "cmip.INTEGER", HFILL }},
+        "INTEGER", HFILL }},
     { &hf_cmip_ProceduralStatus_item,
-      { "Item", "cmip.ProceduralStatus_item",
+      { "ProceduralStatus item", "cmip.ProceduralStatus_item",
         FT_INT32, BASE_DEC, VALS(cmip_ProceduralStatus_item_vals), 0,
-        "cmip.ProceduralStatus_item", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_ProposedRepairActions_item,
-      { "Item", "cmip.ProposedRepairActions_item",
+      { "SpecificIdentifier", "cmip.SpecificIdentifier",
         FT_UINT32, BASE_DEC, VALS(cmip_SpecificIdentifier_vals), 0,
-        "cmip.SpecificIdentifier", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_mechanism,
       { "mechanism", "cmip.mechanism",
         FT_OID, BASE_NONE, NULL, 0,
-        "cmip.OBJECT_IDENTIFIER", HFILL }},
+        "OBJECT_IDENTIFIER", HFILL }},
     { &hf_cmip_application,
       { "application", "cmip.application",
         FT_UINT32, BASE_DEC, VALS(acse_AE_title_vals), 0,
-        "acse.AE_title", HFILL }},
+        "AE_title", HFILL }},
     { &hf_cmip_serviceUseridentifier,
       { "identifier", "cmip.identifier",
         FT_OID, BASE_NONE, NULL, 0,
-        "cmip.T_serviceUseridentifier", HFILL }},
+        "T_serviceUseridentifier", HFILL }},
     { &hf_cmip_details,
       { "details", "cmip.details",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.T_details", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_number,
       { "number", "cmip.number",
         FT_INT32, BASE_DEC, NULL, 0,
-        "cmip.INTEGER", HFILL }},
+        "INTEGER", HFILL }},
     { &hf_cmip_string,
       { "string", "cmip.string",
         FT_STRING, BASE_NONE, NULL, 0,
-        "cmip.GraphicString", HFILL }},
+        "GraphicString", HFILL }},
     { &hf_cmip_oi,
       { "oi", "cmip.oi",
         FT_OID, BASE_NONE, NULL, 0,
-        "cmip.OBJECT_IDENTIFIER", HFILL }},
+        "OBJECT_IDENTIFIER", HFILL }},
     { &hf_cmip_int,
       { "int", "cmip.int",
         FT_INT32, BASE_DEC, NULL, 0,
-        "cmip.INTEGER", HFILL }},
+        "INTEGER", HFILL }},
     { &hf_cmip_SpecificProblems_item,
-      { "Item", "cmip.SpecificProblems_item",
+      { "SpecificIdentifier", "cmip.SpecificIdentifier",
         FT_UINT32, BASE_DEC, VALS(cmip_SpecificIdentifier_vals), 0,
-        "cmip.SpecificIdentifier", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_specific,
       { "specific", "cmip.specific",
         FT_STRING, BASE_NONE, NULL, 0,
-        "cmip.GeneralizedTime", HFILL }},
+        "GeneralizedTime", HFILL }},
     { &hf_cmip_continual,
       { "continual", "cmip.continual",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_SupportedFeatures_item,
-      { "Item", "cmip.SupportedFeatures_item",
+      { "SupportedFeatures item", "cmip.SupportedFeatures_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.SupportedFeatures_item", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_featureIdentifier,
       { "featureIdentifier", "cmip.featureIdentifier",
         FT_OID, BASE_NONE, NULL, 0,
-        "cmip.T_featureIdentifier", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_featureInfo,
       { "featureInfo", "cmip.featureInfo",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.T_featureInfo", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_name,
       { "name", "cmip.name",
         FT_STRING, BASE_NONE, NULL, 0,
-        "cmip.GraphicString", HFILL }},
+        "GraphicString", HFILL }},
     { &hf_cmip_nothing,
       { "nothing", "cmip.nothing",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_oid,
       { "oid", "cmip.oid",
         FT_OID, BASE_NONE, NULL, 0,
-        "cmip.OBJECT_IDENTIFIER", HFILL }},
+        "OBJECT_IDENTIFIER", HFILL }},
     { &hf_cmip_hour,
       { "hour", "cmip.hour",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "cmip.INTEGER_0_23", HFILL }},
+        "INTEGER_0_23", HFILL }},
     { &hf_cmip_minute,
       { "minute", "cmip.minute",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "cmip.INTEGER_0_59", HFILL }},
+        "INTEGER_0_59", HFILL }},
     { &hf_cmip_triggeredThreshold,
       { "triggeredThreshold", "cmip.triggeredThreshold",
         FT_UINT32, BASE_DEC, VALS(cmip_AttributeId_vals), 0,
-        "cmip.AttributeId", HFILL }},
+        "AttributeId", HFILL }},
     { &hf_cmip_observedValue,
       { "observedValue", "cmip.observedValue",
         FT_UINT32, BASE_DEC, VALS(cmip_ObservedValue_vals), 0,
-        "cmip.ObservedValue", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_thresholdLevel,
       { "thresholdLevel", "cmip.thresholdLevel",
         FT_UINT32, BASE_DEC, VALS(cmip_ThresholdLevelInd_vals), 0,
-        "cmip.ThresholdLevelInd", HFILL }},
+        "ThresholdLevelInd", HFILL }},
     { &hf_cmip_armTime,
       { "armTime", "cmip.armTime",
         FT_STRING, BASE_NONE, NULL, 0,
-        "cmip.GeneralizedTime", HFILL }},
+        "GeneralizedTime", HFILL }},
     { &hf_cmip_up,
       { "up", "cmip.up",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.T_up", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_high,
       { "high", "cmip.high",
         FT_UINT32, BASE_DEC, VALS(cmip_ObservedValue_vals), 0,
-        "cmip.ObservedValue", HFILL }},
+        "ObservedValue", HFILL }},
     { &hf_cmip_low,
       { "low", "cmip.low",
         FT_UINT32, BASE_DEC, VALS(cmip_ObservedValue_vals), 0,
-        "cmip.ObservedValue", HFILL }},
+        "ObservedValue", HFILL }},
     { &hf_cmip_down,
       { "down", "cmip.down",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.T_down", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_WeekMask_item,
-      { "Item", "cmip.WeekMask_item",
+      { "WeekMask item", "cmip.WeekMask_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.WeekMask_item", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_daysOfWeek,
       { "daysOfWeek", "cmip.daysOfWeek",
-        FT_BYTES, BASE_HEX, NULL, 0,
-        "cmip.T_daysOfWeek", HFILL }},
+        FT_BYTES, BASE_NONE, NULL, 0,
+        NULL, HFILL }},
     { &hf_cmip_intervalsOfDay,
       { "intervalsOfDay", "cmip.intervalsOfDay",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "cmip.IntervalsOfDay", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_local,
       { "local", "cmip.local",
         FT_INT32, BASE_DEC, NULL, 0,
-        "cmip.T_local", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_global,
       { "global", "cmip.global",
         FT_OID, BASE_NONE, NULL, 0,
-        "cmip.OBJECT_IDENTIFIER", HFILL }},
+        "OBJECT_IDENTIFIER", HFILL }},
     { &hf_cmip_invoke,
       { "invoke", "cmip.invoke",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.Invoke", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_returnResult,
       { "returnResult", "cmip.returnResult",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.ReturnResult", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_returnError,
       { "returnError", "cmip.returnError",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.ReturnError", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_reject,
       { "reject", "cmip.reject",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.Reject", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_invokeId,
       { "invokeId", "cmip.invokeId",
         FT_UINT32, BASE_DEC, VALS(cmip_InvokeId_vals), 0,
-        "cmip.InvokeId", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_linkedId,
       { "linkedId", "cmip.linkedId",
         FT_UINT32, BASE_DEC, VALS(cmip_T_linkedId_vals), 0,
-        "cmip.T_linkedId", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_linkedIdPresent,
       { "present", "cmip.present",
         FT_INT32, BASE_DEC, NULL, 0,
-        "cmip.T_linkedIdPresent", HFILL }},
+        "T_linkedIdPresent", HFILL }},
     { &hf_cmip_absent,
       { "absent", "cmip.absent",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.NULL", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_opcode,
       { "opcode", "cmip.opcode",
         FT_UINT32, BASE_DEC, VALS(cmip_Code_vals), 0,
-        "cmip.Code", HFILL }},
+        "Code", HFILL }},
     { &hf_cmip_argument,
       { "argument", "cmip.argument",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.InvokeArgument", HFILL }},
+        "InvokeArgument", HFILL }},
     { &hf_cmip_result,
       { "result", "cmip.result",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.T_result", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_resultArgument,
       { "result", "cmip.result",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.ResultArgument", HFILL }},
+        "ResultArgument", HFILL }},
     { &hf_cmip_errcode,
       { "errcode", "cmip.errcode",
         FT_UINT32, BASE_DEC, VALS(cmip_Code_vals), 0,
-        "cmip.Code", HFILL }},
+        "Code", HFILL }},
     { &hf_cmip_parameter,
       { "parameter", "cmip.parameter",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.T_parameter", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_problem,
       { "problem", "cmip.problem",
         FT_UINT32, BASE_DEC, VALS(cmip_T_problem_vals), 0,
-        "cmip.T_problem", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_general,
       { "general", "cmip.general",
         FT_INT32, BASE_DEC, VALS(cmip_GeneralProblem_vals), 0,
-        "cmip.GeneralProblem", HFILL }},
+        "GeneralProblem", HFILL }},
     { &hf_cmip_invokeProblem,
       { "invoke", "cmip.invoke",
         FT_INT32, BASE_DEC, VALS(cmip_InvokeProblem_vals), 0,
-        "cmip.InvokeProblem", HFILL }},
+        "InvokeProblem", HFILL }},
     { &hf_cmip_returnResultProblem,
       { "returnResult", "cmip.returnResult",
         FT_INT32, BASE_DEC, VALS(cmip_ReturnResultProblem_vals), 0,
-        "cmip.ReturnResultProblem", HFILL }},
+        "ReturnResultProblem", HFILL }},
     { &hf_cmip_returnErrorProblem,
       { "returnError", "cmip.returnError",
         FT_INT32, BASE_DEC, VALS(cmip_ReturnErrorProblem_vals), 0,
-        "cmip.ReturnErrorProblem", HFILL }},
+        "ReturnErrorProblem", HFILL }},
     { &hf_cmip_present,
       { "present", "cmip.present",
         FT_INT32, BASE_DEC, NULL, 0,
-        "cmip.INTEGER", HFILL }},
+        "INTEGER", HFILL }},
     { &hf_cmip_synchronization,
       { "synchronization", "cmip.synchronization",
         FT_UINT32, BASE_DEC, VALS(cmip_CMISSync_vals), 0,
-        "cmip.CMISSync", HFILL }},
+        "CMISSync", HFILL }},
     { &hf_cmip_actionInfo,
       { "actionInfo", "cmip.actionInfo",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.ActionInfo", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_attributeIdList,
       { "attributeIdList", "cmip.attributeIdList",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "cmip.SET_OF_AttributeId", HFILL }},
+        "SET_OF_AttributeId", HFILL }},
     { &hf_cmip_attributeIdList_item,
-      { "Item", "cmip.attributeIdList_item",
+      { "AttributeId", "cmip.AttributeId",
         FT_UINT32, BASE_DEC, VALS(cmip_AttributeId_vals), 0,
-        "cmip.AttributeId", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_modificationList,
       { "modificationList", "cmip.modificationList",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "cmip.T_modificationList", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_modificationList_item,
-      { "Item", "cmip.modificationList_item",
+      { "modificationList item", "cmip.modificationList_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.T_modificationList_item", HFILL }},
+        "T_modificationList_item", HFILL }},
     { &hf_cmip_attributevalue,
       { "attributeValue", "cmip.attributeValue",
         FT_NONE, BASE_NONE, NULL, 0,
-        "cmip.T_attributevalue", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_InvokeId_present,
       { "InvokeId.present", "cmip.InvokeId_present",
         FT_INT32, BASE_DEC, NULL, 0,
-        "cmip.InvokeId_present", HFILL }},
+        "InvokeId_present", HFILL }},
     { &hf_cmip_FunctionalUnits_multipleObjectSelection,
       { "multipleObjectSelection", "cmip.multipleObjectSelection",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_FunctionalUnits_filter,
       { "filter", "cmip.filter",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_FunctionalUnits_multipleReply,
       { "multipleReply", "cmip.multipleReply",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_FunctionalUnits_extendedService,
       { "extendedService", "cmip.extendedService",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_FunctionalUnits_cancelGet,
       { "cancelGet", "cmip.cancelGet",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_ProtocolVersion_version1,
       { "version1", "cmip.version1",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_ProtocolVersion_version2,
       { "version2", "cmip.version2",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_T_daysOfWeek_sunday,
       { "sunday", "cmip.sunday",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_T_daysOfWeek_monday,
       { "monday", "cmip.monday",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_T_daysOfWeek_tuesday,
       { "tuesday", "cmip.tuesday",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_T_daysOfWeek_wednesday,
       { "wednesday", "cmip.wednesday",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_T_daysOfWeek_thursday,
       { "thursday", "cmip.thursday",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_T_daysOfWeek_friday,
       { "friday", "cmip.friday",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_T_daysOfWeek_saturday,
       { "saturday", "cmip.saturday",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
 
 /*--- End of included file: packet-cmip-hfarr.c ---*/
-#line 194 "packet-cmip-template.c"
+#line 188 "../../asn1/cmip/packet-cmip-template.c"
   };
 
   /* List of subtrees */
@@ -5599,7 +5587,7 @@ void proto_register_cmip(void) {
     &ett_cmip,
 
 /*--- Included file: packet-cmip-ettarr.c ---*/
-#line 1 "packet-cmip-ettarr.c"
+#line 1 "../../asn1/cmip/packet-cmip-ettarr.c"
     &ett_cmip_PAR_missingAttributeValue,
     &ett_cmip_ActionArgument,
     &ett_cmip_ActionError,
@@ -5723,7 +5711,7 @@ void proto_register_cmip(void) {
     &ett_cmip_T_modificationList_item,
 
 /*--- End of included file: packet-cmip-ettarr.c ---*/
-#line 200 "packet-cmip-template.c"
+#line 194 "../../asn1/cmip/packet-cmip-template.c"
   };
 
   /* Register protocol */
@@ -5734,7 +5722,7 @@ void proto_register_cmip(void) {
   proto_register_subtree_array(ett, array_length(ett));
 
 /*--- Included file: packet-cmip-dis-tab.c ---*/
-#line 1 "packet-cmip-dis-tab.c"
+#line 1 "../../asn1/cmip/packet-cmip-dis-tab.c"
   register_ber_oid_dissector("2.9.2.21.7.13", dissect_BaseManagedObjectId_PDU, proto_cmip, "BaseManagedObjectId(13)");
   register_ber_oid_dissector("2.9.3.2.7.1", dissect_SimpleNameType_PDU, proto_cmip, "discriminatorId(1)");
   register_ber_oid_dissector("2.9.3.2.7.2", dissect_SimpleNameType_PDU, proto_cmip, "logId(2)");
@@ -5808,9 +5796,11 @@ void proto_register_cmip(void) {
 
 
 /*--- End of included file: packet-cmip-dis-tab.c ---*/
-#line 209 "packet-cmip-template.c"
+#line 203 "../../asn1/cmip/packet-cmip-template.c"
     oid_add_from_string("discriminatorId(1)","2.9.3.2.7.1");
 
+  attribute_id_dissector_table = register_dissector_table("cmip.attribute_id", "CMIP Attribute Id", FT_UINT32, BASE_DEC);
+
 }
 
 
@@ -5819,7 +5809,7 @@ void proto_reg_handoff_cmip(void) {
        register_ber_oid_dissector("2.9.0.0.2", dissect_cmip, proto_cmip, "cmip");
        register_ber_oid_dissector("2.9.1.1.4", dissect_cmip, proto_cmip, "joint-iso-itu-t(2) ms(9) cmip(1) cmip-pci(1) abstractSyntax(4)");
 
-       oid_add_from_string("2.9.3.2.3.1","managedObjectClass(3) alarmRecord(1)");  
+       oid_add_from_string("2.9.3.2.3.1","managedObjectClass(3) alarmRecord(1)");
        oid_add_from_string("2.9.3.2.3.2","managedObjectClass(3) attributeValueChangeRecord(2)");
        oid_add_from_string("2.9.3.2.3.3","managedObjectClass(3) discriminator(3)");
        oid_add_from_string("2.9.3.2.3.4","managedObjectClass(3) eventForwardingDiscriminator(4)");