Changeset 67 for trunk/pdns/pdns/resolver.cc

Timestamp:

12/12/02 20:53:20 (11 years ago)

Author:

ahu

Message:

heading up to 2.9.2

Files:

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

trunk/pdns/pdns/resolver.cc

@@ -74 +74 @@
   d_sock=-1;
   d_timeout=500000;
+  d_soacount=0;
   d_buf=new unsigned char[66000];
 }
@@ -329 +330 @@
 int Resolver::axfrChunk(Resolver::res_t &res)
 {
+  if(d_soacount>1) {
+    Utility::closesocket(d_sock);
+    d_sock=-1;
+    return 0;
+  }
+
   // d_sock is connected and is about to spit out a packet
   int len=getLength();
@@ -336 +343 @@
   timeoutReadn((char *)d_buf,len); 
   d_len=len;
+
   res=result();
-  if(!res.empty())
-    if(res.begin()->qtype.getCode()==QType::SOA || res.end()->qtype.getCode()==QType::SOA)
+  for(res_t::const_iterator i=res.begin();i!=res.end();++i)
+    if(i->qtype.getCode()==QType::SOA) {
       d_soacount++;
-
-  if(d_soacount==2) {
-    Utility::closesocket(d_sock);
-    d_sock=-1;
-    return 0;
-  }
+    }
+
+  if(d_soacount>1 && !res.empty()) // chop off the last SOA
+    res.resize(res.size()-1);
+    
 
   return 1;