mirror of
https://github.com/vcmi/vcmi.git
synced 2024-12-24 22:14:36 +02:00
Refactoring of networking code on server and client
* Avoid server crash on dummy connect / disconnect. * Avoid server crash when host left from PreGame. * Server print it's state with name when it's waiting for connection or in pregame. * Server will use random port if specified port is busy.
This commit is contained in:
parent
9b867808a7
commit
cc163c4e05
@ -1273,8 +1273,11 @@ static void mainLoop()
|
|||||||
|
|
||||||
void startGame(StartInfo * options, CConnection *serv/* = nullptr*/)
|
void startGame(StartInfo * options, CConnection *serv/* = nullptr*/)
|
||||||
{
|
{
|
||||||
serverAlive.waitWhileTrue();
|
if(!CServerHandler::DO_NOT_START_SERVER)
|
||||||
serverAlive.setn(true);
|
{
|
||||||
|
serverAlive.waitWhileTrue();
|
||||||
|
serverAlive.setn(true);
|
||||||
|
}
|
||||||
|
|
||||||
if(vm.count("onlyAI"))
|
if(vm.count("onlyAI"))
|
||||||
{
|
{
|
||||||
|
@ -708,16 +708,13 @@ void CClient::stopConnection()
|
|||||||
connectionHandler->join();
|
connectionHandler->join();
|
||||||
|
|
||||||
logNetwork->infoStream() << "Connection handler thread joined";
|
logNetwork->infoStream() << "Connection handler thread joined";
|
||||||
|
vstd::clear_pointer(connectionHandler);
|
||||||
delete connectionHandler;
|
|
||||||
connectionHandler = nullptr;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (serv) //and delete connection
|
if (serv) //and delete connection
|
||||||
{
|
{
|
||||||
serv->close();
|
serv->close();
|
||||||
delete serv;
|
vstd::clear_pointer(serv);
|
||||||
serv = nullptr;
|
|
||||||
logNetwork->warnStream() << "Our socket has been closed.";
|
logNetwork->warnStream() << "Our socket has been closed.";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -990,6 +987,7 @@ CConnection * CServerHandler::connectToServer()
|
|||||||
#ifndef VCMI_ANDROID
|
#ifndef VCMI_ANDROID
|
||||||
if(!shared->sr->ready)
|
if(!shared->sr->ready)
|
||||||
waitForServer();
|
waitForServer();
|
||||||
|
port = boost::lexical_cast<std::string>(shared->sr->port);
|
||||||
#else
|
#else
|
||||||
waitForServer();
|
waitForServer();
|
||||||
#endif
|
#endif
|
||||||
|
@ -19,19 +19,22 @@
|
|||||||
struct ServerReady
|
struct ServerReady
|
||||||
{
|
{
|
||||||
bool ready;
|
bool ready;
|
||||||
|
uint16_t port; //ui16?
|
||||||
boost::interprocess::interprocess_mutex mutex;
|
boost::interprocess::interprocess_mutex mutex;
|
||||||
boost::interprocess::interprocess_condition cond;
|
boost::interprocess::interprocess_condition cond;
|
||||||
|
|
||||||
ServerReady()
|
ServerReady()
|
||||||
{
|
{
|
||||||
ready = false;
|
ready = false;
|
||||||
|
port = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void setToTrueAndNotify()
|
void setToTrueAndNotify(uint16_t Port)
|
||||||
{
|
{
|
||||||
{
|
{
|
||||||
boost::unique_lock<boost::interprocess::interprocess_mutex> lock(mutex);
|
boost::unique_lock<boost::interprocess::interprocess_mutex> lock(mutex);
|
||||||
ready = true;
|
ready = true;
|
||||||
|
port = Port;
|
||||||
}
|
}
|
||||||
cond.notify_all();
|
cond.notify_all();
|
||||||
}
|
}
|
||||||
|
@ -424,4 +424,4 @@
|
|||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||||
<ImportGroup Label="ExtensionTargets">
|
<ImportGroup Label="ExtensionTargets">
|
||||||
</ImportGroup>
|
</ImportGroup>
|
||||||
</Project>
|
</Project>
|
||||||
|
@ -669,4 +669,4 @@
|
|||||||
<Filter>Header Files</Filter>
|
<Filter>Header Files</Filter>
|
||||||
</ClInclude>
|
</ClInclude>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
</Project>
|
</Project>
|
||||||
|
@ -191,8 +191,7 @@ void CConnection::close()
|
|||||||
if(socket)
|
if(socket)
|
||||||
{
|
{
|
||||||
socket->close();
|
socket->close();
|
||||||
delete socket;
|
vstd::clear_pointer(socket);
|
||||||
socket = nullptr;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2716,10 +2716,16 @@ void CGameHandler::close()
|
|||||||
}
|
}
|
||||||
end2 = true;
|
end2 = true;
|
||||||
|
|
||||||
//for (CConnection *cc : conns)
|
for (auto & elem : conns)
|
||||||
// if (cc && cc->socket && cc->socket->is_open())
|
{
|
||||||
// cc->socket->close();
|
if(!elem->isOpen())
|
||||||
//exit(0);
|
continue;
|
||||||
|
|
||||||
|
boost::unique_lock<boost::mutex> lock(*(elem)->wmx);
|
||||||
|
elem->close();
|
||||||
|
elem->connected = false;
|
||||||
|
}
|
||||||
|
exit(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool CGameHandler::arrangeStacks(ObjectInstanceID id1, ObjectInstanceID id2, ui8 what, SlotID p1, SlotID p2, si32 val, PlayerColor player)
|
bool CGameHandler::arrangeStacks(ObjectInstanceID id1, ObjectInstanceID id2, ui8 what, SlotID p1, SlotID p2, si32 val, PlayerColor player)
|
||||||
|
@ -45,7 +45,6 @@ std::string NAME = GameConstants::VCMI_VERSION + std::string(" (") + NAME_AFFIX
|
|||||||
namespace intpr = boost::interprocess;
|
namespace intpr = boost::interprocess;
|
||||||
#endif
|
#endif
|
||||||
bool end2 = false;
|
bool end2 = false;
|
||||||
int port = 3030;
|
|
||||||
|
|
||||||
boost::program_options::variables_map cmdLineOptions;
|
boost::program_options::variables_map cmdLineOptions;
|
||||||
|
|
||||||
@ -106,6 +105,10 @@ void CPregameServer::handleConnection(CConnection *cpc)
|
|||||||
auto unlock = vstd::makeUnlockGuard(mx);
|
auto unlock = vstd::makeUnlockGuard(mx);
|
||||||
while(state == RUNNING) boost::this_thread::sleep(boost::posix_time::milliseconds(50));
|
while(state == RUNNING) boost::this_thread::sleep(boost::posix_time::milliseconds(50));
|
||||||
}
|
}
|
||||||
|
else if(quitting) // Server must be stopped if host is leaving from lobby to avoid crash
|
||||||
|
{
|
||||||
|
end2 = true;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
catch (const std::exception& e)
|
catch (const std::exception& e)
|
||||||
@ -206,20 +209,29 @@ void CPregameServer::connectionAccepted(const boost::system::error_code& ec)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
logNetwork->info("We got a new connection! :)");
|
try
|
||||||
CConnection *pc = new CConnection(upcomingConnection, NAME);
|
{
|
||||||
initConnection(pc);
|
logNetwork->info("We got a new connection! :)");
|
||||||
upcomingConnection = nullptr;
|
std::string name = NAME;
|
||||||
|
CConnection *pc = new CConnection(upcomingConnection, name.append(" STATE_PREGAME"));
|
||||||
|
initConnection(pc);
|
||||||
|
upcomingConnection = nullptr;
|
||||||
|
|
||||||
startListeningThread(pc);
|
startListeningThread(pc);
|
||||||
|
|
||||||
*pc << (ui8)pc->connectionID << curmap;
|
*pc << (ui8)pc->connectionID << curmap;
|
||||||
|
|
||||||
announceTxt(pc->name + " joins the game");
|
announceTxt(pc->name + " joins the game");
|
||||||
auto pj = new PlayerJoined();
|
auto pj = new PlayerJoined();
|
||||||
pj->playerName = pc->name;
|
pj->playerName = pc->name;
|
||||||
pj->connectionID = pc->connectionID;
|
pj->connectionID = pc->connectionID;
|
||||||
toAnnounce.push_back(pj);
|
toAnnounce.push_back(pj);
|
||||||
|
}
|
||||||
|
catch(std::exception& e)
|
||||||
|
{
|
||||||
|
upcomingConnection = nullptr;
|
||||||
|
logNetwork->info("I guess it was just my imagination!");
|
||||||
|
}
|
||||||
|
|
||||||
start_async_accept();
|
start_async_accept();
|
||||||
}
|
}
|
||||||
@ -314,9 +326,23 @@ void CPregameServer::startListeningThread(CConnection * pc)
|
|||||||
}
|
}
|
||||||
|
|
||||||
CVCMIServer::CVCMIServer()
|
CVCMIServer::CVCMIServer()
|
||||||
: io(new boost::asio::io_service()), acceptor(new TAcceptor(*io, boost::asio::ip::tcp::endpoint(boost::asio::ip::tcp::v4(), port))), firstConnection(nullptr)
|
: port(3030), io(new boost::asio::io_service()), firstConnection(nullptr)
|
||||||
{
|
{
|
||||||
logNetwork->trace("CVCMIServer created!");
|
logNetwork->trace("CVCMIServer created!");
|
||||||
|
if(cmdLineOptions.count("port"))
|
||||||
|
port = cmdLineOptions["port"].as<ui16>();
|
||||||
|
logNetwork->info("Port %d will be used", port);
|
||||||
|
try
|
||||||
|
{
|
||||||
|
acceptor = new TAcceptor(*io, boost::asio::ip::tcp::endpoint(boost::asio::ip::tcp::v4(), port));
|
||||||
|
}
|
||||||
|
catch(...)
|
||||||
|
{
|
||||||
|
logNetwork->info("Port %d is busy, trying to use random port instead", port);
|
||||||
|
acceptor = new TAcceptor(*io, boost::asio::ip::tcp::endpoint(boost::asio::ip::tcp::v4(), 0));
|
||||||
|
port = acceptor->local_endpoint().port();
|
||||||
|
}
|
||||||
|
logNetwork->info("Listening for connections at port %d", port);
|
||||||
}
|
}
|
||||||
CVCMIServer::~CVCMIServer()
|
CVCMIServer::~CVCMIServer()
|
||||||
{
|
{
|
||||||
@ -413,50 +439,62 @@ void CVCMIServer::start()
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
boost::system::error_code error;
|
boost::system::error_code error;
|
||||||
logNetwork->info("Listening for connections at port %d", acceptor->local_endpoint().port());
|
for (;;)
|
||||||
auto s = new boost::asio::ip::tcp::socket(acceptor->get_io_service());
|
{
|
||||||
boost::thread acc(std::bind(vaccept,acceptor,s,&error));
|
try
|
||||||
#ifndef VCMI_ANDROID
|
{
|
||||||
sr->setToTrueAndNotify();
|
auto s = new boost::asio::ip::tcp::socket(acceptor->get_io_service());
|
||||||
delete mr;
|
boost::thread acc(std::bind(vaccept,acceptor,s,&error));
|
||||||
|
#ifdef VCMI_ANDROID
|
||||||
|
{ // in block to clean-up vm helper after use, because we don't need to keep this thread attached to vm
|
||||||
|
CAndroidVMHelper envHelper;
|
||||||
|
envHelper.callStaticVoidMethod(CAndroidVMHelper::NATIVE_METHODS_DEFAULT_CLASS, "onServerReady");
|
||||||
|
logNetwork->info("Sending server ready message to client");
|
||||||
|
}
|
||||||
#else
|
#else
|
||||||
{ // in block to clean-up vm helper after use, because we don't need to keep this thread attached to vm
|
sr->setToTrueAndNotify(port);
|
||||||
CAndroidVMHelper envHelper;
|
delete mr;
|
||||||
envHelper.callStaticVoidMethod(CAndroidVMHelper::NATIVE_METHODS_DEFAULT_CLASS, "onServerReady");
|
|
||||||
logNetwork->info("Sending server ready message to client");
|
|
||||||
}
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
acc.join();
|
acc.join();
|
||||||
if (error)
|
if (error)
|
||||||
{
|
{
|
||||||
logNetwork->warnStream() << "Got connection but there is an error " << error;
|
logNetwork->warnStream()<<"Got connection but there is an error " << error;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
logNetwork->info("We've accepted someone... ");
|
logNetwork->info("We've accepted someone... ");
|
||||||
firstConnection = new CConnection(s, NAME);
|
std::string name = NAME;
|
||||||
logNetwork->info("Got connection!");
|
firstConnection = new CConnection(s, name.append(" STATE_WAITING"));
|
||||||
while (!end2)
|
logNetwork->info("Got connection!");
|
||||||
{
|
while(!end2)
|
||||||
ui8 mode;
|
{
|
||||||
*firstConnection >> mode;
|
ui8 mode;
|
||||||
switch (mode)
|
*firstConnection >> mode;
|
||||||
|
switch (mode)
|
||||||
|
{
|
||||||
|
case 0:
|
||||||
|
firstConnection->close();
|
||||||
|
exit(0);
|
||||||
|
case 1:
|
||||||
|
firstConnection->close();
|
||||||
|
return;
|
||||||
|
case 2:
|
||||||
|
newGame();
|
||||||
|
break;
|
||||||
|
case 3:
|
||||||
|
loadGame();
|
||||||
|
break;
|
||||||
|
case 4:
|
||||||
|
newPregame();
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
catch(std::exception& e)
|
||||||
{
|
{
|
||||||
case 0:
|
vstd::clear_pointer(firstConnection);
|
||||||
firstConnection->close();
|
logNetwork->info("I guess it was just my imagination!");
|
||||||
exit(0);
|
|
||||||
case 1:
|
|
||||||
firstConnection->close();
|
|
||||||
return;
|
|
||||||
case 2:
|
|
||||||
newGame();
|
|
||||||
break;
|
|
||||||
case 3:
|
|
||||||
loadGame();
|
|
||||||
break;
|
|
||||||
case 4:
|
|
||||||
newPregame();
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -507,7 +545,7 @@ static void handleCommandOptions(int argc, char *argv[])
|
|||||||
opts.add_options()
|
opts.add_options()
|
||||||
("help,h", "display help and exit")
|
("help,h", "display help and exit")
|
||||||
("version,v", "display version information and exit")
|
("version,v", "display version information and exit")
|
||||||
("port", po::value<int>()->default_value(3030), "port at which server will listen to connections from client")
|
("port", po::value<ui16>(), "port at which server will listen to connections from client")
|
||||||
("resultsFile", po::value<std::string>()->default_value("./results.txt"), "file to which the battle result will be appended. Used only in the DUEL mode.");
|
("resultsFile", po::value<std::string>()->default_value("./results.txt"), "file to which the battle result will be appended. Used only in the DUEL mode.");
|
||||||
|
|
||||||
if(argc > 1)
|
if(argc > 1)
|
||||||
@ -584,12 +622,7 @@ int main(int argc, char** argv)
|
|||||||
logConfig.configureDefault();
|
logConfig.configureDefault();
|
||||||
logGlobal->info(NAME);
|
logGlobal->info(NAME);
|
||||||
|
|
||||||
|
|
||||||
handleCommandOptions(argc, argv);
|
handleCommandOptions(argc, argv);
|
||||||
if (cmdLineOptions.count("port"))
|
|
||||||
port = cmdLineOptions["port"].as<int>();
|
|
||||||
logNetwork->info("Port %d will be used.", port);
|
|
||||||
|
|
||||||
preinitDLL(console);
|
preinitDLL(console);
|
||||||
settings.init();
|
settings.init();
|
||||||
logConfig.configure();
|
logConfig.configure();
|
||||||
@ -630,11 +663,9 @@ int main(int argc, char** argv)
|
|||||||
CAndroidVMHelper envHelper;
|
CAndroidVMHelper envHelper;
|
||||||
envHelper.callStaticVoidMethod(CAndroidVMHelper::NATIVE_METHODS_DEFAULT_CLASS, "killServer");
|
envHelper.callStaticVoidMethod(CAndroidVMHelper::NATIVE_METHODS_DEFAULT_CLASS, "killServer");
|
||||||
#endif
|
#endif
|
||||||
delete VLC;
|
vstd::clear_pointer(VLC);
|
||||||
VLC = nullptr;
|
|
||||||
CResourceHandler::clear();
|
CResourceHandler::clear();
|
||||||
|
return 0;
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef VCMI_ANDROID
|
#ifdef VCMI_ANDROID
|
||||||
|
@ -43,6 +43,7 @@ typedef boost::asio::basic_stream_socket < boost::asio::ip::tcp , boost::asio::s
|
|||||||
|
|
||||||
class CVCMIServer
|
class CVCMIServer
|
||||||
{
|
{
|
||||||
|
ui16 port;
|
||||||
boost::asio::io_service *io;
|
boost::asio::io_service *io;
|
||||||
TAcceptor * acceptor;
|
TAcceptor * acceptor;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user