Mamanyonyo/akashi-esquizolandia
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hecho

Browse Source
This commit is contained in:
simio 2025-06-22 03:52:52 -03:00
parent af37e7e01d
commit 3cfe9461cc
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/server.cpp
View File

@ -94,20 +94,20 @@ void Server::start()
// Start non-secure server // Start non-secure server
if (!server->listen(bind_addr, m_port)) { if (!server->listen(bind_addr, m_port)) {
qDebug() << "Non-secure server error:" << server->errorString(); qDebug() << "Non-secure server error:" << server->errorString();
} } else {
else { connect(server, &QWebSocketServer::newConnection, this, [this]() {
connect(server, &QWebSocketServer::newConnection, this->clientConnected(server);
this, &Server::clientConnected); });
qInfo() << "Non-secure server listening on" << server->serverPort(); qInfo() << "Non-secure server listening on" << server->serverPort();
} }
// Start secure server // Start secure server
if (!secure_server->listen(bind_addr, m_secure_port)) { if (!secure_server->listen(bind_addr, m_secure_port)) {
qDebug() << "Secure server error:" << secure_server->errorString(); qDebug() << "Secure server error:" << secure_server->errorString();
} } else {
else { connect(secure_server, &QWebSocketServer::newConnection, this, [this]() {
connect(secure_server, &QWebSocketServer::newConnection, this->clientConnected(secure_server);
this, &Server::clientConnected); });
qInfo() << "Secure server listening on" << secure_server->serverPort(); qInfo() << "Secure server listening on" << secure_server->serverPort();
} }
@ -192,9 +192,14 @@ QVector<AOClient *> Server::getClients()
return m_clients; return m_clients;
} }
void Server::clientConnected() void Server::clientConnected(QWebSocketServer* whichServer)
{ {
QWebSocket *socket = server->nextPendingConnection(); QWebSocket *socket = whichServer->nextPendingConnection();
if (!socket) {
qWarning() << "Failed to get pending connection from" << whichServer->serverName();
return;
}
NetworkSocket *l_socket = new NetworkSocket(socket, socket); NetworkSocket *l_socket = new NetworkSocket(socket, socket);
// Too many players. Reject connection! // Too many players. Reject connection!

2
src/server.h
View File

@ -345,7 +345,7 @@ class Server : public QObject
* @details The function creates an AOClient to represent the user, assigns a user ID to them, and * @details The function creates an AOClient to represent the user, assigns a user ID to them, and
* checks if the client is banned. * checks if the client is banned.
*/ */
void clientConnected(); void clientConnected(QWebSocketServer *whichServer);
/** /**
* @brief Marks a userID as free and ads it back to the available client id queue. * @brief Marks a userID as free and ads it back to the available client id queue.