From a70a1b3eb639474aa5ea132f7ef2e9d1129ddc39 Mon Sep 17 00:00:00 2001 From: Tomas Kukosa Date: Thu, 3 May 2007 11:37:47 +0000 Subject: EXTERNAL type is handled in asn2wrs now private implementations were renamed EXTERNAL -> EXTERNALt svn path=/trunk/; revision=21662 --- asn1/rtse/rtse-exp.cnf | 6 +++--- asn1/rtse/rtse.asn | 2 +- asn1/rtse/rtse.cnf | 12 ++++++------ 3 files changed, 10 insertions(+), 10 deletions(-) (limited to 'asn1/rtse') diff --git a/asn1/rtse/rtse-exp.cnf b/asn1/rtse/rtse-exp.cnf index df55207f75..da343754de 100644 --- a/asn1/rtse/rtse-exp.cnf +++ b/asn1/rtse/rtse-exp.cnf @@ -1,6 +1,6 @@ # Do not modify this file. # It is created automatically by the ASN.1 to Wireshark dissector compiler -# ./rtse-exp.cnf +# .\rtse-exp.cnf # ../../tools/asn2wrs.py -b -e -p rtse -c rtse.cnf -s packet-rtse-template rtse.asn #.MODULE @@ -12,7 +12,7 @@ RTORQapdu BER_CLASS_UNI BER_UNI_TAG_SET RTOACapdu BER_CLASS_UNI BER_UNI_TAG_SET RTORJapdu BER_CLASS_UNI BER_UNI_TAG_SET RTABapdu BER_CLASS_UNI BER_UNI_TAG_SET -EXTERNAL BER_CLASS_UNI 8 +EXTERNALt BER_CLASS_UNI 8 #.END #.TYPE_ATTR @@ -20,6 +20,6 @@ RTORQapdu TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL RTOACapdu TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 RTORJapdu TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 RTABapdu TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 -EXTERNAL TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 +EXTERNALt TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 #.END diff --git a/asn1/rtse/rtse.asn b/asn1/rtse/rtse.asn index 453e27ae0d..e481f358ee 100644 --- a/asn1/rtse/rtse.asn +++ b/asn1/rtse/rtse.asn @@ -143,7 +143,7 @@ AbortReason ::= INTEGER { -- 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, diff --git a/asn1/rtse/rtse.cnf b/asn1/rtse/rtse.cnf index d36713f49a..d3ea8f5a71 100644 --- a/asn1/rtse/rtse.cnf +++ b/asn1/rtse/rtse.cnf @@ -3,7 +3,7 @@ RTORQapdu RTOACapdu RTORJapdu RTABapdu -EXTERNAL +EXTERNALt #.FN_BODY RTORJapdu/userDataRJ char *oid = NULL; @@ -89,11 +89,11 @@ EXTERNAL if(session) session->ros_op = (ROS_OP_INVOKE | ROS_OP_ARGUMENT); - offset = dissect_rtse_EXTERNAL(FALSE, next_tvb, 0, pinfo, tree, -1); + offset = dissect_rtse_EXTERNALt(FALSE, next_tvb, 0, pinfo, tree, -1); } -#.FN_BODY EXTERNAL +#.FN_BODY EXTERNALt gint8 class; gboolean pc, ind_field; gint32 tag; @@ -109,9 +109,9 @@ EXTERNAL } offset = dissect_ber_sequence(TRUE, pinfo, tree, tvb, offset, - EXTERNAL_sequence, hf_index, ett_rtse_EXTERNAL); + EXTERNALt_sequence, hf_index, ett_rtse_EXTERNALt); -#.FN_BODY EXTERNAL/indirect-reference +#.FN_BODY EXTERNALt/indirect-reference char *oid; offset = dissect_ber_integer(FALSE, pinfo, tree, tvb, offset, @@ -124,7 +124,7 @@ EXTERNAL } -#.FN_BODY EXTERNAL/encoding/single-ASN1-type +#.FN_BODY EXTERNALt/encoding/single-ASN1-type offset=call_rtse_oid_callback(object_identifier_id, tvb, offset, pinfo, top_tree); -- cgit v1.2.3