osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Adjust when name_len offset is used. Part of bug 8776 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8776) 

From Dario Lombardo

svn path=/trunk/; revision=50169
This commit is contained in:
Michael Mann 2013-06-26 14:09:10 +00:00
parent cbe96aeb4d
commit 8da89ad091
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
epan/dissectors/packet-dns.c
View File

@ -1179,9 +1179,8 @@ dissect_dns_query(tvbuff_t *tvb, int offset, int dns_data_offset,
q_tree = proto_item_add_subtree(tq, ett_dns_qd);
proto_tree_add_string(q_tree, hf_dns_qry_name, tvb, offset, name_len, name);
offset += name_len;
tq = proto_tree_add_uint(q_tree, hf_dns_qry_name_len, tvb, offset, 2, (guint32)strlen(name));
tq = proto_tree_add_uint(q_tree, hf_dns_qry_name_len, tvb, offset, name_len, (guint32)strlen(name));
PROTO_ITEM_SET_GENERATED(tq);
/* Count how many '.' are in the string, plus 1, in order to count the number
@ -1192,9 +1191,11 @@ dissect_dns_query(tvbuff_t *tvb, int offset, int dns_data_offset,
labels++;
}
labels++;
tq = proto_tree_add_uint(q_tree, hf_dns_count_labels, tvb, offset, 2, labels);
tq = proto_tree_add_uint(q_tree, hf_dns_count_labels, tvb, offset, name_len, labels);
PROTO_ITEM_SET_GENERATED(tq);
offset += name_len;
proto_tree_add_uint_format(q_tree, hf_dns_qry_type, tvb, offset, 2, type,
"Type: %s", dns_type_description(type));
offset += 2;
@ -3487,7 +3488,7 @@ dissect_dns_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
val_to_str(rcode, rcode_vals, "Unknown error (%u)"));
}
}
if (opcode == OPCODE_UPDATE) {
isupdate = TRUE;
} else {