Changeset 1430

Timestamp:

10/11/09 19:13:59 (10 months ago)

Author:

ahu

Message:

disable EDNS by default - delivers nothing but trouble..

Location:

trunk/pdns/pdns

Files:

• pdns_recursor.cc (modified) (2 diffs)
• syncres.cc (modified) (2 diffs)
• syncres.hh (modified) (1 diff)

trunk/pdns/pdns/pdns_recursor.cc

@@ -1849 +1849 @@
   
   SyncRes::s_noEDNSPing = ::arg().mustDo("disable-edns-ping");
+  SyncRes::s_noEDNS = ::arg().mustDo("disable-edns");
 
   SyncRes::s_maxnegttl=::arg().asNum("max-negative-ttl");
@@ -2143 +2144 @@
     ::arg().set("lua-dns-script", "Filename containing an optional 'lua' script that will be used to modify dns answers")="";
     ::arg().setSwitch( "ignore-rd-bit", "Assume each packet requires recursion, for compatability" )= "off"; 
-    ::arg().setSwitch( "disable-edns-ping", "Disable EDNSPing" )= ""; 
+    ::arg().setSwitch( "disable-edns-ping", "Disable EDNSPing" )= "no"; 
+    ::arg().setSwitch( "disable-edns", "Disable EDNS" )= ""; 
 
     ::arg().setCmd("help","Provide a helpful message");

trunk/pdns/pdns/syncres.cc

@@ -68 +68 @@
 SyncRes::throttle_t SyncRes::s_throttle;
 bool SyncRes::s_noEDNSPing;
+bool SyncRes::s_noEDNS;
 
 /** everything begins here - this is the entry point just after receiving a packet */
@@ -244 +245 @@
      If '4', send bare queries
   */
+
+  if(s_noEDNS) {
+    g_stats.noEdnsOutQueries++;
+    return asyncresolve(ip, domain, type, doTCP, sendRDQuery, 0, now, res);
+  }
 
   SyncRes::EDNSStatus* ednsstatus;

trunk/pdns/pdns/syncres.hh

@@ -358 +358 @@
 
   static bool s_noEDNSPing;
+  static bool s_noEDNS;
 
   struct AuthDomain