games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-24 22:14:36 +02:00
Code Issues Releases Activity

Reverted debug changes

Browse Source
This commit is contained in:
Ivan Savenko 2023-06-27 16:27:46 +03:00
parent 4a5c1556a1
commit 6493922f9b
1 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
server/CVCMIServer.cpp
View File

@ -408,54 +408,54 @@ void CVCMIServer::threadHandleClient(std::shared_ptr<CConnection> c)
setThreadName("CVCMIServer::handleConnection");
c->enterLobbyConnectionMode();
//#ifndef _MSC_VER
// try
// {
//#endif
#ifndef _MSC_VER
try
{
#endif
while(c->connected)
{
CPack * pack;
//try
//{
try
{
pack = c->retrievePack();
//}
//catch(boost::system::system_error & e)
//{
// logNetwork->error("Network error receiving a pack. Connection %s dies. What happened: %s", c->toString(), e.what());
// hangingConnections.insert(c);
// connections.erase(c);
// if(connections.empty() || hostClient == c)
// state = EServerState::SHUTDOWN;
//
// if(gh && state == EServerState::GAMEPLAY)
// {
// gh->handleClientDisconnection(c);
// }
// break;
//}
}
catch(boost::system::system_error & e)
{
logNetwork->error("Network error receiving a pack. Connection %s dies. What happened: %s", c->toString(), e.what());
hangingConnections.insert(c);
connections.erase(c);
if(connections.empty() || hostClient == c)
state = EServerState::SHUTDOWN;
if(gh && state == EServerState::GAMEPLAY)
{
gh->handleClientDisconnection(c);
}
break;
}
CVCMIServerPackVisitor visitor(*this, this->gh);
pack->visit(visitor);
}
//#ifndef _MSC_VER
// }
// catch(const std::exception & e)
// {
// (void)e;
// boost::unique_lock<boost::recursive_mutex> queueLock(mx);
// logNetwork->error("%s dies... \nWhat happened: %s", c->toString(), e.what());
// }
// catch(...)
// {
// state = EServerState::SHUTDOWN;
// handleException();
// throw;
// }
//#endif
#ifndef _MSC_VER
}
catch(const std::exception & e)
{
(void)e;
boost::unique_lock<boost::recursive_mutex> queueLock(mx);
logNetwork->error("%s dies... \nWhat happened: %s", c->toString(), e.what());
}
catch(...)
{
state = EServerState::SHUTDOWN;
handleException();
throw;
}
#endif
boost::unique_lock<boost::recursive_mutex> queueLock(mx);
// if(state != ENDING_AND_STARTING_GAME)
if(c->connected)
{
auto lcd = std::make_unique<LobbyClientDisconnected>();