diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2006-04-03 19:07:52 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2006-04-03 19:07:52 +0000 |
| commit | e47e1c864d0f142908eb0497119fe404764529cb (patch) | |
| tree | 7119c2d98b410ca56302dfde72653eefc00fdbf6 /asn1/ftam | |
| parent | 34335a2bc186444a8cbb138d528005051e0e20e5 (diff) | |
| download | wireshark-e47e1c864d0f142908eb0497119fe404764529cb.tar.gz wireshark-e47e1c864d0f142908eb0497119fe404764529cb.tar.bz2 wireshark-e47e1c864d0f142908eb0497119fe404764529cb.zip | |
Fix bug http://bugs.ethereal.com/bugzilla/show_bug.cgi?id=850 problems with tagged assignments.
Add som OID names.
svn path=/trunk/; revision=17798
Diffstat (limited to 'asn1/ftam')
| -rw-r--r-- | asn1/ftam/ISO8571-FTAM.asn | 8 | ||||
| -rw-r--r-- | asn1/ftam/ftam.cnf | 17 | ||||
| -rw-r--r-- | asn1/ftam/packet-ftam-template.c | 5 |
3 files changed, 11 insertions, 19 deletions
diff --git a/asn1/ftam/ISO8571-FTAM.asn b/asn1/ftam/ISO8571-FTAM.asn index 68378bc0b3..8037341559 100644 --- a/asn1/ftam/ISO8571-FTAM.asn +++ b/asn1/ftam/ISO8571-FTAM.asn @@ -131,7 +131,7 @@ FTAM-Quality-of-Service ::= [6] IMPLICIT INTEGER { Contents-Type-List ::= [7] IMPLICIT SEQUENCE OF - CHOICE {document-type-name Document-Type-Name, + CHOICE {document-type-name [APPLICATION 14] IMPLICIT Document-Type-Name, abstract-Syntax-name Abstract-Syntax-Name} F-TERMINATE-request ::= SEQUENCE { @@ -742,7 +742,9 @@ Entity-Reference ::= INTEGER { -- XXX Bug in asn2eth that can not handle tagged assignements -- XXX woraround implemented in teh conformance file -- -Document-Type-Name ::= [APPLICATION 14] IMPLICIT OBJECT IDENTIFIER +-- Document-Type-Name ::= [APPLICATION 14] IMPLICIT OBJECT IDENTIFIER +-- Changed where used instead. 20060403 Anders Broman (Bug 850) +Document-Type-Name ::= OBJECT IDENTIFIER -- -- XXX Bug in asn2eth that can not handle tagged assignements @@ -926,7 +928,7 @@ Account-Attribute ::= CHOICE { Contents-Type-Attribute ::= CHOICE { document-type - [0] IMPLICIT SEQUENCE {document-type-name Document-Type-Name, + [0] IMPLICIT SEQUENCE {document-type-name [APPLICATION 14] IMPLICIT Document-Type-Name, parameter [0] ANY OPTIONAL}, -- The actual types to be used for values of the Parameter field diff --git a/asn1/ftam/ftam.cnf b/asn1/ftam/ftam.cnf index 22ab59d506..5f4e6f8832 100644 --- a/asn1/ftam/ftam.cnf +++ b/asn1/ftam/ftam.cnf @@ -453,21 +453,8 @@ Legal-Qualification-Attribute/actual-values actual_values9 Diagnostic_sequence_of, hf_index, ett_ftam_Diagnostic); -#.FN_BODY Document-Type-Name FN_VARIANT = _str VAL_PTR = &object_identifier_id - gint8 class; - gboolean pc, ind_field; - gint32 tag; - guint32 len1; - - if(!implicit_tag){ - /* XXX asn2eth can not yet handle tagged assignment yes so this - * XXX is some conformance file magic to work around that bug - */ - offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); - offset = get_ber_length(tree, tvb, offset, &len1, &ind_field); - } -%(DEFAULT_BODY)s - +#.FN_PARS Document-Type-Name FN_VARIANT = _str VAL_PTR = &object_identifier_id + #.FN_BODY FADU-Lock gint8 class; gboolean pc, ind_field; diff --git a/asn1/ftam/packet-ftam-template.c b/asn1/ftam/packet-ftam-template.c index e0b01ebfc9..131136e1f3 100644 --- a/asn1/ftam/packet-ftam-template.c +++ b/asn1/ftam/packet-ftam-template.c @@ -5,7 +5,7 @@ * also based on original handwritten dissector by * Yuriy Sidelnikov <YSidelnikov@hotmail.com> * - * Anders Broman and Ronnie Sahlberg 2005 + * Anders Broman and Ronnie Sahlberg 2005 - 2006 * * $Id$ * @@ -127,7 +127,10 @@ void proto_reg_handoff_ftam(void) { /* Unstructured text file document type FTAM-1 */ register_ber_oid_name("1.0.8571.5.1","ISO FTAM unstructured text"); + register_ber_oid_name("1.0.8571.5.2","ISO FTAM sequential text"); register_ber_oid_name("1.0.8571.2.3","FTAM unstructured text abstract syntax"); + register_ber_oid_name("1.0.8571.2.4","FTAM sequential text abstract syntax"); + register_ber_oid_name("1.0.8571.2.5","FTAM simple-hierarchy"); register_ber_oid_name("1.0.8571.3.1","FTAM hierarchical file model"); register_ber_oid_name("1.0.8571.4.1","FTAM unstructured constraint set"); |