ASN.1 dissectors regenerated with new asn2wrs to get updated field blurb

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@18921 f5534014-38df-0310-8fa8-9805f1628bb7

1 files changed, 133 insertions, 133 deletions

diff --git a/epan/dissectors/packet-cmip.c b/epan/dissectors/packet-cmip.c
index f5038b3097..f2db1c6173 100644
--- a/epan/dissectors/packet-cmip.c
+++ b/epan/dissectors/packet-cmip.c
@@ -2984,535 +2984,535 @@ void proto_register_cmip(void) {
     { &hf_cmip_modifyOperator,
       { "modifyOperator", "cmip.modifyOperator",
         FT_INT32, BASE_DEC, VALS(cmip_ModifyOperator_vals), 0,
-        "", HFILL }},
+        "cmip.ModifyOperator", HFILL }},
     { &hf_cmip_attributeId,
       { "attributeId", "cmip.attributeId",
         FT_OID, BASE_NONE, NULL, 0,
-        "ModificationItem/attributeId", HFILL }},
+        "cmip.T_attributeId", HFILL }},
     { &hf_cmip_attributeValue,
       { "attributeValue", "cmip.attributeValue",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ModificationItem/attributeValue", HFILL }},
+        "cmip.T_attributeValue", HFILL }},
     { &hf_cmip_managedObjectClass,
       { "managedObjectClass", "cmip.managedObjectClass",
         FT_UINT32, BASE_DEC, VALS(cmip_ObjectClass_vals), 0,
-        "", HFILL }},
+        "cmip.ObjectClass", HFILL }},
     { &hf_cmip_managedObjectInstance,
       { "managedObjectInstance", "cmip.managedObjectInstance",
         FT_UINT32, BASE_DEC, VALS(cmip_ObjectInstance_vals), 0,
-        "", HFILL }},
+        "cmip.ObjectInstance", HFILL }},
     { &hf_cmip_currentTime,
       { "currentTime", "cmip.currentTime",
         FT_STRING, BASE_NONE, NULL, 0,
-        "", HFILL }},
+        "cmip.GeneralizedTime", HFILL }},
     { &hf_cmip_getInfoList,
       { "getInfoList", "cmip.getInfoList",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "GetListError/getInfoList", HFILL }},
+        "cmip.SET_OF_GetInfoStatus", HFILL }},
     { &hf_cmip_getInfoList_item,
       { "Item", "cmip.getInfoList_item",
         FT_UINT32, BASE_DEC, VALS(cmip_GetInfoStatus_vals), 0,
-        "GetListError/getInfoList/_item", HFILL }},
+        "cmip.GetInfoStatus", HFILL }},
     { &hf_cmip_attributeIdError,
       { "attributeIdError", "cmip.attributeIdError",
         FT_NONE, BASE_NONE, NULL, 0,
-        "GetInfoStatus/attributeIdError", HFILL }},
+        "cmip.AttributeIdError", HFILL }},
     { &hf_cmip_attribute,
       { "attribute", "cmip.attribute",
         FT_NONE, BASE_NONE, NULL, 0,
-        "", HFILL }},
+        "cmip.Attribute", HFILL }},
     { &hf_cmip_errorStatus,
       { "errorStatus", "cmip.errorStatus",
         FT_UINT32, BASE_DEC, VALS(cmip_T_errorStatus_vals), 0,
-        "AttributeIdError/errorStatus", HFILL }},
+        "cmip.T_errorStatus", HFILL }},
     { &hf_cmip_attributeId1,
       { "attributeId", "cmip.attributeId",
         FT_UINT32, BASE_DEC, VALS(cmip_AttributeId_vals), 0,
-        "AttributeIdError/attributeId", HFILL }},
+        "cmip.AttributeId", HFILL }},
     { &hf_cmip_setInfoList,
       { "setInfoList", "cmip.setInfoList",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "SetListError/setInfoList", HFILL }},
+        "cmip.SET_OF_SetInfoStatus", HFILL }},
     { &hf_cmip_setInfoList_item,
       { "Item", "cmip.setInfoList_item",
         FT_UINT32, BASE_DEC, VALS(cmip_SetInfoStatus_vals), 0,
-        "SetListError/setInfoList/_item", HFILL }},
+        "cmip.SetInfoStatus", HFILL }},
     { &hf_cmip_actionErrorInfo,
       { "actionErrorInfo", "cmip.actionErrorInfo",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ActionError/actionErrorInfo", HFILL }},
+        "cmip.ActionErrorInfo", HFILL }},
     { &hf_cmip_specificErrorInfo,
       { "specificErrorInfo", "cmip.specificErrorInfo",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ProcessingFailure/specificErrorInfo", HFILL }},
+        "cmip.SpecificErrorInfo", HFILL }},
     { &hf_cmip_RDNSequence_item,
       { "Item", "cmip.RDNSequence_item",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "RDNSequence/_item", HFILL }},
