diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2010-11-07 20:51:16 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2010-11-07 20:51:16 +0000 |
| commit | ae7d471ebec12e8b9e7fccaf138db18b3e1a9224 (patch) | |
| tree | b5dfa275aa6d19ada037e029f0d33ba641a5dc7c | |
| parent | 8b468e9284cfd8e3718416b02969518d461c8ad1 (diff) | |
Make the changes from:
Use value_string_ext fcns to access certain value_string arrays;
Sort certain value_string arrays so the values are in ascending order;
Use val_to_str_ext() instead of for loops to do value_string array lookups (voip_calls.c).
Minor whitespace cleanup.
In the source files of the as2wrs generated dissectors.
svn path=/trunk/; revision=34803
| -rw-r--r-- | asn1/camel/packet-camel-template.c | 2 | ||||
| -rw-r--r-- | asn1/h225/h225.cnf | 4 | ||||
| -rw-r--r-- | asn1/inap/inap.cnf | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/asn1/camel/packet-camel-template.c b/asn1/camel/packet-camel-template.c index 5ac8abb170..475f008b21 100644 --- a/asn1/camel/packet-camel-template.c +++ b/asn1/camel/packet-camel-template.c @@ -454,7 +454,7 @@ void proto_register_camel(void) { "ERROR code", HFILL }}, { &hf_camel_cause_indicator, /* Currently not enabled */ { "Cause indicator", "camel.cause_indicator", - FT_UINT8, BASE_DEC, VALS(q850_cause_code_vals), 0x7f, + FT_UINT8, BASE_DEC|BASE_EXT_STRING, &q850_cause_code_vals_ext, 0x7f, NULL, HFILL }}, { &hf_digit, { "Digit Value", "camel.digit_value", diff --git a/asn1/h225/h225.cnf b/asn1/h225/h225.cnf index cbc9dab6a7..23ea813fd7 100644 --- a/asn1/h225/h225.cnf +++ b/asn1/h225/h225.cnf @@ -68,7 +68,7 @@ H323-UserInformation RasMessage ExtendedAliasAddress #.END - + #---------------------------------------------------------------------------------------- #.OMIT_ASSIGNMENT @@ -720,7 +720,7 @@ H245TransportAddress/ipAddress/ip TYPE = FT_IPv4 DISPLAY = BASE_NONE STRINGS H245TransportAddress/ip6Address/ip TYPE = FT_IPv6 DISPLAY = BASE_NONE STRINGS = NULL VendorIdentifier/productId TYPE = FT_STRING DISPLAY = BASE_NONE STRINGS = NULL VendorIdentifier/versionId TYPE = FT_STRING DISPLAY = BASE_NONE STRINGS = NULL -H323-UserInformation/user-data/protocol-discriminator TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(q931_protocol_discriminator_vals) +H323-UserInformation/user-data/protocol-discriminator TYPE = FT_UINT32 DISPLAY = BASE_DEC|BASE_EXT_STRING STRINGS = &q931_protocol_discriminator_vals_ext H323-UU-PDU/tunnelledSignallingMessage/messageContent/_item TYPE = FT_UINT32 DISPLAY = BASE_DEC NonStandardParameter/data TYPE = FT_UINT32 DISPLAY = BASE_DEC FastStart/_item TYPE = FT_UINT32 DISPLAY = BASE_DEC diff --git a/asn1/inap/inap.cnf b/asn1/inap/inap.cnf index 71daa29ba0..4185dfc72b 100644 --- a/asn1/inap/inap.cnf +++ b/asn1/inap/inap.cnf @@ -297,7 +297,7 @@ dissect_isup_called_party_number_parameter(parameter_tvb, tree, NULL); dissect_q931_high_layer_compat_ie(parameter_tvb, 0, tvb_length_remaining(parameter_tvb,0), subtree); #.TYPE_ATTR -CallingPartysCategory TYPE = FT_UINT16 DISPLAY = BASE_DEC STRINGS = VALS(isup_calling_partys_category_value) +CallingPartysCategory TYPE = FT_UINT16 DISPLAY = BASE_DEC|BASE_EXT_STRING STRINGS = &isup_calling_partys_category_value_ext #.END |