diff options
| author | sfisher <sfisher@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-01-06 17:15:50 +0000 |
|---|---|---|
| committer | sfisher <sfisher@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-01-06 17:15:50 +0000 |
| commit | 11dbfaa318912641339f0b5bb3a81228a836e973 (patch) | |
| tree | 2ab3f5e21443928d5013f18ed93e74573f4a0f46 | |
| parent | b25dc66c63527ae6a439cefd50a00f4ecef153fd (diff) | |
When showing a DNS query response containing a SRV record, display items
in the tree of the service record broken out. For example,
"_ldap._tcp.domain.com" shows:
Service: ldap
Protocol: tcp
Name: domain.com
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35401 f5534014-38df-0310-8fa8-9805f1628bb7
| -rw-r--r-- | epan/dissectors/packet-dns.c | 39 |
1 files changed, 38 insertions, 1 deletions
diff --git a/epan/dissectors/packet-dns.c b/epan/dissectors/packet-dns.c index 8cabef8944..8173e83313 100644 --- a/epan/dissectors/packet-dns.c +++ b/epan/dissectors/packet-dns.c @@ -78,6 +78,9 @@ static int hf_dns_qry_type = -1; static int hf_dns_qry_class = -1; static int hf_dns_qry_class_mdns = -1; static int hf_dns_qry_qu = -1; +static int hf_dns_srv_service = -1; +static int hf_dns_srv_proto = -1; +static int hf_dns_srv_name = -1; static int hf_dns_rr_name = -1; static int hf_dns_rr_type = -1; static int hf_dns_rr_class = -1; @@ -973,10 +976,32 @@ add_rr_to_tree(proto_item *trr, int rr_type, tvbuff_t *tvb, int offset, guint ttl, gushort data_len, gboolean is_mdns) { proto_tree *rr_tree; + gchar **srv_rr_info; rr_tree = proto_item_add_subtree(trr, rr_type); - proto_tree_add_string(rr_tree, hf_dns_rr_name, tvb, offset, namelen, name); + + if(type == T_SRV) { + srv_rr_info = g_strsplit(name, ".", 3); + + /* The + 1 on the strings is to skip the leading '_' */ + + proto_tree_add_string(rr_tree, hf_dns_srv_service, tvb, offset, + namelen, srv_rr_info[0]+1); + + proto_tree_add_string(rr_tree, hf_dns_srv_proto, tvb, offset, + namelen, srv_rr_info[1]+1); + + proto_tree_add_string(rr_tree, hf_dns_srv_name, tvb, offset, + namelen, srv_rr_info[2]); + + g_strfreev(srv_rr_info); + } else { + proto_tree_add_string(rr_tree, hf_dns_rr_name, tvb, offset, + namelen, name); + } + offset += namelen; + proto_tree_add_uint_format(rr_tree, hf_dns_rr_type, tvb, offset, 2, type, "Type: %s", dns_type_description(type)); offset += 2; @@ -3482,6 +3507,18 @@ proto_register_dns(void) { "Cache flush", "dns.resp.cache_flush", FT_BOOLEAN, 16, NULL, C_FLUSH, "Cache flush flag", HFILL }}, + { &hf_dns_srv_service, + { "Service", "dns.srv.service", + FT_STRING, BASE_NONE, NULL, 0x0, + "Desired service", HFILL }}, + { &hf_dns_srv_proto, + { "Protocol", "dns.srv.proto", + FT_STRING, BASE_NONE, NULL, 0x0, + "Desired protocol", HFILL }}, + { &hf_dns_srv_name, + { "Name", "dns.srv.name", + FT_STRING, BASE_NONE, NULL, 0x0, + "Domain this resource record refers to", HFILL }}, { &hf_dns_rr_name, { "Name", "dns.resp.name", FT_STRING, BASE_NONE, NULL, 0x0, |