From 16512c7b8c8e9c6659300f08456e2dee6f4a6fbb Mon Sep 17 00:00:00 2001 From: Anders Broman Date: Sat, 13 Sep 2008 15:32:59 +0000 Subject: Use original UnidialoguePDUs. svn path=/trunk/; revision=26188 --- asn1/tcap/Makefile.common | 8 ++++---- asn1/tcap/tcap.asn | 33 ++++----------------------------- asn1/tcap/tcap.cnf | 34 ++++++++++++++++++++++++++++++++-- 3 files changed, 40 insertions(+), 35 deletions(-) (limited to 'asn1') diff --git a/asn1/tcap/Makefile.common b/asn1/tcap/Makefile.common index 6d6f8fea6f..b64d89b033 100644 --- a/asn1/tcap/Makefile.common +++ b/asn1/tcap/Makefile.common @@ -29,7 +29,8 @@ NEED_PACKET_PROTO_H = 1 EXT_ASN_FILE_LIST = -ASN_FILE_LIST = $(PROTOCOL_NAME).asn +ASN_FILE_LIST = $(PROTOCOL_NAME).asn\ + UnidialoguePDUs.asn # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn # files do not exist for all protocols: Please add/remove as required. @@ -42,11 +43,10 @@ EXTRA_DIST = \ SRC_FILES = \ $(EXTRA_DIST) \ - $(EXT_ASN_FILE_LIST) + $(EXT_ASN_FILE_LIST) \ DialoguePDUs.asn \ TCAPMessages.asn \ - TC-Notation-Extensions.asn \ - UnidialoguePDUs.asn + TC-Notation-Extensions.asn A2W_FLAGS= -b diff --git a/asn1/tcap/tcap.asn b/asn1/tcap/tcap.asn index 0ebd11030e..bcbbdfc415 100644 --- a/asn1/tcap/tcap.asn +++ b/asn1/tcap/tcap.asn @@ -43,14 +43,14 @@ Applicationcontext ::= OBJECT IDENTIFIER AARQ-apdu ::= [APPLICATION 0] IMPLICIT SEQUENCE { protocol-versionrq [0] IMPLICIT BIT STRING { version1 (0) } DEFAULT { version1 }, - application-context-name [1] Applicationcontext, - user-information [30] IMPLICIT User-information - OPTIONAL } + application-context-name [1] OBJECT IDENTIFIER, + user-information [30] IMPLICIT SEQUENCE OF EXTERNAL OPTIONAL +} AARE-apdu ::= [APPLICATION 1] IMPLICIT SEQUENCE { protocol-versionre [0] IMPLICIT BIT STRING { version1 (0) } DEFAULT { version1 }, - application-context-name [1] Applicationcontext, + application-context-name [1] OBJECT IDENTIFIER, result [2] Associate-result, result-source-diagnostic [3] Associate-source-diagnostic, user-information [30] IMPLICIT User-information @@ -111,31 +111,6 @@ Release-request-reason ::= INTEGER { normal (0), Release-response-reason ::= INTEGER { normal (0), not-finished (1), user-defined (30) } ---END - - ---UnidialoguePDUs { ccitt recommendation q 773 modules (2) unidialoguePDUs (3) version1 (1) } - ---DEFINITIONS ::= - ---BEGIN - ---EXPORTS uniDialogue-as-id, UniDialoguePDU; - --- Abstract syntax name for unstructured dialogue APDUs - -uniDialogue-as-id OBJECT IDENTIFIER ::= { ccitt recommendation q 773 as (1) - unidialogue-as (2) version1 (1) } - -UniDialoguePDU ::= CHOICE { unidialoguePDU AUDT-apdu } - -AUDT-apdu ::= [APPLICATION 0] IMPLICIT SEQUENCE { - protocol-version3 [0] IMPLICIT BIT STRING {version1 (0) } - DEFAULT { version1 }, - application-context-name [1] Applicationcontext, - user-information [30] IMPLICIT User-information - OPTIONAL } - END diff --git a/asn1/tcap/tcap.cnf b/asn1/tcap/tcap.cnf index c7cbf6722e..f911f6ee70 100644 --- a/asn1/tcap/tcap.cnf +++ b/asn1/tcap/tcap.cnf @@ -5,6 +5,8 @@ #.OMIT_ASSIGNMENT RLRQ-apdu RLRE-apdu +Release-request-reason +Release-response-reason #.END #.MODULE_IMPORT @@ -23,8 +25,26 @@ UniDialoguePDU B "0.0.17.773.1.2.1" "uniDialogue-as-id" #.NO_EMIT #.TYPE_RENAME +AARE-apdu/_untag/application-context-name AARE_application_context_name +AARQ-apdu/_untag/application-context-name AARQ_application_context_name +AUDT-apdu/_untag/application-context-name AUDT_application_context_name + +AARQ-apdu/_untag/user-information AARQ_user_information +AARE-apdu/_untag/user-information AARE_user_information +ABRT-apdu/_untag/user-information ABRT_user_information +AUDT-apdu/_untag/user-information AUDT_user_information #.FIELD_RENAME +AARQ-apdu/_untag/application-context-name aarq_application_context_name +AARE-apdu/_untag/application-context-name aare_application_context_name +AUDT-apdu/_untag/application-context-name audt_application_context_name + +AARQ-apdu/_untag/user-information aarq_user_information +AARE-apdu/_untag/user-information aare_user_information +AUDT-apdu/_untag/user-information audt_user_information +ABRT-apdu/_untag/user-information abrt_user_information +#.END + #---------------------------------------------------------------------------------------- #.FN_BODY DialogueOC @@ -75,11 +95,21 @@ if (!next_tvb) /* return comp_offset+len; or return offset (will be automatically added */ #---------------------------------------------------------------------------------------- -#.FN_BODY Applicationcontext FN_VARIANT = _str VAL_PTR = &cur_oid +#.FN_BODY AUDT-apdu/_untag/application-context-name FN_VARIANT = _str VAL_PTR = &cur_oid %(DEFAULT_BODY)s tcap_private.oid= (void*) cur_oid; tcap_private.acv=TRUE; - +#---------------------------------------------------------------------------------------- +#.FN_BODY AARQ-apdu/_untag/application-context-name FN_VARIANT = _str VAL_PTR = &cur_oid +%(DEFAULT_BODY)s + tcap_private.oid= (void*) cur_oid; + tcap_private.acv=TRUE; +#---------------------------------------------------------------------------------------- +#.FN_BODY AARE-apdu/_untag/application-context-name FN_VARIANT = _str VAL_PTR = &cur_oid +%(DEFAULT_BODY)s + tcap_private.oid= (void*) cur_oid; + tcap_private.acv=TRUE; +#---------------------------------------------------------------------------------------- # Do not overwrite the ApplicationContext with the UserInfoOID ! # #---------------------------------------------------------------------------------------- -- cgit v1.2.1