Changeset 2625

Timestamp:

06/07/12 10:44:31 (12 months ago)

Author:

peter

Message:

make sure every RR actually goes in the right place in a recursor response packet

Location:

trunk/pdns/pdns

Files:

• misc.cc (modified) (1 diff)
• misc.hh (modified) (1 diff)
• pdns_recursor.cc (modified) (1 diff)

trunk/pdns/pdns/misc.cc

@@ -560 +560 @@
 }
 
+static bool comparePlace(DNSResourceRecord a, DNSResourceRecord b)
+{
+  return (a.d_place < b.d_place);
+}
+
+// make sure rrs is sorted in d_place order to avoid surprises later
+// then shuffle the parts that desire shuffling
+void orderAndShuffle(vector<DNSResourceRecord>& rrs)
+{
+  std::stable_sort(rrs.begin(), rrs.end(), comparePlace);
+  shuffle(rrs);
+}
 
 void normalizeTV(struct timeval& tv)

trunk/pdns/pdns/misc.hh

@@ -289 +289 @@
 string makeHexDump(const string& str);
 void shuffle(vector<DNSResourceRecord>& rrs);
+void orderAndShuffle(vector<DNSResourceRecord>& rrs);
 
 void normalizeTV(struct timeval& tv);

trunk/pdns/pdns/pdns_recursor.cc

@@ -555 +555 @@
     
       if(ret.size()) {
-        shuffle(ret);
+        orderAndShuffle(ret);
         
         for(vector<DNSResourceRecord>::const_iterator i=ret.begin(); i!=ret.end(); ++i) {