diff options
Diffstat (limited to 'asn1/acse')
-rw-r--r-- | asn1/acse/acse-exp.cnf | 9 | ||||
-rw-r--r-- | asn1/acse/acse.asn | 32 | ||||
-rw-r--r-- | asn1/acse/acse.cnf | 2 | ||||
-rw-r--r-- | asn1/acse/packet-acse-template.c | 4 |
4 files changed, 28 insertions, 19 deletions
diff --git a/asn1/acse/acse-exp.cnf b/asn1/acse/acse-exp.cnf index 7d309cbbc9..97f5c62841 100644 --- a/asn1/acse/acse-exp.cnf +++ b/asn1/acse/acse-exp.cnf @@ -1,3 +1,12 @@ +# Do not modify this file. +# It is created automatically by the ASN.1 to Wireshark dissector compiler +# .\acse-exp.cnf +# ../../tools/asn2wrs.py -b -e -p acse -c acse.cnf -s packet-acse-template acse.asn + +#.MODULE +ACSE-1 acse +#.END + #.IMPORT_TAG EXTERNAL BER_CLASS_UNI 8 AP-title BER_CLASS_ANY/*choice*/ -1/*choice*/ diff --git a/asn1/acse/acse.asn b/asn1/acse/acse.asn index eea7559e94..8fc75e0f57 100644 --- a/asn1/acse/acse.asn +++ b/asn1/acse/acse.asn @@ -1,6 +1,6 @@ -- ACSE definition from -- http://www.itu.int/ITU-T/asn1/database/itu-t/x/x227bis/1998/ACSE-1.html --- and modified to pass through ASN2ETH +-- and modified to pass through asn2wrs -- -- -- Module ACSE-1 (X.227bis:09/1998) @@ -18,9 +18,9 @@ IMPORTS -- ITU-T Rec. X.501 | ISO/IEC 9594-2. --- Workaround for bug in ASN2ETH in the .cnf file +-- Workaround for bug in asn2wrs in the .cnf file -- to handle the lack of support for tagged assignments. --- remove that workaround once asn2eth learns how to handle +-- remove that workaround once asn2wrs learns how to handle -- tagged assignments. EXTERNAL ::= [UNIVERSAL 8] IMPLICIT SEQUENCE { @@ -45,30 +45,30 @@ aCSE-id OBJECT IDENTIFIER ::= -- may be used to identify the Association Control ASE. -- top level CHOICE ACSE-apdu ::= CHOICE { ---ASN2ETH bug +--asn2wrs bug -- aarq AARQ-apdu, aarq [APPLICATION 0] IMPLICIT AARQ-apdu, ---ASN2ETH bug +--asn2wrs bug -- aare AARE-apdu, aare [APPLICATION 1] IMPLICIT AARE-apdu, ---ASN2ETH bug +--asn2wrs bug -- rlrq RLRQ-apdu, rlrq [APPLICATION 2] IMPLICIT RLRQ-apdu, ---ASN2ETH bug +--asn2wrs bug -- rlre RLRE-apdu, rlre [APPLICATION 3] IMPLICIT RLRE-apdu, ---ASN2ETH bug +--asn2wrs bug -- abrt ABRT-apdu, abrt [APPLICATION 4] IMPLICIT ABRT-apdu, ..., -- Extensions for higher level association FU ---ASN2ETH bug +--asn2wrs bug -- adt A-DT-apdu, adt [APPLICATION 5] IMPLICIT A-DT-apdu, ---ASN2ETH bug +--asn2wrs bug -- acrq ACRQ-apdu, acrq [APPLICATION 6] IMPLICIT ACRQ-apdu, ---ASN2ETH bug +--asn2wrs bug -- acrp ACRP-apdu acrp [APPLICATION 7] IMPLICIT ACRP-apdu } @@ -301,14 +301,14 @@ Context-list ::= SEQUENCE OF SEQUENCE {pci Presentation-context-identifier, abstract-syntax Abstract-syntax-name, --- bug in ASN2ETH +-- bug in asn2wrs -- transfer-syntaxes SEQUENCE OF Transfer-syntax-name} transfer-syntaxes SEQUENCE OF TransferSyntaxName} Default-Context-List ::= SEQUENCE OF SEQUENCE {abstract-syntax-name [0] IMPLICIT Abstract-syntax-name OPTIONAL, --- bug in ASN2ETH +-- bug in asn2wrs -- transfer-syntax-name [1] IMPLICIT Transfer-syntax-name transfer-syntax-name [1] IMPLICIT TransferSyntaxName } @@ -328,11 +328,11 @@ P-context-result-list ::= Result ::= INTEGER {acceptance(0), user-rejection(1), provider-rejection(2)} ---bug in ASN2ETH +--bug in asn2wrs --Concrete-syntax-name ::= Transfer-syntax-name Concrete-syntax-name ::= TransferSyntaxName ---bug in ASN2ETH +--bug in asn2wrs --Transfer-syntax-name ::= OBJECT IDENTIFIER TransferSyntaxName ::= OBJECT IDENTIFIER @@ -374,7 +374,7 @@ User-Data ::= CHOICE { -- see ITU-T Rec. X.226 | ISO/IEC 8823-1. PDV-list ::= SEQUENCE { ---bug in ASN2ETH +--bug in asn2wrs -- transfer-syntax-name Transfer-syntax-name OPTIONAL, transfer-syntax-name TransferSyntaxName OPTIONAL, presentation-context-identifier Presentation-context-identifier, diff --git a/asn1/acse/acse.cnf b/asn1/acse/acse.cnf index b22d1c6e6a..d841f4937b 100644 --- a/asn1/acse/acse.cnf +++ b/asn1/acse/acse.cnf @@ -47,7 +47,7 @@ ACRQ-apdu/aSO-context-name aCRQ_aSO_context_name guint32 len1; if(!implicit_tag) { - /* XXX asn2eth can not yet handle tagged assignment so for the + /* XXX asn2wrs can not yet handle tagged assignment so for the * time being just remove this tag manually inside the EXTERNAL * dissector. */ diff --git a/asn1/acse/packet-acse-template.c b/asn1/acse/packet-acse-template.c index a341d33164..cea1aeb173 100644 --- a/asn1/acse/packet-acse-template.c +++ b/asn1/acse/packet-acse-template.c @@ -1,9 +1,9 @@ /*XXX - There is a bug in asn2eth that it can not yet handle tagged assignments such + There is a bug in asn2wrs that it can not yet handle tagged assignments such as EXTERNAL ::= [UNIVERSAL 8] IMPLICIT SEQUENCE { This bug is workedaround by some .cnf magic but this should be cleaned up - once asn2eth learns how to deal with tagged assignments + once asn2wrs learns how to deal with tagged assignments */ /* packet-acse.c |