evert/osb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Server: Log TCP error and carry on

Browse Source 
Fixes the Singleplayer server thread locking up forever and leaving us in an eternal loading screen if the TCP socket fails to bind. Something on my PC is hogging the default server port, which is what made me encounter this.
This commit is contained in:
Kae 2023-07-26 18:47:23 +10:00
parent c090b935ac
commit ddab1db73f
2 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
source/game/StarUniverseServer.cpp
View File

@ -70,7 +70,7 @@ UniverseServer::UniverseServer(String const& storageDir)
loadTempWorldIndex(); loadTempWorldIndex();
m_lastClockUpdateSent = 0.0; m_lastClockUpdateSent = 0.0;
m_stop = false; m_stop = false;
m_listenTcp = false; m_tcpState = TcpState::No;
m_storageTriggerDeadline = 0; m_storageTriggerDeadline = 0;
m_clearBrokenWorldsDeadline = 0; m_clearBrokenWorldsDeadline = 0;
@ -104,7 +104,8 @@ UniverseServer::~UniverseServer() {
} }
void UniverseServer::setListeningTcp(bool listenTcp) { void UniverseServer::setListeningTcp(bool listenTcp) {
m_listenTcp = listenTcp; if (!listenTcp || m_tcpState != TcpState::Fuck)
m_tcpState = listenTcp ? TcpState::Yes : TcpState::No;
} }
void UniverseServer::addClient(UniverseConnection remoteConnection) { void UniverseServer::addClient(UniverseConnection remoteConnection) {
@ -469,7 +470,7 @@ void UniverseServer::run() {
TcpServerPtr tcpServer; TcpServerPtr tcpServer;
while (!m_stop) { while (!m_stop) {
if (m_listenTcp && !tcpServer) { if (m_tcpState == TcpState::Yes && !tcpServer) {
auto& root = Root::singleton(); auto& root = Root::singleton();
auto configuration = root.configuration(); auto configuration = root.configuration();
auto assets = root.assets(); auto assets = root.assets();
@ -478,20 +479,27 @@ void UniverseServer::run() {
Logger::info("UniverseServer: listening for incoming TCP connections on {}", bindAddress); Logger::info("UniverseServer: listening for incoming TCP connections on {}", bindAddress);
tcpServer = make_shared<TcpServer>(bindAddress); try {
tcpServer->setAcceptCallback([this, maxPendingConnections](TcpSocketPtr socket) { tcpServer = make_shared<TcpServer>(bindAddress);
tcpServer->setAcceptCallback([this, maxPendingConnections](TcpSocketPtr socket) {
RecursiveMutexLocker locker(m_mainLock); RecursiveMutexLocker locker(m_mainLock);
if (m_connectionAcceptThreads.size() < maxPendingConnections) { if (m_connectionAcceptThreads.size() < maxPendingConnections) {
Logger::info("UniverseServer: Connection received from: {}", socket->remoteAddress()); Logger::info("UniverseServer: Connection received from: {}", socket->remoteAddress());
m_connectionAcceptThreads.append(Thread::invoke("UniverseServer::acceptConnection", [this, socket]() { m_connectionAcceptThreads.append(Thread::invoke("UniverseServer::acceptConnection", [this, socket]() {
acceptConnection(UniverseConnection(TcpPacketSocket::open(socket)), socket->remoteAddress().address()); acceptConnection(UniverseConnection(TcpPacketSocket::open(socket)), socket->remoteAddress().address());
})); }));
} else { }
else {
Logger::warn("UniverseServer: maximum pending connections, dropping connection from: {}", socket->remoteAddress().address()); Logger::warn("UniverseServer: maximum pending connections, dropping connection from: {}", socket->remoteAddress().address());
} }
}); });
}
} else if (!m_listenTcp && tcpServer) { catch (StarException const& e) {
Logger::error("UniverseServer: Error setting up TCP, cannot accept connections: {}", e.what());
m_tcpState = TcpState::Fuck;
tcpServer.reset();
}
} else if (m_tcpState == TcpState::No && tcpServer) {
Logger::info("UniverseServer: Not listening for incoming TCP connections"); Logger::info("UniverseServer: Not listening for incoming TCP connections");
tcpServer.reset(); tcpServer.reset();
} }

4
source/game/StarUniverseServer.hpp
View File

@ -114,6 +114,8 @@ private:
Maybe<Uuid> uuid; Maybe<Uuid> uuid;
}; };
enum class TcpState : uint8_t { No, Yes, Fuck };
void processUniverseFlags(); void processUniverseFlags();
void sendPendingChat(); void sendPendingChat();
void updateTeams(); void updateTeams();
@ -218,7 +220,7 @@ private:
int64_t m_clearBrokenWorldsDeadline; int64_t m_clearBrokenWorldsDeadline;
int64_t m_lastClockUpdateSent; int64_t m_lastClockUpdateSent;
atomic<bool> m_stop; atomic<bool> m_stop;
atomic<bool> m_listenTcp; atomic<TcpState> m_tcpState;
mutable ReadersWriterMutex m_clientsLock; mutable ReadersWriterMutex m_clientsLock;
unsigned m_maxPlayers; unsigned m_maxPlayers;