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

Pylon logic imporvements

Browse Source 
* Removed duplicate json parsing that was part of a PR that required a small refactor.
* Only check if response buffer is empty when we are going to parse the error message (this helps finding bugs in master server, since failure to parse has an exception handler).
* Log private server token and error messages to dedicated server console.
This commit is contained in:
Kawe Mazidjatari 2023-02-04 19:18:18 +01:00
parent 654e4e4271
commit 66f31916d1
3 changed files with 83 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

135
r5dev/networksystem/pylon.cpp
View File

@ -149,60 +149,54 @@ bool CPylon::GetServerByToken(NetGameServer_t& slOutServer, string& svOutMessage
if (bDebugLog)
{
DevMsg(eDLL_T::ENGINE, "%s - Comp-server replied with status: '%d'\n", __FUNCTION__, status);
try
{
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)
{
DevMsg(eDLL_T::ENGINE, "%s - Encountered error parsing Comp-server response body: '%s'\n", __FUNCTION__, ex.what());
}
}
try
{
if (status == 200) // STATUS_OK
{
if (!svResponseBuf.empty())
{
nlohmann::json jsResultBody = nlohmann::json::parse(svResponseBuf);
nlohmann::json jsResultBody = nlohmann::json::parse(svResponseBuf);
if (jsResultBody["success"].is_boolean() && jsResultBody["success"])
if (bDebugLog)
{
string svResultBody = jsResultBody.dump(4);
DevMsg(eDLL_T::ENGINE, "%s - Comp-server response body:\n%s\n", __FUNCTION__, svResultBody.c_str());
}
if (jsResultBody["success"].is_boolean() && jsResultBody["success"])
{
slOutServer = NetGameServer_t
{
slOutServer = NetGameServer_t
{
jsResultBody["server"].value("name",""),
jsResultBody["server"].value("description",""),
jsResultBody["server"].value("hidden","false") == "true",
jsResultBody["server"].value("map",""),
jsResultBody["server"].value("playlist",""),
jsResultBody["server"].value("ip",""),
jsResultBody["server"].value("port", ""),
jsResultBody["server"].value("key",""),
jsResultBody["server"].value("checksum",""),
jsResultBody["server"].value("version", SDK_VERSION),
jsResultBody["server"].value("playerCount", ""),
jsResultBody["server"].value("maxPlayers", ""),
jsResultBody["server"].value("timeStamp", 0),
jsResultBody["server"].value("publicRef", ""),
jsResultBody["server"].value("cachedId", ""),
};
return true;
jsResultBody["server"].value("name",""),
jsResultBody["server"].value("description",""),
jsResultBody["server"].value("hidden","false") == "true",
jsResultBody["server"].value("map",""),
jsResultBody["server"].value("playlist",""),
jsResultBody["server"].value("ip",""),
jsResultBody["server"].value("port", ""),
jsResultBody["server"].value("key",""),
jsResultBody["server"].value("checksum",""),
jsResultBody["server"].value("version", SDK_VERSION),
jsResultBody["server"].value("playerCount", ""),
jsResultBody["server"].value("maxPlayers", ""),
jsResultBody["server"].value("timeStamp", 0),
jsResultBody["server"].value("publicRef", ""),
jsResultBody["server"].value("cachedId", ""),
};
return true;
}
else
{
if (jsResultBody["error"].is_string())
{
svOutMessage = jsResultBody["error"].get<string>();
}
else
{
if (jsResultBody["error"].is_string())
{
svOutMessage = jsResultBody["error"].get<string>();
}
else
{
svOutMessage = fmt::format("Unknown error with status: {:d}", status);
}
return false;
svOutMessage = fmt::format("Unknown error with status: {:d}", status);
}
return false;
}
}
else
@ -271,7 +265,6 @@ bool CPylon::PostServerHost(string& svOutMessage, string& svOutToken, const NetG
string svResponseBuf;
const bool bDebugLog = pylon_showdebuginfo->GetBool();
if (bDebugLog)
{
DevMsg(eDLL_T::ENGINE, "%s - Sending post host request to comp-server:\n%s\n", __FUNCTION__, svRequestBody.c_str());
@ -286,15 +279,6 @@ bool CPylon::PostServerHost(string& svOutMessage, string& svOutToken, const NetG
if (bDebugLog)
{
DevMsg(eDLL_T::ENGINE, "%s - Comp-server replied with status: '%d'\n", __FUNCTION__, status);
try
{
string svResultBody = nlohmann::json::parse(svResponseBuf).dump(4);
DevMsg(eDLL_T::ENGINE, "%s - Comp-server response body:\n%s\n", __FUNCTION__, svResultBody.c_str());
}
catch (const std::exception& ex)
{
DevMsg(eDLL_T::ENGINE, "%s - Encountered error parsing Comp-server response body: '%s'\n", __FUNCTION__, ex.what());
}
}
try
@ -302,6 +286,13 @@ bool CPylon::PostServerHost(string& svOutMessage, string& svOutToken, const NetG
if (status == 200) // STATUS_OK
{
nlohmann::json jsResultBody = nlohmann::json::parse(svResponseBuf);
if (bDebugLog)
{
string svResultBody = jsResultBody.dump(4);
DevMsg(eDLL_T::ENGINE, "%s - Comp-server response body:\n%s\n", __FUNCTION__, svResultBody.c_str());
}
if (jsResultBody["success"].is_boolean() && jsResultBody["success"].get<bool>())
{
if (jsResultBody["token"].is_string())
@ -368,25 +359,45 @@ bool CPylon::PostServerHost(string& svOutMessage, string& svOutToken, const NetG
return false;
}
#ifdef DEDICATED
//-----------------------------------------------------------------------------
// Purpose: Send keep alive request to Pylon Master Server.
// Input : &netGameServer -
// Output : Returns true on success, false otherwise.
//-----------------------------------------------------------------------------
bool CPylon::KeepAlive(const NetGameServer_t& netGameServer) const
bool CPylon::KeepAlive(const NetGameServer_t& netGameServer)
{
#ifndef CLIENT_DLL
if (g_pServer->IsActive() && sv_pylonVisibility->GetBool()) // Check for active game.
if (!g_pServer->IsActive() || !sv_pylonVisibility->GetBool()) // Check for active game.
{
string m_szHostToken;
string m_szHostRequestMessage;
bool result = PostServerHost(m_szHostRequestMessage, m_szHostToken, netGameServer);
return result;
return false;
}
#endif // !CLIENT_DLL
return false;
string svHostToken;
string svErrorMsg;
bool result = PostServerHost(svErrorMsg, svHostToken, netGameServer);
if (!result)
{
if (!svErrorMsg.empty() && m_ErrorMsg.compare(svErrorMsg) != NULL)
{
m_ErrorMsg = svErrorMsg;
Error(eDLL_T::SERVER, NO_ERROR, "%s\n", svErrorMsg.c_str());
}
}
else // Attempt to log the token, if there is one.
{
if (!svHostToken.empty() && m_Token.compare(svHostToken) != NULL)
{
m_Token = svHostToken;
DevMsg(eDLL_T::SERVER, "Published server with token: %s'%s%s%s'\n",
g_svReset.c_str(), g_svGreyB.c_str(),
svHostToken.c_str(), g_svReset.c_str());
}
}
return result;
}
#endif // DEDICATED
//-----------------------------------------------------------------------------
// Purpose: Checks if client is banned on the comp server.

10
r5dev/networksystem/pylon.h
View File

@ -8,9 +8,15 @@ 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& 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;
#ifdef DEDICATED
bool KeepAlive(const NetGameServer_t& netGameServer);
private:
string m_Token;
string m_ErrorMsg;
#endif // DEDICATED
};
extern CPylon* g_pMasterServer;

2
r5dev/tier2/curlutils.cpp
View File

@ -79,7 +79,9 @@ bool CURLHandleError(CURL* curl, CURLcode res, string& outMessage)
const char* curlError = curl_easy_strerror(res);
Error(eDLL_T::ENGINE, NO_ERROR, "CURL: %s\n", curlError);
#ifndef DEDICATED // Error already gets logged to the console.
outMessage = curlError;
#endif // !DEDICATED
curl_easy_cleanup(curl);
return false;