fzorb/REDACTED-rig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed daemon support over HTTPS.

Browse source
This commit is contained in:
XMRig 2019-04-12 04:25:47 +07:00
parent 62012a1a50
commit 5e369a5af8
6 changed files with 90 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/base/net/stratum/DaemonClient.cpp
View file

@ -72,19 +72,11 @@ bool xmrig::DaemonClient::disconnect()
bool xmrig::DaemonClient::isTLS() const
{
# ifdef XMRIG_FEATURE_TLS
return m_pool.isTLS();
# else
return false;
}
const char *xmrig::DaemonClient::tlsFingerprint() const
{
return nullptr;
}
const char *xmrig::DaemonClient::tlsVersion() const
{
return nullptr;
# endif
}
@ -145,6 +137,11 @@ void xmrig::DaemonClient::onHttpData(const HttpData &data)
m_ip = static_cast<const HttpContext &>(data).ip().c_str();
if (isTLS()) {
m_tlsVersion = static_cast<const HttpsClient &>(data).version();
m_tlsFingerprint = static_cast<const HttpsClient &>(data).fingerprint();
}
rapidjson::Document doc;
if (doc.Parse(data.body.c_str()).HasParseError()) {
if (!isQuiet()) {
@ -294,7 +291,7 @@ void xmrig::DaemonClient::send(int method, const char *url, const char *data, si
HttpClient *client;
# ifdef XMRIG_FEATURE_TLS
if (m_pool.isTLS()) {
client = new HttpsClient(method, url, this, data, size);
client = new HttpsClient(method, url, this, data, size, m_pool.fingerprint());
}
else
# endif

6
src/base/net/stratum/DaemonClient.h
View file

@ -44,8 +44,6 @@ public:
protected:
bool disconnect() override;
bool isTLS() const override;
const char *tlsFingerprint() const override;
const char *tlsVersion() const override;
int64_t submit(const JobResult &result) override;
void connect() override;
void connect(const Pool &pool) override;
@ -55,6 +53,8 @@ protected:
inline bool hasExtension(Extension) const noexcept override { return false; }
inline const char *mode() const override { return "daemon"; }
inline const char *tlsFingerprint() const override { return m_tlsFingerprint; }
inline const char *tlsVersion() const override { return m_tlsVersion; }
inline void deleteLater() override { delete this; }
inline void tick(uint64_t) override {}
@ -68,6 +68,8 @@ private:
void setState(SocketState state);
String m_blocktemplate;
String m_tlsFingerprint;
String m_tlsVersion;
Timer *m_timer;
};