some updates for CMIP.

note taht cmip does not yet compile due to a possible asn2eth compiler bug


svn path=/trunk/; revision=14756

asn1/cmip/CMIP.asn

@@ -7,7 +7,10 @@ BEGIN
 
 IMPORTS
   DistinguishedName, RDNSequence
-    FROM InformationFramework;
+    FROM InformationFramework
+  EXTERNAL
+    FROM ACSE-1 {joint-iso-itu-t association-control(2) modules(0) acse1(1) version1(1)};
+
 
 ModificationItem ::= SEQUENCE {
   modifyOperator   [2] IMPLICIT ModifyOperator OPTIONAL,
@@ -440,7 +443,7 @@ ROS ::= CHOICE {
 -- CMIP-A-ABORT
 --      Information carried in user-information parameter of A-ABORT
 CMIPAbortInfo ::= SEQUENCE {
-  abortSource  [0] IMPLICIT CMIPAbortSource
+  abortSource  [0] IMPLICIT CMIPAbortSource,
   userInfo     [1]  EXTERNAL OPTIONAL
 }
 
@@ -458,7 +461,7 @@ FunctionalUnits ::= BIT STRING {
 --	Information carried in user-information parameter of A-ASSOCIATE
 CMIPUserInfo ::= SEQUENCE {
   protocolVersion  [0] IMPLICIT ProtocolVersion OPTIONAL,
-  functionalUnits  [1] IMPLICIT FunctionalUnits OPTIONAL
+  functionalUnits  [1] IMPLICIT FunctionalUnits OPTIONAL,
   accessControl    [2]  EXTERNAL OPTIONAL,
   userInfo         [3]  EXTERNAL OPTIONAL
 }

asn1/cmip/cmip.cnf

@@ -5,8 +5,10 @@
 
 #.MODULE_IMPORT
 InformationFramework x509if
+ACSE-1 acse
 
 #.INCLUDE ../x509if/x509if-exp.cnf
+#.INCLUDE ../acse/acse-exp.cnf
 
 #.EXPORTS
 CMIPAbortInfo

asn1/cmip/packet-cmip-template.c

@@ -35,6 +35,7 @@
 #include <string.h>
 
 #include "packet-ber.h"
+#include "packet-acse.h"
 #include "packet-x509if.h"
 #include "packet-cmip.h"