Changeset 1830

Timestamp:

01/07/11 21:33:04 (2 years ago)

Author:

ahu

Message:

remove old 'guillotine' truncate functionality which should've been disabled a long time ago
tought the packetcache about EDNS response size
no longer cache TCP answers for UDP usage

closes ticket 200

silence some debugging

Location:

trunk/pdns/pdns

Files:

• dbdnsseckeeper.cc (modified) (1 diff)
• dnspacket.cc (modified) (2 diffs)
• dnspacket.hh (modified) (1 diff)
• packetcache.cc (modified) (5 diffs)
• packetcache.hh (modified) (5 diffs)
• packethandler.cc (modified) (4 diffs)

trunk/pdns/pdns/dbdnsseckeeper.cc

@@ -213 +213 @@
   }
   else if(dk.haveActiveKSKFor(qname, &dpk)) {
-    cerr<<"Found a KSK for '"<<qname<<"'"<<endl;
+//    cerr<<"Found a KSK for '"<<qname<<"'"<<endl;
     *rc=dpk.d_key;
     return dpk.getDNSKEY();

trunk/pdns/pdns/dnspacket.cc

@@ -311 +311 @@
 
         drc->toPacket(pw);
-        
-        if(!d_tcp && pw.size() + 20 > getMaxReplyLen()) {
-          cerr<<"Truncating!"<<endl;
+        if(!d_tcp && pw.size() + 20 > getMaxReplyLen()) { // XXX FIXME, 20? what does it mean?
           pw.rollback();
           if(pos->d_place == DNSResourceRecord::ANSWER) {
-            cerr<<"Set TC bit"<<endl;
             pw.getHeader()->tc=1;
           }
@@ -344 +341 @@
   len=packet.size();
 }
-
-
-/** Truncates a packet that has already been wrapup()-ed, possibly via a call to getData(). Do not call this function
-    before having done this - it will possibly break your packet, or crash your program. 
-
-    This method sets the 'TC' bit in the stringbuffer, and caps the len attributed to new_length.
-*/ 
-
-void DNSPacket::truncate(int new_length)
-{
-  if(new_length>len || !d_wrapped)
-    return;
-
-  DLOG(L<<Logger::Warning<<"Truncating a packet to "<< remote.toString() <<endl);
-
-  len=new_length;
-  stringbuffer[2]|=2; // set TC
-}
-
 
 void DNSPacket::setQuestion(int op, const string &qd, int newqtype)

trunk/pdns/pdns/dnspacket.hh

@@ -124 +124 @@
   const char *getRaw(void); //!< provides access to the raw packet, possibly on a packet that has never been 'wrapped'
   void spoofQuestion(const string &qd); //!< paste in the exact right case of the question. Useful for PacketCache
-  void truncate(int new_length); // has documentation in source
 
   vector<DNSResourceRecord*> getAPRecords(); //!< get a vector with DNSResourceRecords that need additional processing

trunk/pdns/pdns/packetcache.cc

@@ -86 +86 @@
     }
 
-    haveSomething=getEntryLocked(p->qdomain, p->qtype, PacketCache::PACKETCACHE, value, -1, packetMeritsRecursion);
+    haveSomething=getEntryLocked(p->qdomain, p->qtype, PacketCache::PACKETCACHE, value, -1, packetMeritsRecursion, p->getMaxReplyLen());
   }
   if(haveSomething) {
@@ -125 +125 @@
   bool packetMeritsRecursion=d_doRecursion && q->d.rd;
 
-  insert(q->qdomain, q->qtype, PacketCache::PACKETCACHE, r->getString(), packetMeritsRecursion ? d_recursivettl : d_ttl, -1, packetMeritsRecursion);
+  insert(q->qdomain, q->qtype, PacketCache::PACKETCACHE, r->getString(), packetMeritsRecursion ? d_recursivettl : d_ttl, -1, packetMeritsRecursion, 
+    q->getMaxReplyLen());
 }
 
 // universal key appears to be: qname, qtype, kind (packet, query cache), optionally zoneid, meritsRecursion