+        "cmip.RelativeDistinguishedName", HFILL }},
     { &hf_cmip_RelativeDistinguishedName_item,
       { "Item", "cmip.RelativeDistinguishedName_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "RelativeDistinguishedName/_item", HFILL }},
+        "cmip.AttributeValueAssertion", HFILL }},
     { &hf_cmip_deleteErrorInfo,
       { "deleteErrorInfo", "cmip.deleteErrorInfo",
         FT_UINT32, BASE_DEC, VALS(cmip_T_deleteErrorInfo_vals), 0,
-        "DeleteError/deleteErrorInfo", HFILL }},
+        "cmip.T_deleteErrorInfo", HFILL }},
     { &hf_cmip_attributeError,
       { "attributeError", "cmip.attributeError",
         FT_NONE, BASE_NONE, NULL, 0,
-        "SetInfoStatus/attributeError", HFILL }},
+        "cmip.AttributeError", HFILL }},
     { &hf_cmip_errorId,
       { "errorId", "cmip.errorId",
         FT_OID, BASE_NONE, NULL, 0,
-        "SpecificErrorInfo/errorId", HFILL }},
+        "cmip.T_errorId", HFILL }},
     { &hf_cmip_errorInfo,
       { "errorInfo", "cmip.errorInfo",
         FT_NONE, BASE_NONE, NULL, 0,
-        "SpecificErrorInfo/errorInfo", HFILL }},
+        "cmip.T_errorInfo", HFILL }},
     { &hf_cmip_actionType,
       { "actionType", "cmip.actionType",
         FT_OID, BASE_NONE, NULL, 0,
-        "NoSuchArgumentAction/actionType", HFILL }},
+        "cmip.T_actionType", HFILL }},
     { &hf_cmip_eventType,
       { "eventType", "cmip.eventType",
         FT_OID, BASE_NONE, NULL, 0,
-        "NoSuchArgumentEvent/eventType", HFILL }},
+        "cmip.T_eventType", HFILL }},
     { &hf_cmip_actionId,
       { "actionId", "cmip.actionId",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NoSuchArgument/actionId", HFILL }},
+        "cmip.NoSuchArgumentAction", HFILL }},
     { &hf_cmip_eventId,
       { "eventId", "cmip.eventId",
         FT_NONE, BASE_NONE, NULL, 0,
-        "NoSuchArgument/eventId", HFILL }},
+        "cmip.NoSuchArgumentEvent", HFILL }},
     { &hf_cmip_eventType1,
       { "eventType", "cmip.eventType",
         FT_OID, BASE_NONE, NULL, 0,
-        "InvalidArgumentValueEventValue/eventType", HFILL }},
+        "cmip.T_eventType1", HFILL }},
     { &hf_cmip_eventInfo,
       { "eventInfo", "cmip.eventInfo",
         FT_NONE, BASE_NONE, NULL, 0,
-        "InvalidArgumentValueEventValue/eventInfo", HFILL }},
+        "cmip.T_eventInfo", HFILL }},
     { &hf_cmip_actionValue,
       { "actionValue", "cmip.actionValue",
         FT_NONE, BASE_NONE, NULL, 0,
-        "InvalidArgumentValue/actionValue", HFILL }},
+        "cmip.ActionInfo", HFILL }},
     { &hf_cmip_eventValue,
       { "eventValue", "cmip.eventValue",
         FT_NONE, BASE_NONE, NULL, 0,
-        "InvalidArgumentValue/eventValue", HFILL }},
+        "cmip.InvalidArgumentValueEventValue", HFILL }},
     { &hf_cmip_actionType1,
       { "actionType", "cmip.actionType",
         FT_OID, BASE_NONE, NULL, 0,
-        "ErrorInfo/actionType", HFILL }},
+        "cmip.T_actionType1", HFILL }},
     { &hf_cmip_actionArgument,
       { "actionArgument", "cmip.actionArgument",
         FT_UINT32, BASE_DEC, VALS(cmip_NoSuchArgument_vals), 0,
-        "ErrorInfo/actionArgument", HFILL }},
+        "cmip.NoSuchArgument", HFILL }},
     { &hf_cmip_argumentValue,
       { "argumentValue", "cmip.argumentValue",
         FT_UINT32, BASE_DEC, VALS(cmip_InvalidArgumentValue_vals), 0,
-        "ErrorInfo/argumentValue", HFILL }},
+        "cmip.InvalidArgumentValue", HFILL }},
     { &hf_cmip_errorStatus1,
       { "errorStatus", "cmip.errorStatus",
         FT_UINT32, BASE_DEC, VALS(cmip_T_errorStatus1_vals), 0,
-        "ActionErrorInfo/errorStatus", HFILL }},
+        "cmip.T_errorStatus1", HFILL }},
     { &hf_cmip_errorInfo1,
       { "errorInfo", "cmip.errorInfo",
         FT_UINT32, BASE_DEC, VALS(cmip_ErrorInfo_vals), 0,
-        "ActionErrorInfo/errorInfo", HFILL }},
+        "cmip.ErrorInfo", HFILL }},
     { &hf_cmip_errorStatus2,
       { "errorStatus", "cmip.errorStatus",
         FT_UINT32, BASE_DEC, VALS(cmip_T_errorStatus2_vals), 0,
-        "AttributeError/errorStatus", HFILL }},
+        "cmip.T_errorStatus2", HFILL }},
     { &hf_cmip_attributeId2,
       { "attributeId", "cmip.attributeId",
         FT_OID, BASE_NONE, NULL, 0,
-        "AttributeError/attributeId", HFILL }},
+        "cmip.T_attributeId1", HFILL }},
     { &hf_cmip_attributeValue1,
       { "attributeValue", "cmip.attributeValue",
         FT_NONE, BASE_NONE, NULL, 0,
-        "AttributeError/attributeValue", HFILL }},
+        "cmip.T_attributeValue1", HFILL }},
     { &hf_cmip_attributeList,
       { "attributeList", "cmip.attributeList",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "", HFILL }},
