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-gdsdb.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-gdsdb.c')
| -rw-r--r-- | epan/dissectors/packet-gdsdb.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/epan/dissectors/packet-gdsdb.c b/epan/dissectors/packet-gdsdb.c index 94b679966a..023dd31d37 100644 --- a/epan/dissectors/packet-gdsdb.c +++ b/epan/dissectors/packet-gdsdb.c @@ -439,7 +439,7 @@ gdsdb_connect(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(tree, hf_gdsdb_connect_filename, tvb, - offset, 4, ENC_BIG_ENDIAN); + offset, 4, ENC_ASCII|ENC_BIG_ENDIAN); length = tvb_get_ntohl(tvb, offset); offset += length + 6; proto_tree_add_item(tree, hf_gdsdb_connect_count, tvb, @@ -447,7 +447,7 @@ gdsdb_connect(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) count = tvb_get_ntohl(tvb, offset); offset += 4; proto_tree_add_item(tree, hf_gdsdb_connect_userid, tvb, - offset, 4, ENC_BIG_ENDIAN); + offset, 4, ENC_ASCII|ENC_BIG_ENDIAN); length = tvb_get_ntohl(tvb, offset); offset += length + 5; for(i=0;i<count;i++){ @@ -546,7 +546,7 @@ gdsdb_attach(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(tree, hf_gdsdb_attach_filename, tvb, - offset, 4, ENC_BIG_ENDIAN); + offset, 4, ENC_ASCII|ENC_BIG_ENDIAN); length = tvb_get_ntohl(tvb, offset); offset += length + 6; proto_tree_add_uint_format_value(tree, @@ -571,7 +571,7 @@ gdsdb_compile(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(tree, hf_gdsdb_compile_blr, tvb, - offset, 4, ENC_BIG_ENDIAN); + offset, 4, ENC_ASCII|ENC_BIG_ENDIAN); } return tvb_length(tvb); @@ -662,7 +662,7 @@ gdsdb_response(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) offset, 8, ENC_BIG_ENDIAN); offset += 8; proto_tree_add_item(tree, hf_gdsdb_response_data, tvb, - offset, 4, ENC_BIG_ENDIAN); + offset, 4, ENC_ASCII|ENC_BIG_ENDIAN); length = tvb_get_ntohl(tvb, offset); offset += length + 4; proto_tree_add_item(tree, hf_gdsdb_response_status, tvb, @@ -723,7 +723,7 @@ gdsdb_open_blob2(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) if (tree) { offset = 4; proto_tree_add_item(tree, hf_gdsdb_openblob2_bpb, tvb, offset, - 4, ENC_BIG_ENDIAN); + 4, ENC_ASCII|ENC_BIG_ENDIAN); length = tvb_get_ntohl(tvb, offset); offset += length + 6; proto_tree_add_item(tree, hf_gdsdb_openblob_transaction, tvb, @@ -827,7 +827,7 @@ gdsdb_info(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) offset += 4; if(opcode == op_service_info) { proto_tree_add_item(tree, hf_gdsdb_info_items, tvb, - offset, 4, ENC_BIG_ENDIAN); + offset, 4, ENC_ASCII|ENC_BIG_ENDIAN); length = tvb_get_ntohl(tvb, offset); offset += length + 6; } |