Changeset 1262

Timestamp:

08/24/08 18:28:52 (2 years ago)

Author:

ahu

Message:

speed up storing & handling AAAA-records in cache

Files:

• trunk/pdns/pdns/recursor_cache.cc (modified) (3 diffs)

trunk/pdns/pdns/recursor_cache.cc

@@ -43 +43 @@
   rr.qname=qname;
 
-  if(rr.qtype.getCode()==QType::A) {
+  if(rr.qtype.getCode()==QType::A && serial.size()==4) {
     uint32_t ip;
     memcpy((char*)&ip, serial.c_str(), 4);
     rr.content=U32ToIP(ntohl(ip));
+  }
+  else if(rr.qtype.getCode()==QType::AAAA && serial.size()==16) {
+    ComboAddress tmp;
+    tmp.sin4.sin_family=AF_INET6;
+    memcpy(tmp.sin6.sin6_addr.s6_addr, serial.c_str(), 16);
+    rr.content=tmp.toString();
   }
   else if(rr.qtype.getCode()==QType::CNAME || rr.qtype.getCode()==QType::NS || rr.qtype.getCode()==QType::PTR) {
@@ -85 +91 @@
     IpToU32(rr.content, &ip);
     return string((char*)&ip, 4);
+  }
+  else if(type==QType::AAAA) {
+    ComboAddress ca(rr.content);
+    return string((char*)&ca.sin6.sin6_addr.s6_addr, 16);
   }
   else if(type==QType::NS || type==QType::CNAME)
@@ -325 +335 @@
     }
   }
+
   if(isNew) {
     sort(ce.d_records.begin(), ce.d_records.end());
   }
-
+  
   if(ce.d_records.capacity() != ce.d_records.size())
     vector<StoredRecord>(ce.d_records).swap(ce.d_records);
-
+  
   d_cache.replace(stored, ce);
 }