hipnosuer
/
Zuma
forked from ShuriZma/suyu
1
0
Fork 0
Code Pull Requests Activity

web_backend: Fix CPR bug where Winsock is not properly initializing.

This commit is contained in:
bunnei 2017-08-26 19:02:03 -04:00
parent c8562b21d9
commit 7698567fc9
1 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/web_service/web_backend.cpp
View File

@ -2,6 +2,10 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
#ifdef _WIN32
#include <winsock.h>
#endif
#include <cstdlib> #include <cstdlib>
#include <thread> #include <thread>
#include <cpr/cpr.h> #include <cpr/cpr.h>
@ -12,18 +16,7 @@ namespace WebService {
static constexpr char API_VERSION[]{"1"}; static constexpr char API_VERSION[]{"1"};
static void PostJsonAuthenticated(const std::string& url, const std::string& data, static std::unique_ptr<cpr::Session> g_session;
const std::string& username, const std::string& token) {
cpr::Post(cpr::Url{url}, cpr::Body{data}, cpr::Header{{"Content-Type", "application/json"},
{"x-username", username},
{"x-token", token},
{"api-version", API_VERSION}});
}
static void PostJsonAnonymous(const std::string& url, const std::string& data) {
cpr::Post(cpr::Url{url}, cpr::Body{data},
cpr::Header{{"Content-Type", "application/json"}, {"api-version", API_VERSION}});
}
void PostJson(const std::string& url, const std::string& data, bool allow_anonymous, void PostJson(const std::string& url, const std::string& data, bool allow_anonymous,
const std::string& username, const std::string& token) { const std::string& username, const std::string& token) {
@ -38,14 +31,33 @@ void PostJson(const std::string& url, const std::string& data, bool allow_anonym
return; return;
} }
// Post JSON asynchronously by spawning a new thread #ifdef _WIN32
// On Windows, CPR/libcurl does not properly initialize Winsock. The below code is used to
// initialize Winsock globally, which fixes this problem. Without this, only the first CPR
// session will properly be created, and subsequent ones will fail.
WSADATA wsa_data;
const int wsa_result{WSAStartup(MAKEWORD(2, 2), &wsa_data)};
if (wsa_result) {
LOG_CRITICAL(WebService, "WSAStartup failed: %d", wsa_result);
}
#endif
// Built request header
cpr::Header header;
if (are_credentials_provided) { if (are_credentials_provided) {
// Authenticated request if credentials are provided // Authenticated request if credentials are provided
std::thread{PostJsonAuthenticated, url, data, username, token}.detach(); header = {{"Content-Type", "application/json"},
{"x-username", username.c_str()},
{"x-token", token.c_str()},
{"api-version", API_VERSION}};
} else { } else {
// Otherwise, anonymous request // Otherwise, anonymous request
std::thread{PostJsonAnonymous, url, data}.detach(); header = cpr::Header{{"Content-Type", "application/json"}, {"api-version", API_VERSION}};
} }
// Post JSON asynchronously
static cpr::AsyncResponse future;
future = cpr::PostAsync(cpr::Url{url.c_str()}, cpr::Body{data.c_str()}, header);
} }
} // namespace WebService } // namespace WebService