+        "cmip.SET_OF_Attribute", HFILL }},
     { &hf_cmip_attributeList_item,
       { "Item", "cmip.attributeList_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "", HFILL }},
+        "cmip.Attribute", HFILL }},
     { &hf_cmip_baseManagedObjectClass,
       { "baseManagedObjectClass", "cmip.baseManagedObjectClass",
         FT_UINT32, BASE_DEC, VALS(cmip_ObjectClass_vals), 0,
-        "", HFILL }},
+        "cmip.ObjectClass", HFILL }},
     { &hf_cmip_baseManagedObjectInstance,
       { "baseManagedObjectInstance", "cmip.baseManagedObjectInstance",
         FT_UINT32, BASE_DEC, VALS(cmip_ObjectInstance_vals), 0,
-        "", HFILL }},
+        "cmip.ObjectInstance", HFILL }},
     { &hf_cmip_accessControl,
       { "accessControl", "cmip.accessControl",
         FT_NONE, BASE_NONE, NULL, 0,
-        "", HFILL }},
+        "cmip.AccessControl", HFILL }},
     { &hf_cmip_synchronization,
       { "synchronization", "cmip.synchronization",
         FT_UINT32, BASE_DEC, VALS(cmip_CMISSync_vals), 0,
-        "", HFILL }},
+        "cmip.CMISSync", HFILL }},
     { &hf_cmip_scope,
       { "scope", "cmip.scope",
         FT_UINT32, BASE_DEC, VALS(cmip_Scope_vals), 0,
-        "", HFILL }},
+        "cmip.Scope", HFILL }},
     { &hf_cmip_filter,
       { "filter", "cmip.filter",
         FT_UINT32, BASE_DEC, VALS(cmip_CMISFilter_vals), 0,
-        "", HFILL }},
+        "cmip.CMISFilter", HFILL }},
     { &hf_cmip_modificationList,
       { "modificationList", "cmip.modificationList",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "SetArgument/modificationList", HFILL }},
