Generate CMIP from original asn1 files with -X and -T option.

svn path=/trunk/; revision=22187

1 files changed, 86 insertions, 44 deletions

diff --git a/asn1/cmip/cmip.cnf b/asn1/cmip/cmip.cnf
index f44ea05877..1ac58859f1 100644
--- a/asn1/cmip/cmip.cnf
+++ b/asn1/cmip/cmip.cnf
@@ -5,6 +5,34 @@
 
 #.INCLUDE ../acse/acse-exp.cnf
 
+#.MODULE
+Remote-Operations-Information-Objects cmip.ros
+Attribute-ASN1Module cmip.x721
+
+
+#.OMIT_ASSIGNMENT Remote-Operations-Information-Objects
+Bind
+Unbind
+#.END
+
+#.MAKE_ENUM
+Code/local
+
+#.TYPE_RENAME
+
+Invoke/argument             InvokeArgument
+ReturnResult/result/result  ResultArgument
+
+#.FIELD_RENAME
+
+Invoke/linkedId/present     linkedIdPresent
+
+Reject/problem/invoke       invokeProblem
+Reject/problem/returnError  returnErrorProblem
+Reject/problem/returnResult returnResultProblem
+
+ReturnResult/result/result  resultArgument
+
 #.EXPORTS
 CMIPAbortInfo
 CMIPUserInfo
@@ -16,11 +44,25 @@ Attribute
 RDNSequence
 
 #.REGISTER
-OperationalState		B "2.9.3.2.7.35" "smi2AttributeID(7)operationalState(35)"
-Destination				B "2.9.3.2.7.55" "smi2AttributeID(7)destination(55)"
-DiscriminatorConstruct	B "2.9.3.2.7.56" "smi2AttributeID(7)discriminatorConstruct(56)"
-NameBinding				B "2.9.3.2.7.63" "smi2AttributeID(7)nameBinding(63)"
-ObjectClass				B "2.9.3.2.7.65" "smi2AttributeID(7)objectClass(65)"
+# X.721
+LogRecordId				B "2.9.3.2.7.3"  "logRecordId(3)"
+SystemId				B "2.9.3.2.7.4"  "systemId(4)"
+SystemTitle				B "2.9.3.2.7.5"  "systemTitle(5)"
+AdditionalText			B "2.9.3.2.7.7"  "additionalText(7)"
+BackedUpStatus			B "2.9.3.2.7.11"  "backedUpStatus(11)"
+# Currently in the GNM dissector
+#AdministrativeState	B "2.9.3.2.7.31" "administrativeState(31)"
+#ControlStatus			B "2.9.3.2.7.34" "controlStatus(34)"
+UsageState				B "2.9.3.2.7.39" "usageState(39)"
+OperationalState		B "2.9.3.2.7.35" "operationalState(35)"
+Allomorphs				B "2.9.3.2.7.50" "allomorphs(50)"
+Destination				B "2.9.3.2.7.55" "destination(55)"
+DiscriminatorConstruct	B "2.9.3.2.7.56" "discriminatorConstruct(56)"
+NameBinding				B "2.9.3.2.7.63" "nameBinding(63)"
+ObjectClass				B "2.9.3.2.7.65" "objectClass(65)"
+# Currently in the GNM dissector
+#Packages				B "2.9.3.2.7.66""packages(66)"
+
 
 #.NO_EMIT
 
@@ -29,6 +71,7 @@ ObjectClass				B "2.9.3.2.7.65" "smi2AttributeID(7)objectClass(65)"
 #.TYPE_RENAME
 
 #.FIELD_RENAME
+SetArgument/modificationList/_item/attributeValue attributevalue
 
 #.FN_HDR CMIPAbortInfo
   if(check_col(actx->pinfo->cinfo, COL_INFO)){
@@ -51,7 +94,7 @@ ObjectClass				B "2.9.3.2.7.65" "smi2AttributeID(7)objectClass(65)"
   }
 #.END
 
-#.FN_BODY Opcode  VAL_PTR = &opcode
+#.FN_BODY Code/local  VAL_PTR = &opcode
   %(DEFAULT_BODY)s
   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"));
@@ -105,9 +148,7 @@ ObjectClass				B "2.9.3.2.7.65" "smi2AttributeID(7)objectClass(65)"
 #.FN_BODY AttributeValueAssertion/value
     offset=call_ber_oid_callback(attributevalueassertion_id, tvb, offset, actx->pinfo, tree);
 
-#.FN_BODY Argument
-  switch(opcode_type){
-  case OPCODE_INVOKE:
+#.FN_BODY Invoke/argument
     switch(opcode){
     case 0: /* M-eventreport */
       offset = dissect_cmip_EventReportArgument(FALSE, tvb, offset, actx, tree, -1);
@@ -143,8 +184,10 @@ ObjectClass				B "2.9.3.2.7.65" "smi2AttributeID(7)objectClass(65)"
       offset = dissect_cmip_InvokeIDType(FALSE, tvb,  offset, actx, tree, -1);
       break;
     }
-    break;
-  case OPCODE_RETURN_RESULT:
+    
+
+#.FN_BODY ReturnResult/result/result
+
     switch(opcode){
     case 0: /* M-eventreport*/
       break;  /* No return data */
@@ -175,46 +218,35 @@ ObjectClass				B "2.9.3.2.7.65" "smi2AttributeID(7)objectClass(65)"
     case 10: /* M-cancelget */
       break; /* doe this one return any data? */
     }
-    break;
   /*XXX add more types here */
-  }
+ 
+#.FN_BODY ReturnError/parameter
+/* TODO: add code here */
 
