Update net

src/base/base.cmake

@@ -22,6 +22,7 @@ set(HEADERS_BASE
     src/base/kernel/config/BaseConfig.h
     src/base/kernel/config/BaseTransform.h
     src/base/kernel/config/Title.h
+    src/base/kernel/constants.h
     src/base/kernel/Entry.h
     src/base/kernel/interfaces/IAsyncListener.h
     src/base/kernel/interfaces/IBaseListener.h

src/base/kernel/constants.h

@@ -0,0 +1,31 @@
+/* XMRig
+ * Copyright (c) 2018-2020 SChernykh   <https://github.com/SChernykh>
+ * Copyright (c) 2016-2020 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef XMRIG_CONSTANTS_H
+#define XMRIG_CONSTANTS_H
+
+
+#include <cstddef>
+#include <cstdint>
+
+
+constexpr size_t      XMRIG_NET_BUFFER_CHUNK_SIZE           = 64 * 1024;
+constexpr size_t      XMRIG_NET_BUFFER_INIT_CHUNKS          = 4;
+
+
+#endif /* XMRIG_CONSTANTS_H */

src/base/net/dns/Dns.cpp

@@ -1,12 +1,6 @@
 /* XMRig
- * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
+ * Copyright (c) 2018-2020 SChernykh   <https://github.com/SChernykh>
- * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
+ * Copyright (c) 2016-2020 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
- * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
- * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
- * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
- * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2018-2020 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2020 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by

src/base/net/dns/Dns.h

@@ -1,12 +1,6 @@
 /* XMRig
- * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
+ * Copyright (c) 2018-2020 SChernykh   <https://github.com/SChernykh>
- * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
+ * Copyright (c) 2016-2020 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
- * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
- * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
- * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
- * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2018-2020 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2020 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by

src/base/net/dns/DnsRecord.cpp

@@ -1,12 +1,6 @@
 /* XMRig
- * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
+ * Copyright (c) 2018-2020 SChernykh   <https://github.com/SChernykh>
- * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
+ * Copyright (c) 2016-2020 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
- * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
- * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
- * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
- * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2018-2020 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2020 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by

src/base/net/dns/DnsRecord.h

@@ -1,12 +1,6 @@
 /* XMRig
- * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
+ * Copyright (c) 2018-2020 SChernykh   <https://github.com/SChernykh>
- * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
+ * Copyright (c) 2016-2020 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
- * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
- * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
- * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
- * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2018-2020 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2020 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by

src/base/net/http/HttpContext.cpp

@@ -1,13 +1,7 @@
 /* XMRig
- * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
+ * Copyright (c) 2014-2019 heapwolf    <https://github.com/heapwolf>
- * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
+ * Copyright (c) 2018-2020 SChernykh   <https://github.com/SChernykh>
- * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
+ * Copyright (c) 2016-2020 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
- * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
- * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
- * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2014-2019 heapwolf    <https://github.com/heapwolf>
- * Copyright 2018-2020 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2020 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -160,6 +154,10 @@ uint64_t xmrig::HttpContext::elapsed() const
 
 void xmrig::HttpContext::close(int status)
 {
+    if (!get(id())) {
+        return;
+    }
+
     auto listener = httpListener();
 
     if (status < 0 && listener) {
@@ -262,7 +260,7 @@ void xmrig::HttpContext::attach(http_parser_settings *settings)
 
     settings->on_body = [](http_parser *parser, const char *at, size_t len) -> int
     {
-        static_cast<HttpContext*>(parser->data)->body += std::string(at, len);
+        static_cast<HttpContext*>(parser->data)->body.append(at, len);
 
         return 0;
     };

src/base/net/http/HttpContext.h

@@ -1,13 +1,7 @@
 /* XMRig
- * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
+ * Copyright (c) 2014-2019 heapwolf    <https://github.com/heapwolf>
- * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
+ * Copyright (c) 2018-2020 SChernykh   <https://github.com/SChernykh>
- * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
+ * Copyright (c) 2016-2020 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
- * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
- * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
- * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
- * Copyright 2014-2019 heapwolf    <https://github.com/heapwolf>
- * Copyright 2018-2020 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2020 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by

src/base/net/tls/ServerTls.cpp

@@ -1,6 +1,6 @@
 /* XMRig
- * Copyright 2018-2020 SChernykh   <https://github.com/SChernykh>
+ * Copyright (c) 2018-2020 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2020 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright (c) 2016-2020 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -20,6 +20,7 @@
 #include "base/net/tls/ServerTls.h"
 
 
+#include <algorithm>
 #include <cassert>
 #include <cstring>
 #include <openssl/ssl.h>
@@ -39,11 +40,23 @@ xmrig::ServerTls::~ServerTls()
 }
 
 
+bool xmrig::ServerTls::isHTTP(const char *data, size_t size)
+{
+    assert(size > 0);
+
+    static const char test[6] = "GET /";
+
+    return size > 0 && memcmp(data, test, std::min(size, sizeof(test) - 1)) == 0;
+}
+
+
 bool xmrig::ServerTls::isTLS(const char *data, size_t size)
 {
+    assert(size > 0);
+
     static const uint8_t test[3] = { 0x16, 0x03, 0x01 };
 
-    return size >= sizeof(test) && memcmp(data, test, sizeof(test)) == 0;
+    return size > 0 && memcmp(data, test, std::min(size, sizeof(test))) == 0;
 }
 
 

src/base/net/tls/ServerTls.h

@@ -1,6 +1,6 @@
 /* XMRig
- * Copyright 2018-2020 SChernykh   <https://github.com/SChernykh>
+ * Copyright (c) 2018-2020 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2020 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright (c) 2016-2020 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -41,6 +41,7 @@ public:
     ServerTls(SSL_CTX *ctx);
     virtual ~ServerTls();
 
+    static bool isHTTP(const char *data, size_t size);
     static bool isTLS(const char *data, size_t size);
 
     bool send(const char *data, size_t size);

src/base/net/tools/LineReader.cpp

@@ -19,8 +19,9 @@
 
 
 #include "base/net/tools/LineReader.h"
-#include "base/net/tools/NetBuffer.h"
+#include "base/kernel/constants.h"
 #include "base/kernel/interfaces/ILineListener.h"
+#include "base/net/tools/NetBuffer.h"
 
 #include <cassert>
 #include <cstring>
@@ -55,7 +56,7 @@ void xmrig::LineReader::reset()
 
 void xmrig::LineReader::add(const char *data, size_t size)
 {
-    if (size > NetBuffer::kChunkSize - m_pos) {
+    if (size > XMRIG_NET_BUFFER_CHUNK_SIZE - m_pos) {
         // it breakes correctness silently for long lines
         return;
     }

src/base/net/tools/MemPool.h

@@ -1,6 +1,6 @@
 /* XMRig
- * Copyright 2018-2020 SChernykh   <https://github.com/SChernykh>
+ * Copyright (c) 2018-2020 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2020 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright (c) 2016-2020 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -20,10 +20,10 @@
 #define XMRIG_MEMPOOL_H
 
 
-#include <map>
-#include <set>
 #include <array>
 #include <cassert>
+#include <map>
+#include <set>
 
 
 namespace xmrig {

src/base/net/tools/NetBuffer.cpp

@@ -1,6 +1,6 @@
 /* XMRig
- * Copyright 2018-2020 SChernykh   <https://github.com/SChernykh>
+ * Copyright (c) 2018-2020 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2020 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright (c) 2016-2020 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -17,8 +17,9 @@
  */
 
 
-#include "base/net/tools/MemPool.h"
 #include "base/net/tools/NetBuffer.h"
+#include "base/kernel/constants.h"
+#include "base/net/tools/MemPool.h"
 
 
 #include <cassert>
@@ -28,14 +29,13 @@
 namespace xmrig {
 
 
-static constexpr size_t kInitSize                       = 4;
+static MemPool<XMRIG_NET_BUFFER_CHUNK_SIZE, XMRIG_NET_BUFFER_INIT_CHUNKS> *pool = nullptr;
-static MemPool<NetBuffer::kChunkSize, kInitSize> *pool  = nullptr;
 
 
-inline MemPool<NetBuffer::kChunkSize, kInitSize> *getPool()
+inline MemPool<XMRIG_NET_BUFFER_CHUNK_SIZE, XMRIG_NET_BUFFER_INIT_CHUNKS> *getPool()
 {
     if (!pool) {
-        pool = new MemPool<NetBuffer::kChunkSize, kInitSize>();
+        pool = new MemPool<XMRIG_NET_BUFFER_CHUNK_SIZE, XMRIG_NET_BUFFER_INIT_CHUNKS>();
     }
 
     return pool;
@@ -67,17 +67,25 @@ void xmrig::NetBuffer::destroy()
 void xmrig::NetBuffer::onAlloc(uv_handle_t *, size_t, uv_buf_t *buf)
 {
     buf->base = getPool()->allocate();
-    buf->len  = kChunkSize;
+    buf->len  = XMRIG_NET_BUFFER_CHUNK_SIZE;
 }
 
 
 void xmrig::NetBuffer::release(const char *buf)
 {
+    if (buf == nullptr) {
+        return;
+    }
+
     getPool()->deallocate(buf);
 }
 
 
 void xmrig::NetBuffer::release(const uv_buf_t *buf)
 {
+    if (buf->base == nullptr) {
+        return;
+    }
+
     getPool()->deallocate(buf->base);
 }

src/base/net/tools/NetBuffer.h

@@ -1,6 +1,6 @@
 /* XMRig
- * Copyright 2018-2020 SChernykh   <https://github.com/SChernykh>
+ * Copyright (c) 2018-2020 SChernykh   <https://github.com/SChernykh>
- * Copyright 2016-2020 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright (c) 2016-2020 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -33,8 +33,6 @@ namespace xmrig {
 class NetBuffer
 {
 public:
-    static constexpr size_t kChunkSize = 16 * 1024;
-
     static char *allocate();
     static void destroy();
     static void onAlloc(uv_handle_t *handle, size_t suggested_size, uv_buf_t *buf);