jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-11-11 20:43:25 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

[Server] Accept the database interface in the socket handler constructors

Browse source 
AbstractServerSocketInterface and its Tcp and Websocket subclasses still took a
concrete Servatrice_DatabaseInterface pointer, so the handler could not be
constructed with anything but the MySQL implementation even though its body now
speaks only Server_DatabaseInterface. Retype the three constructors and drop the
now-unused servatrice_database_interface.h include. Callers pass the pool's
Servatrice_DatabaseInterface, which converts to the base pointer, so behaviour
is unchanged.
This commit is contained in:
Lukas Brübach 2026-11-10 01:56:00 +01:00
parent 4007a88e67
commit 9ef1bbed5d
2 changed files with 7 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

7
servatrice/src/serversocketinterface.cpp
View file

@ -37,7 +37,6 @@
#include "main.h" #include "main.h"
#include "metrics_registry.h" #include "metrics_registry.h"
#include "servatrice.h" #include "servatrice.h"
#include "servatrice_database_interface.h"
#include "server.h" #include "server.h"
#include "server_database_interface.h" #include "server_database_interface.h"
#include "server_logger.h" #include "server_logger.h"
@ -192,7 +191,7 @@ static const int protocolVersion = 14;
static const int MAX_TCP_MESSAGE_SIZE = 1500000; static const int MAX_TCP_MESSAGE_SIZE = 1500000;
AbstractServerSocketInterface::AbstractServerSocketInterface(Servatrice *_server, AbstractServerSocketInterface::AbstractServerSocketInterface(Servatrice *_server,
Servatrice_DatabaseInterface *_databaseInterface, Server_DatabaseInterface *_databaseInterface,
QObject *parent) QObject *parent)
: Server_ProtocolHandler(_server, _databaseInterface, parent), servatrice(_server) : Server_ProtocolHandler(_server, _databaseInterface, parent), servatrice(_server)
{ {
@ -3674,7 +3673,7 @@ Response::ResponseCode AbstractServerSocketInterface::cmdUpdateAdminNotes(const
} }
TcpServerSocketInterface::TcpServerSocketInterface(Servatrice *_server, TcpServerSocketInterface::TcpServerSocketInterface(Servatrice *_server,
Servatrice_DatabaseInterface *_databaseInterface, Server_DatabaseInterface *_databaseInterface,
QObject *parent) QObject *parent)
: AbstractServerSocketInterface(_server, _databaseInterface, parent), messageInProgress(false), : AbstractServerSocketInterface(_server, _databaseInterface, parent), messageInProgress(false),
handshakeStarted(false) handshakeStarted(false)
@ -3869,7 +3868,7 @@ bool TcpServerSocketInterface::initTcpSession()
} }
WebsocketServerSocketInterface::WebsocketServerSocketInterface(Servatrice *_server, WebsocketServerSocketInterface::WebsocketServerSocketInterface(Servatrice *_server,
Servatrice_DatabaseInterface *_databaseInterface, Server_DatabaseInterface *_databaseInterface,
QObject *parent) QObject *parent)
: AbstractServerSocketInterface(_server, _databaseInterface, parent), socket(nullptr) : AbstractServerSocketInterface(_server, _databaseInterface, parent), socket(nullptr)
{ {

10
servatrice/src/serversocketinterface.h
View file

@ -37,7 +37,7 @@
#include <server_protocolhandler.h> #include <server_protocolhandler.h>
class Servatrice; class Servatrice;
class Servatrice_DatabaseInterface; class Server_DatabaseInterface;
class DeckList; class DeckList;
class ServerInfo_DeckStorage_Folder; class ServerInfo_DeckStorage_Folder;
class Command_AddToList; class Command_AddToList;
@ -247,7 +247,7 @@ private:
public: public:
AbstractServerSocketInterface(Servatrice *_server, AbstractServerSocketInterface(Servatrice *_server,
Servatrice_DatabaseInterface *_databaseInterface, Server_DatabaseInterface *_databaseInterface,
QObject *parent = 0); QObject *parent = 0);
~AbstractServerSocketInterface() ~AbstractServerSocketInterface()
{ {
@ -264,9 +264,7 @@ class TcpServerSocketInterface : public AbstractServerSocketInterface
{ {
Q_OBJECT Q_OBJECT
public: public:
TcpServerSocketInterface(Servatrice *_server, TcpServerSocketInterface(Servatrice *_server, Server_DatabaseInterface *_databaseInterface, QObject *parent = 0);
Servatrice_DatabaseInterface *_databaseInterface,
QObject *parent = 0);
~TcpServerSocketInterface(); ~TcpServerSocketInterface();
QHostAddress getPeerAddress() const QHostAddress getPeerAddress() const
@ -312,7 +310,7 @@ class WebsocketServerSocketInterface : public AbstractServerSocketInterface
Q_OBJECT Q_OBJECT
public: public:
WebsocketServerSocketInterface(Servatrice *_server, WebsocketServerSocketInterface(Servatrice *_server,
Servatrice_DatabaseInterface *_databaseInterface, Server_DatabaseInterface *_databaseInterface,
QObject *parent = nullptr); QObject *parent = nullptr);
~WebsocketServerSocketInterface(); ~WebsocketServerSocketInterface();