From f1cb85b8aae5fa80ccc480068ab4ceff4a8cd13d Mon Sep 17 00:00:00 2001 From: SaltySnail Date: Wed, 12 Jun 2024 00:38:37 +0200 Subject: [PATCH 1/4] try fixing launcher crashing when sending too much data in a packet. --- src/Network/GlobalHandler.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Network/GlobalHandler.cpp b/src/Network/GlobalHandler.cpp index d6cb7771..b0128cb2 100755 --- a/src/Network/GlobalHandler.cpp +++ b/src/Network/GlobalHandler.cpp @@ -244,7 +244,7 @@ void TCPGameServer(const std::string& IP, int Port){ Rcv = 0; do{ Temp = recv(CSocket,&Ret[Rcv],Size-Rcv,0); - if(Temp < 1)break; + // if(Temp < 1)break; Rcv += Temp; }while(Rcv < Size && !TCPTerminate); if(Temp < 1 || TCPTerminate)break; From e6bee795fbd678fef3f50e7dbdcdeafab06a6f66 Mon Sep 17 00:00:00 2001 From: SaltySnail Date: Wed, 12 Jun 2024 01:41:43 +0200 Subject: [PATCH 2/4] 2nd attempt, why won't it just compile locally --- src/Network/GlobalHandler.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Network/GlobalHandler.cpp b/src/Network/GlobalHandler.cpp index b0128cb2..2ce54807 100755 --- a/src/Network/GlobalHandler.cpp +++ b/src/Network/GlobalHandler.cpp @@ -247,6 +247,7 @@ void TCPGameServer(const std::string& IP, int Port){ // if(Temp < 1)break; Rcv += Temp; }while(Rcv < Size && !TCPTerminate); + debug("(Game) Got data from buffer: " + std::string(Ret)); if(Temp < 1 || TCPTerminate)break; ServerSend(Ret,false); From 7d8404ab555181c371188f789c04c6eb2d9717ee Mon Sep 17 00:00:00 2001 From: SaltySnail Date: Wed, 12 Jun 2024 01:57:41 +0200 Subject: [PATCH 3/4] 3rd try --- src/Network/GlobalHandler.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Network/GlobalHandler.cpp b/src/Network/GlobalHandler.cpp index 2ce54807..6de1f683 100755 --- a/src/Network/GlobalHandler.cpp +++ b/src/Network/GlobalHandler.cpp @@ -245,6 +245,7 @@ void TCPGameServer(const std::string& IP, int Port){ do{ Temp = recv(CSocket,&Ret[Rcv],Size-Rcv,0); // if(Temp < 1)break; + debug("(Game) Temp: " + std::string(Temp)); Rcv += Temp; }while(Rcv < Size && !TCPTerminate); debug("(Game) Got data from buffer: " + std::string(Ret)); From 1b76510a37c03ea92f0c5d7437432104fbc5adc9 Mon Sep 17 00:00:00 2001 From: SaltySnail Date: Wed, 12 Jun 2024 02:04:22 +0200 Subject: [PATCH 4/4] 4th try --- src/Network/GlobalHandler.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Network/GlobalHandler.cpp b/src/Network/GlobalHandler.cpp index 6de1f683..ba58fe4d 100755 --- a/src/Network/GlobalHandler.cpp +++ b/src/Network/GlobalHandler.cpp @@ -245,7 +245,7 @@ void TCPGameServer(const std::string& IP, int Port){ do{ Temp = recv(CSocket,&Ret[Rcv],Size-Rcv,0); // if(Temp < 1)break; - debug("(Game) Temp: " + std::string(Temp)); + debug("(Game) Temp: " + Temp); Rcv += Temp; }while(Rcv < Size && !TCPTerminate); debug("(Game) Got data from buffer: " + std::string(Ret));