diff options
| author | gal <gal@f5534014-38df-0310-8fa8-9805f1628bb7> | 2007-10-22 17:08:03 +0000 |
|---|---|---|
| committer | gal <gal@f5534014-38df-0310-8fa8-9805f1628bb7> | 2007-10-22 17:08:03 +0000 |
| commit | ecf7b945c511481e21a848bc8ff82ccbbf03d115 (patch) | |
| tree | 858ffc942e3f3955f1601bf170a29cc8e79bae51 /asn1/rtse | |
| parent | b2e1921fcaf69dd08014f46e6de662b6b9f9cc1d (diff) | |
Update to use the -X and -T flags.
Removed some workaround code in the .cnf file.
There is still some code for handling an EXTERNAL (EXTERNALt) as the RTSE dissector has its own set of callbacks and consequently can't (currently) use the packet-ber.c functions.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@23242 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'asn1/rtse')
| -rw-r--r-- | asn1/rtse/Makefile.common | 2 | ||||
| -rw-r--r-- | asn1/rtse/rtse.cnf | 22 |
2 files changed, 3 insertions, 21 deletions
diff --git a/asn1/rtse/Makefile.common b/asn1/rtse/Makefile.common index f6f1c72591..2dd69dfb6a 100644 --- a/asn1/rtse/Makefile.common +++ b/asn1/rtse/Makefile.common @@ -45,7 +45,7 @@ SRC_FILES = \ $(EXTRA_DIST) \ $(EXT_ASN_FILE_LIST) -A2W_FLAGS= -b -e +A2W_FLAGS= -b -e -X -T EXTRA_CNF= diff --git a/asn1/rtse/rtse.cnf b/asn1/rtse/rtse.cnf index d713930e5b..cc2144b774 100644 --- a/asn1/rtse/rtse.cnf +++ b/asn1/rtse/rtse.cnf @@ -93,25 +93,7 @@ EXTERNALt } -#.FN_BODY EXTERNALt - gint8 class; - gboolean pc, ind_field; - gint32 tag; - guint32 len1; - - if(!implicit_tag) { - /* XXX asn2wrs can not yet handle tagged assignment so for the - * time being just remove this tag manually inside the EXTERNAL - * dissector. - */ - offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); - offset = get_ber_length(tvb, offset, &len1, &ind_field); - } - - offset = dissect_ber_old_sequence(TRUE, actx, tree, tvb, offset, - EXTERNALt_sequence, hf_index, ett_rtse_EXTERNALt); - -#.FN_BODY EXTERNALt/indirect-reference +#.FN_BODY EXTERNALt/_untag/indirect-reference char *oid; offset = dissect_ber_integer(FALSE, actx, tree, tvb, offset, @@ -126,7 +108,7 @@ EXTERNALt } -#.FN_BODY EXTERNALt/encoding/single-ASN1-type +#.FN_BODY EXTERNALt/_untag/encoding/single-ASN1-type if (object_identifier_id) offset=call_rtse_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, top_tree); |