Changeset 1451

Timestamp:

12/06/09 18:20:10 (3 months ago)

Author:

ahu

Message:

implement --forward-zones-recurse and special '+domain=1.2.3.4' syntax for forward-zones-file

Location:

trunk/pdns/pdns

Files:

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

trunk/pdns/pdns/pdns_recursor.cc

@@ -1545 +1545 @@
   typedef vector<string> parts_t;
   parts_t parts;  
-  for(int n=0; n < 2 ; ++n ) {
+  const char *option_names[3]={"auth-zones", "forward-zones", "forward-zones-recurse"};
+  for(int n=0; n < 3 ; ++n ) {
     parts.clear();
-    stringtok(parts, ::arg()[n ? "forward-zones" : "auth-zones"], ",\t\n\r");
+    stringtok(parts, ::arg()[option_names[n]], ",\t\n\r");
     for(parts_t::const_iterator iter = parts.begin(); iter != parts.end(); ++iter) {
       SyncRes::AuthDomain ad;
@@ -1555 +1556 @@
       headers.first=toCanonic("", headers.first);
       if(n==0) {
-        L<<Logger::Error<<"Parsing authoritative data for zone '"<<headers.first<<"' from file '"<<headers.second<<"'"<<endl;
-        ZoneParserTNG zpt(headers.second, headers.first);
-        DNSResourceRecord rr;
-        while(zpt.get(rr)) {
-          try {
-            string tmp=DNSRR2String(rr);
-            rr=String2DNSRR(rr.qname, rr.qtype, tmp, rr.ttl);
-          }
-          catch(std::exception &e) {
-            throw AhuException("Error parsing record '"+rr.qname+"' of type "+rr.qtype.getName()+" in zone '"+headers.first+"' from file '"+headers.second+"': "+e.what());
-          }
-          catch(...) {
-            throw AhuException("Error parsing record '"+rr.qname+"' of type "+rr.qtype.getName()+" in zone '"+headers.first+"' from file '"+headers.second+"'");
-          }
-
-          ad.d_records.insert(rr);
-
-        }
+        L<<Logger::Error<<"Parsing authoritative data for zone '"<<headers.first<<"' from file '"<<headers.second<<"'"<<endl;
+        ZoneParserTNG zpt(headers.second, headers.first);
+        DNSResourceRecord rr;
+        while(zpt.get(rr)) {
+          try {
+            string tmp=DNSRR2String(rr);
+            rr=String2DNSRR(rr.qname, rr.qtype, tmp, rr.ttl);
+          }
+          catch(std::exception &e) {
+            throw AhuException("Error parsing record '"+rr.qname+"' of type "+rr.qtype.getName()+" in zone '"+headers.first+"' from file '"+headers.second+"': "+e.what());
+          }
+          catch(...) {
+            throw AhuException("Error parsing record '"+rr.qname+"' of type "+rr.qtype.getName()+" in zone '"+headers.first+"' from file '"+headers.second+"'");
+          }
+
+          ad.d_records.insert(rr);
+        }
       }
       else {
-        L<<Logger::Error<<"Redirecting queries for zone '"<<headers.first<<"' to: ";
-        convertServersForAD(headers.second, ad, ";");
+        L<<Logger::Error<<"Redirecting queries for zone '"<<headers.first<<"' ";
+        if(n == 2) {
+          L<<"with recursion ";
+          ad.d_rdForward = 1;
+        }
+        else ad.d_rdForward = 0;
+        L<<"to: ";
+        
+        convertServersForAD(headers.second, ad, ";");
+        if(n == 2) {
+          ad.d_rdForward = 1;
+        }
       }
       
@@ -1601 +1611 @@
       trim(domain);
       trim(instructions);
-
+      if(boost::starts_with(domain,"+")) {
+        domain=domain.c_str()+1;
+        ad.d_rdForward = true;
+      }
+      else
+        ad.d_rdForward = false;
       if(domain.empty()) 
         throw AhuException("Error parsing line "+lexical_cast<string>(linenum)+" of " +::arg()["forward-zones-file"]);
@@ -2114 +2129 @@
     ::arg().set("auth-zones", "Zones for which we have authoritative data, comma separated domain=file pairs ")="";
     ::arg().set("forward-zones", "Zones for which we forward queries, comma separated domain=ip pairs")="";
+    ::arg().set("forward-zones-recurse", "Zones for which we forward queries, comma separated domain=ip pairs")="";
     ::arg().set("forward-zones-file", "File with domain=ip pairs for forwarding")="";
     ::arg().set("export-etc-hosts", "If we should serve up contents from /etc/hosts")="off";

trunk/pdns/pdns/syncres.cc

@@ -555 +555 @@
     else {
       for(vector<ComboAddress>::const_iterator server=iter->second.d_servers.begin(); server != iter->second.d_servers.end(); ++server)
-        nsset.insert(server->toStringWithPort());
+        nsset.insert((iter->second.d_rdForward ? "+" : "-") + server->toStringWithPort()); // add a '+' if the rd bit should be set
     }
 
@@ -828 +828 @@
           LOG<<prefix<<qname<<": Domain has hardcoded nameserver(s)"<<endl;
 
-          ComboAddress addr=parseIPAndPort(*tns, 53);
+          string txtAddr = *tns;
+          if(!tns->empty()) {
+            sendRDQuery = txtAddr[0] == '+';
+            txtAddr=txtAddr.c_str()+1;
+          }
+          ComboAddress addr=parseIPAndPort(txtAddr, 53);
           
           remoteIPs.push_back(addr);
           pierceDontQuery=true;
-          //      sendRDQuery=true;
         }
         else {

trunk/pdns/pdns/syncres.hh

@@ -363 +363 @@
   {
     vector<ComboAddress> d_servers;
+    bool d_rdForward;
     typedef multi_index_container <
       DNSResourceRecord,