Co ordidnate CMIP abd GNM.

svn path=/trunk/; revision=15593

3 files changed, 38 insertions, 38 deletions

diff --git a/asn1/cmip/CMIP.asn b/asn1/cmip/CMIP.asn
index 51da9910e8..1a9e2304f7 100644
--- a/asn1/cmip/CMIP.asn
+++ b/asn1/cmip/CMIP.asn
@@ -5,9 +5,8 @@ CMIP-A-ASSOCIATE-Information {joint-iso-itu-t ms(9) cmip(1) modules(0)
   aAssociateUserInfo(1)} DEFINITIONS ::=
 BEGIN
 
-IMPORTS
-  DistinguishedName, RDNSequence
-    FROM InformationFramework
+	IMPORTS
+
   EXTERNAL
     FROM ACSE-1 {joint-iso-itu-t association-control(2) modules(0) acse1(1) version1(1)};
 
@@ -64,6 +63,10 @@ ProcessingFailure ::= SEQUENCE {
   ...
 }
 
+RDNSequence ::= SEQUENCE OF RelativeDistinguishedName
+
+RelativeDistinguishedName ::= SET OF AttributeValueAssertion
+
 DeleteError ::= SEQUENCE {
   managedObjectClass     ObjectClass OPTIONAL,
   managedObjectInstance  ObjectInstance OPTIONAL,
@@ -177,6 +180,8 @@ EventReply ::= SEQUENCE {
   eventReplyInfo  [8] ANY OPTIONAL
 }
 
+DistinguishedName ::= RDNSequence
+
 EventReportResult ::= SEQUENCE {
   managedObjectClass     ObjectClass OPTIONAL,
   managedObjectInstance  ObjectInstance OPTIONAL,
@@ -285,6 +290,11 @@ Attribute ::= SEQUENCE {
   value      ANY
 }
 
+AttributeValueAssertion ::= SEQUENCE {
+  id     OBJECT IDENTIFIER,
+  value  ANY
+}
+
 -- This Recommendation | International Standard does not allocate any values for localForm.
 -- Where this alternative is used, the permissible values for the integers and their meanings shall be defined
 -- as part of the application context in which they are used
@@ -317,11 +327,6 @@ OperationalState ::= ENUMERATED {disabled(0), enabled(1)}
 
 NameBinding ::= OBJECT IDENTIFIER
 
--- IMPORTED FROM ASN1DefinedTypesModule {itu-t recommendation m gnm(3100) informationModel(0) asn1Modules(2) asn1DefinedTypesModule(0)} 
-
-NameType ::= CHOICE {numericName  INTEGER,
-                     pString      GraphicString
-}
 
 -- FROM ACSE
 AE-title ::= CHOICE {
diff --git a/asn1/cmip/cmip.cnf b/asn1/cmip/cmip.cnf
index dbd3cd901a..f601cd77b8 100644
--- a/asn1/cmip/cmip.cnf
+++ b/asn1/cmip/cmip.cnf
@@ -4,10 +4,8 @@
 # $Id$
 
 #.MODULE_IMPORT
-InformationFramework x509if
 ACSE-1 acse
 
-#.INCLUDE ../x509if/x509if-exp.cnf
 #.INCLUDE ../acse/acse-exp.cnf
 
 #.EXPORTS
@@ -15,6 +13,10 @@ CMIPAbortInfo
 CMIPUserInfo
 ROS
 InvokeIDType
+ObjectInstance
+ObjectClass
+Attribute
+RDNSequence
 
 #.NO_EMIT
 
@@ -36,16 +38,23 @@ InvokeIDType
   }
 #.END
 
+#.FN_PARS CMIPAbortSource
+
+VAL_PTR = &value
+
 #.FN_BODY CMIPAbortSource
   guint32 value;
-  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, &value);
+
+  %(DEFAULT_BODY)s
   if(check_col(pinfo->cinfo, COL_INFO)){
     col_append_fstr(pinfo->cinfo, COL_INFO, " AbortSource:%%s", val_to_str(value, cmip_CMIPAbortSource_vals, " Unknown AbortSource:%%d"));
   }
 #.END
+#.FN_PARS Opcode
+	VAL_PTR = &opcode
 
 #.FN_BODY Opcode
-  offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, &opcode);
+  %(DEFAULT_BODY)s
   if(check_col(pinfo->cinfo, COL_INFO)){
     col_prepend_fstr(pinfo->cinfo, COL_INFO, "%%s", val_to_str(opcode, cmip_Opcode_vals, " Unknown Opcode:%%d"));
   }
@@ -79,10 +88,12 @@ InvokeIDType
   }
 #.END
 
+#.FN_PARS AttributeId/globalForm
+	VAL_PTR = attribute_identifier_id
+
 #.FN_BODY AttributeId/globalForm
   attributeform = ATTRIBUTE_GLOBAL_FORM;
-  offset = dissect_ber_object_identifier(implicit_tag, pinfo, tree, tvb, offset,
-                                         hf_cmip_globalForm, attribute_identifier_id);
+  %(DEFAULT_BODY)s
 
 #.FN_BODY AttributeId/localForm
   attributeform = ATTRIBUTE_LOCAL_FORM;
