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

rename 'g_szNetKey' to 'g_svNetKey'

Browse Source 
sv = string variable
This commit is contained in:
Kawe Mazidjatari 2022-05-27 02:24:34 +02:00
parent fc74a692fa
commit 5aeac9f72a
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
r5dev/engine/net.cpp
View File

@ -64,15 +64,15 @@ int NET_SendDatagram(SOCKET s, void* pPayload, int iLenght, v_netadr_t* pAdr, bo
//-----------------------------------------------------------------------------
void NET_SetKey(const string& svNetKey)
{
g_szNetKey.clear();
g_szNetKey = svNetKey;
g_svNetKey.clear();
g_svNetKey = svNetKey;
DevMsg(eDLL_T::ENGINE, "______________________________________________________________\n");
DevMsg(eDLL_T::ENGINE, "] NET_KEY ----------------------------------------------------\n");
DevMsg(eDLL_T::ENGINE, "] BASE64: %s%s%s\n", g_svGreyB.c_str(), g_szNetKey.c_str(), g_svReset.c_str());
DevMsg(eDLL_T::ENGINE, "] BASE64: %s%s%s\n", g_svGreyB.c_str(), g_svNetKey.c_str(), g_svReset.c_str());
DevMsg(eDLL_T::ENGINE, "--------------------------------------------------------------\n");
v_NET_SetKey(g_pNetKey, g_szNetKey.c_str());
v_NET_SetKey(g_pNetKey, g_svNetKey.c_str());
}
//-----------------------------------------------------------------------------
@ -80,7 +80,7 @@ void NET_SetKey(const string& svNetKey)
//-----------------------------------------------------------------------------
void NET_GenerateKey()
{
g_szNetKey.clear();
g_svNetKey.clear();
net_useRandomKey->SetValue(1);
BCRYPT_ALG_HANDLE hAlgorithm;
@ -98,17 +98,17 @@ void NET_GenerateKey()
for (int i = 0; i < 0x10u; i++)
{
g_szNetKey += pBuffer[i];
g_svNetKey += pBuffer[i];
}
g_szNetKey = Base64Encode(g_szNetKey);
g_svNetKey = Base64Encode(g_svNetKey);
DevMsg(eDLL_T::ENGINE, "______________________________________________________________\n");
DevMsg(eDLL_T::ENGINE, "] NET_KEY ----------------------------------------------------\n");
DevMsg(eDLL_T::ENGINE, "] BASE64: %s%s%s\n", g_svGreyB.c_str(), g_szNetKey.c_str(), g_svReset.c_str());
DevMsg(eDLL_T::ENGINE, "] BASE64: %s%s%s\n", g_svGreyB.c_str(), g_svNetKey.c_str(), g_svReset.c_str());
DevMsg(eDLL_T::ENGINE, "--------------------------------------------------------------\n");
v_NET_SetKey(g_pNetKey, g_szNetKey.c_str());
v_NET_SetKey(g_pNetKey, g_svNetKey.c_str());
}
//-----------------------------------------------------------------------------
@ -246,6 +246,6 @@ void NET_Detach()
}
///////////////////////////////////////////////////////////////////////////////
string g_szNetKey = "WDNWLmJYQ2ZlM0VoTid3Yg==";
string g_svNetKey = "WDNWLmJYQ2ZlM0VoTid3Yg==";
uintptr_t g_pNetKey = NULL;
#endif // !NETCONSOLE

2
r5dev/engine/net.h
View File

@ -38,7 +38,7 @@ void NET_Attach();
void NET_Detach();
///////////////////////////////////////////////////////////////////////////////
extern string g_szNetKey;
extern string g_svNetKey;
extern uintptr_t g_pNetKey;
///////////////////////////////////////////////////////////////////////////////

4
r5dev/gameui/IBrowser.cpp
View File

@ -618,7 +618,7 @@ void IBrowser::SendHostingPostRequest(void)
std::to_string(*g_nClientRemoteChecksum),
std::string(),
g_szNetKey.c_str()
g_svNetKey.c_str()
}
);
@ -668,7 +668,7 @@ void IBrowser::SettingsSection(void)
g_pR5net = new R5Net::Client(r5net_matchmaking_hostname->GetString());
}
}
ImGui::InputText("Netkey", (char*)g_szNetKey.c_str(), ImGuiInputTextFlags_ReadOnly);
ImGui::InputText("Netkey", (char*)g_svNetKey.c_str(), ImGuiInputTextFlags_ReadOnly);
if (ImGui::Button("Regenerate Encryption Key"))
{
RegenerateEncryptionKey();

2
r5dev/networksystem/pylon.cpp
View File

@ -36,7 +36,7 @@ void KeepAliveToPylon()
false,
std::to_string(*g_nServerRemoteChecksum),
std::string(),
g_szNetKey.c_str()
g_svNetKey.c_str()
}
);
}