mirror of
https://github.com/Mauler125/r5sdk.git
synced 2025-02-09 19:15:03 +01:00
Finish libcurl implementation
Master server queries now use SSL.
This commit is contained in:
Kawe Mazidjatari
parent
14487abfaf
commit
500a7c1925
@ -4,6 +4,8 @@
|
||||
#define WIN32_LEAN_AND_MEAN // Prevent winsock2 redefinition.
|
||||
#include <windows.h>
|
||||
#include <WinSock2.h>
|
||||
#include <Ws2tcpip.h>
|
||||
#include <bcrypt.h>
|
||||
#include <comdef.h>
|
||||
#include <gdiplus.h>
|
||||
#include <timeapi.h>
|
||||
@ -79,6 +81,8 @@
|
||||
#include "thirdparty/spdlog/include/sinks/ansicolor_sink.h"
|
||||
#include "thirdparty/spdlog/include/sinks/rotating_file_sink.h"
|
||||
|
||||
#include "thirdparty/curl/include/curl/curl.h"
|
||||
|
||||
#include "common/pseudodefs.h"
|
||||
#include "common/x86defs.h"
|
||||
#include "common/sdkdefs.h"
|
||||
@ -87,7 +91,6 @@
|
||||
#include "public/utility/memaddr.h"
|
||||
#include "public/utility/module.h"
|
||||
#include "public/utility/sigcache.h"
|
||||
#include "public/utility/httplib.h"
|
||||
#include "public/utility/vdf_parser.h"
|
||||
|
||||
#include "core/assert.h"
|
||||
|
||||
@ -7,6 +7,7 @@
|
||||
|
||||
#include <core/stdafx.h>
|
||||
#include <tier1/cvar.h>
|
||||
#include <tier2/curlutils.h>
|
||||
#include <networksystem/pylon.h>
|
||||
#ifndef CLIENT_DLL
|
||||
#include <engine/server/server.h>
|
||||
@ -14,34 +15,35 @@
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// Purpose: returns a vector of hosted servers.
|
||||
// Input : &svOutMessage -
|
||||
// Output : vector<NetGameServer_t>
|
||||
//-----------------------------------------------------------------------------
|
||||
vector<NetGameServer_t> CPylon::GetServerList(string& svOutMessage) const
|
||||
{
|
||||
vector<NetGameServer_t> vslList{};
|
||||
vector<NetGameServer_t> vslList;
|
||||
|
||||
nlohmann::json jsRequestBody = nlohmann::json::object();
|
||||
jsRequestBody["version"] = SDK_VERSION;
|
||||
|
||||
string svRequestBody = jsRequestBody.dump(4);
|
||||
string svResponse;
|
||||
|
||||
if (pylon_showdebuginfo->GetBool())
|
||||
{
|
||||
DevMsg(eDLL_T::ENGINE, "%s - Sending server list request to comp-server:\n%s\n", __FUNCTION__, svRequestBody.c_str());
|
||||
}
|
||||
|
||||
httplib::Client htClient(pylon_matchmaking_hostname->GetString()); htClient.set_connection_timeout(10);
|
||||
httplib::Result htResult = htClient.Post("/servers", svRequestBody.c_str(), svRequestBody.length(), "application/json");
|
||||
|
||||
if (htResult && pylon_showdebuginfo->GetBool())
|
||||
CURLINFO status;
|
||||
if (!QueryMasterServer(pylon_matchmaking_hostname->GetString(), "/servers", svRequestBody, svResponse, svOutMessage, status))
|
||||
{
|
||||
DevMsg(eDLL_T::ENGINE, "%s - Comp-server replied with '%d'\n", __FUNCTION__, htResult->status);
|
||||
return vslList;
|
||||
}
|
||||
|
||||
try
|
||||
{
|
||||
if (htResult && htResult->status == 200) // STATUS_OK
|
||||
if (status == 200) // STATUS_OK
|
||||
{
|
||||
nlohmann::json jsResultBody = nlohmann::json::parse(htResult->body);
|
||||
nlohmann::json jsResultBody = nlohmann::json::parse(svResponse);
|
||||
if (jsResultBody["success"].is_boolean() && jsResultBody["success"].get<bool>())
|
||||
{
|
||||
for (auto& obj : jsResultBody["servers"])
|
||||
@ -76,17 +78,17 @@ vector<NetGameServer_t> CPylon::GetServerList(string& svOutMessage) const
|
||||
}
|
||||
else
|
||||
{
|
||||
svOutMessage = string("Unknown error with status: ") + std::to_string(htResult->status);
|
||||
svOutMessage = string("Unknown error with status: ") + std::to_string(status);
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if (htResult)
|
||||
if (status)
|
||||
{
|
||||
if (!htResult->body.empty())
|
||||
if (!svResponse.empty())
|
||||
{
|
||||
nlohmann::json jsResultBody = nlohmann::json::parse(htResult->body);
|
||||
nlohmann::json jsResultBody = nlohmann::json::parse(svResponse);
|
||||
|
||||
if (jsResultBody["error"].is_string())
|
||||
{
|
||||
@ -94,13 +96,13 @@ vector<NetGameServer_t> CPylon::GetServerList(string& svOutMessage) const
|
||||
}
|
||||
else
|
||||
{
|
||||
svOutMessage = string("Failed HTTP request: ") + std::to_string(htResult->status);
|
||||
svOutMessage = string("Failed HTTP request: ") + std::to_string(status);
|
||||
}
|
||||
|
||||
return vslList;
|
||||
}
|
||||
|
||||
svOutMessage = string("Failed HTTP request: ") + std::to_string(htResult->status);
|
||||
svOutMessage = string("Failed HTTP request: ") + std::to_string(status);
|
||||
return vslList;
|
||||
}
|
||||
|
||||
@ -120,7 +122,7 @@ vector<NetGameServer_t> CPylon::GetServerList(string& svOutMessage) const
|
||||
// Purpose: Gets the server by token string.
|
||||
// Input : &slOutServer -
|
||||
// &svOutMessage -
|
||||
// svToken -
|
||||
// &svToken -
|
||||
// Output : Returns true on success, false on failure.
|
||||
//-----------------------------------------------------------------------------
|
||||
bool CPylon::GetServerByToken(NetGameServer_t& slOutServer, string& svOutMessage, const string& svToken) const
|
||||
@ -129,22 +131,26 @@ bool CPylon::GetServerByToken(NetGameServer_t& slOutServer, string& svOutMessage
|
||||
jsRequestBody["token"] = svToken;
|
||||
|
||||
string svRequestBody = jsRequestBody.dump(4);
|
||||
string svResponseBuf;
|
||||
|
||||
if (pylon_showdebuginfo->GetBool())
|
||||
{
|
||||
DevMsg(eDLL_T::ENGINE, "%s - Sending token connect request to comp-server:\n%s\n", __FUNCTION__, svRequestBody.c_str());
|
||||
}
|
||||
|
||||
httplib::Client htClient(pylon_matchmaking_hostname->GetString()); htClient.set_connection_timeout(10);
|
||||
httplib::Result htResult = htClient.Post("/server/byToken", svRequestBody.c_str(), svRequestBody.length(), "application/json");
|
||||
CURLINFO status;
|
||||
if (!QueryMasterServer(pylon_matchmaking_hostname->GetString(), "/server/byToken", svRequestBody, svResponseBuf, svOutMessage, status))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
if (pylon_showdebuginfo->GetBool())
|
||||
{
|
||||
DevMsg(eDLL_T::ENGINE, "%s - Comp-server replied with status: '%d'\n", __FUNCTION__, htResult->status);
|
||||
DevMsg(eDLL_T::ENGINE, "%s - Comp-server replied with status: '%d'\n", __FUNCTION__, status);
|
||||
try
|
||||
{
|
||||
string jsResultBody = nlohmann::json::parse(htResult->body).dump(4);
|
||||
DevMsg(eDLL_T::ENGINE, "%s - Comp-server response body:\n'%s'\n", __FUNCTION__, jsResultBody.c_str());
|
||||
string jsResultBody = nlohmann::json::parse(svResponseBuf).dump(4);
|
||||
DevMsg(eDLL_T::ENGINE, "%s - Comp-server response body:\n%s\n", __FUNCTION__, jsResultBody.c_str());
|
||||
}
|
||||
catch (const std::exception& ex)
|
||||
{
|
||||
@ -154,13 +160,13 @@ bool CPylon::GetServerByToken(NetGameServer_t& slOutServer, string& svOutMessage
|
||||
|
||||
try
|
||||
{
|
||||
if (htResult && htResult->status == 200) // STATUS_OK
|
||||
if (status == 200) // STATUS_OK
|
||||
{
|
||||
if (!htResult->body.empty())
|
||||
if (!svResponseBuf.empty())
|
||||
{
|
||||
nlohmann::json jsResultBody = nlohmann::json::parse(htResult->body);
|
||||
nlohmann::json jsResultBody = nlohmann::json::parse(svResponseBuf);
|
||||
|
||||
if (htResult && jsResultBody["success"].is_boolean() && jsResultBody["success"])
|
||||
if (jsResultBody["success"].is_boolean() && jsResultBody["success"])
|
||||
{
|
||||
slOutServer = NetGameServer_t
|
||||
{
|
||||
@ -190,7 +196,7 @@ bool CPylon::GetServerByToken(NetGameServer_t& slOutServer, string& svOutMessage
|
||||
}
|
||||
else
|
||||
{
|
||||
svOutMessage = string("Unknown error with status: ") + std::to_string(htResult->status);
|
||||
svOutMessage = string("Unknown error with status: ") + std::to_string(status);
|
||||
}
|
||||
|
||||
slOutServer = NetGameServer_t{};
|
||||
@ -200,28 +206,25 @@ bool CPylon::GetServerByToken(NetGameServer_t& slOutServer, string& svOutMessage
|
||||
}
|
||||
else
|
||||
{
|
||||
if (htResult)
|
||||
if (!svResponseBuf.empty())
|
||||
{
|
||||
if (!htResult->body.empty())
|
||||
nlohmann::json jsResultBody = nlohmann::json::parse(svResponseBuf);
|
||||
|
||||
if (jsResultBody["error"].is_string())
|
||||
{
|
||||
nlohmann::json jsResultBody = nlohmann::json::parse(htResult->body);
|
||||
|
||||
if (jsResultBody["error"].is_string())
|
||||
{
|
||||
svOutMessage = jsResultBody["error"].get<string>();
|
||||
}
|
||||
else
|
||||
{
|
||||
svOutMessage = string("Server not found: ") + std::to_string(htResult->status);
|
||||
}
|
||||
|
||||
return false;
|
||||
svOutMessage = jsResultBody["error"].get<string>();
|
||||
}
|
||||
else
|
||||
{
|
||||
svOutMessage = string("Server not found: ") + std::to_string(status);
|
||||
}
|
||||
|
||||
svOutMessage = string("Failed HTTP request: ") + std::to_string(htResult->status);
|
||||
return false;
|
||||
}
|
||||
|
||||
svOutMessage = string("Failed HTTP request: ") + std::to_string(status);
|
||||
return false;
|
||||
|
||||
svOutMessage = "Failed to reach comp-server: connection timed-out";
|
||||
slOutServer = NetGameServer_t{};
|
||||
return false;
|
||||
@ -239,44 +242,49 @@ bool CPylon::GetServerByToken(NetGameServer_t& slOutServer, string& svOutMessage
|
||||
// Purpose: Sends host server POST request.
|
||||
// Input : &svOutMessage -
|
||||
// &svOutToken -
|
||||
// &slServerListing -
|
||||
// &netGameServer -
|
||||
// Output : Returns true on success, false on failure.
|
||||
//-----------------------------------------------------------------------------
|
||||
bool CPylon::PostServerHost(string& svOutMessage, string& svOutToken, const NetGameServer_t& slServerListing) const
|
||||
bool CPylon::PostServerHost(string& svOutMessage, string& svOutToken, const NetGameServer_t& netGameServer) const
|
||||
{
|
||||
nlohmann::json jsRequestBody = nlohmann::json::object();
|
||||
jsRequestBody["name"] = slServerListing.m_svHostName;
|
||||
jsRequestBody["description"] = slServerListing.m_svDescription;
|
||||
jsRequestBody["hidden"] = slServerListing.m_bHidden;
|
||||
jsRequestBody["map"] = slServerListing.m_svHostMap;
|
||||
jsRequestBody["playlist"] = slServerListing.m_svPlaylist;
|
||||
jsRequestBody["ip"] = slServerListing.m_svIpAddress;
|
||||
jsRequestBody["port"] = slServerListing.m_svGamePort;
|
||||
jsRequestBody["key"] = slServerListing.m_svEncryptionKey;
|
||||
jsRequestBody["checksum"] = slServerListing.m_svRemoteChecksum;
|
||||
jsRequestBody["version"] = slServerListing.m_svSDKVersion;
|
||||
jsRequestBody["playerCount"] = slServerListing.m_svPlayerCount;
|
||||
jsRequestBody["maxPlayers"] = slServerListing.m_svMaxPlayers;
|
||||
jsRequestBody["timeStamp"] = slServerListing.m_nTimeStamp;
|
||||
jsRequestBody["publicRef"] = slServerListing.m_svPublicRef;
|
||||
jsRequestBody["cachedId"] = slServerListing.m_svCachedId;
|
||||
jsRequestBody["name"] = netGameServer.m_svHostName;
|
||||
jsRequestBody["description"] = netGameServer.m_svDescription;
|
||||
jsRequestBody["hidden"] = netGameServer.m_bHidden;
|
||||
jsRequestBody["map"] = netGameServer.m_svHostMap;
|
||||
jsRequestBody["playlist"] = netGameServer.m_svPlaylist;
|
||||
jsRequestBody["ip"] = netGameServer.m_svIpAddress;
|
||||
jsRequestBody["port"] = netGameServer.m_svGamePort;
|
||||
jsRequestBody["key"] = netGameServer.m_svEncryptionKey;
|
||||
jsRequestBody["checksum"] = netGameServer.m_svRemoteChecksum;
|
||||
jsRequestBody["version"] = netGameServer.m_svSDKVersion;
|
||||
jsRequestBody["playerCount"] = netGameServer.m_svPlayerCount;
|
||||
jsRequestBody["maxPlayers"] = netGameServer.m_svMaxPlayers;
|
||||
jsRequestBody["timeStamp"] = netGameServer.m_nTimeStamp;
|
||||
jsRequestBody["publicRef"] = netGameServer.m_svPublicRef;
|
||||
jsRequestBody["cachedId"] = netGameServer.m_svCachedId;
|
||||
|
||||
string svRequestBody = jsRequestBody.dump(4);
|
||||
string svResponseBuf;
|
||||
|
||||
if (pylon_showdebuginfo->GetBool())
|
||||
{
|
||||
DevMsg(eDLL_T::ENGINE, "%s - Sending post host request to comp-server:\n%s\n", __FUNCTION__, svRequestBody.c_str());
|
||||
}
|
||||
|
||||
httplib::Client htClient(pylon_matchmaking_hostname->GetString()); htClient.set_connection_timeout(10);
|
||||
httplib::Result htResult = htClient.Post("/servers/add", svRequestBody.c_str(), svRequestBody.length(), "application/json");
|
||||
|
||||
if (htResult && pylon_showdebuginfo->GetBool())
|
||||
CURLINFO status;
|
||||
if (!QueryMasterServer(pylon_matchmaking_hostname->GetString(), "/servers/add", svRequestBody, svResponseBuf, svOutMessage, status))
|
||||
{
|
||||
DevMsg(eDLL_T::ENGINE, "%s - Comp-server replied with status: '%d'\n", __FUNCTION__, htResult->status);
|
||||
return false;
|
||||
}
|
||||
|
||||
if (pylon_showdebuginfo->GetBool())
|
||||
{
|
||||
DevMsg(eDLL_T::ENGINE, "%s - Comp-server replied with status: '%d'\n", __FUNCTION__, status);
|
||||
try
|
||||
{
|
||||
string jsResultBody = nlohmann::json::parse(htResult->body).dump(4);
|
||||
DevMsg(eDLL_T::ENGINE, "%s - Comp-server response body:\n'%s'\n", __FUNCTION__, jsResultBody.c_str());
|
||||
string jsResultBody = nlohmann::json::parse(svResponseBuf).dump(4);
|
||||
DevMsg(eDLL_T::ENGINE, "%s - Comp-server response body:\n%s\n", __FUNCTION__, jsResultBody.c_str());
|
||||
}
|
||||
catch (const std::exception& ex)
|
||||
{
|
||||
@ -286,9 +294,9 @@ bool CPylon::PostServerHost(string& svOutMessage, string& svOutToken, const NetG
|
||||
|
||||
try
|
||||
{
|
||||
if (htResult && htResult->status == 200) // STATUS_OK
|
||||
if (status == 200) // STATUS_OK
|
||||
{
|
||||
nlohmann::json jsResultBody = nlohmann::json::parse(htResult->body);
|
||||
nlohmann::json jsResultBody = nlohmann::json::parse(svResponseBuf);
|
||||
if (jsResultBody["success"].is_boolean() && jsResultBody["success"].get<bool>())
|
||||
{
|
||||
if (jsResultBody["token"].is_string())
|
||||
@ -310,37 +318,34 @@ bool CPylon::PostServerHost(string& svOutMessage, string& svOutToken, const NetG
|
||||
}
|
||||
else
|
||||
{
|
||||
svOutMessage = string("Unknown error with status: ") + std::to_string(htResult->status);
|
||||
svOutMessage = string("Unknown error with status: ") + std::to_string(status);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if (htResult)
|
||||
if (!svResponseBuf.empty())
|
||||
{
|
||||
if (!htResult->body.empty())
|
||||
nlohmann::json jsResultBody = nlohmann::json::parse(svResponseBuf);
|
||||
|
||||
if (jsResultBody["error"].is_string())
|
||||
{
|
||||
nlohmann::json jsResultBody = nlohmann::json::parse(htResult->body);
|
||||
|
||||
if (jsResultBody["error"].is_string())
|
||||
{
|
||||
svOutMessage = jsResultBody["error"].get<string>();
|
||||
}
|
||||
else
|
||||
{
|
||||
svOutMessage = string("Failed HTTP request: ") + std::to_string(htResult->status);
|
||||
}
|
||||
|
||||
svOutToken = string();
|
||||
return false;
|
||||
svOutMessage = jsResultBody["error"].get<string>();
|
||||
}
|
||||
else
|
||||
{
|
||||
svOutMessage = string("Failed HTTP request: ") + std::to_string(status);
|
||||
}
|
||||
|
||||
svOutToken = string();
|
||||
svOutMessage = string("Failed HTTP request: ") + std::to_string(htResult->status);
|
||||
return false;
|
||||
}
|
||||
|
||||
svOutToken = string();
|
||||
svOutMessage = string("Failed HTTP request: ") + std::to_string(status);
|
||||
return false;
|
||||
|
||||
svOutToken = string();
|
||||
svOutMessage = "Failed to reach comp-server: connection timed-out";
|
||||
return false;
|
||||
@ -367,7 +372,7 @@ bool CPylon::KeepAlive(const NetGameServer_t& netGameServer) const
|
||||
string m_szHostToken;
|
||||
string m_szHostRequestMessage;
|
||||
|
||||
bool result = g_pMasterServer->PostServerHost(m_szHostRequestMessage, m_szHostToken, netGameServer);
|
||||
bool result = PostServerHost(m_szHostRequestMessage, m_szHostToken, netGameServer);
|
||||
return result;
|
||||
}
|
||||
#endif // !CLIENT_DLL
|
||||
@ -376,7 +381,7 @@ bool CPylon::KeepAlive(const NetGameServer_t& netGameServer) const
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// Purpose: Checks if client is banned on the comp server.
|
||||
// Input : svIpAddress -
|
||||
// Input : &svIpAddress -
|
||||
// nNucleusID -
|
||||
// &svOutReason -
|
||||
// Output : Returns true if banned, false if not banned.
|
||||
@ -387,14 +392,22 @@ bool CPylon::CheckForBan(const string& svIpAddress, const uint64_t nNucleusID, s
|
||||
jsRequestBody["id"] = nNucleusID;
|
||||
jsRequestBody["ip"] = svIpAddress;
|
||||
|
||||
httplib::Client htClient(pylon_matchmaking_hostname->GetString()); htClient.set_connection_timeout(10);
|
||||
httplib::Result htResult = htClient.Post("/banlist/isBanned", jsRequestBody.dump(4).c_str(), jsRequestBody.dump(4).length(), "application/json");
|
||||
string svRequestBody = jsRequestBody.dump(4);
|
||||
string svResponseBuf;
|
||||
string svOutMessage;
|
||||
CURLINFO status;
|
||||
|
||||
if (!QueryMasterServer(pylon_matchmaking_hostname->GetString(), "/banlist/isBanned", svRequestBody, svResponseBuf, svOutMessage, status))
|
||||
{
|
||||
Error(eDLL_T::ENGINE, NO_ERROR, "%s - Failed to query comp-server: %s\n", __FUNCTION__, svOutMessage.c_str());
|
||||
return false;
|
||||
}
|
||||
|
||||
try
|
||||
{
|
||||
if (htResult && htResult->status == 200)
|
||||
if (status == 200)
|
||||
{
|
||||
nlohmann::json jsResultBody = nlohmann::json::parse(htResult->body);
|
||||
nlohmann::json jsResultBody = nlohmann::json::parse(svResponseBuf);
|
||||
if (jsResultBody["success"].is_boolean() && jsResultBody["success"].get<bool>())
|
||||
{
|
||||
if (jsResultBody["banned"].is_boolean() && jsResultBody["banned"].get<bool>())
|
||||
@ -404,6 +417,10 @@ bool CPylon::CheckForBan(const string& svIpAddress, const uint64_t nNucleusID, s
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
Error(eDLL_T::ENGINE, NO_ERROR, "%s - Failed to query comp-server: status code = %d\n", __FUNCTION__, status);
|
||||
}
|
||||
}
|
||||
catch (const std::exception& ex)
|
||||
{
|
||||
@ -411,5 +428,39 @@ bool CPylon::CheckForBan(const string& svIpAddress, const uint64_t nNucleusID, s
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// Purpose: Sends query to master server.
|
||||
// Input : &svHostName -
|
||||
// &svApi -
|
||||
// &svInRequest -
|
||||
// &svResponse -
|
||||
// &svOutMessage -
|
||||
// &outStatus -
|
||||
// Output : Returns true if successful, false otherwise.
|
||||
//-----------------------------------------------------------------------------
|
||||
bool CPylon::QueryMasterServer(const string& svHostName, const string& svApi, const string& svInRequest,
|
||||
string& svOutResponse, string& svOutMessage, CURLINFO& outStatus) const
|
||||
{
|
||||
string svUrl;
|
||||
CURLFormatUrl(svUrl, svHostName, svApi);
|
||||
|
||||
curl_slist* sList = nullptr;
|
||||
CURL* curl = CURLInitRequest(svUrl, svInRequest, svOutResponse, sList);
|
||||
if (!curl)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
CURLcode res = CURLSubmitRequest(curl, sList);
|
||||
if (!CURLHandleError(curl, res, svOutMessage))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
outStatus = CURLRetrieveInfo(curl);
|
||||
return true;
|
||||
}
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
CPylon* g_pMasterServer(new CPylon());
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
#pragma once
|
||||
#include "thirdparty/curl/include/curl/curl.h"
|
||||
#include "serverlisting.h"
|
||||
|
||||
class CPylon
|
||||
@ -6,8 +7,10 @@ class CPylon
|
||||
public:
|
||||
vector<NetGameServer_t> GetServerList(string& svOutMessage) const;
|
||||
bool GetServerByToken(NetGameServer_t& slOutServer, string& svOutMessage, const string& svToken) const;
|
||||
bool PostServerHost(string& svOutMessage, string& svOutToken, const NetGameServer_t& slServerListing) const;
|
||||
bool PostServerHost(string& svOutMessage, string& svOutToken, const NetGameServer_t& netGameServer) const;
|
||||
bool KeepAlive(const NetGameServer_t& netGameServer) const;
|
||||
bool CheckForBan(const string& svIpAddress, const uint64_t nNucleusID, string& svOutReason) const;
|
||||
|
||||
bool QueryMasterServer(const string& svHostName, const string& svApi, const string& svRequest, string& svResponse, string& svOutMessage, CURLINFO& status) const;
|
||||
};
|
||||
extern CPylon* g_pMasterServer;
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -144,6 +144,7 @@
|
||||
<ClCompile Include="..\tier1\splitstring.cpp" />
|
||||
<ClCompile Include="..\tier1\strtools.cpp" />
|
||||
<ClCompile Include="..\tier1\utlbuffer.cpp" />
|
||||
<ClCompile Include="..\tier2\curlutils.cpp" />
|
||||
<ClCompile Include="..\tier2\meshutils.cpp" />
|
||||
<ClCompile Include="..\tier2\renderutils.cpp" />
|
||||
<ClCompile Include="..\tier2\socketcreator.cpp" />
|
||||
@ -344,7 +345,6 @@
|
||||
<ClInclude Include="..\public\trace.h" />
|
||||
<ClInclude Include="..\public\utility\binstream.h" />
|
||||
<ClInclude Include="..\public\utility\crashhandler.h" />
|
||||
<ClInclude Include="..\public\utility\httplib.h" />
|
||||
<ClInclude Include="..\public\utility\memaddr.h" />
|
||||
<ClInclude Include="..\public\utility\module.h" />
|
||||
<ClInclude Include="..\public\utility\sigcache.h" />
|
||||
@ -580,6 +580,7 @@
|
||||
<ClInclude Include="..\tier1\utlmemory.h" />
|
||||
<ClInclude Include="..\tier1\utlrbtree.h" />
|
||||
<ClInclude Include="..\tier1\utlvector.h" />
|
||||
<ClInclude Include="..\tier2\curlutils.h" />
|
||||
<ClInclude Include="..\tier2\meshutils.h" />
|
||||
<ClInclude Include="..\tier2\renderutils.h" />
|
||||
<ClInclude Include="..\tier2\socketcreator.h" />
|
||||
@ -682,14 +683,14 @@
|
||||
</DisableSpecificWarnings>
|
||||
<LanguageStandard>stdcpp17</LanguageStandard>
|
||||
<LanguageStandard_C>stdc17</LanguageStandard_C>
|
||||
<AdditionalOptions>/D GAMESDK /D CLIENT_DLL /D _CRT_SECURE_NO_WARNINGS %(AdditionalOptions)</AdditionalOptions>
|
||||
<AdditionalOptions>/D GAMESDK /D CLIENT_DLL /D _CRT_SECURE_NO_WARNINGS /D CURL_STATICLIB %(AdditionalOptions)</AdditionalOptions>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<EnableUAC>false</EnableUAC>
|
||||
<ModuleDefinitionFile>..\ClientSDK.def</ModuleDefinitionFile>
|
||||
<AdditionalDependencies>d3d11.lib;bcrypt.lib;libcurl_x64.lib;libdetours_x64.lib;libimgui_x64.lib;liblzham_x64.lib;libprotobuf_x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<AdditionalDependencies>advapi32.lib;bcrypt.lib;crypt32.lib;d3d11.lib;wldap32.lib;ws2_32.lib;libcurl_x64.lib;libdetours_x64.lib;libimgui_x64.lib;liblzham_x64.lib;libprotobuf_x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<AdditionalLibraryDirectories>$(SolutionDir)lib\$(Configuration)\</AdditionalLibraryDirectories>
|
||||
<StackReserveSize>8000000</StackReserveSize>
|
||||
</Link>
|
||||
@ -723,7 +724,7 @@
|
||||
<CreateHotpatchableImage>
|
||||
</CreateHotpatchableImage>
|
||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||
<AdditionalOptions>/D GAMESDK /D CLIENT_DLL /D _CRT_SECURE_NO_WARNINGS %(AdditionalOptions)</AdditionalOptions>
|
||||
<AdditionalOptions>/D GAMESDK /D CLIENT_DLL /D _CRT_SECURE_NO_WARNINGS /D CURL_STATICLIB %(AdditionalOptions)</AdditionalOptions>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
@ -732,7 +733,7 @@
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<EnableUAC>false</EnableUAC>
|
||||
<ModuleDefinitionFile>..\ClientSDK.def</ModuleDefinitionFile>
|
||||
<AdditionalDependencies>d3d11.lib;bcrypt.lib;libcurl_x64.lib;libdetours_x64.lib;libimgui_x64.lib;liblzham_x64.lib;libprotobuf_x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<AdditionalDependencies>advapi32.lib;bcrypt.lib;crypt32.lib;d3d11.lib;wldap32.lib;ws2_32.lib;libcurl_x64.lib;libdetours_x64.lib;libimgui_x64.lib;liblzham_x64.lib;libprotobuf_x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<AdditionalLibraryDirectories>$(SolutionDir)lib\$(Configuration)\</AdditionalLibraryDirectories>
|
||||
<SetChecksum>true</SetChecksum>
|
||||
<StackReserveSize>8000000</StackReserveSize>
|
||||
|
||||
@ -672,6 +672,9 @@
|
||||
<ClCompile Include="..\launcher\prx.cpp">
|
||||
<Filter>sdk\launcher</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\tier2\curlutils.cpp">
|
||||
<Filter>sdk\tier2</Filter>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="..\client\cdll_engine_int.h">
|
||||
@ -1763,9 +1766,6 @@
|
||||
<ClInclude Include="..\public\utility\binstream.h">
|
||||
<Filter>sdk\public\utility</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\public\utility\httplib.h">
|
||||
<Filter>sdk\public\utility</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\public\utility\memaddr.h">
|
||||
<Filter>sdk\public\utility</Filter>
|
||||
</ClInclude>
|
||||
@ -1982,6 +1982,9 @@
|
||||
<ClInclude Include="..\launcher\prx.h">
|
||||
<Filter>sdk\launcher</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\tier2\curlutils.h">
|
||||
<Filter>sdk\tier2</Filter>
|
||||
</ClInclude>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Image Include="..\shared\resource\lockedserver.png">
|
||||
|
||||
@ -65,7 +65,7 @@
|
||||
<SDLCheck>true</SDLCheck>
|
||||
<PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<ConformanceMode>true</ConformanceMode>
|
||||
<AdditionalOptions>/D GAMESDK /D DEDICATED /D _CRT_SECURE_NO_WARNINGS %(AdditionalOptions)</AdditionalOptions>
|
||||
<AdditionalOptions>/D GAMESDK /D DEDICATED /D _CRT_SECURE_NO_WARNINGS /D CURL_STATICLIB %(AdditionalOptions)</AdditionalOptions>
|
||||
<PrecompiledHeader>Use</PrecompiledHeader>
|
||||
<PrecompiledHeaderFile>core\stdafx.h</PrecompiledHeaderFile>
|
||||
<LanguageStandard>stdcpp17</LanguageStandard>
|
||||
@ -74,7 +74,7 @@
|
||||
<Link>
|
||||
<SubSystem>Console</SubSystem>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<AdditionalDependencies>bcrypt.lib;user32.lib;libcurl_x64.lib;libdetours_x64.lib;liblzham_x64.lib;libprotobuf_x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<AdditionalDependencies>advapi32.lib;bcrypt.lib;crypt32.lib;user32.lib;wldap32.lib;ws2_32.lib;libcurl_x64.lib;libdetours_x64.lib;liblzham_x64.lib;libprotobuf_x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<AdditionalLibraryDirectories>$(SolutionDir)lib\$(Configuration)\</AdditionalLibraryDirectories>
|
||||
<ModuleDefinitionFile>..\Dedicated.def</ModuleDefinitionFile>
|
||||
<StackReserveSize>8000000</StackReserveSize>
|
||||
@ -95,7 +95,7 @@
|
||||
<SDLCheck>true</SDLCheck>
|
||||
<PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<ConformanceMode>true</ConformanceMode>
|
||||
<AdditionalOptions>/D GAMESDK /D DEDICATED /D _CRT_SECURE_NO_WARNINGS %(AdditionalOptions)</AdditionalOptions>
|
||||
<AdditionalOptions>/D GAMESDK /D DEDICATED /D _CRT_SECURE_NO_WARNINGS /D CURL_STATICLIB %(AdditionalOptions)</AdditionalOptions>
|
||||
<PrecompiledHeader>Use</PrecompiledHeader>
|
||||
<PrecompiledHeaderFile>core\stdafx.h</PrecompiledHeaderFile>
|
||||
<LanguageStandard>stdcpp17</LanguageStandard>
|
||||
@ -109,7 +109,7 @@
|
||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||
<OptimizeReferences>true</OptimizeReferences>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<AdditionalDependencies>bcrypt.lib;user32.lib;libcurl_x64.lib;libdetours_x64.lib;liblzham_x64.lib;libprotobuf_x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<AdditionalDependencies>advapi32.lib;bcrypt.lib;crypt32.lib;user32.lib;wldap32.lib;ws2_32.lib;libcurl_x64.lib;libdetours_x64.lib;liblzham_x64.lib;libprotobuf_x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<AdditionalLibraryDirectories>$(SolutionDir)lib\$(Configuration)\</AdditionalLibraryDirectories>
|
||||
<ModuleDefinitionFile>..\Dedicated.def</ModuleDefinitionFile>
|
||||
<SetChecksum>true</SetChecksum>
|
||||
@ -279,7 +279,6 @@
|
||||
<ClInclude Include="..\public\trace.h" />
|
||||
<ClInclude Include="..\public\utility\binstream.h" />
|
||||
<ClInclude Include="..\public\utility\crashhandler.h" />
|
||||
<ClInclude Include="..\public\utility\httplib.h" />
|
||||
<ClInclude Include="..\public\utility\memaddr.h" />
|
||||
<ClInclude Include="..\public\utility\module.h" />
|
||||
<ClInclude Include="..\public\utility\sigcache.h" />
|
||||
@ -506,6 +505,7 @@
|
||||
<ClInclude Include="..\tier1\utlmemory.h" />
|
||||
<ClInclude Include="..\tier1\utlrbtree.h" />
|
||||
<ClInclude Include="..\tier1\utlvector.h" />
|
||||
<ClInclude Include="..\tier2\curlutils.h" />
|
||||
<ClInclude Include="..\tier2\socketcreator.h" />
|
||||
<ClInclude Include="..\vpc\IAppSystem.h" />
|
||||
<ClInclude Include="..\vpc\interfaces.h" />
|
||||
@ -647,6 +647,7 @@
|
||||
<ClCompile Include="..\tier1\splitstring.cpp" />
|
||||
<ClCompile Include="..\tier1\strtools.cpp" />
|
||||
<ClCompile Include="..\tier1\utlbuffer.cpp" />
|
||||
<ClCompile Include="..\tier2\curlutils.cpp" />
|
||||
<ClCompile Include="..\tier2\socketcreator.cpp" />
|
||||
<ClCompile Include="..\vpc\IAppSystem.cpp" />
|
||||
<ClCompile Include="..\vpc\interfaces.cpp" />
|
||||
|
||||
@ -1188,9 +1188,6 @@
|
||||
<ClInclude Include="..\public\utility\binstream.h">
|
||||
<Filter>sdk\public\utility</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\public\utility\httplib.h">
|
||||
<Filter>sdk\public\utility</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\networksystem\bansystem.h">
|
||||
<Filter>sdk\networksystem</Filter>
|
||||
</ClInclude>
|
||||
@ -1386,6 +1383,9 @@
|
||||
<ClInclude Include="..\game\server\baseentity.h">
|
||||
<Filter>sdk\game\server</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\tier2\curlutils.h">
|
||||
<Filter>sdk\tier2</Filter>
|
||||
</ClInclude>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="..\common\opcodes.cpp">
|
||||
@ -1766,6 +1766,9 @@
|
||||
<ClCompile Include="..\common\netmessages.cpp">
|
||||
<Filter>sdk\common</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\tier2\curlutils.cpp">
|
||||
<Filter>sdk\tier2</Filter>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="..\Dedicated.def" />
|
||||
|
||||
@ -162,6 +162,7 @@
|
||||
<ClCompile Include="..\tier1\splitstring.cpp" />
|
||||
<ClCompile Include="..\tier1\strtools.cpp" />
|
||||
<ClCompile Include="..\tier1\utlbuffer.cpp" />
|
||||
<ClCompile Include="..\tier2\curlutils.cpp" />
|
||||
<ClCompile Include="..\tier2\meshutils.cpp" />
|
||||
<ClCompile Include="..\tier2\renderutils.cpp" />
|
||||
<ClCompile Include="..\tier2\socketcreator.cpp" />
|
||||
@ -396,7 +397,6 @@
|
||||
<ClInclude Include="..\public\trace.h" />
|
||||
<ClInclude Include="..\public\utility\binstream.h" />
|
||||
<ClInclude Include="..\public\utility\crashhandler.h" />
|
||||
<ClInclude Include="..\public\utility\httplib.h" />
|
||||
<ClInclude Include="..\public\utility\memaddr.h" />
|
||||
<ClInclude Include="..\public\utility\module.h" />
|
||||
<ClInclude Include="..\public\utility\sigcache.h" />
|
||||
@ -632,6 +632,7 @@
|
||||
<ClInclude Include="..\tier1\utlmemory.h" />
|
||||
<ClInclude Include="..\tier1\utlrbtree.h" />
|
||||
<ClInclude Include="..\tier1\utlvector.h" />
|
||||
<ClInclude Include="..\tier2\curlutils.h" />
|
||||
<ClInclude Include="..\tier2\meshutils.h" />
|
||||
<ClInclude Include="..\tier2\renderutils.h" />
|
||||
<ClInclude Include="..\tier2\socketcreator.h" />
|
||||
@ -734,14 +735,14 @@
|
||||
</DisableSpecificWarnings>
|
||||
<LanguageStandard>stdcpp17</LanguageStandard>
|
||||
<LanguageStandard_C>stdc17</LanguageStandard_C>
|
||||
<AdditionalOptions>/D GAMESDK /D _CRT_SECURE_NO_WARNINGS %(AdditionalOptions)</AdditionalOptions>
|
||||
<AdditionalOptions>/D GAMESDK /D _CRT_SECURE_NO_WARNINGS /D CURL_STATICLIB %(AdditionalOptions)</AdditionalOptions>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<EnableUAC>false</EnableUAC>
|
||||
<ModuleDefinitionFile>..\GameSDK.def</ModuleDefinitionFile>
|
||||
<AdditionalDependencies>d3d11.lib;bcrypt.lib;libdetours_x64.lib;libcurl_x64.lib;libimgui_x64.lib;liblzham_x64.lib;libprotobuf_x64.lib;librecast_x64.lib;libdtdetour_x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<AdditionalDependencies>advapi32.lib;bcrypt.lib;crypt32.lib;d3d11.lib;wldap32.lib;ws2_32.lib;libdetours_x64.lib;libcurl_x64.lib;libimgui_x64.lib;liblzham_x64.lib;libprotobuf_x64.lib;librecast_x64.lib;libdtdetour_x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<AdditionalLibraryDirectories>$(SolutionDir)lib\$(Configuration)\</AdditionalLibraryDirectories>
|
||||
<StackReserveSize>8000000</StackReserveSize>
|
||||
</Link>
|
||||
@ -775,7 +776,7 @@
|
||||
<CreateHotpatchableImage>
|
||||
</CreateHotpatchableImage>
|
||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||
<AdditionalOptions>/D GAMESDK /D _CRT_SECURE_NO_WARNINGS %(AdditionalOptions)</AdditionalOptions>
|
||||
<AdditionalOptions>/D GAMESDK /D _CRT_SECURE_NO_WARNINGS /D CURL_STATICLIB %(AdditionalOptions)</AdditionalOptions>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
@ -784,7 +785,7 @@
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<EnableUAC>false</EnableUAC>
|
||||
<ModuleDefinitionFile>..\GameSDK.def</ModuleDefinitionFile>
|
||||
<AdditionalDependencies>d3d11.lib;bcrypt.lib;libdetours_x64.lib;libcurl_x64.lib;libimgui_x64.lib;liblzham_x64.lib;libprotobuf_x64.lib;librecast_x64.lib;libdtdetour_x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<AdditionalDependencies>advapi32.lib;bcrypt.lib;crypt32.lib;d3d11.lib;wldap32.lib;ws2_32.lib;libdetours_x64.lib;libcurl_x64.lib;libimgui_x64.lib;liblzham_x64.lib;libprotobuf_x64.lib;librecast_x64.lib;libdtdetour_x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<AdditionalLibraryDirectories>$(SolutionDir)lib\$(Configuration)\</AdditionalLibraryDirectories>
|
||||
<SetChecksum>true</SetChecksum>
|
||||
<StackReserveSize>8000000</StackReserveSize>
|
||||
|
||||
@ -735,6 +735,9 @@
|
||||
<ClCompile Include="..\launcher\prx.cpp">
|
||||
<Filter>sdk\launcher</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\tier2\curlutils.cpp">
|
||||
<Filter>sdk\tier2</Filter>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="..\client\cdll_engine_int.h">
|
||||
@ -1883,9 +1886,6 @@
|
||||
<ClInclude Include="..\public\utility\binstream.h">
|
||||
<Filter>sdk\public\utility</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\public\utility\httplib.h">
|
||||
<Filter>sdk\public\utility</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\networksystem\bansystem.h">
|
||||
<Filter>sdk\networksystem</Filter>
|
||||
</ClInclude>
|
||||
@ -2147,6 +2147,9 @@
|
||||
<ClInclude Include="..\launcher\prx.h">
|
||||
<Filter>sdk\launcher</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\tier2\curlutils.h">
|
||||
<Filter>sdk\tier2</Filter>
|
||||
</ClInclude>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Image Include="..\shared\resource\lockedserver.png">
|
||||
|
||||
@ -429,7 +429,7 @@
|
||||
<SDLCheck>true</SDLCheck>
|
||||
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<ConformanceMode>true</ConformanceMode>
|
||||
<AdditionalOptions>/D _CRT_SECURE_NO_WARNINGS /D BUILDING_LIBCURL /D USE_WINDOWS_SSPI /D USE_SCHANNEL %(AdditionalOptions)</AdditionalOptions>
|
||||
<AdditionalOptions>/D _CRT_SECURE_NO_WARNINGS /D BUILDING_LIBCURL /D CURL_STATICLIB /D USE_WINDOWS_SSPI /D USE_SCHANNEL %(AdditionalOptions)</AdditionalOptions>
|
||||
<LanguageStandard>stdcpp17</LanguageStandard>
|
||||
<AdditionalIncludeDirectories>$(SolutionDir)r5dev\thirdparty\curl\include\;$(SolutionDir)r5dev\thirdparty\curl\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
</ClCompile>
|
||||
@ -446,7 +446,7 @@
|
||||
<SDLCheck>true</SDLCheck>
|
||||
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<ConformanceMode>true</ConformanceMode>
|
||||
<AdditionalOptions>/D _CRT_SECURE_NO_WARNINGS /D BUILDING_LIBCURL /D USE_WINDOWS_SSPI /D USE_SCHANNEL %(AdditionalOptions)</AdditionalOptions>
|
||||
<AdditionalOptions>/D _CRT_SECURE_NO_WARNINGS /D BUILDING_LIBCURL /D CURL_STATICLIB /D USE_WINDOWS_SSPI /D USE_SCHANNEL %(AdditionalOptions)</AdditionalOptions>
|
||||
<LanguageStandard>stdcpp17</LanguageStandard>
|
||||
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
|
||||
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
|
||||
@ -467,7 +467,7 @@
|
||||
<SDLCheck>true</SDLCheck>
|
||||
<PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<ConformanceMode>true</ConformanceMode>
|
||||
<AdditionalOptions>/D _CRT_SECURE_NO_WARNINGS /D BUILDING_LIBCURL /D USE_WINDOWS_SSPI /D USE_SCHANNEL %(AdditionalOptions)</AdditionalOptions>
|
||||
<AdditionalOptions>/D _CRT_SECURE_NO_WARNINGS /D BUILDING_LIBCURL /D CURL_STATICLIB /D USE_WINDOWS_SSPI /D USE_SCHANNEL %(AdditionalOptions)</AdditionalOptions>
|
||||
<LanguageStandard>stdcpp17</LanguageStandard>
|
||||
<AdditionalIncludeDirectories>$(SolutionDir)r5dev\thirdparty\curl\include\;$(SolutionDir)r5dev\thirdparty\curl\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
</ClCompile>
|
||||
@ -484,7 +484,7 @@
|
||||
<SDLCheck>true</SDLCheck>
|
||||
<PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<ConformanceMode>true</ConformanceMode>
|
||||
<AdditionalOptions>/D _CRT_SECURE_NO_WARNINGS /D BUILDING_LIBCURL /D USE_WINDOWS_SSPI /D USE_SCHANNEL %(AdditionalOptions)</AdditionalOptions>
|
||||
<AdditionalOptions>/D _CRT_SECURE_NO_WARNINGS /D BUILDING_LIBCURL /D CURL_STATICLIB /D USE_WINDOWS_SSPI /D USE_SCHANNEL %(AdditionalOptions)</AdditionalOptions>
|
||||
<LanguageStandard>stdcpp17</LanguageStandard>
|
||||
<OmitFramePointers>true</OmitFramePointers>
|
||||
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user