R5Reloaded/r5sdk
1
0
Fork 0
mirror of https://github.com/Mauler125/r5sdk.git synced 2025-02-09 19:15:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add cURL parameter to enable 'CURLOPT_FOLLOWLOCATION'

Browse Source 
Option to allow following redirects.
This commit is contained in:
Kawe Mazidjatari 2023-08-01 02:20:53 +02:00
parent c059ec65ac
commit 8e8b2ace38
2 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
r5dev/public/tier2/curlutils.h
View File

@ -23,6 +23,7 @@ struct CURLParams
, statusFunction(nullptr)
, timeout(0)
, verifyPeer(false)
, followRedirect(false)
, verbose(false)
{}
@ -31,6 +32,7 @@ struct CURLParams
int timeout;
bool verifyPeer;
bool followRedirect;
bool verbose;
};
@ -38,9 +40,10 @@ size_t CURLWriteStringCallback(char* contents, const size_t size, const size_t n
size_t CURLWriteFileCallback(void* data, const size_t size, const size_t nmemb, FILE* userp);
bool CURLDownloadFile(const char* remote, const char* savePath, const char* fileName,
const char* options, curl_off_t dataSize, void* customPointer, CURLParams& params);
const char* options, curl_off_t dataSize, void* customPointer, const CURLParams& params);
CURL* CURLInitRequest(const char* remote, const char* request, string& outResponse, curl_slist*& slist, CURLParams& params);
CURL* CURLInitRequest(const char* remote, const char* request, string& outResponse,
curl_slist*& slist, const CURLParams& params);
CURLcode CURLSubmitRequest(CURL* curl, curl_slist*& slist);
CURLINFO CURLRetrieveInfo(CURL* curl);

31
r5dev/tier2/curlutils.cpp
View File

@ -18,22 +18,23 @@ size_t CURLWriteFileCallback(void* data, const size_t size, const size_t nmemb,
return numBytesWritten;
}
void CURLInitCommonOptions(CURL* curl, const char* remote, const void* writeData,
const void* writeFunction, const int timeout, const bool verifyPeer, const bool debug)
void CURLInitCommonOptions(CURL* curl, const char* remote,
const void* writeData, const CURLParams& params)
{
curl_easy_setopt(curl, CURLOPT_TIMEOUT, timeout);
curl_easy_setopt(curl, CURLOPT_VERBOSE, debug);
curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, verifyPeer);
curl_easy_setopt(curl, CURLOPT_TIMEOUT, params.timeout);
curl_easy_setopt(curl, CURLOPT_VERBOSE, params.verbose);
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, params.followRedirect);
curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, params.verifyPeer);
curl_easy_setopt(curl, CURLOPT_NOSIGNAL, 1L);
curl_easy_setopt(curl, CURLOPT_USE_SSL, CURLUSESSL_ALL);
curl_easy_setopt(curl, CURLOPT_URL, remote);
curl_easy_setopt(curl, CURLOPT_WRITEDATA, writeData);
curl_easy_setopt(curl, CURLOPT_USERAGENT, "R5R HTTPS/1.0");
curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, writeFunction);
curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, params.writeFunction);
}
bool CURLDownloadFile(const char* remote, const char* savePath, const char* fileName,
const char* options, curl_off_t dataSize, void* customPointer, CURLParams& params)
const char* options, curl_off_t dataSize, void* customPointer, const CURLParams& params)
{
CURL* curl = curl_easy_init();
if (!curl)
@ -63,13 +64,7 @@ bool CURLDownloadFile(const char* remote, const char* savePath, const char* file
progressData.cust = customPointer;
progressData.size = dataSize;
CURLInitCommonOptions(curl, remote, file,
params.writeFunction,
params.timeout,
params.verifyPeer,
params.verbose);
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1l);
CURLInitCommonOptions(curl, remote, file, params);
if (params.statusFunction)
{
@ -98,7 +93,7 @@ bool CURLDownloadFile(const char* remote, const char* savePath, const char* file
}
CURL* CURLInitRequest(const char* remote, const char* request,
string& outResponse, curl_slist*& slist, CURLParams& params)
string& outResponse, curl_slist*& slist, const CURLParams& params)
{
std::function<void(const char*)> fnError = [&](const char* errorMsg)
{
@ -120,11 +115,7 @@ CURL* CURLInitRequest(const char* remote, const char* request,
return nullptr;
}
CURLInitCommonOptions(curl, remote, &outResponse,
params.writeFunction,
params.timeout,
params.verifyPeer,
params.verbose);
CURLInitCommonOptions(curl, remote, &outResponse, params);
curl_easy_setopt(curl, CURLOPT_HTTPHEADER, slist);
if (request)