diff options
| -rw-r--r-- | asn1/acse/acse-exp.cnf | 8 | ||||
| -rw-r--r-- | asn1/acse/acse.cnf | 3 | ||||
| -rw-r--r-- | asn1/acse/packet-acse-template.h | 2 | ||||
| -rw-r--r-- | asn1/cmip/CMIP.asn | 12 | ||||
| -rw-r--r-- | epan/dissectors/packet-acse.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-acse.h | 8 |
6 files changed, 24 insertions, 11 deletions
diff --git a/asn1/acse/acse-exp.cnf b/asn1/acse/acse-exp.cnf new file mode 100644 index 0000000000..89ca8db0b7 --- /dev/null +++ b/asn1/acse/acse-exp.cnf @@ -0,0 +1,8 @@ +#.IMPORT_TAG +EXTERNAL BER_CLASS_UNI 8 +#.END + +#.TYPE_ATTR +EXTERNAL TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 +#.END + diff --git a/asn1/acse/acse.cnf b/asn1/acse/acse.cnf index a6ce2a9283..460bc9404f 100644 --- a/asn1/acse/acse.cnf +++ b/asn1/acse/acse.cnf @@ -3,6 +3,9 @@ InformationFramework x509if #.INCLUDE ../x509if/x509if-exp.cnf +#.EXPORTS +EXTERNAL + #.TYPE_RENAME AARQ-apdu/protocol-version T_AARQ_protocol_version AARE-apdu/protocol-version T_AARE_protocol_version diff --git a/asn1/acse/packet-acse-template.h b/asn1/acse/packet-acse-template.h index c18b3be1fb..409b4b6487 100644 --- a/asn1/acse/packet-acse-template.h +++ b/asn1/acse/packet-acse-template.h @@ -26,7 +26,7 @@ #ifndef PACKET_ACSE_H #define PACKET_ACSE_H -/*#include "packet-acse-exp.h"*/ +#include "packet-acse-exp.h" #endif /* PACKET_ACSE_H */ diff --git a/asn1/cmip/CMIP.asn b/asn1/cmip/CMIP.asn index 5039c787ee..05dc9e5c24 100644 --- a/asn1/cmip/CMIP.asn +++ b/asn1/cmip/CMIP.asn @@ -316,9 +316,7 @@ Scope ::= CHOICE { CMISSync ::= ENUMERATED {bestEffort(0), atomic(1)} -- Supporting type definitions ---XXX Dont support EXTERNAL yet ---AccessControl ::= EXTERNAL -AccessControl ::= OCTET STRING +AccessControl ::= EXTERNAL GetArgument ::= SEQUENCE { @@ -443,8 +441,7 @@ ROS ::= CHOICE { -- Information carried in user-information parameter of A-ABORT CMIPAbortInfo ::= SEQUENCE { abortSource [0] IMPLICIT CMIPAbortSource ---XXX Dont know how to handle EXTERNAL yet ---XXX userInfo [1] EXTERNAL OPTIONAL + userInfo [1] EXTERNAL OPTIONAL } CMIPAbortSource ::= ENUMERATED {cmiseServiceUser(0), cmiseServiceProvider(1)} @@ -462,9 +459,8 @@ FunctionalUnits ::= BIT STRING { CMIPUserInfo ::= SEQUENCE { protocolVersion [0] IMPLICIT ProtocolVersion OPTIONAL, functionalUnits [1] IMPLICIT FunctionalUnits OPTIONAL ---XXX Dont know how to handle EXTERNAL yet ---XXX accessControl [2] EXTERNAL OPTIONAL, ---XXX userInfo [3] EXTERNAL OPTIONAL + accessControl [2] EXTERNAL OPTIONAL, + userInfo [3] EXTERNAL OPTIONAL } ProtocolVersion ::= BIT STRING {version1(0), version2(1)} diff --git a/epan/dissectors/packet-acse.c b/epan/dissectors/packet-acse.c index 90feaf723d..8d9d156571 100644 --- a/epan/dissectors/packet-acse.c +++ b/epan/dissectors/packet-acse.c @@ -439,7 +439,7 @@ static const ber_sequence_t EXTERNAL_sequence[] = { { 0, 0, 0, NULL } }; -static int +int dissect_acse_EXTERNAL(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { gint8 class; gboolean pc, ind_field; diff --git a/epan/dissectors/packet-acse.h b/epan/dissectors/packet-acse.h index 0bbd9298d0..01b29ce85c 100644 --- a/epan/dissectors/packet-acse.h +++ b/epan/dissectors/packet-acse.h @@ -33,7 +33,13 @@ #ifndef PACKET_ACSE_H #define PACKET_ACSE_H -/*#include "packet-acse-exp.h"*/ + +/*--- Included file: packet-acse-exp.h ---*/ + +int dissect_acse_EXTERNAL(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index); + +/*--- End of included file: packet-acse-exp.h ---*/ + #endif /* PACKET_ACSE_H */ |