diff options
| author | Guy Harris <guy@alum.mit.edu> | 2016-05-08 13:42:52 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2016-05-08 20:43:24 +0000 |
| commit | 2cb16b2efd29aa3446b52eba3bd54771ffff0ffe (patch) | |
| tree | 17ded55a1e55c795431840616e0a16f0039829cc | |
| parent | 728e683b14517c6c9688666a8a7dd4ad35f807cf (diff) | |
Show MIBenum values for character sets as decimal.
http://www.iana.org/assignments/character-sets/character-sets.xhtml is
the official IANA registry for character sets, including MIBenum values,
and it shows MIBenum values in decimal, not hex, so show them in
decimal, not hex.
Change-Id: Id00a0d351a1f758401232aba621cc60aeccf360a
Reviewed-on: https://code.wireshark.org/review/15292
Reviewed-by: Guy Harris <guy@alum.mit.edu>
| -rw-r--r-- | epan/dissectors/packet-btavrcp.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-btsdp.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-wbxml.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-wsp.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-wtls.c | 6 |
5 files changed, 7 insertions, 7 deletions
diff --git a/epan/dissectors/packet-btavrcp.c b/epan/dissectors/packet-btavrcp.c index 49e2194503..11aca16eae 100644 --- a/epan/dissectors/packet-btavrcp.c +++ b/epan/dissectors/packet-btavrcp.c @@ -2443,7 +2443,7 @@ proto_register_btavrcp(void) }, { &hf_btavrcp_character_set, { "Character Set", "btavrcp.character_set", - FT_UINT16, BASE_HEX|BASE_EXT_STRING, &wap_mib_enum_vals_character_sets_ext, 0x00, + FT_UINT16, BASE_DEC|BASE_EXT_STRING, &wap_mib_enum_vals_character_sets_ext, 0x00, NULL, HFILL } }, { &hf_btavrcp_number_of_items, diff --git a/epan/dissectors/packet-btsdp.c b/epan/dissectors/packet-btsdp.c index 0b611bbd64..d57d79643a 100644 --- a/epan/dissectors/packet-btsdp.c +++ b/epan/dissectors/packet-btsdp.c @@ -6070,7 +6070,7 @@ proto_register_btsdp(void) }, { &hf_sdp_lang_encoding, { "Language Encoding", "btsdp.lang.encoding", - FT_UINT16, BASE_HEX | BASE_EXT_STRING, &wap_mib_enum_vals_character_sets_ext, 0, + FT_UINT16, BASE_DEC | BASE_EXT_STRING, &wap_mib_enum_vals_character_sets_ext, 0, NULL, HFILL } }, { &hf_sdp_lang_attribute_base, diff --git a/epan/dissectors/packet-wbxml.c b/epan/dissectors/packet-wbxml.c index 697e2c0d91..4834044b38 100644 --- a/epan/dissectors/packet-wbxml.c +++ b/epan/dissectors/packet-wbxml.c @@ -7910,7 +7910,7 @@ proto_register_wbxml(void) { &hf_wbxml_charset, { "Character Set", "wbxml.charset", - FT_UINT32, BASE_HEX|BASE_EXT_STRING, + FT_UINT32, BASE_DEC|BASE_EXT_STRING, &wap_mib_enum_vals_character_sets_ext, 0x00, "WBXML Character Set", HFILL } }, diff --git a/epan/dissectors/packet-wsp.c b/epan/dissectors/packet-wsp.c index fc049bd5ce..650e07201d 100644 --- a/epan/dissectors/packet-wsp.c +++ b/epan/dissectors/packet-wsp.c @@ -3526,7 +3526,7 @@ parameter (proto_tree *tree, packet_info *pinfo, proto_item *ti, tvbuff_t *tvb, get_integer_value(val, tvb, offset, val_len, ok); if (ok) { val_str = val_to_str_ext(val, &wap_mib_enum_vals_character_sets_ext, - "<Unknown character set Identifier 0x%X>"); + "<Unknown character set Identifier %u>"); proto_tree_add_string(tree, hf_parameter_charset, tvb, offset, val_len, val_str); proto_item_append_text(ti, "; charset=%s", val_str); diff --git a/epan/dissectors/packet-wtls.c b/epan/dissectors/packet-wtls.c index 115c7c2c5b..dcc130db2a 100644 --- a/epan/dissectors/packet-wtls.c +++ b/epan/dissectors/packet-wtls.c @@ -1229,7 +1229,7 @@ proto_register_wtls(void) { &hf_wtls_hands_cli_hello_key_identifier_charset, { "Identifier CharSet", "wtls.handshake.client_hello.ident_charset", - FT_UINT16, BASE_HEX|BASE_EXT_STRING, &wap_mib_enum_vals_character_sets_ext, 0x00, + FT_UINT16, BASE_DEC|BASE_EXT_STRING, &wap_mib_enum_vals_character_sets_ext, 0x00, NULL, HFILL } }, @@ -1439,7 +1439,7 @@ proto_register_wtls(void) { &hf_wtls_hands_certificate_wtls_issuer_charset, { "Charset", "wtls.handshake.certificate.issuer.charset", - FT_UINT16, BASE_HEX|BASE_EXT_STRING, &wap_mib_enum_vals_character_sets_ext, 0x00, + FT_UINT16, BASE_DEC|BASE_EXT_STRING, &wap_mib_enum_vals_character_sets_ext, 0x00, NULL, HFILL } }, @@ -1481,7 +1481,7 @@ proto_register_wtls(void) { &hf_wtls_hands_certificate_wtls_subject_charset, { "Charset", "wtls.handshake.certificate.subject.charset", - FT_UINT16, BASE_HEX|BASE_EXT_STRING, &wap_mib_enum_vals_character_sets_ext, 0x00, + FT_UINT16, BASE_DEC|BASE_EXT_STRING, &wap_mib_enum_vals_character_sets_ext, 0x00, NULL, HFILL } }, |