diff options
| author | Tomas Kukosa <tomas.kukosa@siemens.com> | 2005-11-14 10:02:31 +0000 |
|---|---|---|
| committer | Tomas Kukosa <tomas.kukosa@siemens.com> | 2005-11-14 10:02:31 +0000 |
| commit | 3b770d5c7c9aa12a455d6307b762b3fca875fbf7 (patch) | |
| tree | e8f6231cfc7a837d8fc9901a7a676180dce93bd1 /asn1/ftam | |
| parent | 0496eb5dcabb32c36084b2efb620fe6fe9a50b12 (diff) | |
| download | wireshark-3b770d5c7c9aa12a455d6307b762b3fca875fbf7.tar.gz | |
- dissect_ber_object_identifier() returns value as tvb
- new dissect_ber_object_identifier_str() function
- BER dissectors adapted and regenerated
svn path=/trunk/; revision=16501
Diffstat (limited to 'asn1/ftam')
| -rw-r--r-- | asn1/ftam/ftam.cnf | 11 | ||||
| -rw-r--r-- | asn1/ftam/packet-ftam-template.c | 2 |
2 files changed, 5 insertions, 8 deletions
diff --git a/asn1/ftam/ftam.cnf b/asn1/ftam/ftam.cnf index d4f6af9448..22ab59d506 100644 --- a/asn1/ftam/ftam.cnf +++ b/asn1/ftam/ftam.cnf @@ -68,9 +68,7 @@ Object-Availability-Attribute/actual-values actual_values8 Legal-Qualification-Attribute/actual-values actual_values9 #.FN_PARS Extension-Attribute/extension-attribute-identifier - VAL_PTR = object_identifier_id - - + FN_VARIANT = _str VAL_PTR = &object_identifier_id #.FN_BODY Contents-Type-Attribute/document-type/parameter offset=call_ber_oid_callback(object_identifier_id, tvb, offset, pinfo, tree); @@ -79,7 +77,7 @@ Legal-Qualification-Attribute/actual-values actual_values9 offset=call_ber_oid_callback(object_identifier_id, tvb, offset, pinfo, tree); #.FN_PARS Attribute-Extensions-Pattern/_item/extension-set-attribute-Patterns/_item/extension-attribute-identifier - VAL_PTR = object_identifier_id + FN_VARIANT = _str VAL_PTR = &object_identifier_id #.FN_BODY Attribute-Extensions-Pattern/_item/extension-set-attribute-Patterns/_item/extension-attribute-Pattern offset=call_ber_oid_callback(object_identifier_id, tvb, offset, pinfo, tree); @@ -455,7 +453,7 @@ Legal-Qualification-Attribute/actual-values actual_values9 Diagnostic_sequence_of, hf_index, ett_ftam_Diagnostic); -#.FN_BODY Document-Type-Name +#.FN_BODY Document-Type-Name FN_VARIANT = _str VAL_PTR = &object_identifier_id gint8 class; gboolean pc, ind_field; gint32 tag; @@ -468,8 +466,7 @@ Legal-Qualification-Attribute/actual-values actual_values9 offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); offset = get_ber_length(tree, tvb, offset, &len1, &ind_field); } - offset = dissect_ber_object_identifier(TRUE, pinfo, tree, tvb, offset, - hf_index, object_identifier_id); +%(DEFAULT_BODY)s #.FN_BODY FADU-Lock gint8 class; diff --git a/asn1/ftam/packet-ftam-template.c b/asn1/ftam/packet-ftam-template.c index ceffa589b8..e0b01ebfc9 100644 --- a/asn1/ftam/packet-ftam-template.c +++ b/asn1/ftam/packet-ftam-template.c @@ -50,7 +50,7 @@ /* Initialize the protocol and registered fields */ int proto_ftam = -1; -static char object_identifier_id[MAX_OID_STR_LEN]; +static const char *object_identifier_id; /* Declare the function to avoid a compiler warning */ static int dissect_ftam_OR_Set(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_); |