diff options
Diffstat (limited to 'asn1/acse')
| -rw-r--r-- | asn1/acse/acse-exp.cnf | 6 | ||||
| -rw-r--r-- | asn1/acse/acse.asn | 6 | ||||
| -rw-r--r-- | asn1/acse/acse.cnf | 12 |
3 files changed, 12 insertions, 12 deletions
diff --git a/asn1/acse/acse-exp.cnf b/asn1/acse/acse-exp.cnf index 059cda3589..0cef28cedf 100644 --- a/asn1/acse/acse-exp.cnf +++ b/asn1/acse/acse-exp.cnf @@ -1,6 +1,6 @@ # Do not modify this file. # It is created automatically by the ASN.1 to Wireshark dissector compiler -# ./acse-exp.cnf +# .\acse-exp.cnf # ../../tools/asn2wrs.py -b -e -p acse -c acse.cnf -s packet-acse-template acse.asn #.MODULE @@ -8,7 +8,7 @@ ACSE-1 acse #.END #.IMPORT_TAG -EXTERNAL BER_CLASS_UNI 8 +EXTERNALt BER_CLASS_UNI 8 AP-title BER_CLASS_ANY/*choice*/ -1/*choice*/ AE-qualifier BER_CLASS_ANY/*choice*/ -1/*choice*/ ASO-qualifier BER_CLASS_ANY/*choice*/ -1/*choice*/ @@ -17,7 +17,7 @@ AP-invocation-identifier BER_CLASS_UNI BER_UNI_TAG_INTEGER #.END #.TYPE_ATTR -EXTERNAL TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 +EXTERNALt TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 AP-title TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(acse_AP_title_vals) BITMASK = 0 AE-qualifier TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(acse_ASO_qualifier_vals) BITMASK = 0 ASO-qualifier TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(acse_ASO_qualifier_vals) BITMASK = 0 diff --git a/asn1/acse/acse.asn b/asn1/acse/acse.asn index d012010532..1b250ffb43 100644 --- a/asn1/acse/acse.asn +++ b/asn1/acse/acse.asn @@ -22,7 +22,7 @@ IMPORTS -- to handle the lack of support for tagged assignments. -- remove that workaround once asn2wrs learns how to handle -- tagged assignments. -EXTERNAL ::= [UNIVERSAL 8] IMPLICIT SEQUENCE +EXTERNALt ::= [UNIVERSAL 8] IMPLICIT SEQUENCE { direct-reference OBJECT IDENTIFIER OPTIONAL, indirect-reference INTEGER OPTIONAL, @@ -367,7 +367,7 @@ Associate-source-diagnostic ::= CHOICE { User-information ::= Association-data -Association-data ::= SEQUENCE OF EXTERNAL +Association-data ::= SEQUENCE OF EXTERNALt Simply-encoded-data ::= OCTET STRING @@ -405,7 +405,7 @@ Authentication-value-other ::= SEQUENCE { Authentication-value ::= CHOICE { charstring [0] IMPLICIT GraphicString, bitstring [1] IMPLICIT BIT STRING, - external [2] IMPLICIT EXTERNAL, + external [2] IMPLICIT EXTERNALt, other [3] IMPLICIT Authentication-value-other } diff --git a/asn1/acse/acse.cnf b/asn1/acse/acse.cnf index 4ac0e7424b..5447c3314d 100644 --- a/asn1/acse/acse.cnf +++ b/asn1/acse/acse.cnf @@ -6,7 +6,7 @@ #.INCLUDE ../x509if/x509if-exp.cnf #.EXPORTS -EXTERNAL +EXTERNALt AP-title AP-invocation-identifier AE-qualifier @@ -37,7 +37,7 @@ AARQ-apdu/aSO-context-name aARQ_aSO_context_name AARE-apdu/aSO-context-name aARE_aSO_context_name ACRQ-apdu/aSO-context-name aCRQ_aSO_context_name -#.FN_BODY EXTERNAL +#.FN_BODY EXTERNALt gint8 class; gboolean pc, ind_field; gint32 tag; @@ -52,7 +52,7 @@ ACRQ-apdu/aSO-context-name aCRQ_aSO_context_name offset = get_ber_length(tree, tvb, offset, &len1, &ind_field); } offset = dissect_ber_sequence(TRUE, pinfo, tree, tvb, offset, - EXTERNAL_sequence, hf_index, ett_acse_EXTERNAL); + EXTERNALt_sequence, hf_index, ett_acse_EXTERNALt); #.FN_PARS Authentication-value-other/other-mechanism-name FN_VARIANT = _str VAL_PTR = &object_identifier_id @@ -79,7 +79,7 @@ ACRQ-apdu/aSO-context-name aCRQ_aSO_context_name offset = dissect_ber_object_identifier_str(FALSE, pinfo, tree, tvb, offset, hf_index, &object_identifier_id); -#.FN_BODY EXTERNAL/indirect-reference +#.FN_BODY EXTERNALt/indirect-reference char *oid; offset = dissect_ber_integer(FALSE, pinfo, tree, tvb, offset, hf_acse_indirect_reference, @@ -93,10 +93,10 @@ ACRQ-apdu/aSO-context-name aCRQ_aSO_context_name if(session) session->pres_ctx_id = indir_ref; -#.FN_PARS EXTERNAL/direct-reference +#.FN_PARS EXTERNALt/direct-reference FN_VARIANT = _str VAL_PTR = &object_identifier_id -#.FN_BODY EXTERNAL/encoding/single-ASN1-type +#.FN_BODY EXTERNALt/encoding/single-ASN1-type offset=call_ber_oid_callback(object_identifier_id, tvb, offset, pinfo, top_tree ? top_tree : tree); #.FN_PARS Release-request-reason |