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

Merge remote-tracking branch 'xmrig/master' into feature_cc

Browse source
This commit is contained in:
Ben Gräf 2017-10-07 20:05:56 +02:00
commit b6fc43b8a4
87 changed files with 15705 additions and 6502 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/api/Httpd.cpp
View file

@ -23,6 +23,7 @@
#include <cstring>
#include <microhttpd.h>
#include <string.h>
#include "api/Api.h"
@ -30,10 +31,6 @@
#include "log/Log.h"
static const char k500 [] = "{\"error\":\"INTERNAL_SERVER_ERROR\"}";
static const size_t k500Size = sizeof(k500) - 1;
Httpd::Httpd(int port, const char *accessToken) :
m_accessToken(accessToken),
m_port(port),
@ -48,7 +45,7 @@ bool Httpd::start()
return false;
}
m_daemon = MHD_start_daemon(MHD_USE_SELECT_INTERNALLY, 4455, nullptr, nullptr, &Httpd::handler, this, MHD_OPTION_END);
m_daemon = MHD_start_daemon(MHD_USE_SELECT_INTERNALLY, m_port, nullptr, nullptr, &Httpd::handler, this, MHD_OPTION_END);
if (!m_daemon) {
LOG_ERR("HTTP Daemon failed to start.");
return false;
@ -109,13 +106,11 @@ int Httpd::handler(void *cls, struct MHD_Connection *connection, const char *url
return done(connection, status, nullptr);
}
MHD_Response *rsp = nullptr;
size_t size = 0;
const char *buf = Api::get(url, &size, &status);
if (size) {
rsp = MHD_create_response_from_buffer(size, (void*) buf, MHD_RESPMEM_PERSISTENT);
char *buf = Api::get(url, &status);
if (buf == nullptr) {
return MHD_NO;
}
MHD_Response *rsp = MHD_create_response_from_buffer(strlen(buf), (void*) buf, MHD_RESPMEM_MUST_FREE);
return done(connection, status, rsp);
}