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-smtp.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-smtp.c')
| -rw-r--r-- | epan/dissectors/packet-smtp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-smtp.c b/epan/dissectors/packet-smtp.c index 3b966ba220..0c021be3af 100644 --- a/epan/dissectors/packet-smtp.c +++ b/epan/dissectors/packet-smtp.c @@ -722,10 +722,10 @@ dissect_smtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) cmdresp_tree = proto_item_add_subtree(ti, ett_smtp_cmdresp); proto_tree_add_item(cmdresp_tree, hf_smtp_req_command, tvb, - loffset, cmdlen, FALSE); + loffset, cmdlen, ENC_ASCII|ENC_NA); if (linelen > 5) { proto_tree_add_item(cmdresp_tree, hf_smtp_req_parameter, tvb, - loffset + 5, linelen - 5, FALSE); + loffset + 5, linelen - 5, ENC_ASCII|ENC_NA); } if (smtp_data_desegment && !spd_frame_data->more_frags) { @@ -820,7 +820,7 @@ dissect_smtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (linelen >= 4) { proto_tree_add_item(cmdresp_tree, hf_smtp_rsp_parameter, tvb, - offset + 4, linelen - 4, FALSE); + offset + 4, linelen - 4, ENC_ASCII|ENC_NA); } } } |