From: Aki Tuomi <cmouse@desteem.org>
Date: Wed, 14 Jan 2015 09:57:45 +0000 (+0200)
Subject: Use NetworkError, remove redundant code
X-Git-Tag: auth-3.4.2~10^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2d5580a30834c06b75c70ea2cf5f45b23d6e2f75;p=thirdparty%2Fpdns.git

Use NetworkError, remove redundant code

(cherry picked from commit 7731f6fff580fb5b2ac4863bb3ffb20112f5dbe8)
---

diff --git a/modules/remotebackend/httpconnector.cc b/modules/remotebackend/httpconnector.cc
index 9befb8bef9..efef0123b7 100644
--- a/modules/remotebackend/httpconnector.cc
+++ b/modules/remotebackend/httpconnector.cc
@@ -389,23 +389,13 @@ int HTTPConnector::recv_message(rapidjson::Document &output) {
     try {
       t0 = time((time_t*)NULL);
       while(arl.ready() == false && (labs(time((time_t*)NULL) - t0) <= timeout/1000)) {
-        rd = d_socket->readWithTimeout(buffer, sizeof(buffer), timeout);
-        if (rd<0) {
-          delete d_socket;
-          d_socket = NULL;
-          fail = true;
-          break;
-        }
+        rd = d_socket->readWithTimeout(buffer, sizeof(buffer), timeout); // if rd<=0 this will throw
         buffer[rd] = 0;
         arl.feed(std::string(buffer, rd));
       }
       // timeout occured.
-      if (arl.ready() == false) {
-        L<<Logger::Error<<"While reading from HTTP endpoint "<<d_addr.toStringWithPort()<<": timeout"<<std::endl;
-        delete d_socket;
-        d_socket = NULL;
-        fail = true;
-      }     
+      if (arl.ready() == false)
+        throw NetworkError("timeout");
     } catch (NetworkError &ne) {
       L<<Logger::Error<<"While reading from HTTP endpoint "<<d_addr.toStringWithPort()<<": "<<ne.what()<<std::endl; 
       delete d_socket;