+        "cmip.SET_OF_ModificationItem", HFILL }},
     { &hf_cmip_modificationList_item,
       { "Item", "cmip.modificationList_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "SetArgument/modificationList/_item", HFILL }},
+        "cmip.ModificationItem", HFILL }},
     { &hf_cmip_getResult,
       { "getResult", "cmip.getResult",
         FT_NONE, BASE_NONE, NULL, 0,
-        "LinkedReplyArgument/getResult", HFILL }},
+        "cmip.GetResult", HFILL }},
     { &hf_cmip_getListError,
       { "getListError", "cmip.getListError",
         FT_NONE, BASE_NONE, NULL, 0,
-        "LinkedReplyArgument/getListError", HFILL }},
+        "cmip.GetListError", HFILL }},
     { &hf_cmip_setResult,
       { "setResult", "cmip.setResult",
         FT_NONE, BASE_NONE, NULL, 0,
-        "LinkedReplyArgument/setResult", HFILL }},
+        "cmip.SetResult", HFILL }},
     { &hf_cmip_setListError,
       { "setListError", "cmip.setListError",
         FT_NONE, BASE_NONE, NULL, 0,
-        "LinkedReplyArgument/setListError", HFILL }},
+        "cmip.SetListError", HFILL }},
     { &hf_cmip_actionResult,
       { "actionResult", "cmip.actionResult",
         FT_NONE, BASE_NONE, NULL, 0,
-        "LinkedReplyArgument/actionResult", HFILL }},
+        "cmip.ActionResult", HFILL }},
     { &hf_cmip_processingFailure,
       { "processingFailure", "cmip.processingFailure",
         FT_NONE, BASE_NONE, NULL, 0,
-        "LinkedReplyArgument/processingFailure", HFILL }},
+        "cmip.ProcessingFailure", HFILL }},
     { &hf_cmip_deleteResult,
       { "deleteResult", "cmip.deleteResult",
         FT_NONE, BASE_NONE, NULL, 0,
-        "LinkedReplyArgument/deleteResult", HFILL }},
+        "cmip.DeleteResult", HFILL }},
     { &hf_cmip_actionError,
       { "actionError", "cmip.actionError",
         FT_NONE, BASE_NONE, NULL, 0,
-        "LinkedReplyArgument/actionError", HFILL }},
+        "cmip.ActionError", HFILL }},
     { &hf_cmip_deleteError,
       { "deleteError", "cmip.deleteError",
         FT_NONE, BASE_NONE, NULL, 0,
-        "LinkedReplyArgument/deleteError", HFILL }},
+        "cmip.DeleteError", HFILL }},
     { &hf_cmip_eventType2,
       { "eventType", "cmip.eventType",
         FT_OID, BASE_NONE, NULL, 0,
-        "EventReply/eventType", HFILL }},
+        "cmip.T_eventType2", HFILL }},
     { &hf_cmip_eventReplyInfo,
       { "eventReplyInfo", "cmip.eventReplyInfo",
         FT_NONE, BASE_NONE, NULL, 0,
-        "EventReply/eventReplyInfo", HFILL }},
+        "cmip.T_eventReplyInfo", HFILL }},
     { &hf_cmip_eventReply,
       { "eventReply", "cmip.eventReply",
         FT_NONE, BASE_NONE, NULL, 0,
-        "EventReportResult/eventReply", HFILL }},
+        "cmip.EventReply", HFILL }},
     { &hf_cmip_eventTime,
       { "eventTime", "cmip.eventTime",
         FT_STRING, BASE_NONE, NULL, 0,
-        "EventReportArgument/eventTime", HFILL }},
+        "cmip.GeneralizedTime", HFILL }},
     { &hf_cmip_eventType3,
       { "eventType", "cmip.eventType",
         FT_OID, BASE_NONE, NULL, 0,
-        "EventReportArgument/eventType", HFILL }},
+        "cmip.T_eventType3", HFILL }},
     { &hf_cmip_eventInfo1,
       { "eventInfo", "cmip.eventInfo",
         FT_NONE, BASE_NONE, NULL, 0,
-        "EventReportArgument/eventInfo", HFILL }},
+        "cmip.T_eventInfo1", HFILL }},
     { &hf_cmip_managedOrSuperiorObjectInstance,
       { "managedOrSuperiorObjectInstance", "cmip.managedOrSuperiorObjectInstance",
         FT_UINT32, BASE_DEC, VALS(cmip_T_managedOrSuperiorObjectInstance_vals), 0,
-        "CreateArgument/managedOrSuperiorObjectInstance", HFILL }},
+        "cmip.T_managedOrSuperiorObjectInstance", HFILL }},
     { &hf_cmip_superiorObjectInstance,
       { "superiorObjectInstance", "cmip.superiorObjectInstance",
         FT_UINT32, BASE_DEC, VALS(cmip_ObjectInstance_vals), 0,
-        "CreateArgument/managedOrSuperiorObjectInstance/superiorObjectInstance", HFILL }},
+        "cmip.ObjectInstance", HFILL }},
     { &hf_cmip_referenceObjectInstance,
       { "referenceObjectInstance", "cmip.referenceObjectInstance",
         FT_UINT32, BASE_DEC, VALS(cmip_ObjectInstance_vals), 0,
-        "CreateArgument/referenceObjectInstance", HFILL }},
+        "cmip.ObjectInstance", HFILL }},
     { &hf_cmip_actionType2,
       { "actionType", "cmip.actionType",
         FT_OID, BASE_NONE, NULL, 0,
-        "ActionReply/actionType", HFILL }},
+        "cmip.T_actionType2", HFILL }},
     { &hf_cmip_actionReplyInfo,
       { "actionReplyInfo", "cmip.actionReplyInfo",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ActionReply/actionReplyInfo", HFILL }},
+        "cmip.T_actionReplyInfo", HFILL }},
     { &hf_cmip_actionReply,
       { "actionReply", "cmip.actionReply",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ActionResult/actionReply", HFILL }},
+        "cmip.ActionReply", HFILL }},
     { &hf_cmip_actionInfo,
       { "actionInfo", "cmip.actionInfo",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ActionArgument/actionInfo", HFILL }},
+        "cmip.ActionInfo", HFILL }},
     { &hf_cmip_actionType3,
       { "actionType", "cmip.actionType",
         FT_OID, BASE_NONE, NULL, 0,
-        "ActionInfo/actionType", HFILL }},
+        "cmip.T_actionType3", HFILL }},
     { &hf_cmip_actionInfoArg,
       { "actionInfoArg", "cmip.actionInfoArg",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ActionInfo/actionInfoArg", HFILL }},
+        "cmip.T_actionInfoArg", HFILL }},
     { &hf_cmip_ocglobalForm,
       { "ocglobalForm", "cmip.ocglobalForm",
         FT_OID, BASE_NONE, NULL, 0,
-        "ObjectClass/ocglobalForm", HFILL }},
+        "cmip.T_ocglobalForm", HFILL }},
     { &hf_cmip_oclocalForm,
       { "oclocalForm", "cmip.oclocalForm",
         FT_INT32, BASE_DEC, NULL, 0,
-        "ObjectClass/oclocalForm", HFILL }},
+        "cmip.T_oclocalForm", HFILL }},
     { &hf_cmip_distinguishedName,
       { "distinguishedName", "cmip.distinguishedName",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "ObjectInstance/distinguishedName", HFILL }},
