Changeset 509

Timestamp:

10/04/05 19:55:01 (8 years ago)

Author:

ahu

Message:

Fix the bug reported in  http://mailman.powerdns.com/pipermail/pdns-users/2005-October/002703.html
regarding duplicate SRV records with differing weights being weeded down to one.
Plus add a regression test for this

Location:

trunk/pdns

Files:

• pdns/dnspacket.cc (modified) (2 diffs)
• regression-tests/double-srv (added)
• regression-tests/double-srv/command (added)
• regression-tests/double-srv/description (added)
• regression-tests/double-srv/expected_result (added)
• regression-tests/test.com (modified) (1 diff)

trunk/pdns/pdns/dnspacket.cc

@@ -241 +241 @@
   if(d_compress)
     for(vector<DNSResourceRecord>::const_iterator i=rrs.begin();i!=rrs.end();++i) 
-      if(rr.qname==i->qname && rr.qtype==i->qtype && rr.content==i->content)
-        if(rr.qtype.getCode()!=QType::MX || rr.priority==i->priority)
+      if(rr.qname==i->qname && rr.qtype==i->qtype && rr.content==i->content) {
+        if(rr.qtype.getCode()!=QType::MX && rr.qtype.getCode()!=QType::SRV)
           return;
+        if(rr.priority==i->priority)
+          return;
+      }
 
   rrs.push_back(rr);
@@ -1109 +1112 @@
   commitD();
 
-
   len=stringbuffer.length();
 }

trunk/pdns/regression-tests/test.com

@@ -21 +21 @@
 counter                 IN      A       1.1.1.5
 _ldap._tcp.dc           IN      SRV     0 100 389 server1
+_double._tcp.dc         IN      SRV     0 100 389 server1
+_double._tcp.dc         IN      SRV     1 100 389 server1