diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2014-05-16 08:48:40 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2014-05-16 06:58:53 +0000 |
| commit | c24ede34501c049efc7cb0914359c05a0ed921ca (patch) | |
| tree | 222a0ecd6a724a03329078c52c3123d782471e59 /epan | |
| parent | 6989febd472f8f8fea0b4f0230b7edcb223aad31 (diff) | |
DNS: fix soft-deprecated APIs
tvb_length -> tvb_reported_length
tvb_get_string -> tvb_get_string_enc
Change-Id: Ia511f0e9d3f8ae3d7a1a965431016336ec47188d
Reviewed-on: https://code.wireshark.org/review/1660
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/packet-dns.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/epan/dissectors/packet-dns.c b/epan/dissectors/packet-dns.c index cbbf3a58f0..1574b11bc6 100644 --- a/epan/dissectors/packet-dns.c +++ b/epan/dissectors/packet-dns.c @@ -1963,10 +1963,10 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset, cpu_offset = cur_offset; cpu_len = tvb_get_guint8(tvb, cpu_offset); - cpu = tvb_get_string(wmem_packet_scope(), tvb, cpu_offset + 1, cpu_len); + cpu = tvb_get_string_enc(wmem_packet_scope(), tvb, cpu_offset + 1, cpu_len, ENC_ASCII|ENC_NA); os_offset = cpu_offset + 1 + cpu_len; os_len = tvb_get_guint8(tvb, os_offset); - os = tvb_get_string(wmem_packet_scope(), tvb, os_offset + 1, os_len); + os = tvb_get_string_enc(wmem_packet_scope(), tvb, os_offset + 1, os_len, ENC_ASCII|ENC_NA); if (cinfo != NULL) { col_append_fstr(cinfo, COL_INFO, " %.*s %.*s", cpu_len, cpu, os_len, os); @@ -2440,7 +2440,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset, flags_len = tvb_get_guint8(tvb, offset); offset += 1; proto_tree_add_item(rr_tree, hf_dns_naptr_flags, tvb, offset, flags_len, ENC_ASCII|ENC_NA); - flags = tvb_get_string(wmem_packet_scope(), tvb, offset, flags_len); + flags = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, flags_len, ENC_ASCII|ENC_NA); offset += flags_len; /* Service */ @@ -3370,10 +3370,10 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset, cur_offset++; tag_len = tvb_get_guint8(tvb, cur_offset); - tag = tvb_get_string(wmem_packet_scope(), tvb, cur_offset + 1, tag_len); + tag = tvb_get_string_enc(wmem_packet_scope(), tvb, cur_offset + 1, tag_len, ENC_ASCII|ENC_NA); value_len = data_len - (tag_len + 2); - value = tvb_get_string(wmem_packet_scope(), tvb, cur_offset + 1 + tag_len, value_len); + value = tvb_get_string_enc(wmem_packet_scope(), tvb, cur_offset + 1 + tag_len, value_len, ENC_ASCII|ENC_NA); value = format_text(value, value_len); @@ -3843,7 +3843,7 @@ dissect_dns_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* d col_set_str(pinfo->cinfo, COL_PROTOCOL, "DNS"); dissect_dns_common(tvb, pinfo, tree, TRUE, FALSE, FALSE); - return tvb_length(tvb); + return tvb_reported_length(tvb); } static int @@ -3851,7 +3851,7 @@ dissect_dns_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) { tcp_dissect_pdus(tvb, pinfo, tree, dns_desegment, 2, get_dns_pdu_len, dissect_dns_tcp_pdu, data); - return tvb_length(tvb); + return tvb_reported_length(tvb); } void |