-#.FN_HDR ObjectClass/ocglobalForm
+#.FN_HDR ObjectClass/globalForm
   objectclassform = OBJECTCLASS_GLOBAL_FORM;
-#.FN_PARS ObjectClass/ocglobalForm
+#.FN_PARS ObjectClass/globalForm
   FN_VARIANT = _str  VAL_PTR = &objectclass_identifier_id
 
-#.FN_HDR ObjectClass/oclocalForm
+#.FN_HDR ObjectClass/localForm
   objectclassform = OBJECTCLASS_LOCAL_FORM;
 
-#.FN_PARS ActionInfo/actionType
+#.FN_PARS ActionTypeId/globalForm
   FN_VARIANT = _str  HF_INDEX = hf_cmip_actionType_OID  VAL_PTR = &object_identifier_id
 
 #.FN_BODY ActionInfo/actionInfoArg
   offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree);
 
-#.FN_PARS ActionReply/actionType
-  FN_VARIANT = _str  HF_INDEX = hf_cmip_actionType_OID  VAL_PTR = &object_identifier_id
-
-#.FN_BODY ActionReply/actionReplyInfo
-  offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree);
-
-#.FN_PARS EventReportArgument/eventType
+#.FN_PARS EventTypeId/globalForm
   FN_VARIANT = _str  HF_INDEX = hf_cmip_eventType_OID  VAL_PTR = &object_identifier_id
 
 #.FN_BODY EventReportArgument/eventInfo
   offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree);
 
-#.FN_PARS EventReply/eventType
-  FN_VARIANT = _str  HF_INDEX = hf_cmip_eventType_OID  VAL_PTR = &object_identifier_id
-
 #.FN_BODY EventReply/eventReplyInfo
   offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree);
 
-#.FN_PARS ModificationItem/attributeId
-  FN_VARIANT = _str  HF_INDEX = hf_cmip_attributeId_OID  VAL_PTR = &object_identifier_id
-
-#.FN_BODY ModificationItem/attributeValue
+#.FN_BODY SetArgument/modificationList/_item/attributeValue
   offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree);
 
 #.FN_PARS SpecificErrorInfo/errorId
@@ -223,27 +255,37 @@ ObjectClass				B "2.9.3.2.7.65" "smi2AttributeID(7)objectClass(65)"
 #.FN_BODY SpecificErrorInfo/errorInfo
   offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree);
 
-#.FN_PARS AttributeError/attributeId
-  FN_VARIANT = _str  HF_INDEX = hf_cmip_attributeId_OID  VAL_PTR = &object_identifier_id
-
 #.FN_BODY AttributeError/attributeValue
   offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree);
 
-#.FN_PARS ErrorInfo/actionType
-  FN_VARIANT = _str  HF_INDEX = hf_cmip_actionType_OID  VAL_PTR = &object_identifier_id
+#.FN_BODY InvalidArgumentValue/eventValue/eventInfo
 
-#.FN_PARS NoSuchArgumentAction/actionType
-  FN_VARIANT = _str  HF_INDEX = hf_cmip_actionType_OID  VAL_PTR = &object_identifier_id
+  offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree);
+#.FN_BODY ActionReply/actionReplyInfo
+  offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree);
 
-#.FN_PARS NoSuchArgumentEvent/eventType
-  FN_VARIANT = _str  HF_INDEX = hf_cmip_eventType_OID  VAL_PTR = &object_identifier_id
 
-#.FN_PARS InvalidArgumentValueEventValue/eventType
-  FN_VARIANT = _str  HF_INDEX = hf_cmip_eventType_OID  VAL_PTR = &object_identifier_id
+# X.721
+#.FN_PARS ManagementExtension/identifier FN_VARIANT = _str  VAL_PTR = &object_identifier_id
 
-#.FN_BODY InvalidArgumentValueEventValue/eventInfo
+#.FN_BODY ManagementExtension/information
   offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree);
 
-#.END
+#.FN_BODY AttributeValueChangeDefinition/_item/oldAttributeValue
+  offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree);
+
+#.FN_BODY AttributeValueChangeDefinition/_item/newAttributeValue
+  offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree);
+
+#.FN_PARS ServiceUser/identifier FN_VARIANT = _str  VAL_PTR = &object_identifier_id
 
+#.FN_BODY ServiceUser/details
+  offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree);
 
+#.FN_PARS SupportedFeatures/_item/featureIdentifier FN_VARIANT = _str  VAL_PTR = &object_identifier_id
+
+#.FN_BODY SupportedFeatures/_item/featureInfo
+  offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree);
+
+
+#.END