Changeset 761

Timestamp:

04/22/06 17:30:35 (4 years ago)

Author:

ahu

Message:

fix david g's bug one level up as well - we used to do the wrong thing with truncated packets, leaving untrue an, ns and arcounts around
change version to 3.0.1-snapshot

Location:

trunk/pdns/pdns

Files:

• config-recursor.h (modified) (1 diff)
• dist-recursor (modified) (1 diff)
• dnsparser.cc (modified) (2 diffs)
• dnsscan.cc (modified) (3 diffs)
• docs/pdns.sgml (modified) (1 diff)
• pdns-recursor.spec (modified) (1 diff)

trunk/pdns/pdns/config-recursor.h

@@ -1 +1 @@
 #define SYSCONFDIR "/etc/powerdns/" 
 #define LOCALSTATEDIR "/var/run/" 
-#define VERSION "3.0"
+#define VERSION "3.0.1-snapshot"
 #define RECURSOR
 #define GCC_SKIP_LOCKING

trunk/pdns/pdns/dist-recursor

@@ -1 @@
-VERSION=3.0
+VERSION=3.0.1-snapshot
 
 INCLUDES="iputils.hh arguments.hh base64.hh zoneparser-tng.hh \

trunk/pdns/pdns/dnsparser.cc

@@ -189 +189 @@
   copy(packet+sizeof(dnsheader), packet+len, d_content.begin());
   
-  unsigned int n;
+  unsigned int n=0;
 
   PacketReader pr(d_content);
@@ -235 +235 @@
   }
   catch(out_of_range &re) {
-    if(!(validPacket && d_header.tc)) // don't sweat it over truncated packets
+    if(validPacket && d_header.tc) { // don't sweat it over truncated packets, but do adjust an, ns and arcount
+      if(n < d_header.ancount) {
+        d_header.ancount=n; d_header.nscount = d_header.arcount = 0;
+      }
+      else if(n < d_header.ancount + d_header.nscount) {
+        d_header.nscount = n - d_header.ancount; d_header.arcount=0;
+      }
+      else {
+        d_header.arcount = n - d_header.ancount - d_header.nscount;
+      }
+    }
+    else {
       throw MOADNSException("Error parsing packet of "+lexical_cast<string>(len)+" bytes (rd="+
                             lexical_cast<string>(d_header.rd)+
                             "), out of bounds: "+string(re.what()));
+    }
   }
 }

trunk/pdns/pdns/dnsscan.cc

@@ -39 +39 @@
       for(int i=0; i < mdp.d_qname.length(); ++i)
         if(!isalnum(mdp.d_qname[i]) && mdp.d_qname[i]!='.' && mdp.d_qname[i]!='-' && mdp.d_qname[i]!='_') {
-          cout<<mdp.d_qname<<"|"<<mdp.d_qtype<<"|"<<mdp.d_qclass<<"\n";
-          sock.sendTo(string(pr.d_payload, pr.d_payload + pr.d_len), remote);
+          //      cout<<mdp.d_qname<<"|"<<mdp.d_qtype<<"|"<<mdp.d_qclass<<"\n";
+          // sock.sendTo(string(pr.d_payload, pr.d_payload + pr.d_len), remote);
           break;
         }
@@ -53 +53 @@
     }
     catch(MOADNSException &e) {
-      cerr<<"Error: "<<e.what()<<"\n";
+      cout<<"Error: "<<e.what()<<"\n";
       sock.sendTo(string(pr.d_payload, pr.d_payload + pr.d_len), remote);
     }
@@ -60 +60 @@
 catch(exception& e)
 {
-  cerr<<"Fatal: "<<e.what()<<endl;
+  cout<<"Fatal: "<<e.what()<<endl;
 }
 

trunk/pdns/pdns/docs/pdns.sgml

@@ -8504 +8504 @@
         </para>
         <para>
+          Zone2sql with the --gmysql flag also assumes this layout is in place.
+        </para>
+        <para>
           This schema contains all elements needed for master, slave and superslave operation. Depending on which features will be used, the 'GRANT' statements
           can be trimmed to make sure PDNS cannot subvert the contents of your database.
         </para>
         <para>
-          Zone2sql with the --gmysql flag also assumes this layout is in place.
+          When using the InnoDB storage engine, we suggest adding the following lines to the 'create table records' command above:
+<programlisting>
+CONSTRAINT `records_ibfk_1` FOREIGN KEY (`domain_id`) REFERENCES `domains`
+(`id`) ON DELETE CASCADE
+</programlisting>
+        </para>
+        <para>
+          This automates deletion of records on deletion of a domain from the domains table.
         </para>
       </sect2>

trunk/pdns/pdns/pdns-recursor.spec

@@ -3 +3 @@
 Buildroot: /tmp/pdns/
 Name: pdns-recursor
-Version: 3.0
+Version: 3.0.1snapshot
 Release: 1
 Summary: extremely powerful and versatile recursing nameserver