@@ -93,6 +104,11 @@ InvokeIDType
   if(attributeform==ATTRIBUTE_GLOBAL_FORM){
     offset=call_ber_oid_callback(attribute_identifier_id, tvb, offset, pinfo, tree);
   }
+#.FN_PARS AttributeValueAssertion/id
+	VAL_PTR = attributevalueassertion_id
+
+#.FN_BODY AttributeValueAssertion/value
+    offset=call_ber_oid_callback(attributevalueassertion_id, tvb, offset, pinfo, tree);
 
 #.FN_BODY Argument
   switch(opcode_type){
diff --git a/asn1/cmip/packet-cmip-template.c b/asn1/cmip/packet-cmip-template.c
index aefa5c82fb..62bfd326bd 100644
--- a/asn1/cmip/packet-cmip-template.c
+++ b/asn1/cmip/packet-cmip-template.c
@@ -2,7 +2,7 @@
  * Routines for X.711 CMIP packet dissection
  *   Ronnie Sahlberg 2004
  *
- * $Id$
+ * $Id:$
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -53,7 +53,6 @@ static int hf_cmip_actionType_OID = -1;
 static int hf_cmip_eventType_OID = -1;
 static int hf_cmip_attributeId_OID = -1;
 static int hf_cmip_errorId_OID = -1;
-static int hf_AdministrativeState = -1;
 static int hf_DiscriminatorConstruct = -1;
 static int hf_Destination = -1;
 static int hf_NameBinding = -1;
@@ -78,6 +77,8 @@ static int attributeform;
 #define ATTRIBUTE_GLOBAL_FORM 1
 static char attribute_identifier_id[BER_MAX_OID_STR_LEN];
 
+static char attributevalueassertion_id[BER_MAX_OID_STR_LEN];
+
 static char object_identifier_id[BER_MAX_OID_STR_LEN];
 
 static int objectclassform;
@@ -89,13 +90,6 @@ static char objectclass_identifier_id[BER_MAX_OID_STR_LEN];
 
 
 static void
-dissect_cmip_attribute_31(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
-{
-
-	dissect_cmip_AdministrativeState(FALSE, tvb, 0, pinfo, parent_tree, hf_AdministrativeState);
-
-}
-static void
 dissect_cmip_attribute_35(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
 {
 
@@ -135,13 +129,6 @@ dissect_cmip_attribute_65(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_
 
 }
 
-static void
-dissect_cmip_M3100_attribute_NameType(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
-{
-
-	dissect_cmip_NameType(FALSE, tvb, 0, pinfo, parent_tree, -1);
-
-}
 
 /* XXX this one should be broken out later and moved into the conformance file */
 static void
@@ -219,10 +206,6 @@ void proto_register_cmip(void) {
       { "errorId", "cmip.errorId_OID",
         FT_STRING, BASE_NONE, NULL, 0,
         "errorId", HFILL }},
-    { &hf_AdministrativeState,
-      { "AdministrativeState", "cmip.AdministrativeState",
-        FT_UINT32, BASE_DEC, VALS(cmip_AdministrativeState_vals), 0,
-        "", HFILL }},
    { &hf_DiscriminatorConstruct,
       { "DiscriminatorConstruct", "cmip.DiscriminatorConstruct",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -266,15 +249,11 @@ void proto_register_cmip(void) {
 /*--- proto_reg_handoff_cmip -------------------------------------------*/
 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.3.2.7.31", dissect_cmip_attribute_31, proto_cmip, "smi2AttributeID (7) administrativeState(31)");
 	register_ber_oid_dissector("2.9.3.2.7.35", dissect_cmip_attribute_35, proto_cmip, "smi2AttributeID (7) operationalState(35)");
 	register_ber_oid_dissector("2.9.3.2.7.55", dissect_cmip_attribute_55, proto_cmip, "smi2AttributeID (7) destination(55)");
 	register_ber_oid_dissector("2.9.3.2.7.56", dissect_cmip_attribute_56, proto_cmip, "smi2AttributeID (7) discriminatorConstruct(56)");
 	register_ber_oid_dissector("2.9.3.2.7.63", dissect_cmip_attribute_63, proto_cmip, "smi2AttributeID (7) nameBinding(63)");
 	register_ber_oid_dissector("2.9.3.2.7.65", dissect_cmip_attribute_65, proto_cmip, "smi2AttributeID (7) objectClass(65)");
-	register_ber_oid_dissector("0.0.13.3100.0.7.20", dissect_cmip_M3100_attribute_NameType, proto_cmip, "equipmentId(20)");
-	register_ber_oid_dissector("0.0.13.3100.0.7.28", dissect_cmip_M3100_attribute_NameType, proto_cmip, "managedElementId(28)");
-	register_ber_oid_dissector("0.0.13.3100.0.7.30", dissect_cmip_M3100_attribute_NameType, proto_cmip, "networkId(30)");
 
 	register_ber_oid_name("2.9.3.2.3.4","eventForwardingDiscriminator(4)");