#include <string.h>
#include "packet-ber.h"
+#include "packet-acse.h"
#include "packet-x509if.h"
#include "packet-cmip.h"
static int hf_cmip_returnError = -1; /* ReturnError */
static int hf_cmip_reject = -1; /* Reject */
static int hf_cmip_abortSource = -1; /* CMIPAbortSource */
+static int hf_cmip_userInfo = -1; /* EXTERNAL */
static int hf_cmip_protocolVersion = -1; /* ProtocolVersion */
static int hf_cmip_functionalUnits = -1; /* FunctionalUnits */
+static int hf_cmip_accessControl1 = -1; /* EXTERNAL */
/* named bits */
static int hf_cmip_FunctionalUnits_multipleObjectSelection = -1;
static int hf_cmip_FunctionalUnits_filter = -1;
}
static int dissect_and_item(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
return dissect_cmip_CMISFilter(FALSE, tvb, offset, pinfo, tree, hf_cmip_and_item);
-}\r
-#if 0
+}
static int dissect_or_item(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
return dissect_cmip_CMISFilter(FALSE, tvb, offset, pinfo, tree, hf_cmip_or_item);
-}\r
-#endif
+}
static int dissect_not(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
return dissect_cmip_CMISFilter(FALSE, tvb, offset, pinfo, tree, hf_cmip_not);
}
static int dissect_localDistinguishedName_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
return dissect_x509if_RDNSequence(TRUE, tvb, offset, pinfo, tree, hf_cmip_localDistinguishedName);
}
+static int dissect_userInfo(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+ return dissect_acse_EXTERNAL(FALSE, tvb, offset, pinfo, tree, hf_cmip_userInfo);
+}
+static int dissect_accessControl1(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+ return dissect_acse_EXTERNAL(FALSE, tvb, offset, pinfo, tree, hf_cmip_accessControl1);
+}
-static const value_string ModifyOperator_vals[] = {
+static const value_string cmip_ModifyOperator_vals[] = {
{ 0, "replace" },
{ 1, "addValues" },
{ 2, "removeValues" },
static int
dissect_cmip_ModifyOperator(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
- offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+ offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index,
+ NULL);
return offset;
}
}
+
static int
dissect_cmip_T_attributeId(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_object_identifier(FALSE, pinfo, tree, tvb, offset,
}
+
static int
dissect_cmip_T_ocglobalForm(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
objectclassform = OBJECTCLASS_GLOBAL_FORM;
}
-static const value_string ObjectClass_vals[] = {
+static const value_string cmip_ObjectClass_vals[] = {
{ 0, "ocglobalForm" },
{ 1, "oclocalForm" },
{ 0, NULL }
}
-static const value_string ObjectInstance_vals[] = {
+static const value_string cmip_ObjectInstance_vals[] = {
{ 2, "distinguishedName" },
{ 3, "nonSpecificForm" },
{ 4, "localDistinguishedName" },
}
-static const value_string T_errorStatus_vals[] = {
+static const value_string cmip_T_errorStatus_vals[] = {
{ 2, "accessDenied" },
{ 5, "noSuchAttribute" },
{ 0, NULL }
}
+
static int
dissect_cmip_T_globalForm(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
attributeform = ATTRIBUTE_GLOBAL_FORM;
}
-static const value_string AttributeId_vals[] = {
+static const value_string cmip_AttributeId_vals[] = {
{ 0, "globalForm" },
{ 1, "localForm" },
{ 0, NULL }
}
-static const value_string GetInfoStatus_vals[] = {
+static const value_string cmip_GetInfoStatus_vals[] = {
{ 0, "attributeIdError" },
{ 1, "attribute" },
{ 0, NULL }
}
-static const value_string T_errorStatus2_vals[] = {
+static const value_string cmip_T_errorStatus2_vals[] = {
{ 2, "accessDenied" },
{ 5, "noSuchAttribute" },
{ 6, "invalidAttributeValue" },
}
+
static int
dissect_cmip_T_attributeId1(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_object_identifier(FALSE, pinfo, tree, tvb, offset,
}
-static const value_string SetInfoStatus_vals[] = {
+static const value_string cmip_SetInfoStatus_vals[] = {
{ 0, "attributeError" },
{ 1, "attribute" },
{ 0, NULL }
}
-static const value_string T_errorStatus1_vals[] = {
+static const value_string cmip_T_errorStatus1_vals[] = {
{ 2, "accessDenied" },
{ 9, "noSuchAction" },
{ 14, "noSuchArgument" },
}
+
static int
dissect_cmip_T_actionType1(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_object_identifier(FALSE, pinfo, tree, tvb, offset,
}
+
static int
dissect_cmip_T_actionType(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_object_identifier(FALSE, pinfo, tree, tvb, offset,
}
+
static int
dissect_cmip_T_eventType(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_object_identifier(FALSE, pinfo, tree, tvb, offset,
}
-static const value_string NoSuchArgument_vals[] = {
+static const value_string cmip_NoSuchArgument_vals[] = {
{ 0, "actionId" },
{ 1, "eventId" },
{ 0, NULL }
}
+
static int
dissect_cmip_T_actionType3(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_object_identifier(FALSE, pinfo, tree, tvb, offset,
}
+
static int
dissect_cmip_T_eventType1(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_object_identifier(FALSE, pinfo, tree, tvb, offset,
}
-static const value_string InvalidArgumentValue_vals[] = {
+static const value_string cmip_InvalidArgumentValue_vals[] = {
{ 0, "actionValue" },
{ 1, "eventValue" },
{ 0, NULL }
}
-static const value_string ErrorInfo_vals[] = {
+static const value_string cmip_ErrorInfo_vals[] = {
{ 0, "actionType" },
{ 1, "actionArgument" },
{ 2, "argumentValue" },
}
+
static int
dissect_cmip_T_errorId(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_object_identifier(FALSE, pinfo, tree, tvb, offset,
}
-static const value_string T_deleteErrorInfo_vals[] = {
+static const value_string cmip_T_deleteErrorInfo_vals[] = {
{ 2, "accessDenied" },
{ 0, NULL }
};
static int
dissect_cmip_AccessControl(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
- offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index,
- NULL);
+ offset = dissect_acse_EXTERNAL(implicit_tag, tvb, offset, pinfo, tree, hf_index);
return offset;
}
}
-static const value_string CMISSync_vals[] = {
+static const value_string cmip_CMISSync_vals[] = {
{ 0, "bestEffort" },
{ 1, "atomic" },
{ 0, NULL }
}
-static const value_string T_namedNumbers_vals[] = {
+static const value_string cmip_T_namedNumbers_vals[] = {
{ 0, "baseObject" },
{ 1, "firstLevelOnly" },
{ 2, "wholeSubtree" },
static int
dissect_cmip_T_namedNumbers(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
- offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+ offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index,
+ NULL);
return offset;
}
static int
dissect_cmip_INTEGER(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
- offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+ offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index,
+ NULL);
return offset;
}
}
-static const value_string Scope_vals[] = {
+static const value_string cmip_Scope_vals[] = {
{ 0, "namedNumbers" },
{ 1, "individualLevels" },
{ 2, "baseToNthLevel" },
}
-static const value_string T_substrings_item_vals[] = {
+static const value_string cmip_T_substrings_item_vals[] = {
{ 0, "initialString" },
{ 1, "anyString" },
{ 2, "finalString" },
}
-static const value_string FilterItem_vals[] = {
+static const value_string cmip_FilterItem_vals[] = {
{ 0, "equality" },
{ 1, "substrings" },
{ 2, "greaterOrEqual" },
}
-static const value_string CMISFilter_vals[] = {
+static const value_string cmip_CMISFilter_vals[] = {
{ 8, "item" },
{ 9, "and" },
{ 10, "or" },
}
+
static int
dissect_cmip_T_actionType2(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_object_identifier(FALSE, pinfo, tree, tvb, offset,
}
-static const value_string LinkedReplyArgument_vals[] = {
+static const value_string cmip_LinkedReplyArgument_vals[] = {
{ 0, "getResult" },
{ 1, "getListError" },
{ 2, "setResult" },
}
+
static int
dissect_cmip_T_eventType2(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_object_identifier(FALSE, pinfo, tree, tvb, offset,
}
+
static int
dissect_cmip_T_eventType3(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_object_identifier(FALSE, pinfo, tree, tvb, offset,
}
-static const value_string T_managedOrSuperiorObjectInstance_vals[] = {
+static const value_string cmip_T_managedOrSuperiorObjectInstance_vals[] = {
{ -1/*choice*/, "managedObjectInstance" },
{ 8, "superiorObjectInstance" },
{ 0, NULL }
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_baseManagedObjectInstance },
{ 0, 0, 0, NULL }
};
-\r
-#if 0
+
static int
dissect_cmip_BaseManagedObjectId(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
BaseManagedObjectId_sequence, hf_index, ett_cmip_BaseManagedObjectId);
return offset;
-}\r
-#endif
+}
static const ber_sequence_t SET_OF_AttributeId_set_of[1] = {
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_attributeIdList_item },
}
-static const value_string Opcode_vals[] = {
+static const value_string cmip_Opcode_vals[] = {
{ 0, "m-EventReport" },
{ 1, "m-EventReport-Confirmed" },
{ 2, "m-Linked-Reply" },
dissect_cmip_Opcode(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, &opcode);
if(check_col(pinfo->cinfo, COL_INFO)){
- col_prepend_fstr(pinfo->cinfo, COL_INFO, "%s", val_to_str(opcode, Opcode_vals, " Unknown Opcode:%d"));
+ col_prepend_fstr(pinfo->cinfo, COL_INFO, "%s", val_to_str(opcode, cmip_Opcode_vals, " Unknown Opcode:%d"));
}
return offset;
static int
dissect_cmip_InvokeID(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
- offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+ offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index,
+ NULL);
return offset;
}
}
+
static int
dissect_cmip_NULL(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
- { proto_item *ti_tmp;
- ti_tmp = proto_tree_add_item(tree, hf_index, tvb, offset>>8, 0, FALSE);
- proto_item_append_text(ti_tmp, ": NULL");
- }
+ offset = dissect_ber_null(implicit_tag, pinfo, tree, tvb, offset, hf_index);
return offset;
}
}
-static const value_string InvokeId_vals[] = {
+static const value_string cmip_InvokeId_vals[] = {
{ 0, "present" },
{ 1, "absent" },
{ 0, NULL }
}
-static const value_string InvokeLinkedId_vals[] = {
+static const value_string cmip_InvokeLinkedId_vals[] = {
{ 0, "present" },
{ 1, "absent" },
{ 0, NULL }
}
-static const value_string GeneralProblem_vals[] = {
+static const value_string cmip_GeneralProblem_vals[] = {
{ 0, "unrecognizedPDU" },
{ 1, "mistypedPDU" },
{ 2, "badlyStructuredPDU" },
static int
dissect_cmip_GeneralProblem(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
- offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+ offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index,
+ NULL);
return offset;
}
}
-static const value_string InvokeProblem_vals[] = {
+static const value_string cmip_InvokeProblem_vals[] = {
{ 0, "duplicateInvocation" },
{ 1, "unrecognizedOperation" },
{ 2, "mistypedArgument" },
static int
dissect_cmip_InvokeProblem(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
- offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+ offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index,
+ NULL);
return offset;
}
}
-static const value_string ReturnResultProblem_vals[] = {
+static const value_string cmip_ReturnResultProblem_vals[] = {
{ 0, "unrecognizedInvocation" },
{ 1, "resultResponseUnexpected" },
{ 2, "mistypedResult" },
static int
dissect_cmip_ReturnResultProblem(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
- offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+ offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index,
+ NULL);
return offset;
}
}
-static const value_string ReturnErrorProblem_vals[] = {
+static const value_string cmip_ReturnErrorProblem_vals[] = {
{ 0, "unrecognizedInvocation" },
{ 1, "errorResponseUnexpected" },
{ 2, "unrecognizedError" },
static int
dissect_cmip_ReturnErrorProblem(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
- offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+ offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index,
+ NULL);
return offset;
}
}
-static const value_string RejectProblem_vals[] = {
+static const value_string cmip_RejectProblem_vals[] = {
{ 0, "general-unrecognizedPDU" },
{ 1, "general-mistypedPDU" },
{ 2, "general-badlyStructuredPDU" },
{ 0, NULL }
};
-#if 0
+
static int
dissect_cmip_RejectProblem(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
- offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
+ offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index,
+ NULL);
return offset;
-}\r
-#endif
+}
-static const value_string RejectProb_vals[] = {
+static const value_string cmip_RejectProb_vals[] = {
{ 0, "generalProblem" },
{ 1, "invokeProblem" },
{ 2, "returnResultProblem" },
}
-const value_string ROS_vals[] = {
+const value_string cmip_ROS_vals[] = {
{ 1, "invoke" },
{ 2, "returnResult" },
{ 3, "returnError" },
}
-static const value_string CMIPAbortSource_vals[] = {
+static const value_string cmip_CMIPAbortSource_vals[] = {
{ 0, "cmiseServiceUser" },
{ 1, "cmiseServiceProvider" },
{ 0, NULL }
guint32 value;
offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, &value);
if(check_col(pinfo->cinfo, COL_INFO)){
- col_append_fstr(pinfo->cinfo, COL_INFO, " AbortSource:%s", val_to_str(value, CMIPAbortSource_vals, " Unknown AbortSource:%d"));
+ col_append_fstr(pinfo->cinfo, COL_INFO, " AbortSource:%s", val_to_str(value, cmip_CMIPAbortSource_vals, " Unknown AbortSource:%d"));
}
return offset;
static const ber_sequence_t CMIPAbortInfo_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_abortSource_impl },
+ { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_userInfo },
{ 0, 0, 0, NULL }
};
}
static const asn_namedbit FunctionalUnits_bits[] = {
- { 0, &hf_cmip_FunctionalUnits_multipleObjectSelection, -1, -1, NULL, NULL },
- { 1, &hf_cmip_FunctionalUnits_filter, -1, -1, NULL, NULL },
- { 2, &hf_cmip_FunctionalUnits_multipleReply, -1, -1, NULL, NULL },
- { 3, &hf_cmip_FunctionalUnits_extendedService, -1, -1, NULL, NULL },
- { 4, &hf_cmip_FunctionalUnits_cancelGet, -1, -1, NULL, NULL },
+ { 0, &hf_cmip_FunctionalUnits_multipleObjectSelection, -1, -1, "multipleObjectSelection", NULL },
+ { 1, &hf_cmip_FunctionalUnits_filter, -1, -1, "filter", NULL },
+ { 2, &hf_cmip_FunctionalUnits_multipleReply, -1, -1, "multipleReply", NULL },
+ { 3, &hf_cmip_FunctionalUnits_extendedService, -1, -1, "extendedService", NULL },
+ { 4, &hf_cmip_FunctionalUnits_cancelGet, -1, -1, "cancelGet", NULL },
{ 0, NULL, 0, 0, NULL, NULL }
};
}
static const asn_namedbit ProtocolVersion_bits[] = {
- { 0, &hf_cmip_ProtocolVersion_version1, -1, -1, NULL, NULL },
- { 1, &hf_cmip_ProtocolVersion_version2, -1, -1, NULL, NULL },
+ { 0, &hf_cmip_ProtocolVersion_version1, -1, -1, "version1", NULL },
+ { 1, &hf_cmip_ProtocolVersion_version2, -1, -1, "version2", NULL },
{ 0, NULL, 0, 0, NULL, NULL }
};
static const ber_sequence_t CMIPUserInfo_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_protocolVersion_impl },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_functionalUnits_impl },
+ { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_accessControl1 },
+ { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL, dissect_userInfo },
{ 0, 0, 0, NULL }
};
{ &hf_cmip_modifyOperator,
{ "modifyOperator", "cmip.modifyOperator",
- FT_INT32, BASE_DEC, VALS(ModifyOperator_vals), 0,
+ FT_INT32, BASE_DEC, VALS(cmip_ModifyOperator_vals), 0,
"", HFILL }},
{ &hf_cmip_attributeId,
{ "attributeId", "cmip.attributeId",
"ModificationItem/attributeValue", HFILL }},
{ &hf_cmip_managedObjectClass,
{ "managedObjectClass", "cmip.managedObjectClass",
- FT_UINT32, BASE_DEC, VALS(ObjectClass_vals), 0,
+ FT_UINT32, BASE_DEC, VALS(cmip_ObjectClass_vals), 0,
"", HFILL }},
{ &hf_cmip_managedObjectInstance,
{ "managedObjectInstance", "cmip.managedObjectInstance",
- FT_UINT32, BASE_DEC, VALS(ObjectInstance_vals), 0,
+ FT_UINT32, BASE_DEC, VALS(cmip_ObjectInstance_vals), 0,
"", HFILL }},
{ &hf_cmip_currentTime,
{ "currentTime", "cmip.currentTime",
"GetListError/getInfoList", HFILL }},
{ &hf_cmip_getInfoList_item,
{ "Item", "cmip.getInfoList_item",
- FT_UINT32, BASE_DEC, VALS(GetInfoStatus_vals), 0,
+ FT_UINT32, BASE_DEC, VALS(cmip_GetInfoStatus_vals), 0,
"GetListError/getInfoList/_item", HFILL }},
{ &hf_cmip_attributeIdError,
{ "attributeIdError", "cmip.attributeIdError",
"", HFILL }},
{ &hf_cmip_errorStatus,
{ "errorStatus", "cmip.errorStatus",
- FT_UINT32, BASE_DEC, VALS(T_errorStatus_vals), 0,
+ FT_UINT32, BASE_DEC, VALS(cmip_T_errorStatus_vals), 0,
"AttributeIdError/errorStatus", HFILL }},
{ &hf_cmip_attributeId1,
{ "attributeId", "cmip.attributeId",
- FT_UINT32, BASE_DEC, VALS(AttributeId_vals), 0,
+ FT_UINT32, BASE_DEC, VALS(cmip_AttributeId_vals), 0,
"AttributeIdError/attributeId", HFILL }},
{ &hf_cmip_setInfoList,
{ "setInfoList", "cmip.setInfoList",
"SetListError/setInfoList", HFILL }},
{ &hf_cmip_setInfoList_item,
{ "Item", "cmip.setInfoList_item",
- FT_UINT32, BASE_DEC, VALS(SetInfoStatus_vals), 0,
+ FT_UINT32, BASE_DEC, VALS(cmip_SetInfoStatus_vals), 0,
"SetListError/setInfoList/_item", HFILL }},
{ &hf_cmip_actionErrorInfo,
{ "actionErrorInfo", "cmip.actionErrorInfo",
"ProcessingFailure/specificErrorInfo", HFILL }},
{ &hf_cmip_deleteErrorInfo,
{ "deleteErrorInfo", "cmip.deleteErrorInfo",
- FT_UINT32, BASE_DEC, VALS(T_deleteErrorInfo_vals), 0,
+ FT_UINT32, BASE_DEC, VALS(cmip_T_deleteErrorInfo_vals), 0,
"DeleteError/deleteErrorInfo", HFILL }},
{ &hf_cmip_attributeError,
{ "attributeError", "cmip.attributeError",
"ErrorInfo/actionType", HFILL }},
{ &hf_cmip_actionArgument,
{ "actionArgument", "cmip.actionArgument",
- FT_UINT32, BASE_DEC, VALS(NoSuchArgument_vals), 0,
+ FT_UINT32, BASE_DEC, VALS(cmip_NoSuchArgument_vals), 0,
"ErrorInfo/actionArgument", HFILL }},
{ &hf_cmip_argumentValue,
{ "argumentValue", "cmip.argumentValue",
- FT_UINT32, BASE_DEC, VALS(InvalidArgumentValue_vals), 0,
+ FT_UINT32, BASE_DEC, VALS(cmip_InvalidArgumentValue_vals), 0,
"ErrorInfo/argumentValue", HFILL }},
{ &hf_cmip_errorStatus1,
{ "errorStatus", "cmip.errorStatus",
- FT_UINT32, BASE_DEC, VALS(T_errorStatus1_vals), 0,
+ FT_UINT32, BASE_DEC, VALS(cmip_T_errorStatus1_vals), 0,
"ActionErrorInfo/errorStatus", HFILL }},
{ &hf_cmip_errorInfo1,
{ "errorInfo", "cmip.errorInfo",
- FT_UINT32, BASE_DEC, VALS(ErrorInfo_vals), 0,
+ FT_UINT32, BASE_DEC, VALS(cmip_ErrorInfo_vals), 0,
"ActionErrorInfo/errorInfo", HFILL }},
{ &hf_cmip_errorStatus2,
{ "errorStatus", "cmip.errorStatus",
- FT_UINT32, BASE_DEC, VALS(T_errorStatus2_vals), 0,
+ FT_UINT32, BASE_DEC, VALS(cmip_T_errorStatus2_vals), 0,
"AttributeError/errorStatus", HFILL }},
{ &hf_cmip_attributeId2,
{ "attributeId", "cmip.attributeId",
"", HFILL }},
{ &hf_cmip_baseManagedObjectClass,
{ "baseManagedObjectClass", "cmip.baseManagedObjectClass",
- FT_UINT32, BASE_DEC, VALS(ObjectClass_vals), 0,
+ FT_UINT32, BASE_DEC, VALS(cmip_ObjectClass_vals), 0,
"", HFILL }},
{ &hf_cmip_baseManagedObjectInstance,
{ "baseManagedObjectInstance", "cmip.baseManagedObjectInstance",
- FT_UINT32, BASE_DEC, VALS(ObjectInstance_vals), 0,
+ FT_UINT32, BASE_DEC, VALS(cmip_ObjectInstance_vals), 0,
"", HFILL }},
{ &hf_cmip_accessControl,
{ "accessControl", "cmip.accessControl",
- FT_BYTES, BASE_HEX, NULL, 0,
+ FT_NONE, BASE_NONE, NULL, 0,
"", HFILL }},
{ &hf_cmip_synchronization,
{ "synchronization", "cmip.synchronization",
- FT_UINT32, BASE_DEC, VALS(CMISSync_vals), 0,
+ FT_UINT32, BASE_DEC, VALS(cmip_CMISSync_vals), 0,
"", HFILL }},
{ &hf_cmip_scope,
{ "scope", "cmip.scope",
- FT_UINT32, BASE_DEC, VALS(Scope_vals), 0,
+ FT_UINT32, BASE_DEC, VALS(cmip_Scope_vals), 0,
"", HFILL }},
{ &hf_cmip_filter,
{ "filter", "cmip.filter",
- FT_UINT32, BASE_DEC, VALS(CMISFilter_vals), 0,
+ FT_UINT32, BASE_DEC, VALS(cmip_CMISFilter_vals), 0,
"", HFILL }},
{ &hf_cmip_modificationList,
{ "modificationList", "cmip.modificationList",
"EventReportArgument/eventInfo", HFILL }},
{ &hf_cmip_managedOrSuperiorObjectInstance,
{ "managedOrSuperiorObjectInstance", "cmip.managedOrSuperiorObjectInstance",
- FT_UINT32, BASE_DEC, VALS(T_managedOrSuperiorObjectInstance_vals), 0,
+ FT_UINT32, BASE_DEC, VALS(cmip_T_managedOrSuperiorObjectInstance_vals), 0,
"CreateArgument/managedOrSuperiorObjectInstance", HFILL }},
{ &hf_cmip_superiorObjectInstance,
{ "superiorObjectInstance", "cmip.superiorObjectInstance",
- FT_UINT32, BASE_DEC, VALS(ObjectInstance_vals), 0,
+ FT_UINT32, BASE_DEC, VALS(cmip_ObjectInstance_vals), 0,
"CreateArgument/managedOrSuperiorObjectInstance/superiorObjectInstance", HFILL }},
{ &hf_cmip_referenceObjectInstance,
{ "referenceObjectInstance", "cmip.referenceObjectInstance",
- FT_UINT32, BASE_DEC, VALS(ObjectInstance_vals), 0,
+ FT_UINT32, BASE_DEC, VALS(cmip_ObjectInstance_vals), 0,
"CreateArgument/referenceObjectInstance", HFILL }},
{ &hf_cmip_actionType2,
{ "actionType", "cmip.actionType",
"AttributeId/localForm", HFILL }},
{ &hf_cmip_id,
{ "id", "cmip.id",
- FT_UINT32, BASE_DEC, VALS(AttributeId_vals), 0,
+ FT_UINT32, BASE_DEC, VALS(cmip_AttributeId_vals), 0,
"Attribute/id", HFILL }},
{ &hf_cmip_value,
{ "value", "cmip.value",
"FilterItem/substrings", HFILL }},
{ &hf_cmip_substrings_item,
{ "Item", "cmip.substrings_item",
- FT_UINT32, BASE_DEC, VALS(T_substrings_item_vals), 0,
+ FT_UINT32, BASE_DEC, VALS(cmip_T_substrings_item_vals), 0,
"FilterItem/substrings/_item", HFILL }},
{ &hf_cmip_initialString,
{ "initialString", "cmip.initialString",
"FilterItem/lessOrEqual", HFILL }},
{ &hf_cmip_present,
{ "present", "cmip.present",
- FT_UINT32, BASE_DEC, VALS(AttributeId_vals), 0,
+ FT_UINT32, BASE_DEC, VALS(cmip_AttributeId_vals), 0,
"FilterItem/present", HFILL }},
{ &hf_cmip_subsetOf,
{ "subsetOf", "cmip.subsetOf",
"FilterItem/nonNullSetIntersection", HFILL }},
{ &hf_cmip_item,
{ "item", "cmip.item",
- FT_UINT32, BASE_DEC, VALS(FilterItem_vals), 0,
+ FT_UINT32, BASE_DEC, VALS(cmip_FilterItem_vals), 0,
"CMISFilter/item", HFILL }},
{ &hf_cmip_and,
{ "and", "cmip.and",
"CMISFilter/and", HFILL }},
{ &hf_cmip_and_item,
{ "Item", "cmip.and_item",
- FT_UINT32, BASE_DEC, VALS(CMISFilter_vals), 0,
+ FT_UINT32, BASE_DEC, VALS(cmip_CMISFilter_vals), 0,
"CMISFilter/and/_item", HFILL }},
{ &hf_cmip_or,
{ "or", "cmip.or",
"CMISFilter/or", HFILL }},
{ &hf_cmip_or_item,
{ "Item", "cmip.or_item",
- FT_UINT32, BASE_DEC, VALS(CMISFilter_vals), 0,
+ FT_UINT32, BASE_DEC, VALS(cmip_CMISFilter_vals), 0,
"CMISFilter/or/_item", HFILL }},
{ &hf_cmip_not,
{ "not", "cmip.not",
- FT_UINT32, BASE_DEC, VALS(CMISFilter_vals), 0,
+ FT_UINT32, BASE_DEC, VALS(cmip_CMISFilter_vals), 0,
"CMISFilter/not", HFILL }},
{ &hf_cmip_namedNumbers,
{ "namedNumbers", "cmip.namedNumbers",
- FT_INT32, BASE_DEC, VALS(T_namedNumbers_vals), 0,
+ FT_INT32, BASE_DEC, VALS(cmip_T_namedNumbers_vals), 0,
"Scope/namedNumbers", HFILL }},
{ &hf_cmip_individualLevels,
{ "individualLevels", "cmip.individualLevels",
"GetArgument/attributeIdList", HFILL }},
{ &hf_cmip_attributeIdList_item,
{ "Item", "cmip.attributeIdList_item",
- FT_UINT32, BASE_DEC, VALS(AttributeId_vals), 0,
+ FT_UINT32, BASE_DEC, VALS(cmip_AttributeId_vals), 0,
"GetArgument/attributeIdList/_item", HFILL }},
{ &hf_cmip_opcode,
{ "opcode", "cmip.opcode",
- FT_INT32, BASE_DEC, VALS(Opcode_vals), 0,
+ FT_INT32, BASE_DEC, VALS(cmip_Opcode_vals), 0,
"", HFILL }},
{ &hf_cmip_argument,
{ "argument", "cmip.argument",
"", HFILL }},
{ &hf_cmip_present1,
{ "present", "cmip.present",
- FT_UINT32, BASE_DEC, VALS(InvokeId_vals), 0,
+ FT_UINT32, BASE_DEC, VALS(cmip_InvokeId_vals), 0,
"InvokeLinkedId/present", HFILL }},
{ &hf_cmip_absent,
{ "absent", "cmip.absent",
"InvokeId/present", HFILL }},
{ &hf_cmip_invokeId,
{ "invokeId", "cmip.invokeId",
- FT_UINT32, BASE_DEC, VALS(InvokeId_vals), 0,
+ FT_UINT32, BASE_DEC, VALS(cmip_InvokeId_vals), 0,
"", HFILL }},
{ &hf_cmip_linkedId,
{ "linkedId", "cmip.linkedId",
- FT_UINT32, BASE_DEC, VALS(InvokeLinkedId_vals), 0,
+ FT_UINT32, BASE_DEC, VALS(cmip_InvokeLinkedId_vals), 0,
"Invoke/linkedId", HFILL }},
{ &hf_cmip_rRBody,
{ "rRBody", "cmip.rRBody",
"ReturnResult/rRBody", HFILL }},
{ &hf_cmip_generalProblem,
{ "generalProblem", "cmip.generalProblem",
- FT_INT32, BASE_DEC, VALS(GeneralProblem_vals), 0,
+ FT_INT32, BASE_DEC, VALS(cmip_GeneralProblem_vals), 0,
"RejectProb/generalProblem", HFILL }},
{ &hf_cmip_invokeProblem,
{ "invokeProblem", "cmip.invokeProblem",
- FT_INT32, BASE_DEC, VALS(InvokeProblem_vals), 0,
+ FT_INT32, BASE_DEC, VALS(cmip_InvokeProblem_vals), 0,
"RejectProb/invokeProblem", HFILL }},
{ &hf_cmip_returnResultProblem,
{ "returnResultProblem", "cmip.returnResultProblem",
- FT_INT32, BASE_DEC, VALS(ReturnResultProblem_vals), 0,
+ FT_INT32, BASE_DEC, VALS(cmip_ReturnResultProblem_vals), 0,
"RejectProb/returnResultProblem", HFILL }},
{ &hf_cmip_returnErrorProblem,
{ "returnErrorProblem", "cmip.returnErrorProblem",
- FT_INT32, BASE_DEC, VALS(ReturnErrorProblem_vals), 0,
+ FT_INT32, BASE_DEC, VALS(cmip_ReturnErrorProblem_vals), 0,
"RejectProb/returnErrorProblem", HFILL }},
{ &hf_cmip_rejectProblem,
{ "rejectProblem", "cmip.rejectProblem",
- FT_UINT32, BASE_DEC, VALS(RejectProb_vals), 0,
+ FT_UINT32, BASE_DEC, VALS(cmip_RejectProb_vals), 0,
"Reject/rejectProblem", HFILL }},
{ &hf_cmip_invoke,
{ "invoke", "cmip.invoke",
"ROS/reject", HFILL }},
{ &hf_cmip_abortSource,
{ "abortSource", "cmip.abortSource",
- FT_UINT32, BASE_DEC, VALS(CMIPAbortSource_vals), 0,
+ FT_UINT32, BASE_DEC, VALS(cmip_CMIPAbortSource_vals), 0,
"CMIPAbortInfo/abortSource", HFILL }},
+ { &hf_cmip_userInfo,
+ { "userInfo", "cmip.userInfo",
+ FT_NONE, BASE_NONE, NULL, 0,
+ "", HFILL }},
{ &hf_cmip_protocolVersion,
{ "protocolVersion", "cmip.protocolVersion",
FT_BYTES, BASE_HEX, NULL, 0,
{ "functionalUnits", "cmip.functionalUnits",
FT_BYTES, BASE_HEX, NULL, 0,
"CMIPUserInfo/functionalUnits", HFILL }},
+ { &hf_cmip_accessControl1,
+ { "accessControl", "cmip.accessControl",
+ FT_NONE, BASE_NONE, NULL, 0,
+ "CMIPUserInfo/accessControl", HFILL }},
{ &hf_cmip_FunctionalUnits_multipleObjectSelection,
{ "multipleObjectSelection", "cmip.multipleObjectSelection",
FT_BOOLEAN, 8, NULL, 0x80,