Changeset 843 for trunk/pdns/pdns/pdns_recursor.cc

Timestamp:

05/24/06 00:41:04 (7 years ago)

Author:

ahu

Message:

make query chaining select on type as well..

Files:

• trunk/pdns/pdns/pdns_recursor.cc (modified) (7 diffs)

trunk/pdns/pdns/pdns_recursor.cc

@@ -284 +284 @@
 /* these two functions are used by LWRes */
 // -2 is OS error, -1 is error that depends on the remote, > 0 is success
-int asendto(const char *data, int len, int flags, const ComboAddress& toaddr, uint16_t id, const string& domain, int* fd) 
+int asendto(const char *data, int len, int flags, 
+            const ComboAddress& toaddr, uint16_t id, const string& domain, uint16_t qtype, int* fd) 
 {
 
   PacketID pident;
-  pident.domain=domain;
-  pident.remote=toaddr;
+  pident.domain = domain;
+  pident.remote = toaddr;
+  pident.type = qtype;
 
   // see if there is an existing outstanding request we can chain on to, using partial equivalence function
@@ -325 +327 @@
 
 // -1 is error, 0 is timeout, 1 is success
-int arecvfrom(char *data, int len, int flags, const ComboAddress& fromaddr, int *d_len, uint16_t id, const string& domain, int fd)
+int arecvfrom(char *data, int len, int flags, const ComboAddress& fromaddr, int *d_len, 
+              uint16_t id, const string& domain, uint16_t qtype, int fd)
 {
   static optional<unsigned int> nearMissLimit;
@@ -335 +338 @@
   pident.id=id;
   pident.domain=domain;
+  pident.type = qtype;
   pident.remote=fromaddr;
 
@@ -993 +997 @@
 ;
 
-string questionExpand(const char* packet, uint16_t len)
-{
+string questionExpand(const char* packet, uint16_t len, uint16_t& type)
+{
+  type=0;
   const char* end=packet+len;
   const char* pos=packet+12;
@@ -1009 +1014 @@
   if(ret.empty())
     ret=".";
+
+  if(pos + labellen + 2 <= end)  // is this correct XXX FIXME?
+    type=(*pos)*256 + *(pos+1);
+    
   return ret;
 }
@@ -1141 +1150 @@
     pident.id=dh.id;
     pident.fd=fd;
-    pident.domain=questionExpand(data, len); // don't copy this from above - we need to do the actual read
+    pident.domain=questionExpand(data, len, pident.type); // don't copy this from above - we need to do the actual read
     string packet;
     packet.assign(data, len);
@@ -1156 +1165 @@
       
       for(MT_t::waiters_t::iterator mthread=MT->d_waiters.begin(); mthread!=MT->d_waiters.end(); ++mthread) {
-        if(pident.fd==mthread->key.fd && mthread->key.remote==pident.remote && 
+        if(pident.fd==mthread->key.fd && mthread->key.remote==pident.remote &&  mthread->key.type == pident.type &&
            !Utility::strcasecmp(pident.domain.c_str(), mthread->key.domain.c_str())) {
           mthread->key.nearMisses++;