+        "cmip.DistinguishedName", HFILL }},
     { &hf_cmip_nonSpecificForm,
       { "nonSpecificForm", "cmip.nonSpecificForm",
         FT_BYTES, BASE_HEX, NULL, 0,
-        "ObjectInstance/nonSpecificForm", HFILL }},
+        "cmip.OCTET_STRING", HFILL }},
     { &hf_cmip_localDistinguishedName,
       { "localDistinguishedName", "cmip.localDistinguishedName",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "ObjectInstance/localDistinguishedName", HFILL }},
+        "cmip.RDNSequence", HFILL }},
     { &hf_cmip_globalForm,
       { "globalForm", "cmip.globalForm",
         FT_OID, BASE_NONE, NULL, 0,
-        "AttributeId/globalForm", HFILL }},
+        "cmip.T_globalForm", HFILL }},
     { &hf_cmip_localForm,
       { "localForm", "cmip.localForm",
         FT_INT32, BASE_DEC, NULL, 0,
-        "AttributeId/localForm", HFILL }},
+        "cmip.T_localForm", HFILL }},
     { &hf_cmip_id,
       { "id", "cmip.id",
         FT_UINT32, BASE_DEC, VALS(cmip_AttributeId_vals), 0,
-        "Attribute/id", HFILL }},
+        "cmip.AttributeId", HFILL }},
     { &hf_cmip_value,
       { "value", "cmip.value",
         FT_NONE, BASE_NONE, NULL, 0,
-        "Attribute/value", HFILL }},
+        "cmip.T_value", HFILL }},
     { &hf_cmip_id1,
       { "id", "cmip.id",
         FT_OID, BASE_NONE, NULL, 0,
-        "AttributeValueAssertion/id", HFILL }},
+        "cmip.T_id", HFILL }},
     { &hf_cmip_value1,
       { "value", "cmip.value",
         FT_NONE, BASE_NONE, NULL, 0,
-        "AttributeValueAssertion/value", HFILL }},
+        "cmip.T_value1", HFILL }},
     { &hf_cmip_equality,
       { "equality", "cmip.equality",
         FT_NONE, BASE_NONE, NULL, 0,
-        "FilterItem/equality", HFILL }},
+        "cmip.Attribute", HFILL }},
     { &hf_cmip_substrings,
       { "substrings", "cmip.substrings",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "FilterItem/substrings", HFILL }},
