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

Clear the queue if we failed to sync it

Browse Source
This commit is contained in:
Anonymous-275 2021-03-30 22:10:57 +03:00
parent ca24339c9a
commit 7ccc5a963a
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/TNetwork.cpp
View File

@ -361,6 +361,12 @@ bool TNetwork::TCPSend(TClient& c, const std::string& Data, bool IsSync) {
if (!TCPSend(c, QData, true)) { if (!TCPSend(c, QData, true)) {
if (c.GetStatus() > -1) if (c.GetStatus() > -1)
c.SetStatus(-1); c.SetStatus(-1);
{
std::unique_lock lock(c.MissedPacketQueueMutex());
while(!c.MissedPacketQueue().empty()){
c.MissedPacketQueue().pop();
}
}
CloseSocketProper(c.GetTCPSock()); CloseSocketProper(c.GetTCPSock());
return false; return false;
} }
@ -382,7 +388,7 @@ bool TNetwork::TCPSend(TClient& c, const std::string& Data, bool IsSync) {
c.SetStatus(-1); c.SetStatus(-1);
return false; return false;
} else if (Temp < 0) { } else if (Temp < 0) {
debug("send() < 0: " + std::string(std::strerror(errno))); debug("send() < 0: " + std::string(std::strerror(errno))); //TODO fix it was spamming yet everyone stayed on the server
if (c.GetStatus() > -1) if (c.GetStatus() > -1)
c.SetStatus(-1); c.SetStatus(-1);
CloseSocketProper(c.GetTCPSock()); CloseSocketProper(c.GetTCPSock());

2
src/TServer.cpp
View File

@ -304,6 +304,6 @@ void TServer::Apply(TClient& c, int VID, const std::string& pckt) {
void TServer::InsertClient(const std::shared_ptr<TClient>& NewClient) { void TServer::InsertClient(const std::shared_ptr<TClient>& NewClient) {
debug("inserting client (" + std::to_string(ClientCount()) + ")"); debug("inserting client (" + std::to_string(ClientCount()) + ")");
WriteLock Lock(mClientsMutex); WriteLock Lock(mClientsMutex); //TODO why is there 30+ threads locked here
(void)mClients.insert(NewClient); (void)mClients.insert(NewClient);
} }