diff options
| -rw-r--r-- | asn1/cmip/CMIP.asn | 9 | ||||
| -rw-r--r-- | asn1/cmip/cmip.cnf | 2 | ||||
| -rw-r--r-- | asn1/cmip/packet-cmip-template.c | 1 |
3 files changed, 9 insertions, 3 deletions
diff --git a/asn1/cmip/CMIP.asn b/asn1/cmip/CMIP.asn index 05dc9e5c24..17ba985460 100644 --- 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 0b5accb79f..a395e31620 100644 --- 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 afe58aaece..052923fb7d 100644 --- 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" |