+        "cmip.T_substrings", HFILL }},
     { &hf_cmip_substrings_item,
       { "Item", "cmip.substrings_item",
         FT_UINT32, BASE_DEC, VALS(cmip_T_substrings_item_vals), 0,
-        "FilterItem/substrings/_item", HFILL }},
+        "cmip.T_substrings_item", HFILL }},
     { &hf_cmip_initialString,
       { "initialString", "cmip.initialString",
         FT_NONE, BASE_NONE, NULL, 0,
-        "FilterItem/substrings/_item/initialString", HFILL }},
+        "cmip.Attribute", HFILL }},
     { &hf_cmip_anyString,
       { "anyString", "cmip.anyString",
         FT_NONE, BASE_NONE, NULL, 0,
-        "FilterItem/substrings/_item/anyString", HFILL }},
+        "cmip.Attribute", HFILL }},
     { &hf_cmip_finalString,
       { "finalString", "cmip.finalString",
         FT_NONE, BASE_NONE, NULL, 0,
-        "FilterItem/substrings/_item/finalString", HFILL }},
+        "cmip.Attribute", HFILL }},
     { &hf_cmip_greaterOrEqual,
       { "greaterOrEqual", "cmip.greaterOrEqual",
         FT_NONE, BASE_NONE, NULL, 0,
-        "FilterItem/greaterOrEqual", HFILL }},
+        "cmip.Attribute", HFILL }},
     { &hf_cmip_lessOrEqual,
       { "lessOrEqual", "cmip.lessOrEqual",
         FT_NONE, BASE_NONE, NULL, 0,
-        "FilterItem/lessOrEqual", HFILL }},
+        "cmip.Attribute", HFILL }},
     { &hf_cmip_present,
       { "present", "cmip.present",
         FT_UINT32, BASE_DEC, VALS(cmip_AttributeId_vals), 0,
-        "FilterItem/present", HFILL }},
+        "cmip.AttributeId", HFILL }},
     { &hf_cmip_subsetOf,
       { "subsetOf", "cmip.subsetOf",
         FT_NONE, BASE_NONE, NULL, 0,
-        "FilterItem/subsetOf", HFILL }},
+        "cmip.Attribute", HFILL }},
     { &hf_cmip_supersetOf,
       { "supersetOf", "cmip.supersetOf",
         FT_NONE, BASE_NONE, NULL, 0,
-        "FilterItem/supersetOf", HFILL }},
+        "cmip.Attribute", HFILL }},
     { &hf_cmip_nonNullSetIntersection,
       { "nonNullSetIntersection", "cmip.nonNullSetIntersection",
         FT_NONE, BASE_NONE, NULL, 0,
-        "FilterItem/nonNullSetIntersection", HFILL }},
+        "cmip.Attribute", HFILL }},
     { &hf_cmip_single,
       { "single", "cmip.single",
         FT_UINT32, BASE_DEC, VALS(cmip_AE_title_vals), 0,
-        "Destination/single", HFILL }},
+        "cmip.AE_title", HFILL }},
     { &hf_cmip_multiple,
       { "multiple", "cmip.multiple",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "Destination/multiple", HFILL }},
+        "cmip.SET_OF_AE_title", HFILL }},
     { &hf_cmip_multiple_item,
       { "Item", "cmip.multiple_item",
         FT_UINT32, BASE_DEC, VALS(cmip_AE_title_vals), 0,
-        "Destination/multiple/_item", HFILL }},
+        "cmip.AE_title", HFILL }},
     { &hf_cmip_ae_title_form1,
       { "ae-title-form1", "cmip.ae_title_form1",
         FT_UINT32, BASE_DEC, VALS(cmip_Name_vals), 0,
-        "AE-title/ae-title-form1", HFILL }},
+        "cmip.AE_title_form1", HFILL }},
     { &hf_cmip_ae_title_form2,
       { "ae-title-form2", "cmip.ae_title_form2",
         FT_OID, BASE_NONE, NULL, 0,
-        "AE-title/ae-title-form2", HFILL }},
+        "cmip.AE_title_form2", HFILL }},
     { &hf_cmip_rdnSequence,
       { "rdnSequence", "cmip.rdnSequence",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "Name/rdnSequence", HFILL }},
