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-smb.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-smb.c')
| -rw-r--r-- | epan/dissectors/packet-smb.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/epan/dissectors/packet-smb.c b/epan/dissectors/packet-smb.c index 37b6dd5a60..3c62b11a2f 100644 --- a/epan/dissectors/packet-smb.c +++ b/epan/dissectors/packet-smb.c @@ -9839,7 +9839,7 @@ dissect_send_single_block_message_request(tvbuff_t *tvb, packet_info *pinfo _U_, name_len = tvb_strsize(tvb, offset); CHECK_BYTE_COUNT(name_len); proto_tree_add_item(tree, hf_smb_originator_name, tvb, offset, - name_len, ENC_LITTLE_ENDIAN); + name_len, ENC_ASCII|ENC_NA); COUNT_BYTES(name_len); /* buffer format */ @@ -9852,7 +9852,7 @@ dissect_send_single_block_message_request(tvbuff_t *tvb, packet_info *pinfo _U_, name_len = tvb_strsize(tvb, offset); CHECK_BYTE_COUNT(name_len); proto_tree_add_item(tree, hf_smb_destination_name, tvb, offset, - name_len, ENC_LITTLE_ENDIAN); + name_len, ENC_ASCII|ENC_NA); COUNT_BYTES(name_len); /* buffer format */ @@ -9870,7 +9870,7 @@ dissect_send_single_block_message_request(tvbuff_t *tvb, packet_info *pinfo _U_, /* message */ CHECK_BYTE_COUNT(message_len); proto_tree_add_item(tree, hf_smb_message, tvb, offset, message_len, - ENC_LITTLE_ENDIAN); + ENC_ASCII|ENC_NA); COUNT_BYTES(message_len); END_OF_SMB @@ -9899,7 +9899,7 @@ dissect_send_multi_block_message_start_request(tvbuff_t *tvb, packet_info *pinfo name_len = tvb_strsize(tvb, offset); CHECK_BYTE_COUNT(name_len); proto_tree_add_item(tree, hf_smb_originator_name, tvb, offset, - name_len, ENC_LITTLE_ENDIAN); + name_len, ENC_ASCII|ENC_NA); COUNT_BYTES(name_len); /* buffer format */ @@ -9912,7 +9912,7 @@ dissect_send_multi_block_message_start_request(tvbuff_t *tvb, packet_info *pinfo name_len = tvb_strsize(tvb, offset); CHECK_BYTE_COUNT(name_len); proto_tree_add_item(tree, hf_smb_destination_name, tvb, offset, - name_len, ENC_LITTLE_ENDIAN); + name_len, ENC_ASCII|ENC_NA); COUNT_BYTES(name_len); END_OF_SMB @@ -9965,7 +9965,7 @@ dissect_send_multi_block_message_text_request(tvbuff_t *tvb, packet_info *pinfo /* message */ CHECK_BYTE_COUNT(message_len); proto_tree_add_item(tree, hf_smb_message, tvb, offset, message_len, - ENC_LITTLE_ENDIAN); + ENC_ASCII|ENC_NA); COUNT_BYTES(message_len); END_OF_SMB @@ -9994,7 +9994,7 @@ dissect_forwarded_name(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, name_len = tvb_strsize(tvb, offset); CHECK_BYTE_COUNT(name_len); proto_tree_add_item(tree, hf_smb_forwarded_name, tvb, offset, - name_len, ENC_LITTLE_ENDIAN); + name_len, ENC_ASCII|ENC_NA); COUNT_BYTES(name_len); END_OF_SMB @@ -10023,7 +10023,7 @@ dissect_get_machine_name_response(tvbuff_t *tvb, packet_info *pinfo _U_, proto_t name_len = tvb_strsize(tvb, offset); CHECK_BYTE_COUNT(name_len); proto_tree_add_item(tree, hf_smb_machine_name, tvb, offset, - name_len, ENC_LITTLE_ENDIAN); + name_len, ENC_ASCII|ENC_NA); COUNT_BYTES(name_len); END_OF_SMB @@ -11921,7 +11921,7 @@ dissect_4_2_16_2(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, CHECK_BYTE_COUNT_SUBR(name_len + 1); proto_tree_add_item( subtree, hf_smb_ea_name, tvb, offset, name_len + 1, - ENC_LITTLE_ENDIAN); + ENC_ASCII|ENC_NA); COUNT_BYTES_SUBR(name_len + 1); /* EA data */ |