Changeset 963

Timestamp:

02/19/07 22:04:32 (2 years ago)

Author:

ahu

Message:

implement 'forward-zones-file' for large amounts of forwarded zones, remove TSC manipulation code from default compilation, disable speedups that sometimes caused problems

Files:

• trunk/pdns/pdns/docs/pdns.sgml (modified) (1 diff)
• trunk/pdns/pdns/docs/pdns_recursor.1.txt (modified) (1 diff)
• trunk/pdns/pdns/misc.hh (modified) (1 diff)
• trunk/pdns/pdns/pdns_recursor.cc (modified) (6 diffs)

trunk/pdns/pdns/docs/pdns.sgml

@@ -6842 +6842 @@
-                Comma separated list of 'zonename=IP' pairs. Queries for zones listed here will be forwarded to the IP address listed.
-                <command>forward-zones= ds9a.nl=213.244.168.210, powerdns.com=127.0.0.1</command>. Available since 3.1.
+              </para>
+            </listitem>
+          </varlistentry>
+          <varlistentry>
+            <term>forward-zones-file</term>
+            <listitem>
+              <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.
-              </para>
-            </listitem>

trunk/pdns/pdns/docs/pdns_recursor.1.txt

@@ -90 +90 @@
-           Available since 3.1.
-
+--forward-zones-file::
+           listed here will be forwarded to the IP address listed.
+           One zone per line, like: ds9a.nl=213.244.168.210
+           Available since 3.1.5
+
---hint-file::
-        If set, load root hints from this file

trunk/pdns/pdns/misc.hh

@@ -20 +20 @@
-#define MISC_HH
-
-1
+0
-#define RDTSC(qp) \
-do { \

trunk/pdns/pdns/pdns_recursor.cc

@@ -820 +820 @@
-  ComboAddress fromaddr;
-  socklen_t addrlen=sizeof(fromaddr);
-
+//  
-
-  if((len=recvfrom(fd, data, sizeof(data), 0, (sockaddr *)&fromaddr, &addrlen)) >= 0) {
-
+//    
-    g_stats.addRemote(fromaddr);
-
@@ -842 +842 @@
-      else {
-        ++g_stats.qcounter;
+#if 0
-        uint16_t type;
-        char qname[256];
@@ -893 +894 @@
-        }
-      slow:
+#endif
-        DNSComboWriter* dc = new DNSComboWriter(data, len, g_now);
-        dc->setSocket(fd);
@@ -1482 +1484 @@
-  }
-  
+  if(!::arg()["forward-zones-file"].empty()) {
+    L<<Logger::Warning<<"Reading zone forwarding information from '"<<::arg()["forward-zones-file"]<<"'"<<endl;
+    SyncRes::AuthDomain ad;
+    FILE *rfp=fopen(::arg()["forward-zones-file"].c_str(), "r");
+
+    if(!rfp)
+      throw AhuException("Error opening forward-zones-file '"+::arg()["forward-zones-file"]+"': "+stringerror());
+
+    shared_ptr<FILE> fp=shared_ptr<FILE>(rfp, fclose);
+    
+    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) 
+        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"<<endl;
+  }
+
-  if(::arg().mustDo("export-etc-hosts")) {
-    string line;
@@ -1607 +1640 @@
-    SyncRes::s_serverID=tmp;
-  }
-  
-  
-  parseAuthAndForwards();
@@ -1802 +1834 @@
-    ::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-file", "File with domain=ip pairs for forwarding")="";
-    ::arg().set("export-etc-hosts", "If we should serve up contents from /etc/hosts")="off";
-    ::arg().set("serve-rfc1918", "If we should be authoritative for RFC 1918 private IP space")="";