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-dec-dnart.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-dec-dnart.c')
-rw-r--r-- | epan/dissectors/packet-dec-dnart.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-dec-dnart.c b/epan/dissectors/packet-dec-dnart.c index 764756288d..0d9624eeef 100644 --- a/epan/dissectors/packet-dec-dnart.c +++ b/epan/dissectors/packet-dec-dnart.c @@ -1171,7 +1171,7 @@ handle_connect_contents( image_len = tvb_get_guint8(tvb, my_offset); my_offset++; proto_tree_add_item(contents_tree, hf_dec_sess_dst_name, - tvb, my_offset, image_len, TRUE); + tvb, my_offset, image_len, ENC_ASCII|ENC_NA); my_offset += image_len; } /* The source end user */ @@ -1196,7 +1196,7 @@ handle_connect_contents( image_len = tvb_get_guint8(tvb, my_offset); my_offset++; proto_tree_add_item(contents_tree, hf_dec_sess_src_name, - tvb, my_offset, image_len, TRUE); + tvb, my_offset, image_len, ENC_ASCII|ENC_NA); my_offset += image_len; } /* Now the MENUVER field */ @@ -1211,17 +1211,17 @@ handle_connect_contents( image_len = tvb_get_guint8(tvb, my_offset); my_offset++; proto_tree_add_item(contents_tree, hf_dec_sess_rqstr_id, - tvb, my_offset, image_len, TRUE); + tvb, my_offset, image_len, ENC_ASCII|ENC_NA); my_offset += image_len; image_len = tvb_get_guint8(tvb, my_offset); my_offset++; proto_tree_add_item(contents_tree, hf_dec_sess_rqstr_id, - tvb, my_offset, image_len, TRUE); + tvb, my_offset, image_len, ENC_ASCII|ENC_NA); my_offset += image_len; image_len = tvb_get_guint8(tvb, my_offset); my_offset++; proto_tree_add_item(contents_tree, hf_dec_sess_rqstr_id, - tvb, my_offset, image_len, TRUE); + tvb, my_offset, image_len, ENC_ASCII|ENC_NA); my_offset += image_len; |