Changeset 1168

Timestamp:

03/22/08 19:27:44 (5 years ago)

Author:

ahu

Message:

implement multiple forwarders per domain, both from file and from
configuration file, based on patch by Aaron Thompson, with work from Augie
Schwer. Closes ticket 81.

Plus, add support for forwarding to ports != 53, closing ticket 122.

Location:

trunk/pdns/pdns

Files:

• dnsrecords.cc (modified) (1 diff)
• docs/pdns.sgml (modified) (2 diffs)
• pdns_recursor.cc (modified) (3 diffs)
• syncres.cc (modified) (5 diffs)
• syncres.hh (modified) (1 diff)

trunk/pdns/pdns/dnsrecords.cc

@@ -1 +1 @@
 /*
     PowerDNS Versatile Database Driven Nameserver
-    Copyright (C) 2005 - 2007  PowerDNS.COM BV
+    Copyright (C) 2005 - 2008  PowerDNS.COM BV
 
     This program is free software; you can redistribute it and/or modify

trunk/pdns/pdns/docs/pdns.sgml

@@ -7406 +7406 @@
                 <command>forward-zones= ds9a.nl=213.244.168.210, powerdns.com=127.0.0.1</command>. Available since 3.1.
               </para>
+              <para>
+                Since version 3.1.5, multiple IP addresses can be specified. Additionally, port numbers other than 53 can be configured.
+                Sample syntax: <command>forward-zones=ds9a.nl=213.244.168.210:5300;127.0.0.1, powerdns.com=127.0.0.1;9.8.7.6:530</command>,
+                or on the command line: <command>--forward-zones="ds9a.nl=213.244.168.210:5300;127.0.0.1, powerdns.com=127.0.0.1;9.8.7.6:530"</command>,
             </listitem>
           </varlistentry>
@@ -7413 +7417 @@
               <para>
                 Same as <command>forward-zones</command>, parsed from a file. Only 1 zone is allowed per line, specified as follows:
-                <command>ds9a.nl=213.244.168.210</command>. Available since 3.1.5.
+                <command>ds9a.nl=213.244.168.210, 1.2.3.4:5300</command>. No comments are allowed. Available since 3.1.5. 
               </para>
             </listitem>

trunk/pdns/pdns/pdns_recursor.cc

@@ -1423 +1423 @@
 void parseAuthAndForwards();
 
+void convertServersForAD(const std::string& input, SyncRes::AuthDomain& ad, const char* sepa, bool verbose=true)
+{
+  vector<string> servers;
+  stringtok(servers, input, sepa);
+  ad.d_servers.clear();
+  for(vector<string>::const_iterator iter = servers.begin(); iter != servers.end(); ++iter) {
+    if(verbose && iter != servers.begin()) 
+      L<<", ";
+    pair<string,string> ipport=splitField(*iter, ':');
+    ComboAddress addr(ipport.first, ipport.second.empty() ? 53 : lexical_cast<uint16_t>(ipport.second));
+    if(verbose)
+      L<<addr.toStringWithPort();
+    ad.d_servers.push_back(addr);
+  }
+  if(verbose)
+    L<<endl;
+}
+
 string reloadAuthAndForwards()
 {
@@ -1508 +1526 @@
       }
       else {
-        L<<Logger::Error<<"Redirecting queries for zone '"<<headers.first<<"' to IP '"<<headers.second<<"'"<<endl;
-        ad.d_server=headers.second;
+        L<<Logger::Error<<"Redirecting queries for zone '"<<headers.first<<"' to: ";
+        convertServersForAD(headers.second, ad, ";");
       }
       
@@ -1527 +1545 @@
     
     char line[1024];
-    vector<string> parts;
     int linenum=0;
     uint64_t before = SyncRes::s_domainmap.size();
     while(linenum++, fgets(line, sizeof(line)-1, fp.get())) {
-      parts.clear();
-      stringtok(parts,line,"=, ");
-      if(parts.empty())
-        continue;
-      if(parts.size()<2) 
+      string domain, instructions;
+      tie(domain, instructions)=splitField(line, '=');
+      trim(domain);
+      trim(instructions);
+
+      if(domain.empty()) 
         throw AhuException("Error parsing line "+lexical_cast<string>(linenum)+" of " +::arg()["forward-zones-file"]);
-      trim(parts[0]);
-      trim(parts[1]);
-      parts[0]=toCanonic("", parts[0]);
-      ad.d_server=parts[1];
-      //      cerr<<"Inserting '"<<domain<<"' to '"<<ad.d_server<<"'\n";
-      SyncRes::s_domainmap[parts[0]]=ad;
-    }
-    L<<Logger::Warning<<"Done parsing " << SyncRes::s_domainmap.size() - before<<" forwarding instructions from file '"<<::arg()["forward-zones-files"]<<"'"<<endl;
+
+      try {
+        convertServersForAD(instructions, ad, ",; ", false);
+      }
+      catch(...) {
+        throw AhuException("Conversion error parsing line "+lexical_cast<string>(linenum)+" of " +::arg()["forward-zones-file"]);
+      }
+
+      SyncRes::s_domainmap[toCanonic("", domain)]=ad;
+    }
+    L<<Logger::Warning<<"Done parsing " << SyncRes::s_domainmap.size() - before<<" forwarding instructions from file '"<<::arg()["forward-zones-file"]<<"'"<<endl;
   }
 

trunk/pdns/pdns/syncres.cc

@@ -204 +204 @@
       domainmap_t::const_iterator iter=getBestAuthZone(&authname);
       if(iter != s_domainmap.end()) {
-        string server=iter->second.d_server;
-        if(server.empty()) {
+        const vector<ComboAddress>& servers = iter->second.d_servers;
+        if(servers.empty()) {
           ret.clear();
           doOOBResolve(qname, qtype, ret, depth, res);
@@ -211 +211 @@
         }
         else {
-          LOG<<prefix<<qname<<": forwarding query to hardcoded nameserver '"<<server<<"' for zone '"<<authname<<"'"<<endl;
-          ComboAddress remoteIP(server, 53);
+          const ComboAddress remoteIP = servers.front();
+          LOG<<prefix<<qname<<": forwarding query to hardcoded nameserver '"<< remoteIP.toStringWithPort()<<"' for zone '"<<authname<<"'"<<endl;
 
           res=asyncresolve(remoteIP, qname, qtype.getCode(), false, false, &d_now, &lwr);    
@@ -373 +373 @@
 {
   string subdomain(qname);
-
   string authdomain(qname);
   
   domainmap_t::const_iterator iter=getBestAuthZone(&authdomain);
   if(iter!=s_domainmap.end()) {
-    nsset.insert(iter->second.d_server); // this gets picked up in doResolveAt, if empty it means "we are auth", otherwise it denotes a forward
+    if( iter->second.d_servers.empty() )
+      nsset.insert(string()); // this gets picked up in doResolveAt, if empty it means "we are auth", otherwise it denotes a forward
+    else {
+      for(vector<ComboAddress>::const_iterator server=iter->second.d_servers.begin(); server != iter->second.d_servers.end(); ++server)
+        nsset.insert(server->toStringWithPort());
+    }
+
     return authdomain;
   }
@@ -626 +631 @@
         LOG<<prefix<<qname<<": Trying to resolve NS '"<<*tns<<"' ("<<1+tns-rnameservers.begin()<<"/"<<(unsigned int)rnameservers.size()<<")"<<endl;
         if(!isCanonical(*tns)) {
-          LOG<<prefix<<qname<<": Domain has hardcoded nameserver"<<endl;
-          remoteIPs.push_back(ComboAddress(*tns, 53));
+          LOG<<prefix<<qname<<": Domain has hardcoded nameserver(s)"<<endl;
+
+          pair<string,string> ipport=splitField(*tns, ':');
+          ComboAddress addr(ipport.first, ipport.second.empty() ? 53 : lexical_cast<uint16_t>(ipport.second));
+
+          remoteIPs.push_back(addr);
         }
         else
@@ -649 +658 @@
 
         for(remoteIP = remoteIPs.begin(); remoteIP != remoteIPs.end(); ++remoteIP) {
-          LOG<<prefix<<qname<<": Trying IP "<< remoteIP->toString() <<", asking '"<<qname<<"|"<<qtype.getName()<<"'"<<endl;
+          LOG<<prefix<<qname<<": Trying IP "<< remoteIP->toStringWithPort() <<", asking '"<<qname<<"|"<<qtype.getName()<<"'"<<endl;
           extern NetmaskGroup* g_dontQuery;
           

trunk/pdns/pdns/syncres.hh

@@ -327 +327 @@
   struct AuthDomain
   {
-    string d_server;
+    vector<ComboAddress> d_servers;
     typedef multi_index_container <
       DNSResourceRecord,