]> granicus.if.org Git - pdns/commitdiff
actually notice timeout during AXFR retrieve, thanks hkraal
authorPeter van Dijk <peter.van.dijk@netherlabs.nl>
Tue, 23 Jul 2013 13:24:37 +0000 (15:24 +0200)
committerPeter van Dijk <peter.van.dijk@netherlabs.nl>
Tue, 23 Jul 2013 13:24:37 +0000 (15:24 +0200)
pdns/resolver.cc

index 25c3fa0e25dcf6662ee9d81c2b196846799baf32..7ae35adf159c882fb029f68f07a654fa5c294fed 100644 (file)
@@ -460,8 +460,11 @@ void AXFRRetriever::timeoutReadn(uint16_t bytes)
   int n=0;
   int numread;
   while(n<bytes) {
-    if(waitForData(d_sock, 10-(time(0)-start))<0)
+    int res=waitForData(d_sock, 10-(time(0)-start));
+    if(res<0)
       throw ResolverException("Reading data from remote nameserver over TCP: "+stringerror());
+    if(!res)
+      throw ResolverException("Timeout while reading data from remote nameserver over TCP");
 
     numread=recv(d_sock, d_buf.get()+n, bytes-n, 0);
     if(numread<0)