diff options
| author | Bill Meier <wmeier@newsguy.com> | 2011-10-15 18:46:26 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2011-10-15 18:46:26 +0000 |
| commit | 126aa8539380e6b0b465b48d30f349b76afdc489 (patch) | |
| tree | 16b43738b14751d74a8ca8e4de803ba0b6c87196 /epan/dissectors/packet-gsm_ipa.c | |
| parent | 4c9bb81ad7b0f609fa236c808a1ab9ef6cab5a79 (diff) | |
Convert proto_tree_add_item() 'encoding' arg for field types FT_STRING, FT_STRINGZ, FT_UINT_STRING as follows:
1. If there's no character encoding (ENC_ASCII, ...) specified
then use ENC_ASCII.
2. For all but FT_UINT_STRING, always use ENC_NA
(replacing any existing True/1/FALSE/0
/ENC_BIG_ENDIAN/ENC_LITTLE_ENDIAN).
svn path=/trunk/; revision=39426
Diffstat (limited to 'epan/dissectors/packet-gsm_ipa.c')
| -rw-r--r-- | epan/dissectors/packet-gsm_ipa.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-gsm_ipa.c b/epan/dissectors/packet-gsm_ipa.c index ddb11ccae7..bc95d7f909 100644 --- a/epan/dissectors/packet-gsm_ipa.c +++ b/epan/dissectors/packet-gsm_ipa.c @@ -156,7 +156,7 @@ dissect_ipa_attr(tvbuff_t *tvb, int base_offs, proto_tree *tree) proto_tree_add_item(tree, hf_ipaccess_attr_tag, tvb, offset+2, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_ipaccess_attr_string, - tvb, offset+3, len-1, ENC_BIG_ENDIAN); + tvb, offset+3, len-1, ENC_ASCII|ENC_NA); break; case 0x01: /* a single-byte reqest for a certain attr */ len = 0; @@ -234,7 +234,7 @@ dissect_osmo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ipatree, proto_tree /* Simply display the CTRL data as text */ } else if (osmo_proto == IPAC_PROTO_EXT_CTRL) { if (tree) { - proto_tree_add_item(tree, hf_ipa_osmo_ctrl_data, next_tvb, 0, -1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_ipa_osmo_ctrl_data, next_tvb, 0, -1, ENC_ASCII|ENC_NA); } return 1; } @@ -319,10 +319,10 @@ dissect_ipa(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case HSL_DEBUG: if (tree) { proto_tree_add_item(ipa_tree, hf_ipa_hsl_debug, - next_tvb, 0, len, ENC_BIG_ENDIAN); + next_tvb, 0, len, ENC_ASCII|ENC_NA); if (global_ipa_in_root == TRUE) proto_tree_add_item(tree, hf_ipa_hsl_debug, - next_tvb, 0, len, ENC_BIG_ENDIAN); + next_tvb, 0, len, ENC_ASCII|ENC_NA); } if (global_ipa_in_info == TRUE) col_append_fstr(pinfo->cinfo, COL_INFO, "%s ", |