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-cfm.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-cfm.c')
| -rw-r--r-- | epan/dissectors/packet-cfm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-cfm.c b/epan/dissectors/packet-cfm.c index 1154db6eb6..aaef067ead 100644 --- a/epan/dissectors/packet-cfm.c +++ b/epan/dissectors/packet-cfm.c @@ -432,7 +432,7 @@ static int dissect_cfm_ccm(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr } else { /* MD name format is regular string or DNS string */ proto_tree_add_item(cfm_ccm_maid_tree, hf_cfm_maid_md_name_string, - tvb, maid_offset, cfm_maid_md_name_length, ENC_BIG_ENDIAN); + tvb, maid_offset, cfm_maid_md_name_length, ENC_ASCII|ENC_NA); } maid_offset += cfm_maid_md_name_length; } @@ -446,7 +446,7 @@ static int dissect_cfm_ccm(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr if ((cfm_maid_ma_name_format == 2) || (cfm_maid_ma_name_format == 32)) { proto_tree_add_item(cfm_ccm_maid_tree, hf_cfm_maid_ma_name_string, - tvb, maid_offset, cfm_maid_ma_name_length, ENC_BIG_ENDIAN); + tvb, maid_offset, cfm_maid_ma_name_length, ENC_ASCII|ENC_NA); } else { proto_tree_add_item(cfm_ccm_maid_tree, hf_cfm_maid_ma_name_hex, tvb, maid_offset, cfm_maid_ma_name_length, ENC_NA); |