mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-06-12 17:14:52 -07:00
Clang-format (#3028)
* 1/3 Add .clang-format file and travis compilation check * 2/3 Run clang-format * 3/3 Fix compilation problems due to include reordering * 3bis/3 AfterControlStatement: false
This commit is contained in:
ctrlaltca
GitHub
parent
8dbdd24c8e
commit
b29bd9e070
272 changed files with 13378 additions and 9535 deletions
197
common/server.h
197
common/server.h
|
|
@ -1,18 +1,18 @@
|
|||
#ifndef SERVER_H
|
||||
#define SERVER_H
|
||||
|
||||
#include <QObject>
|
||||
#include <QStringList>
|
||||
#include "pb/commands.pb.h"
|
||||
#include "pb/serverinfo_ban.pb.h"
|
||||
#include "pb/serverinfo_chat_message.pb.h"
|
||||
#include "pb/serverinfo_user.pb.h"
|
||||
#include "pb/serverinfo_warning.pb.h"
|
||||
#include "server_player_reference.h"
|
||||
#include <QMap>
|
||||
#include <QMultiMap>
|
||||
#include <QMutex>
|
||||
#include <QObject>
|
||||
#include <QReadWriteLock>
|
||||
#include "pb/commands.pb.h"
|
||||
#include "pb/serverinfo_user.pb.h"
|
||||
#include "pb/serverinfo_ban.pb.h"
|
||||
#include "pb/serverinfo_warning.pb.h"
|
||||
#include "pb/serverinfo_chat_message.pb.h"
|
||||
#include "server_player_reference.h"
|
||||
#include <QStringList>
|
||||
|
||||
class Server_DatabaseInterface;
|
||||
class Server_Game;
|
||||
|
|
@ -31,7 +31,18 @@ class GameEventContainer;
|
|||
class CommandContainer;
|
||||
class Command_JoinGame;
|
||||
|
||||
enum AuthenticationResult { NotLoggedIn, PasswordRight, UnknownUser, WouldOverwriteOldSession, UserIsBanned, UsernameInvalid, RegistrationRequired, UserIsInactive, ClientIdRequired };
|
||||
enum AuthenticationResult
|
||||
{
|
||||
NotLoggedIn,
|
||||
PasswordRight,
|
||||
UnknownUser,
|
||||
WouldOverwriteOldSession,
|
||||
UserIsBanned,
|
||||
UsernameInvalid,
|
||||
RegistrationRequired,
|
||||
UserIsInactive,
|
||||
ClientIdRequired
|
||||
};
|
||||
|
||||
class Server : public QObject
|
||||
{
|
||||
|
|
@ -42,45 +53,132 @@ signals:
|
|||
void endSession(qint64 sessionId);
|
||||
private slots:
|
||||
void broadcastRoomUpdate(const ServerInfo_Room &roomInfo, bool sendToIsl = false);
|
||||
|
||||
public:
|
||||
mutable QReadWriteLock clientsLock, roomsLock; // locking order: roomsLock before clientsLock
|
||||
Server(QObject *parent = 0);
|
||||
~Server();
|
||||
AuthenticationResult loginUser(Server_ProtocolHandler *session, QString &name, const QString &password, QString &reason, int &secondsLeft, QString &clientid, QString &clientVersion, QString &connectionType);
|
||||
AuthenticationResult loginUser(Server_ProtocolHandler *session,
|
||||
QString &name,
|
||||
const QString &password,
|
||||
QString &reason,
|
||||
int &secondsLeft,
|
||||
QString &clientid,
|
||||
QString &clientVersion,
|
||||
QString &connectionType);
|
||||
|
||||
const QMap<int, Server_Room *> &getRooms() { return rooms; }
|
||||
const QMap<int, Server_Room *> &getRooms()
|
||||
{
|
||||
return rooms;
|
||||
}
|
||||
|
||||
Server_AbstractUserInterface *findUser(const QString &userName) const;
|
||||
const QMap<QString, Server_ProtocolHandler *> &getUsers() const { return users; }
|
||||
const QMap<qint64, Server_ProtocolHandler *> &getUsersBySessionId() const { return usersBySessionId; }
|
||||
virtual QMap<QString, bool> getServerRequiredFeatureList() const { return QMap<QString, bool>(); }
|
||||
const QMap<QString, Server_ProtocolHandler *> &getUsers() const
|
||||
{
|
||||
return users;
|
||||
}
|
||||
const QMap<qint64, Server_ProtocolHandler *> &getUsersBySessionId() const
|
||||
{
|
||||
return usersBySessionId;
|
||||
}
|
||||
virtual QMap<QString, bool> getServerRequiredFeatureList() const
|
||||
{
|
||||
return QMap<QString, bool>();
|
||||
}
|
||||
void addClient(Server_ProtocolHandler *player);
|
||||
void removeClient(Server_ProtocolHandler *player);
|
||||
QList<QString> getOnlineModeratorList();
|
||||
virtual QString getLoginMessage() const { return QString(); }
|
||||
virtual QString getRequiredFeatures() const { return QString(); }
|
||||
virtual bool permitUnregisteredUsers() const { return true; }
|
||||
virtual bool getGameShouldPing() const { return false; }
|
||||
virtual bool getClientIDRequiredEnabled() const { return false; }
|
||||
virtual bool getRegOnlyServerEnabled() const { return false; }
|
||||
virtual bool getMaxUserLimitEnabled() const { return false; }
|
||||
virtual bool getEnableLogQuery() const { return false; }
|
||||
virtual bool getStoreReplaysEnabled() const { return true; }
|
||||
virtual int getIdleClientTimeout() const { return 0; }
|
||||
virtual int getClientKeepAlive() const { return 0; }
|
||||
virtual int getMaxGameInactivityTime() const { return 9999999; }
|
||||
virtual int getMaxPlayerInactivityTime() const { return 9999999; }
|
||||
virtual int getMessageCountingInterval() const { return 0; }
|
||||
virtual int getMaxMessageCountPerInterval() const { return 0; }
|
||||
virtual int getMaxMessageSizePerInterval() const { return 0; }
|
||||
virtual int getMaxGamesPerUser() const { return 0; }
|
||||
virtual int getCommandCountingInterval() const { return 0; }
|
||||
virtual int getMaxCommandCountPerInterval() const { return 0; }
|
||||
virtual int getMaxUserTotal() const { return 9999999; }
|
||||
virtual int getServerID() const { return 0; }
|
||||
virtual QString getLoginMessage() const
|
||||
{
|
||||
return QString();
|
||||
}
|
||||
virtual QString getRequiredFeatures() const
|
||||
{
|
||||
return QString();
|
||||
}
|
||||
virtual bool permitUnregisteredUsers() const
|
||||
{
|
||||
return true;
|
||||
}
|
||||
virtual bool getGameShouldPing() const
|
||||
{
|
||||
return false;
|
||||
}
|
||||
virtual bool getClientIDRequiredEnabled() const
|
||||
{
|
||||
return false;
|
||||
}
|
||||
virtual bool getRegOnlyServerEnabled() const
|
||||
{
|
||||
return false;
|
||||
}
|
||||
virtual bool getMaxUserLimitEnabled() const
|
||||
{
|
||||
return false;
|
||||
}
|
||||
virtual bool getEnableLogQuery() const
|
||||
{
|
||||
return false;
|
||||
}
|
||||
virtual bool getStoreReplaysEnabled() const
|
||||
{
|
||||
return true;
|
||||
}
|
||||
virtual int getIdleClientTimeout() const
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
virtual int getClientKeepAlive() const
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
virtual int getMaxGameInactivityTime() const
|
||||
{
|
||||
return 9999999;
|
||||
}
|
||||
virtual int getMaxPlayerInactivityTime() const
|
||||
{
|
||||
return 9999999;
|
||||
}
|
||||
virtual int getMessageCountingInterval() const
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
virtual int getMaxMessageCountPerInterval() const
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
virtual int getMaxMessageSizePerInterval() const
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
virtual int getMaxGamesPerUser() const
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
virtual int getCommandCountingInterval() const
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
virtual int getMaxCommandCountPerInterval() const
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
virtual int getMaxUserTotal() const
|
||||
{
|
||||
return 9999999;
|
||||
}
|
||||
virtual int getServerID() const
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
Server_DatabaseInterface *getDatabaseInterface() const;
|
||||
int getNextLocalGameId() { QMutexLocker locker(&nextLocalGameIdMutex); return ++nextLocalGameId; }
|
||||
int getNextLocalGameId()
|
||||
{
|
||||
QMutexLocker locker(&nextLocalGameIdMutex);
|
||||
return ++nextLocalGameId;
|
||||
}
|
||||
|
||||
void sendIsl_Response(const Response &item, int serverId = -1, qint64 sessionId = -1);
|
||||
void sendIsl_SessionEvent(const SessionEvent &item, int serverId = -1, qint64 sessionId = -1);
|
||||
|
|
@ -91,15 +189,25 @@ public:
|
|||
|
||||
void addExternalUser(const ServerInfo_User &userInfo);
|
||||
void removeExternalUser(const QString &userName);
|
||||
const QMap<QString, Server_AbstractUserInterface *> &getExternalUsers() const { return externalUsers; }
|
||||
const QMap<QString, Server_AbstractUserInterface *> &getExternalUsers() const
|
||||
{
|
||||
return externalUsers;
|
||||
}
|
||||
|
||||
void addPersistentPlayer(const QString &userName, int roomId, int gameId, int playerId);
|
||||
void removePersistentPlayer(const QString &userName, int roomId, int gameId, int playerId);
|
||||
QList<PlayerReference> getPersistentPlayerReferences(const QString &userName) const;
|
||||
int getUsersCount() const;
|
||||
int getGamesCount() const;
|
||||
int getTCPUserCount() const { return tcpUserCount; }
|
||||
int getWebSocketUserCount() const { return webSocketUserCount; }
|
||||
int getTCPUserCount() const
|
||||
{
|
||||
return tcpUserCount;
|
||||
}
|
||||
int getWebSocketUserCount() const
|
||||
{
|
||||
return webSocketUserCount;
|
||||
}
|
||||
|
||||
private:
|
||||
QMultiMap<QString, PlayerReference> persistentPlayers;
|
||||
mutable QReadWriteLock persistentPlayersLock;
|
||||
|
|
@ -113,12 +221,17 @@ protected slots:
|
|||
void externalRoomUserLeft(int roomId, const QString &userName);
|
||||
void externalRoomSay(int roomId, const QString &userName, const QString &message);
|
||||
void externalRoomGameListChanged(int roomId, const ServerInfo_Game &gameInfo);
|
||||
void externalJoinGameCommandReceived(const Command_JoinGame &cmd, int cmdId, int roomId, int serverId, qint64 sessionId);
|
||||
void externalGameCommandContainerReceived(const CommandContainer &cont, int playerId, int serverId, qint64 sessionId);
|
||||
void
|
||||
externalJoinGameCommandReceived(const Command_JoinGame &cmd, int cmdId, int roomId, int serverId, qint64 sessionId);
|
||||
void
|
||||
externalGameCommandContainerReceived(const CommandContainer &cont, int playerId, int serverId, qint64 sessionId);
|
||||
void externalGameEventContainerReceived(const GameEventContainer &cont, qint64 sessionId);
|
||||
void externalResponseReceived(const Response &resp, qint64 sessionId);
|
||||
|
||||
virtual void doSendIslMessage(const IslMessage & /* msg */, int /* serverId */) { }
|
||||
virtual void doSendIslMessage(const IslMessage & /* msg */, int /* serverId */)
|
||||
{
|
||||
}
|
||||
|
||||
protected:
|
||||
void prepareDestroy();
|
||||
void setDatabaseInterface(Server_DatabaseInterface *_databaseInterface);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue