voxelcoreprojects/voxelcore
1
0
Fork 0
mirror of https://github.com/MihailRis/voxelcore.git synced 2026-10-13 15:01:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

fix other issues

Browse source
This commit is contained in:
MihailRis 2026-09-14 03:05:40 +03:00
parent bd8d55f8bf
commit 5f37118f74
1 changed files with 39 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

52
src/network/Curl.cpp
View file

@ -4,7 +4,6 @@
#define NOMINMAX #define NOMINMAX
#include <curl/curl.h> #include <curl/curl.h>
#include <queue>
using namespace network; using namespace network;
@ -50,9 +49,41 @@ struct ProcessingRequest {
curl = curl_easy_init(); curl = curl_easy_init();
} }
ProcessingRequest(const ProcessingRequest&) = delete;
ProcessingRequest& operator=(const ProcessingRequest&) = delete;
ProcessingRequest(ProcessingRequest&& other) noexcept
: multiHandle(other.multiHandle),
curl(other.curl),
request(std::move(other.request)),
buffer(std::move(other.buffer)),
headers(std::move(other.headers)) {
other.curl = nullptr;
other.multiHandle = nullptr;
}
ProcessingRequest& operator=(ProcessingRequest&& other) noexcept {
if (this != &other) {
if (curl) {
curl_multi_remove_handle(multiHandle, curl);
curl_easy_cleanup(curl);
}
multiHandle = other.multiHandle;
curl = other.curl;
request = std::move(other.request);
buffer = std::move(other.buffer);
headers = std::move(other.headers);
other.curl = nullptr;
other.multiHandle = nullptr;
}
return *this;
}
~ProcessingRequest() { ~ProcessingRequest() {
curl_multi_remove_handle(multiHandle, curl); if (curl) {
curl_easy_cleanup(curl); curl_multi_remove_handle(multiHandle, curl);
curl_easy_cleanup(curl);
}
} }
}; };
@ -88,14 +119,14 @@ public:
hs = curl_slist_append(hs, header.c_str()); hs = curl_slist_append(hs, header.c_str());
} }
curl_easy_setopt(curl, CURLOPT_POSTFIELDSIZE, request.body.length()); curl_easy_setopt(curl, CURLOPT_POSTFIELDSIZE, static_cast<long>(request.body.length()));
if (!request.body.empty()) { if (!request.body.empty()) {
curl_easy_setopt(curl, CURLOPT_COPYPOSTFIELDS, request.body.data()); curl_easy_setopt(curl, CURLOPT_COPYPOSTFIELDS, request.body.data());
} }
curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, request.verifySSL); curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, static_cast<long>(request.verifySSL));
curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, request.verifySSL); curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, static_cast<long>(request.verifySSL));
curl_easy_setopt(curl, CURLOPT_HTTPHEADER, hs); curl_easy_setopt(curl, CURLOPT_HTTPHEADER, hs);
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, request.followLocation); curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, static_cast<long>(request.followLocation));
curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_callback); curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_callback);
curl_easy_setopt(curl, CURLOPT_WRITEDATA, &entry->buffer); curl_easy_setopt(curl, CURLOPT_WRITEDATA, &entry->buffer);
curl_easy_setopt(curl, CURLOPT_HEADERFUNCTION, header_callback); curl_easy_setopt(curl, CURLOPT_HEADERFUNCTION, header_callback);
@ -162,7 +193,7 @@ public:
return; return;
} }
CURLMsg* msg = curl_multi_info_read(multiHandle, &messagesLeft); CURLMsg* msg = curl_multi_info_read(multiHandle, &messagesLeft);
if (msg == nullptr) { if (msg == nullptr || msg->msg != CURLMSG_DONE) {
return; return;
} }
auto curl = msg->easy_handle; auto curl = msg->easy_handle;
@ -225,13 +256,8 @@ public:
} }
static std::unique_ptr<CurlRequests> create() { static std::unique_ptr<CurlRequests> create() {
auto curl = curl_easy_init();
if (curl == nullptr) {
throw std::runtime_error("could not initialize cURL");
}
auto multiHandle = curl_multi_init(); auto multiHandle = curl_multi_init();
if (multiHandle == nullptr) { if (multiHandle == nullptr) {
curl_easy_cleanup(curl);
throw std::runtime_error("could not initialize cURL-multi"); throw std::runtime_error("could not initialize cURL-multi");
} }
return std::make_unique<CurlRequests>(multiHandle); return std::make_unique<CurlRequests>(multiHandle);