-void PacketCache::insert(const string &qname, const QType& qtype, CacheEntryType cet, const string& value, unsigned int ttl, int zoneID, bool meritsRecursion)
+void PacketCache::insert(const string &qname, const QType& qtype, CacheEntryType cet, const string& value, unsigned int ttl, int zoneID, 
+  bool meritsRecursion, unsigned int maxReplyLen)
 {
   if(!((d_ops++) % 300000)) {
@@ -146 +148 @@
   val.ctype=cet;
   val.meritsRecursion=meritsRecursion;
+  val.maxReplyLen = maxReplyLen;
 
   TryWriteLock l(&d_mut);
@@ -249 +252 @@
 }
 
-bool PacketCache::getEntry(const string &qname, const QType& qtype, CacheEntryType cet, string& value, int zoneID, bool meritsRecursion)
+bool PacketCache::getEntry(const string &qname, const QType& qtype, CacheEntryType cet, string& value, int zoneID, bool meritsRecursion, 
+  unsigned int maxReplyLen)
 {
   if(d_ttl<0) 
@@ -263 +267 @@
     return false;
   }
-  return getEntryLocked(qname, qtype, cet, value, zoneID, meritsRecursion);
-}
-
-bool PacketCache::getEntryLocked(const string &qname, const QType& qtype, CacheEntryType cet, string& value, int zoneID, bool meritsRecursion)
+  return getEntryLocked(qname, qtype, cet, value, zoneID, meritsRecursion, maxReplyLen);
+}
+
+bool PacketCache::getEntryLocked(const string &qname, const QType& qtype, CacheEntryType cet, string& value, int zoneID, bool meritsRecursion,
+  unsigned int maxReplyLen)
 {
 
   uint16_t qt = qtype.getCode();
-  cmap_t::const_iterator i=d_map.find(tie(qname, qt, cet, zoneID, meritsRecursion));
+  
+  cmap_t::const_iterator i=d_map.find(tie(qname, qt, cet, zoneID, meritsRecursion, maxReplyLen));
   time_t now=time(0);
   bool ret=(i!=d_map.end() && i->ttd > now);

trunk/pdns/pdns/packetcache.hh

@@ -1 +1 @@
 /*
     PowerDNS Versatile Database Driven Nameserver
-    Copyright (C) 2002 - 2008  PowerDNS.COM BV
+    Copyright (C) 2002 - 2011  PowerDNS.COM BV
 
     This program is free software; you can redistribute it and/or modify
@@ -72 +72 @@
   void insert(DNSPacket *q, DNSPacket *r);  //!< We copy the contents of *p into our cache. Do not needlessly call this to insert questions already in the cache as it wastes resources
 
-  void insert(const string &qname, const QType& qtype, CacheEntryType cet, const string& value, unsigned int ttl, int zoneID=-1, bool meritsRecursion=false);
+  void insert(const string &qname, const QType& qtype, CacheEntryType cet, const string& value, unsigned int ttl, int zoneID=-1, bool meritsRecursion=false,
+    unsigned int maxReplyLen=512);
 
   int get(DNSPacket *p, DNSPacket *q); //!< We return a dynamically allocated copy out of our cache. You need to delete it. You also need to spoof in the right ID with the DNSPacket.spoofID() method.
-  bool getEntry(const string &content, const QType& qtype, CacheEntryType cet, string& entry, int zoneID=-1, bool meritsRecursion=false);
+  bool getEntry(const string &content, const QType& qtype, CacheEntryType cet, string& entry, int zoneID=-1, 
+    bool meritsRecursion=false, unsigned int maxReplyLen=512);
 
   int size(); //!< number of entries in the cache
@@ -83 +85 @@
   map<char,int> getCounts();
 private:
-  bool getEntryLocked(const string &content, const QType& qtype, CacheEntryType cet, string& entry, int zoneID=-1, bool meritsRecursion=false);
+  bool getEntryLocked(const string &content, const QType& qtype, CacheEntryType cet, string& entry, int zoneID=-1, 
+    bool meritsRecursion=false, unsigned int maxReplyLen=512);
   struct CacheEntry
   {
@@ -94 +97 @@
     time_t ttd;
     bool meritsRecursion;
+    unsigned int maxReplyLen;
     string value;
   };
@@ -107 +111 @@
                         member<CacheEntry,string,&CacheEntry::qname>,
                         member<CacheEntry,uint16_t,&CacheEntry::qtype>,
-                        member<CacheEntry,uint16_t, &CacheEntry::ctype>,
-                        member<CacheEntry,int, &CacheEntry::zoneID>,
-                        member<CacheEntry,bool, &CacheEntry::meritsRecursion>
-                      >,
-                  composite_key_compare<CIBackwardsStringCompare, std::less<uint16_t>, std::less<uint16_t>, std::less<int>, std::less<bool> >
-                >,
-               sequenced<>
-               >
+                        member<CacheEntry,uint16_t, &CacheEntry::ctype>,
+                        member<CacheEntry,int, &CacheEntry::zoneID>,
+                        member<CacheEntry,bool, &CacheEntry::meritsRecursion>,
+                        member<CacheEntry,unsigned int, &CacheEntry::maxReplyLen>
+                        >,
+                        composite_key_compare<CIBackwardsStringCompare, std::less<uint16_t>, std::less<uint16_t>, std::less<int>, std::less<bool>, 
+                          std::less<unsigned int> >
+                            >,
+                           sequenced<>
+                           >
   > cmap_t;
 

trunk/pdns/pdns/packethandler.cc

@@ -601 +601 @@
     return;
   }
-  cerr<<"salt in ph: '"<<makeHexDump(ns3rc.d_salt)<<"', narrow="<<narrow<<endl;
+  // cerr<<"salt in ph: '"<<makeHexDump(ns3rc.d_salt)<<"', narrow="<<narrow<<endl;
   string unhashed, before,after;
 
@@ -611 +611 @@
   cerr<<"Done calling for closest encloser, before='"<<before<<"', after='"<<after<<"'"<<endl;
   emitNSEC3(ns3rc, auth, unhashed, fromBase32Hex(before), fromBase32Hex(after), target, r, mode);
-
 
   // now add the main nsec3
@@ -620 +619 @@
   emitNSEC3( ns3rc, auth, unhashed, fromBase32Hex(before), fromBase32Hex(after), target, r, mode);
   
-
   // now add the *
   unhashed=dotConcat("*", auth);
@@ -1346 +1344 @@
 
     r->wrapup(&d_dk); // needed for inserting in cache
-    if(!noCache) {
-      PC.insert(p,r); // in the packet cache
+    if(!p->d_tcp) {
+      PC.insert(p, r); // in the packet cache
     }
   }