+        "cmip.RDNSequence", HFILL }},
     { &hf_cmip_item,
       { "item", "cmip.item",
         FT_UINT32, BASE_DEC, VALS(cmip_FilterItem_vals), 0,
-        "CMISFilter/item", HFILL }},
+        "cmip.FilterItem", HFILL }},
     { &hf_cmip_and,
       { "and", "cmip.and",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "CMISFilter/and", HFILL }},
+        "cmip.SET_OF_CMISFilter", HFILL }},
     { &hf_cmip_and_item,
       { "Item", "cmip.and_item",
         FT_UINT32, BASE_DEC, VALS(cmip_CMISFilter_vals), 0,
-        "CMISFilter/and/_item", HFILL }},
+        "cmip.CMISFilter", HFILL }},
     { &hf_cmip_or,
       { "or", "cmip.or",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "CMISFilter/or", HFILL }},
+        "cmip.SET_OF_CMISFilter", HFILL }},
     { &hf_cmip_or_item,
       { "Item", "cmip.or_item",
         FT_UINT32, BASE_DEC, VALS(cmip_CMISFilter_vals), 0,
-        "CMISFilter/or/_item", HFILL }},
+        "cmip.CMISFilter", HFILL }},
     { &hf_cmip_not,
       { "not", "cmip.not",
         FT_UINT32, BASE_DEC, VALS(cmip_CMISFilter_vals), 0,
-        "CMISFilter/not", HFILL }},
+        "cmip.CMISFilter", HFILL }},
     { &hf_cmip_namedNumbers,
       { "namedNumbers", "cmip.namedNumbers",
         FT_INT32, BASE_DEC, VALS(cmip_T_namedNumbers_vals), 0,
-        "Scope/namedNumbers", HFILL }},
+        "cmip.T_namedNumbers", HFILL }},
     { &hf_cmip_individualLevels,
       { "individualLevels", "cmip.individualLevels",
         FT_INT32, BASE_DEC, NULL, 0,
-        "Scope/individualLevels", HFILL }},
+        "cmip.INTEGER", HFILL }},
     { &hf_cmip_baseToNthLevel,
       { "baseToNthLevel", "cmip.baseToNthLevel",
         FT_INT32, BASE_DEC, NULL, 0,
-        "Scope/baseToNthLevel", HFILL }},
+        "cmip.INTEGER", HFILL }},
     { &hf_cmip_attributeIdList,
       { "attributeIdList", "cmip.attributeIdList",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "GetArgument/attributeIdList", HFILL }},
