osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Use the unmodified DialoguePDUs ASN1 file. 

svn path=/trunk/; revision=26192
This commit is contained in:
Anders Broman 2008-09-14 14:42:39 +00:00
parent 14f76023b3
commit d7c62b2db5
5 changed files with 465 additions and 563 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
asn1/tcap/Makefile.common
View File

@ -30,7 +30,8 @@ NEED_PACKET_PROTO_H = 1
EXT_ASN_FILE_LIST =
ASN_FILE_LIST = $(PROTOCOL_NAME).asn\
UnidialoguePDUs.asn
UnidialoguePDUs.asn \
DialoguePDUs.asn
# The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn
# files do not exist for all protocols: Please add/remove as required.
@ -44,7 +45,6 @@ EXTRA_DIST = \
SRC_FILES = \
$(EXTRA_DIST) \
$(EXT_ASN_FILE_LIST) \
DialoguePDUs.asn \
TCAPMessages.asn \
TC-Notation-Extensions.asn

109
asn1/tcap/tcap.asn
View File

@ -1,25 +1,12 @@
-- $Id$
DialoguePDUs { ccitt recommendation q 773 modules (2) dialoguePDUs(2) version1 (1) }
TCAPMessages {itu-t recommendation q 773 modules(2) messages(1) version3(3)}
DEFINITIONS ::=
BEGIN
EXPORTS dialogue-as-id, DialoguePDU;
-- abstract syntax name for structured dialogue APDUs
dialogue-as-id OBJECT IDENTIFIER ::= { ccitt recommendation q 773 as (1)
dialogue-as (1) version1 (1) }
DialoguePDU ::= CHOICE {
dialogueRequest AARQ-apdu,
dialogueResponse AARE-apdu,
dialogueAbort ABRT-apdu }
DEFINITIONS ::=
BEGIN
--EXPORTS OPERATION, ERROR, Component, InvokeId Type;
-- WS stuff
ExternalPDU ::= [UNIVERSAL 8] IMPLICIT SEQUENCE
{
oid OBJECT IDENTIFIER,
@ -28,91 +15,7 @@ ExternalPDU ::= [UNIVERSAL 8] IMPLICIT SEQUENCE
Dialog1 ::= OCTET STRING
Applicationcontext ::= OBJECT IDENTIFIER
AARQ-apdu ::= [APPLICATION 0] IMPLICIT SEQUENCE {
protocol-versionrq [0] IMPLICIT BIT STRING { version1 (0) }
DEFAULT { version1 },
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] OBJECT IDENTIFIER,
result [2] Associate-result,
result-source-diagnostic [3] Associate-source-diagnostic,
user-information [30] IMPLICIT SEQUENCE OF EXTERNAL OPTIONAL
}
-- RLRQ PDU is currently not used.
-- It is included for completeness only.
RLRQ-apdu ::= [APPLICATION 2] IMPLICIT SEQUENCE {
reasonrq [0] IMPLICIT Release-request-reason OPTIONAL,
user-information [30] IMPLICIT SEQUENCE OF EXTERNAL OPTIONAL
}
-- RLRE PDU is currently not used.
-- It is included for completeness only
RLRE-apdu ::= [APPLICATION 3] IMPLICIT SEQUENCE {
reasonre [0] IMPLICIT Release-response-reason OPTIONAL,
user-information [30] IMPLICIT SEQUENCE OF EXTERNAL OPTIONAL
}
ABRT-apdu ::= [APPLICATION 4] IMPLICIT SEQUENCE {
abort-source [0] IMPLICIT ABRT-source,
user-information [30] IMPLICIT SEQUENCE OF EXTERNAL OPTIONAL
}
ABRT-source ::= INTEGER { dialogue-service-user (0),
dialogue-service-provider (1) }
Associate-result ::= INTEGER { accepted (0),
reject-permanent (1) }
Associate-source-diagnostic ::= CHOICE {
dialogue-service-user [1] INTEGER {
null (0),
no-reason-given (1),
application-context-name-not-supported (2) },
dialogue-service-provider [2] INTEGER {
null (0),
no-reason-given (1),
no-common-dialogue-portion (2) }
}
-- Release-request-reason is currently not used.
-- It is included for completeness only.
Release-request-reason ::= INTEGER { normal (0),
urgent (1),
user-defined (30)
}
-- Release-response-reason is currently not used.
-- It is included for completeness only.
Release-response-reason ::= INTEGER { normal (0),
not-finished (1),
user-defined (30) }
END
TCAPMessages {itu-t recommendation q 773 modules(2) messages(1) version3(3)}
DEFINITIONS ::=
BEGIN
--EXPORTS OPERATION, ERROR, Component, InvokeId Type;
-- End WS
-- Transaction Portion fields
TCMessage ::= CHOICE {

8
asn1/tcap/tcap.cnf
View File

@ -25,6 +25,10 @@ UniDialoguePDU B "0.0.17.773.1.2.1" "uniDialogue-as-id"
#.NO_EMIT
#.TYPE_RENAME
AUDT-apdu/_untag/protocol-version AUDT_protocol_version
AARQ-apdu/_untag/protocol-version AARQ_protocol_version
AARE-apdu/_untag/protocol-version AARE_protocol_version
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
@ -35,6 +39,10 @@ ABRT-apdu/_untag/user-information ABRT_user_information
AUDT-apdu/_untag/user-information AUDT_user_information
#.FIELD_RENAME
AUDT-apdu/_untag/protocol-version audt_protocol_version
AARQ-apdu/_untag/protocol-version aarq_protocol_version
AARE-apdu/_untag/protocol-version aare_protocol_version
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

901
epan/dissectors/packet-tcap.c
View File

File diff suppressed because it is too large Load Diff

6
epan/dissectors/packet-tcap.h
View File

@ -1,7 +1,7 @@
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
/* packet-tcap.h */
/* ../../tools/asn2wrs.py -b -p tcap -c tcap.cnf -s packet-tcap-template tcap.asn UnidialoguePDUs.asn */
/* ../../tools/asn2wrs.py -b -p tcap -c tcap.cnf -s packet-tcap-template tcap.asn UnidialoguePDUs.asn DialoguePDUs.asn */
/* Input file: packet-tcap-template.h */
@ -95,10 +95,10 @@ extern void call_tcap_dissector(dissector_handle_t, tvbuff_t*, packet_info*, pro
/*--- Included file: packet-tcap-exp.h ---*/
#line 1 "packet-tcap-exp.h"
extern const value_string tcap_DialoguePDU_vals[];
extern const value_string tcap_UniDialoguePDU_vals[];
int dissect_tcap_DialoguePDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
extern const value_string tcap_DialoguePDU_vals[];
int dissect_tcap_UniDialoguePDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
int dissect_tcap_DialoguePDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
/*--- End of included file: packet-tcap-exp.h ---*/
#line 88 "packet-tcap-template.h"