diff options
Diffstat (limited to 'epan/dissectors/packet-edonkey.c')
| -rw-r--r-- | epan/dissectors/packet-edonkey.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/epan/dissectors/packet-edonkey.c b/epan/dissectors/packet-edonkey.c index 0e2e6ed388..c1c3ed077a 100644 --- a/epan/dissectors/packet-edonkey.c +++ b/epan/dissectors/packet-edonkey.c @@ -614,7 +614,7 @@ static proto_item* edonkey_tree_add_metatag_name(proto_tree *tree, tvbuff_t *tvb const gchar *tag_name; tag_name = match_strval(special_tagtype, edonkey_special_tags); if (tag_name == NULL) { - return proto_tree_add_item(tree, hf_edonkey_metatag_name, tvb, start, length, FALSE); + return proto_tree_add_item(tree, hf_edonkey_metatag_name, tvb, start, length, ENC_ASCII|ENC_NA); } else { return proto_tree_add_uint_format(tree, hf_edonkey_metatag_id, tvb, start, length, @@ -701,7 +701,7 @@ static int dissect_edonkey_metatag(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree_add_uint(metatag_tree, hf_edonkey_metatag_namesize, tvb, offset+1, 2, tag_name_size); edonkey_tree_add_metatag_name(metatag_tree, tvb, tag_offset-tag_name_size, tag_name_size, special_tagtype); proto_tree_add_uint(metatag_tree, hf_edonkey_string_length, tvb, tag_offset, 2, string_length); - proto_tree_add_item(metatag_tree, hf_edonkey_string, tvb, tag_offset+2, string_length, FALSE); + proto_tree_add_item(metatag_tree, hf_edonkey_string, tvb, tag_offset+2, string_length, ENC_ASCII|ENC_NA); break; case EDONKEY_MTAG_DWORD: @@ -832,7 +832,7 @@ static int dissect_edonkey_metatag(tvbuff_t *tvb, packet_info *pinfo _U_, if (real_tag_type==tag_type) proto_tree_add_uint(metatag_tree, hf_edonkey_metatag_namesize, tvb, offset+1, 2, tag_name_size); edonkey_tree_add_metatag_name(metatag_tree, tvb, tag_offset-tag_name_size, tag_name_size, special_tagtype); - proto_tree_add_item(metatag_tree, hf_edonkey_string, tvb, tag_offset, string_length, FALSE); + proto_tree_add_item(metatag_tree, hf_edonkey_string, tvb, tag_offset, string_length, ENC_ASCII|ENC_NA); } else { /* Unknown tag type - actual tag length is also unknown */ @@ -1085,11 +1085,11 @@ static int dissect_kademlia_tag_string(tvbuff_t *tvb, packet_info *pinfo _U_, hidden_item = proto_tree_add_uint(tree, hf_edonkey_string_length, tvb, offset, 2, string_length); PROTO_ITEM_SET_HIDDEN(hidden_item); - hidden_item = proto_tree_add_item(tree, hf_edonkey_string, tvb, offset+2, string_length, FALSE); + hidden_item = proto_tree_add_item(tree, hf_edonkey_string, tvb, offset+2, string_length, ENC_ASCII|ENC_NA); PROTO_ITEM_SET_HIDDEN(hidden_item); *string_value = tvb_get_ephemeral_string(tvb, offset + 2, string_length); - proto_tree_add_item(tree, hf_kademlia_tag_string, tvb, offset + 2, string_length, FALSE); + proto_tree_add_item(tree, hf_kademlia_tag_string, tvb, offset + 2, string_length, ENC_ASCII|ENC_NA); return offset + 2 + string_length; } @@ -1117,7 +1117,7 @@ static int dissect_edonkey_string(tvbuff_t *tvb, packet_info *pinfo _U_, /* <String> ::= <String length (guint16)> DATA */ guint16 string_length = tvb_get_letohs(tvb, offset); proto_tree_add_uint(tree, hf_edonkey_string_length, tvb, offset, 2, string_length); - proto_tree_add_item(tree, hf_edonkey_string, tvb, offset+2, string_length, FALSE); + proto_tree_add_item(tree, hf_edonkey_string, tvb, offset+2, string_length, ENC_ASCII|ENC_NA); return offset+2+string_length; } @@ -1128,7 +1128,7 @@ static int dissect_edonkey_directory(tvbuff_t *tvb, packet_info *pinfo _U_, /* <Directory> ::= <String> */ guint16 string_length = tvb_get_letohs(tvb, offset); proto_tree_add_uint(tree, hf_edonkey_string_length, tvb, offset, 2, string_length); - proto_tree_add_item(tree, hf_edonkey_directory, tvb, offset+2, string_length, FALSE); + proto_tree_add_item(tree, hf_edonkey_directory, tvb, offset+2, string_length, ENC_ASCII|ENC_NA); return offset+2+string_length; } @@ -1657,7 +1657,7 @@ static int dissect_edonkey_search_query(tvbuff_t *tvb, packet_info *pinfo _U_, /* Add query info */ proto_tree_add_text(search_tree, tvb, offset, 1, "Search by name (0x%02x)", search_type); proto_tree_add_uint(search_tree, hf_edonkey_string_length, tvb, string_offset, 2, string_length); - proto_tree_add_item(search_tree, hf_edonkey_string, tvb, string_offset+2, string_length, FALSE); + proto_tree_add_item(search_tree, hf_edonkey_string, tvb, string_offset+2, string_length, ENC_ASCII|ENC_NA); offset += search_length; break; @@ -1679,7 +1679,7 @@ static int dissect_edonkey_search_query(tvbuff_t *tvb, packet_info *pinfo _U_, /* Add query info */ proto_tree_add_text(search_tree, tvb, offset, 1, "Search by metadata (0x%02x)", search_type); proto_tree_add_uint(search_tree, hf_edonkey_string_length, tvb, string_offset, 2, string_length); - proto_tree_add_item(search_tree, hf_edonkey_string, tvb, string_offset+2, string_length, FALSE); + proto_tree_add_item(search_tree, hf_edonkey_string, tvb, string_offset+2, string_length, ENC_ASCII|ENC_NA); proto_tree_add_uint(search_tree, hf_edonkey_metatag_namesize, tvb, tag_name_offset, 2, tag_name_size); edonkey_tree_add_metatag_name(search_tree, tvb, tag_name_offset+2, tag_name_size, special_tagtype); offset += search_length; |