+        "cmip.SET_OF_AttributeId", HFILL }},
     { &hf_cmip_attributeIdList_item,
       { "Item", "cmip.attributeIdList_item",
         FT_UINT32, BASE_DEC, VALS(cmip_AttributeId_vals), 0,
-        "GetArgument/attributeIdList/_item", HFILL }},
+        "cmip.AttributeId", HFILL }},
     { &hf_cmip_opcode,
       { "opcode", "cmip.opcode",
         FT_INT32, BASE_DEC, VALS(cmip_Opcode_vals), 0,
-        "", HFILL }},
+        "cmip.Opcode", HFILL }},
     { &hf_cmip_argument,
       { "argument", "cmip.argument",
         FT_NONE, BASE_NONE, NULL, 0,
-        "", HFILL }},
+        "cmip.Argument", HFILL }},
     { &hf_cmip_present1,
       { "present", "cmip.present",
         FT_INT32, BASE_DEC, NULL, 0,
-        "InvokeId/present", HFILL }},
+        "cmip.InvokeID", HFILL }},
     { &hf_cmip_absent,
       { "absent", "cmip.absent",
         FT_NONE, BASE_NONE, NULL, 0,
-        "InvokeId/absent", HFILL }},
+        "cmip.NULL", HFILL }},
     { &hf_cmip_invokeId,
       { "invokeId", "cmip.invokeId",
         FT_UINT32, BASE_DEC, VALS(cmip_InvokeId_vals), 0,
-        "", HFILL }},
+        "cmip.InvokeId", HFILL }},
     { &hf_cmip_linkedId,
       { "linkedId", "cmip.linkedId",
         FT_INT32, BASE_DEC, NULL, 0,
-        "Invoke/linkedId", HFILL }},
+        "cmip.InvokeLinkedId", HFILL }},
     { &hf_cmip_rRBody,
       { "rRBody", "cmip.rRBody",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ReturnResult/rRBody", HFILL }},
+        "cmip.ReturnResultBody", HFILL }},
     { &hf_cmip_generalProblem,
       { "generalProblem", "cmip.generalProblem",
         FT_INT32, BASE_DEC, VALS(cmip_GeneralProblem_vals), 0,
-        "RejectProb/generalProblem", HFILL }},
+        "cmip.GeneralProblem", HFILL }},
     { &hf_cmip_invokeProblem,
       { "invokeProblem", "cmip.invokeProblem",
         FT_INT32, BASE_DEC, VALS(cmip_InvokeProblem_vals), 0,
-        "RejectProb/invokeProblem", HFILL }},
+        "cmip.InvokeProblem", HFILL }},
     { &hf_cmip_returnResultProblem,
       { "returnResultProblem", "cmip.returnResultProblem",
         FT_INT32, BASE_DEC, VALS(cmip_ReturnResultProblem_vals), 0,
-        "RejectProb/returnResultProblem", HFILL }},
+        "cmip.ReturnResultProblem", HFILL }},
     { &hf_cmip_returnErrorProblem,
       { "returnErrorProblem", "cmip.returnErrorProblem",
         FT_INT32, BASE_DEC, VALS(cmip_ReturnErrorProblem_vals), 0,
-        "RejectProb/returnErrorProblem", HFILL }},
+        "cmip.ReturnErrorProblem", HFILL }},
     { &hf_cmip_rejectProblem,
       { "rejectProblem", "cmip.rejectProblem",
         FT_UINT32, BASE_DEC, VALS(cmip_RejectProb_vals), 0,
-        "Reject/rejectProblem", HFILL }},
+        "cmip.RejectProb", HFILL }},
     { &hf_cmip_invoke,
       { "invoke", "cmip.invoke",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ROS/invoke", HFILL }},
+        "cmip.Invoke", HFILL }},
     { &hf_cmip_returnResult,
       { "returnResult", "cmip.returnResult",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ROS/returnResult", HFILL }},
+        "cmip.ReturnResult", HFILL }},
     { &hf_cmip_returnError,
       { "returnError", "cmip.returnError",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ROS/returnError", HFILL }},
+        "cmip.ReturnError", HFILL }},
     { &hf_cmip_reject,
       { "reject", "cmip.reject",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ROS/reject", HFILL }},
+        "cmip.Reject", HFILL }},
     { &hf_cmip_abortSource,
       { "abortSource", "cmip.abortSource",
         FT_UINT32, BASE_DEC, VALS(cmip_CMIPAbortSource_vals), 0,
-        "CMIPAbortInfo/abortSource", HFILL }},
+        "cmip.CMIPAbortSource", HFILL }},
     { &hf_cmip_userInfo,
       { "userInfo", "cmip.userInfo",
         FT_NONE, BASE_NONE, NULL, 0,
-        "", HFILL }},
+        "acse.EXTERNAL", HFILL }},
     { &hf_cmip_protocolVersion,
       { "protocolVersion", "cmip.protocolVersion",
         FT_BYTES, BASE_HEX, NULL, 0,
-        "CMIPUserInfo/protocolVersion", HFILL }},
+        "cmip.ProtocolVersion", HFILL }},
     { &hf_cmip_functionalUnits,
       { "functionalUnits", "cmip.functionalUnits",
         FT_BYTES, BASE_HEX, NULL, 0,
-        "CMIPUserInfo/functionalUnits", HFILL }},
+        "cmip.FunctionalUnits", HFILL }},
     { &hf_cmip_accessControl1,
       { "accessControl", "cmip.accessControl",
         FT_NONE, BASE_NONE, NULL, 0,
-        "CMIPUserInfo/accessControl", HFILL }},
+        "acse.EXTERNAL", HFILL }},
     { &hf_cmip_FunctionalUnits_multipleObjectSelection,
       { "multipleObjectSelection", "cmip.multipleObjectSelection",
         FT_BOOLEAN, 8, NULL, 0x80,