Changeset 1130

Timestamp:

02/04/08 23:32:49 (8 months ago)

Author:

ahu

Message:

reprime root hints using EDNS0, thanks to dns-operations AT mail.oarc.isc.org

Files:

• trunk/pdns/pdns/lwres.cc (modified) (2 diffs)
• trunk/pdns/pdns/lwres.hh (modified) (1 diff)
• trunk/pdns/pdns/pdns_recursor.cc (modified) (2 diffs)
• trunk/pdns/pdns/syncres.cc (modified) (3 diffs)
• trunk/pdns/pdns/syncres.hh (modified) (3 diffs)

trunk/pdns/pdns/lwres.cc

@@ -41 +41 @@
-//! returns -2 for OS limits error, -1 for permanent error that has to do with remote, 0 for timeout, 1 for success
-/** Never throws! */
-
+bool doEDNS0, 
-{
-  int len; 
@@ -51 +51 @@
-  pw.getHeader()->rd=0;
-  pw.getHeader()->id=Utility::random();
+
+  if(doEDNS0 && !doTCP) {
+    pw.addOpt(1200, 0, 0); // 1200 bytes answer size
+    pw.commit();
+  }
-  lwr->d_rcode=0;
-

trunk/pdns/pdns/lwres.hh

@@ -64 +64 @@
-};
-
-
+bool doEDNS0, 
-
-#endif // PDNS_LWRES_HH

trunk/pdns/pdns/pdns_recursor.cc

@@ -34 +34 @@
-#include <signal.h>
-#include <stdlib.h>
-#include "htimer.hh"
-
-#include "mtasker.hh"
@@ -1128 +1127 @@
-  if(now.tv_sec - last_rootupdate > 7200) {
-    SyncRes sr(now);
+    sr.setDoEDNS0(true);
-    vector<DNSResourceRecord> ret;
-

trunk/pdns/pdns/syncres.cc

@@ -213 +213 @@
-          ComboAddress remoteIP(server, 53);
-
-
+false, 
-          // filter out the good stuff from lwr.result()
-
@@ -681 +681 @@
-            }
-            
-
+d_doEDNS0, 
-            if(resolveret != 1) {
-              if(resolveret==0) {
@@ -747 +747 @@
-      // reap all answers from this packet that are acceptable
-      for(LWResult::res_t::const_iterator i=lwr.d_result.begin();i != lwr.d_result.end();++i) {
+        if(i->qtype.getCode() == QType::OPT) {
+          LOG<<prefix<<qname<<": skipping OPT answer '"<<i->qname<<"' from '"<<auth<<"' nameservers" <<endl;
+          continue;
+        }
-        LOG<<prefix<<qname<<": accept answer '"<<i->qname<<"|"<<i->qtype.getName()<<"|"<<i->content<<"' from '"<<auth<<"' nameservers? ";
-        if(i->qtype.getCode()==QType::ANY) {

trunk/pdns/pdns/syncres.hh

@@ -213 +213 @@
-  explicit SyncRes(const struct timeval& now) :  d_outqueries(0), d_tcpoutqueries(0), d_throttledqueries(0), d_timeouts(0), d_unreachables(0),
-                                                 d_now(now),
-
+, d_doEDNS0(false)
-  int beginResolve(const string &qname, const QType &qtype, uint16_t qclass, vector<DNSResourceRecord>&ret);
-  void setId(int id)
@@ -232 +232 @@
-    d_nocache=state;
-  }
+
+  void setDoEDNS0(bool state=true)
+  {
+    d_doEDNS0=state;
+  }
+
-  static unsigned int s_queries;
-  static unsigned int s_outgoingtimeouts;
@@ -373 +379 @@
-  bool d_cacheonly;
-  bool d_nocache;
+  bool d_doEDNS0;
-
-  struct GetBestNSAnswer