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-dsi.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-dsi.c')
-rw-r--r-- | epan/dissectors/packet-dsi.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-dsi.c b/epan/dissectors/packet-dsi.c index 97d3547d12..6f45443c97 100644 --- a/epan/dissectors/packet-dsi.c +++ b/epan/dissectors/packet-dsi.c @@ -331,7 +331,7 @@ dissect_dsi_reply_get_status(tvbuff_t *tvb, proto_tree *tree, gint offset) proto_tree_add_item(sub_tree, hf_dsi_server_flag_ext_sleep , tvb, ofs, 2, ENC_BIG_ENDIAN); proto_tree_add_item(sub_tree, hf_dsi_server_flag_fast_copy , tvb, ofs, 2, ENC_BIG_ENDIAN); - proto_tree_add_item(tree, hf_dsi_server_name, tvb, offset +AFPSTATUS_PRELEN, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_dsi_server_name, tvb, offset +AFPSTATUS_PRELEN, 1, ENC_ASCII|ENC_BIG_ENDIAN); flag = tvb_get_ntohs(tvb, ofs); if ((flag & AFPSRVRINFO_SRVSIGNATURE)) { @@ -366,7 +366,7 @@ dissect_dsi_reply_get_status(tvbuff_t *tvb, proto_tree *tree, gint offset) ofs = offset +tvb_get_ntohs(tvb, offset +AFPSTATUS_MACHOFF); if (ofs) - proto_tree_add_item(tree, hf_dsi_server_type, tvb, ofs, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_dsi_server_type, tvb, ofs, 1, ENC_ASCII|ENC_BIG_ENDIAN); ofs = offset +tvb_get_ntohs(tvb, offset +AFPSTATUS_VERSOFF); if (ofs) { @@ -376,7 +376,7 @@ dissect_dsi_reply_get_status(tvbuff_t *tvb, proto_tree *tree, gint offset) sub_tree = proto_item_add_subtree(ti, ett_dsi_vers); for (i = 0; i < nbe; i++) { len = tvb_get_guint8(tvb, ofs); - proto_tree_add_item(sub_tree, hf_dsi_server_vers, tvb, ofs, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_dsi_server_vers, tvb, ofs, 1, ENC_ASCII|ENC_BIG_ENDIAN); ofs += len + 1; } } @@ -389,7 +389,7 @@ dissect_dsi_reply_get_status(tvbuff_t *tvb, proto_tree *tree, gint offset) sub_tree = proto_item_add_subtree(ti, ett_dsi_uams); for (i = 0; i < nbe; i++) { len = tvb_get_guint8(tvb, ofs); - proto_tree_add_item(sub_tree, hf_dsi_server_uams, tvb, ofs, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_dsi_server_uams, tvb, ofs, 1, ENC_ASCII|ENC_BIG_ENDIAN); ofs += len + 1; } } @@ -478,7 +478,7 @@ dissect_dsi_reply_get_status(tvbuff_t *tvb, proto_tree *tree, gint offset) sub_tree = proto_item_add_subtree(ti, ett_dsi_directory); for (i = 0; i < nbe; i++) { len = tvb_get_guint8(tvb, ofs); - proto_tree_add_item(sub_tree, hf_dsi_server_directory, tvb, ofs, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_dsi_server_directory, tvb, ofs, 1, ENC_ASCII|ENC_BIG_ENDIAN); ofs += len + 1; } } |