Added DaemonClient.

src/base/net/http/HttpClient.cpp

@@ -40,11 +40,11 @@ namespace xmrig {
 static const char *kCRLF = "\r\n";
 
 
-class WriteBaton : public Baton<uv_write_t>
+class ClientWriteBaton : public Baton<uv_write_t>
 {
 public:
-    inline WriteBaton(const std::string &header, std::string &&body) :
-        m_body(body),
+    inline ClientWriteBaton(const std::string &header, std::string &&body) :
+        m_body(std::move(body)),
         m_header(header)
     {
         bufs[0].len  = m_header.size();
@@ -63,7 +63,7 @@ public:
 
     inline size_t count() const                      { return bufs[1].base == nullptr ? 1 : 2; }
     inline size_t size() const                       { return bufs[0].len + bufs[1].len; }
-    inline static void onWrite(uv_write_t *req, int) { delete reinterpret_cast<WriteBaton *>(req->data); }
+    inline static void onWrite(uv_write_t *req, int) { delete reinterpret_cast<ClientWriteBaton *>(req->data); }
 
 
     uv_buf_t bufs[2];
@@ -117,7 +117,9 @@ void xmrig::HttpClient::onResolved(const Dns &dns, int status)
     this->status = status;
 
     if (status < 0 && dns.isEmpty()) {
-        LOG_ERR("[%s:%d] DNS error: \"%s\"", dns.host().data(), m_port, uv_strerror(status));
+        if (!m_quiet) {
+            LOG_ERR("[%s:%d] DNS error: \"%s\"", dns.host().data(), m_port, uv_strerror(status));
+        }
 
         return;
     }
@@ -159,15 +161,15 @@ void xmrig::HttpClient::handshake()
 void xmrig::HttpClient::read(const char *data, size_t size)
 {
     if (parse(data, size) < size) {
-        close();
+        close(UV_EPROTO);
     }
 }
 
 
 void xmrig::HttpClient::write(const std::string &header)
 {
-    WriteBaton *baton = new WriteBaton(header, std::move(body));
-    uv_write(&baton->req, stream(), baton->bufs, baton->count(), WriteBaton::onWrite);
+    ClientWriteBaton *baton = new ClientWriteBaton(header, std::move(body));
+    uv_write(&baton->req, stream(), baton->bufs, baton->count(), ClientWriteBaton::onWrite);
 }
 
 
@@ -180,10 +182,12 @@ void xmrig::HttpClient::onConnect(uv_connect_t *req, int status)
     }
 
     if (status < 0) {
-        LOG_ERR("[%s:%d] connect error: \"%s\"", client->m_dns->host().data(), client->m_port, uv_strerror(status));
+        if (!client->m_quiet) {
+            LOG_ERR("[%s:%d] connect error: \"%s\"", client->m_dns->host().data(), client->m_port, uv_strerror(status));
+        }
 
         delete req;
-        client->close();
+        client->close(status);
         return;
     }
 
@@ -205,11 +209,11 @@ void xmrig::HttpClient::onConnect(uv_connect_t *req, int status)
             if (nread >= 0) {
                 client->read(buf->base, static_cast<size_t>(nread));
             } else {
-                if (nread != UV_EOF) {
+                if (!client->m_quiet && nread != UV_EOF) {
                     LOG_ERR("[%s:%d] read error: \"%s\"", client->m_dns->host().data(), client->m_port, uv_strerror(static_cast<int>(nread)));
                 }
 
-                client->close();
+                client->close(static_cast<int>(nread));
             }
 
             delete [] buf->base;

src/base/net/http/HttpClient.h

@@ -44,7 +44,8 @@ public:
     HttpClient(int method, const String &url, IHttpListener *listener, const char *data = nullptr, size_t size = 0);
     ~HttpClient() override;
 
-    inline uint16_t port() const { return m_port; }
+    inline uint16_t port() const     { return m_port; }
+    inline void setQuiet(bool quiet) { m_quiet = quiet; }
 
     bool connect(const String &host, uint16_t port);
     const String &host() const;
@@ -59,6 +60,7 @@ protected:
 private:
     static void onConnect(uv_connect_t *req, int status);
 
+    bool m_quiet;
     Dns *m_dns;
     uint16_t m_port;
 };

src/base/net/http/HttpContext.cpp

@@ -96,8 +96,13 @@ std::string xmrig::HttpContext::ip() const
 }
 
 
-void xmrig::HttpContext::close()
+void xmrig::HttpContext::close(int status)
 {
+    if (status < 0 && m_listener) {
+        this->status = status;
+        m_listener->onHttpData(*this);
+    }
+
     auto it = storage.find(id());
     if (it != storage.end()) {
         storage.erase(it);
@@ -203,8 +208,9 @@ void xmrig::HttpContext::attach(http_parser_settings *settings)
 
     settings->on_message_complete = [](http_parser *parser) -> int
     {
-        const HttpContext *ctx = static_cast<const HttpContext*>(parser->data);
+        HttpContext *ctx = static_cast<HttpContext*>(parser->data);
         ctx->m_listener->onHttpData(*ctx);
+        ctx->m_listener = nullptr;
 
         return 0;
     };

src/base/net/http/HttpContext.h

@@ -56,7 +56,7 @@ public:
 
     size_t parse(const char *data, size_t size);
     std::string ip() const;
-    void close();
+    void close(int status = 0);
 
     static HttpContext *get(uint64_t id);
     static void closeAll();

src/base/net/http/HttpsClient.cpp

@@ -96,7 +96,7 @@ void xmrig::HttpsClient::read(const char *data, size_t size)
             X509 *cert = SSL_get_peer_certificate(m_ssl);
             if (!verify(cert)) {
                 X509_free(cert);
-                return close();
+                return close(UV_EPROTO);
             }
 
             X509_free(cert);
@@ -142,7 +142,7 @@ void xmrig::HttpsClient::flush()
         result = uv_try_write(stream(), &buf, 1) == buf.len;
 
         if (!result) {
-            close();
+            close(UV_EIO);
         }
     }