diff options
author | wmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-10-15 18:46:26 +0000 |
---|---|---|
committer | wmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-10-15 18:46:26 +0000 |
commit | 324bfeb5e255e490809e91ccd615d7d9b538984c (patch) | |
tree | 16b43738b14751d74a8ca8e4de803ba0b6c87196 /epan/dissectors/packet-rmp.c | |
parent | 7b25ae429b0dab3ed9566f8a9d1a069216bc69e4 (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).
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39426 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-rmp.c')
-rw-r--r-- | epan/dissectors/packet-rmp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-rmp.c b/epan/dissectors/packet-rmp.c index 788516ddbd..760608b429 100644 --- a/epan/dissectors/packet-rmp.c +++ b/epan/dissectors/packet-rmp.c @@ -133,13 +133,13 @@ dissect_rmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(rmp_tree, hf_rmp_version, tvb, 8, 2, ENC_BIG_ENDIAN); proto_tree_add_item(rmp_tree, - hf_rmp_machtype, tvb, 10, 20, FALSE); + hf_rmp_machtype, tvb, 10, 20, ENC_ASCII|ENC_NA); /* The remaining fields are optional */ if(!tvb_offset_exists(tvb, 30)) return; len = tvb_get_guint8(tvb, 30); proto_tree_add_item(rmp_tree, - hf_rmp_filename, tvb, 30, 1, ENC_BIG_ENDIAN); + hf_rmp_filename, tvb, 30, 1, ENC_ASCII|ENC_BIG_ENDIAN); if(tvb_offset_exists(tvb, len+31)) call_dissector(data_handle, tvb_new_subset_remaining(tvb, len+31), @@ -157,7 +157,7 @@ dissect_rmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) hf_rmp_version, tvb, 8, 2, ENC_BIG_ENDIAN); len = tvb_get_guint8(tvb, 10); proto_tree_add_item(rmp_tree, - hf_rmp_filename, tvb, 10, 1, ENC_BIG_ENDIAN); + hf_rmp_filename, tvb, 10, 1, ENC_ASCII|ENC_BIG_ENDIAN); if(tvb_offset_exists(tvb, len+11)) call_dissector(data_handle, tvb_new_subset_remaining(tvb, len+11), |