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

Improve netkey logic

Browse Source 
Removed extraneous copy of the base64 netkey. The base64 key is now directly obtained from the netkey singleton.
This commit is contained in:
Kawe Mazidjatari 2023-02-12 02:28:03 +01:00
parent 0734d56fe2
commit e98a6c31e9
3 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
r5dev/engine/net.cpp
View File

@ -67,15 +67,15 @@ int NET_SendDatagram(SOCKET s, void* pPayload, int iLenght, netadr_t* pAdr, bool
//-----------------------------------------------------------------------------
void NET_SetKey(const string& svNetKey)
{
std::lock_guard<std::mutex> l(g_NetKeyMutex);
string svTokenizedKey;
if (svNetKey.size() == AES_128_B64_ENCODED_SIZE &&
IsValidBase64(svNetKey, &g_svNetKey)) // Results are tokenized by 'IsValidBase64()'.
IsValidBase64(svNetKey, &svTokenizedKey)) // Results are tokenized by 'IsValidBase64()'.
{
v_NET_SetKey(g_pNetKey, g_svNetKey.c_str());
v_NET_SetKey(g_pNetKey, svTokenizedKey.c_str());
DevMsg(eDLL_T::ENGINE, "Installed NetKey: %s'%s%s%s'\n",
g_svReset.c_str(), g_svGreyB.c_str(), g_svNetKey.c_str(), g_svReset.c_str());
g_svReset.c_str(), g_svGreyB.c_str(), g_pNetKey->GetBase64NetKey(), g_svReset.c_str());
}
else
{
@ -301,6 +301,5 @@ void VNet::Detach() const
}
///////////////////////////////////////////////////////////////////////////////
string g_svNetKey = DEFAULT_NET_ENCRYPTION_KEY;
netkey_t* g_pNetKey = nullptr;
#endif // !NETCONSOLE

2
r5dev/engine/net.h
View File

@ -46,9 +46,7 @@ void NET_Shutdown(void* thisptr, const char* szReason, uint8_t bBadRep, bool bRe
void NET_RemoveChannel(CClient* pClient, int nIndex, const char* szReason, uint8_t bBadRep, bool bRemoveNow);
///////////////////////////////////////////////////////////////////////////////
extern string g_svNetKey;
extern netkey_t* g_pNetKey;
inline std::mutex g_NetKeyMutex;
///////////////////////////////////////////////////////////////////////////////
class VNet : public IDetour

9
r5dev/gameui/IBrowser.cpp
View File

@ -708,7 +708,6 @@ void CBrowser::UpdateHostingStatus(void)
break;
}
g_NetKeyMutex.lock();
NetGameServer_t netGameServer // !FIXME: create from main thread.
{
g_pServerListManager->m_Server.m_svHostName,
@ -718,7 +717,7 @@ void CBrowser::UpdateHostingStatus(void)
mp_gamemode->GetString(),
hostip->GetString(),
hostport->GetString(),
g_svNetKey,
g_pNetKey->GetBase64NetKey(),
std::to_string(*g_nServerRemoteChecksum),
SDK_VERSION,
std::to_string(g_pServer->GetNumHumanPlayers() + g_pServer->GetNumFakeClients()),
@ -727,7 +726,6 @@ void CBrowser::UpdateHostingStatus(void)
std::chrono::system_clock::now().time_since_epoch()
).count()
};
g_NetKeyMutex.unlock();
std::thread post(&CBrowser::SendHostingPostRequest, this, netGameServer);
post.detach();
@ -795,8 +793,9 @@ void CBrowser::SettingsPanel(void)
ProcessCommand(fmt::format("{:s} \"{:s}\"", "pylon_matchmaking_hostname", m_szMatchmakingHostName).c_str());
}
std::lock_guard<std::mutex> l(g_NetKeyMutex);
ImGui::InputTextWithHint("Netkey", "Network encryption key", const_cast<char*>(g_svNetKey.c_str()), ImGuiInputTextFlags_ReadOnly);
// The 'const' qualifier has been casted away, however the readonly flag is set.
// Still a hack, but better than modifying the Dear ImGui lib even more..
ImGui::InputTextWithHint("Netkey", "Network encryption key", const_cast<char*>(g_pNetKey->GetBase64NetKey()), ImGuiInputTextFlags_ReadOnly);
if (ImGui::Button("Regenerate encryption key"))
{
g_TaskScheduler->Dispatch(NET_GenerateKey, 0);