From 469b1f08de4892370283d678cbd9ad648c803351 Mon Sep 17 00:00:00 2001 From: XMRig Date: Wed, 2 Dec 2020 11:32:11 +0700 Subject: [PATCH] Update net --- src/base/base.cmake | 1 + src/base/kernel/constants.h | 31 +++++++++++++++++++++++++++++++ src/base/net/dns/Dns.cpp | 10 ++-------- src/base/net/dns/Dns.h | 10 ++-------- src/base/net/dns/DnsRecord.cpp | 10 ++-------- src/base/net/dns/DnsRecord.h | 10 ++-------- src/base/net/http/HttpContext.cpp | 18 ++++++++---------- src/base/net/http/HttpContext.h | 12 +++--------- src/base/net/tls/ServerTls.cpp | 19 ++++++++++++++++--- src/base/net/tls/ServerTls.h | 5 +++-- src/base/net/tools/LineReader.cpp | 5 +++-- src/base/net/tools/MemPool.h | 8 ++++---- src/base/net/tools/NetBuffer.cpp | 24 ++++++++++++++++-------- src/base/net/tools/NetBuffer.h | 6 ++---- 14 files changed, 95 insertions(+), 74 deletions(-) create mode 100644 src/base/kernel/constants.h diff --git a/src/base/base.cmake b/src/base/base.cmake index 04506927..d79d7fee 100644 --- a/src/base/base.cmake +++ b/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 diff --git a/src/base/kernel/constants.h b/src/base/kernel/constants.h new file mode 100644 index 00000000..a76cee9a --- /dev/null +++ b/src/base/kernel/constants.h @@ -0,0 +1,31 @@ +/* XMRig + * Copyright (c) 2018-2020 SChernykh + * Copyright (c) 2016-2020 XMRig , + * + * 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 . + */ + +#ifndef XMRIG_CONSTANTS_H +#define XMRIG_CONSTANTS_H + + +#include +#include + + +constexpr size_t XMRIG_NET_BUFFER_CHUNK_SIZE = 64 * 1024; +constexpr size_t XMRIG_NET_BUFFER_INIT_CHUNKS = 4; + + +#endif /* XMRIG_CONSTANTS_H */ diff --git a/src/base/net/dns/Dns.cpp b/src/base/net/dns/Dns.cpp index 6246421c..ef50b20d 100644 --- a/src/base/net/dns/Dns.cpp +++ b/src/base/net/dns/Dns.cpp @@ -1,12 +1,6 @@ /* XMRig - * Copyright 2010 Jeff Garzik - * Copyright 2012-2014 pooler - * Copyright 2014 Lucas Jones - * Copyright 2014-2016 Wolf9466 - * Copyright 2016 Jay D Dee - * Copyright 2017-2018 XMR-Stak , - * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright (c) 2018-2020 SChernykh + * Copyright (c) 2016-2020 XMRig , * * 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 diff --git a/src/base/net/dns/Dns.h b/src/base/net/dns/Dns.h index 068ab80f..86f90145 100644 --- a/src/base/net/dns/Dns.h +++ b/src/base/net/dns/Dns.h @@ -1,12 +1,6 @@ /* XMRig - * Copyright 2010 Jeff Garzik - * Copyright 2012-2014 pooler - * Copyright 2014 Lucas Jones - * Copyright 2014-2016 Wolf9466 - * Copyright 2016 Jay D Dee - * Copyright 2017-2018 XMR-Stak , - * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright (c) 2018-2020 SChernykh + * Copyright (c) 2016-2020 XMRig , * * 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 diff --git a/src/base/net/dns/DnsRecord.cpp b/src/base/net/dns/DnsRecord.cpp index e722ad6a..1667c715 100644 --- a/src/base/net/dns/DnsRecord.cpp +++ b/src/base/net/dns/DnsRecord.cpp @@ -1,12 +1,6 @@ /* XMRig - * Copyright 2010 Jeff Garzik - * Copyright 2012-2014 pooler - * Copyright 2014 Lucas Jones - * Copyright 2014-2016 Wolf9466 - * Copyright 2016 Jay D Dee - * Copyright 2017-2018 XMR-Stak , - * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright (c) 2018-2020 SChernykh + * Copyright (c) 2016-2020 XMRig , * * 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 diff --git a/src/base/net/dns/DnsRecord.h b/src/base/net/dns/DnsRecord.h index 0b572df8..cf6c2598 100644 --- a/src/base/net/dns/DnsRecord.h +++ b/src/base/net/dns/DnsRecord.h @@ -1,12 +1,6 @@ /* XMRig - * Copyright 2010 Jeff Garzik - * Copyright 2012-2014 pooler - * Copyright 2014 Lucas Jones - * Copyright 2014-2016 Wolf9466 - * Copyright 2016 Jay D Dee - * Copyright 2017-2018 XMR-Stak , - * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright (c) 2018-2020 SChernykh + * Copyright (c) 2016-2020 XMRig , * * 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 diff --git a/src/base/net/http/HttpContext.cpp b/src/base/net/http/HttpContext.cpp index b348d7e4..52739e4d 100644 --- a/src/base/net/http/HttpContext.cpp +++ b/src/base/net/http/HttpContext.cpp @@ -1,13 +1,7 @@ /* XMRig - * Copyright 2010 Jeff Garzik - * Copyright 2012-2014 pooler - * Copyright 2014 Lucas Jones - * Copyright 2014-2016 Wolf9466 - * Copyright 2016 Jay D Dee - * Copyright 2017-2018 XMR-Stak , - * Copyright 2014-2019 heapwolf - * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright (c) 2014-2019 heapwolf + * Copyright (c) 2018-2020 SChernykh + * Copyright (c) 2016-2020 XMRig , * * 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(parser->data)->body += std::string(at, len); + static_cast(parser->data)->body.append(at, len); return 0; }; diff --git a/src/base/net/http/HttpContext.h b/src/base/net/http/HttpContext.h index a7554679..4202bfaf 100644 --- a/src/base/net/http/HttpContext.h +++ b/src/base/net/http/HttpContext.h @@ -1,13 +1,7 @@ /* XMRig - * Copyright 2010 Jeff Garzik - * Copyright 2012-2014 pooler - * Copyright 2014 Lucas Jones - * Copyright 2014-2016 Wolf9466 - * Copyright 2016 Jay D Dee - * Copyright 2017-2018 XMR-Stak , - * Copyright 2014-2019 heapwolf - * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright (c) 2014-2019 heapwolf + * Copyright (c) 2018-2020 SChernykh + * Copyright (c) 2016-2020 XMRig , * * 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 diff --git a/src/base/net/tls/ServerTls.cpp b/src/base/net/tls/ServerTls.cpp index e76d5862..abae315d 100644 --- a/src/base/net/tls/ServerTls.cpp +++ b/src/base/net/tls/ServerTls.cpp @@ -1,6 +1,6 @@ /* XMRig - * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright (c) 2018-2020 SChernykh + * Copyright (c) 2016-2020 XMRig , * * 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 #include #include #include @@ -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; } diff --git a/src/base/net/tls/ServerTls.h b/src/base/net/tls/ServerTls.h index 892bed2b..20337eb6 100644 --- a/src/base/net/tls/ServerTls.h +++ b/src/base/net/tls/ServerTls.h @@ -1,6 +1,6 @@ /* XMRig - * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright (c) 2018-2020 SChernykh + * Copyright (c) 2016-2020 XMRig , * * 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); diff --git a/src/base/net/tools/LineReader.cpp b/src/base/net/tools/LineReader.cpp index 3ad5c373..aa2897fc 100644 --- a/src/base/net/tools/LineReader.cpp +++ b/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 #include @@ -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; } diff --git a/src/base/net/tools/MemPool.h b/src/base/net/tools/MemPool.h index 3b8a8ef4..e7cf3a19 100644 --- a/src/base/net/tools/MemPool.h +++ b/src/base/net/tools/MemPool.h @@ -1,6 +1,6 @@ /* XMRig - * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright (c) 2018-2020 SChernykh + * Copyright (c) 2016-2020 XMRig , * * 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 -#include #include #include +#include +#include namespace xmrig { diff --git a/src/base/net/tools/NetBuffer.cpp b/src/base/net/tools/NetBuffer.cpp index 3303d971..8931f06e 100644 --- a/src/base/net/tools/NetBuffer.cpp +++ b/src/base/net/tools/NetBuffer.cpp @@ -1,6 +1,6 @@ /* XMRig - * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright (c) 2018-2020 SChernykh + * Copyright (c) 2016-2020 XMRig , * * 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 @@ -28,14 +29,13 @@ namespace xmrig { -static constexpr size_t kInitSize = 4; -static MemPool *pool = nullptr; +static MemPool *pool = nullptr; -inline MemPool *getPool() +inline MemPool *getPool() { if (!pool) { - pool = new MemPool(); + pool = new MemPool(); } 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); } diff --git a/src/base/net/tools/NetBuffer.h b/src/base/net/tools/NetBuffer.h index 14255bb0..a7a2ee05 100644 --- a/src/base/net/tools/NetBuffer.h +++ b/src/base/net/tools/NetBuffer.h @@ -1,6 +1,6 @@ /* XMRig - * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright (c) 2018-2020 SChernykh + * Copyright (c) 2016-2020 XMRig , * * 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);