BeamMP/BeamMP-Launcher
1
0
Fork 0
mirror of https://github.com/BeamMP/BeamMP-Launcher.git synced 2025-07-04 00:47:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

implement string int header

Browse Source
This commit is contained in:
Lion Kortlepel 2024-06-23 19:36:09 +02:00
parent 7b733bf8eb
commit 137d9dd1e2
No known key found for this signature in database
GPG Key ID: 4322FF2B4C71259B
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Network/Core.cpp
View File

@ -190,7 +190,9 @@ void Parse(std::string Data, SOCKET CSocket) {
break; break;
} }
if (!Data.empty() && CSocket != -1) { if (!Data.empty() && CSocket != -1) {
int res = send(CSocket, (Data + "\n").c_str(), int(Data.size()) + 1, 0); Data = std::to_string(Data.size()) + ">" + Data;
debug("Sending '" + Data + "'");
int res = send(CSocket, Data.c_str(), int(Data.size()), 0);
if (res < 0) { if (res < 0) {
debug("(Core) send failed with error: " + std::to_string(WSAGetLastError())); debug("(Core) send failed with error: " + std::to_string(WSAGetLastError()));
} }

6
src/Network/GlobalHandler.cpp
View File

@ -63,6 +63,8 @@ void GameSend(std::string_view Data) {
return; return;
int32_t Size, Temp, Sent; int32_t Size, Temp, Sent;
Size = int32_t(Data.size()); Size = int32_t(Data.size());
auto SizeStr = std::to_string(Size) + ">";
send(CSocket, SizeStr.c_str(), SizeStr.size(), 0);
Sent = 0; Sent = 0;
#ifdef DEBUG #ifdef DEBUG
if (Size > 1000) { if (Size > 1000) {
@ -78,10 +80,10 @@ void GameSend(std::string_view Data) {
Sent += Temp; Sent += Temp;
} while (Sent < Size); } while (Sent < Size);
// send separately to avoid an allocation for += "\n" // send separately to avoid an allocation for += "\n"
Temp = send(CSocket, "\n", 1, 0); /*Temp = send(CSocket, "\n", 1, 0);
if (!CheckBytes(Temp)) { if (!CheckBytes(Temp)) {
return; return;
} }*/
} }
void ServerSend(std::string Data, bool Rel) { void ServerSend(std::string Data, bool Rel) {
if (Terminate || Data.empty()) if (Terminate || Data.empty())