Added error handling for self-select mode.

src/base/net/http/HttpClient.cpp

@@ -78,9 +78,7 @@ private:
 
 
 xmrig::HttpClient::HttpClient(int method, const String &url, IHttpListener *listener, const char *data, size_t size) :
-    HttpContext(HTTP_RESPONSE, listener),
-    m_quiet(false),
-    m_port(0)
+    HttpContext(HTTP_RESPONSE, listener)
 {
     this->method = method;
     this->url    = url;
@@ -127,7 +125,7 @@ void xmrig::HttpClient::onResolved(const Dns &dns, int status)
 
     sockaddr *addr = dns.get().addr(m_port);
 
-    uv_connect_t *req = new uv_connect_t;
+    auto req  = new uv_connect_t;
     req->data = this;
 
     uv_tcp_connect(req, m_tcp, addr, onConnect);
@@ -140,7 +138,7 @@ void xmrig::HttpClient::handshake()
     headers.insert({ "Connection", "close" });
     headers.insert({ "User-Agent", Platform::userAgent() });
 
-    if (body.size()) {
+    if (!body.empty()) {
         headers.insert({ "Content-Length", std::to_string(body.size()) });
     }
 
@@ -169,14 +167,14 @@ void xmrig::HttpClient::read(const char *data, size_t size)
 
 void xmrig::HttpClient::write(const std::string &header)
 {
-    ClientWriteBaton *baton = new ClientWriteBaton(header, std::move(body));
+    auto baton = new ClientWriteBaton(header, std::move(body));
     uv_write(&baton->req, stream(), baton->bufs, baton->count(), ClientWriteBaton::onWrite);
 }
 
 
 void xmrig::HttpClient::onConnect(uv_connect_t *req, int status)
 {
-    HttpClient *client = static_cast<HttpClient *>(req->data);
+    auto client = static_cast<HttpClient *>(req->data);
     if (!client) {
         delete req;
         return;
@@ -205,7 +203,7 @@ void xmrig::HttpClient::onConnect(uv_connect_t *req, int status)
         },
         [](uv_stream_t *tcp, ssize_t nread, const uv_buf_t *buf)
         {
-            HttpClient *client = static_cast<HttpClient*>(tcp->data);
+            auto client = static_cast<HttpClient*>(tcp->data);
 
             if (nread >= 0) {
                 client->read(buf->base, static_cast<size_t>(nread));

src/base/net/http/HttpClient.h

@@ -30,6 +30,7 @@
 
 #include "base/net/http/HttpContext.h"
 #include "base/kernel/interfaces/IDnsListener.h"
+#include "base/tools/Object.h"
 
 
 namespace xmrig {
@@ -41,6 +42,8 @@ class String;
 class HttpClient : public HttpContext, public IDnsListener
 {
 public:
+    XMRIG_DISABLE_COPY_MOVE_DEFAULT(HttpClient);
+
     HttpClient(int method, const String &url, IHttpListener *listener, const char *data = nullptr, size_t size = 0);
     ~HttpClient() override;
 
@@ -57,13 +60,13 @@ protected:
     virtual void read(const char *data, size_t size);
     virtual void write(const std::string &header);
 
-    bool m_quiet;
+    bool m_quiet = false;
 
 private:
     static void onConnect(uv_connect_t *req, int status);
 
     Dns *m_dns;
-    uint16_t m_port;
+    uint16_t m_port = 0;
 };
 
 

src/base/net/http/HttpContext.cpp

@@ -136,7 +136,7 @@ void xmrig::HttpContext::closeAll()
 
 int xmrig::HttpContext::onHeaderField(http_parser *parser, const char *at, size_t length)
 {
-    HttpContext *ctx = static_cast<HttpContext*>(parser->data);
+    auto ctx = static_cast<HttpContext*>(parser->data);
 
     if (ctx->m_wasHeaderValue) {
         if (!ctx->m_lastHeaderField.empty()) {
@@ -155,7 +155,7 @@ int xmrig::HttpContext::onHeaderField(http_parser *parser, const char *at, size_
 
 int xmrig::HttpContext::onHeaderValue(http_parser *parser, const char *at, size_t length)
 {
-    HttpContext *ctx = static_cast<HttpContext*>(parser->data);
+    auto ctx = static_cast<HttpContext*>(parser->data);
 
     if (!ctx->m_wasHeaderValue) {
         ctx->m_lastHeaderValue = std::string(at, length);
@@ -185,7 +185,7 @@ void xmrig::HttpContext::attach(http_parser_settings *settings)
     settings->on_header_value = onHeaderValue;
 
     settings->on_headers_complete = [](http_parser* parser) -> int {
-        HttpContext *ctx = static_cast<HttpContext*>(parser->data);
+        auto ctx = static_cast<HttpContext*>(parser->data);
         ctx->status = parser->status_code;
 
         if (parser->type == HTTP_REQUEST) {
@@ -208,7 +208,7 @@ void xmrig::HttpContext::attach(http_parser_settings *settings)
 
     settings->on_message_complete = [](http_parser *parser) -> int
     {
-        HttpContext *ctx = static_cast<HttpContext*>(parser->data);
+        auto ctx = static_cast<HttpContext*>(parser->data);
         ctx->m_listener->onHttpData(*ctx);
         ctx->m_listener = nullptr;
 

src/base/net/http/HttpContext.h

@@ -28,15 +28,16 @@
 #define XMRIG_HTTPCONTEXT_H
 
 
-typedef struct http_parser http_parser;
-typedef struct http_parser_settings http_parser_settings;
-typedef struct uv_connect_s uv_connect_t;
-typedef struct uv_handle_s uv_handle_t;
-typedef struct uv_stream_s uv_stream_t;
-typedef struct uv_tcp_s uv_tcp_t;
+using http_parser           = struct http_parser;
+using http_parser_settings  = struct http_parser_settings;
+using uv_connect_t          = struct uv_connect_s;
+using uv_handle_t           = struct uv_handle_s;
+using uv_stream_t           = struct uv_stream_s;
+using uv_tcp_t              = struct uv_tcp_s;
 
 
 #include "base/net/http/HttpData.h"
+#include "base/tools/Object.h"
 
 
 namespace xmrig {
@@ -48,6 +49,8 @@ class IHttpListener;
 class HttpContext : public HttpData
 {
 public:
+    XMRIG_DISABLE_COPY_MOVE_DEFAULT(HttpContext)
+
     HttpContext(int parser_type, IHttpListener *listener);
     virtual ~HttpContext();
 

src/base/net/http/HttpsClient.cpp

@@ -24,7 +24,7 @@
  */
 
 
-#include <assert.h>
+#include <cassert>
 #include <openssl/ssl.h>
 #include <uv.h>
 

src/base/net/http/HttpsClient.h

@@ -28,10 +28,10 @@
 #define XMRIG_HTTPSCLIENT_H
 
 
-typedef struct bio_st BIO;
-typedef struct ssl_ctx_st SSL_CTX;
-typedef struct ssl_st SSL;
-typedef struct x509_st X509;
+using BIO       = struct bio_st;
+using SSL_CTX   = struct ssl_ctx_st;
+using SSL       = struct ssl_st;
+using X509      = struct x509_st;
 
 
 #include "base/net/http/HttpClient.h"
@@ -44,6 +44,8 @@ namespace xmrig {
 class HttpsClient : public HttpClient
 {
 public:
+    XMRIG_DISABLE_COPY_MOVE_DEFAULT(HttpsClient)
+
     HttpsClient(int method, const String &url, IHttpListener *listener, const char *data, size_t size, const String &fingerprint);
     ~HttpsClient() override;