some updates for CMIP.

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

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

diff --git a/asn1/cmip/CMIP.asn b/asn1/cmip/CMIP.asn
index 05dc9e5c2466f334a22c2aa1d1bfa43e74c1a560..17ba9854600dd75ff6f7f70cc20f0a48e527d7e3 100644 (file)
--- a/asn1/cmip/CMIP.asn
+++ b/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
 }

diff --git a/asn1/cmip/cmip.cnf b/asn1/cmip/cmip.cnf
index 0b5accb79f411791573155154077dc65685c684f..a395e316206cf350be891ed38b77d39bee0f049e 100644 (file)
--- a/asn1/cmip/cmip.cnf
+++ b/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

diff --git a/asn1/cmip/packet-cmip-template.c b/asn1/cmip/packet-cmip-template.c
index afe58aaece6b9c29947faca0b09d0c7b9c0ee9af..052923fb7d8bab1f0285b0a14484c5a898132a06 100644 (file)
--- a/asn1/cmip/packet-cmip-template.c
+++ b/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"