X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fquassel.h;h=88b225467f49594607c7c5c04b0083a138602279;hp=6089ac036310441d1b6816d8b38681c8d7d564dc;hb=0dbec2cfc937857d66a9645249f876f1e6b3f05e;hpb=76db8cdfbeffaaba359c8e80cf2146da9e9e7f8a diff --git a/src/common/quassel.h b/src/common/quassel.h index 6089ac03..88b22546 100644 --- a/src/common/quassel.h +++ b/src/common/quassel.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2013 by the Quassel Project * + * Copyright (C) 2005-2018 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -18,20 +18,27 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#ifndef QUASSEL_H_ -#define QUASSEL_H_ +#pragma once + +#include +#include +#include #include +#include +#include #include #include +#include #include "abstractcliparser.h" class QFile; -class Quassel +class Quassel : public QObject { - Q_DECLARE_TR_FUNCTIONS(Quassel) + // TODO Qt5: Use Q_GADGET + Q_OBJECT public: enum RunMode { @@ -47,12 +54,9 @@ public: QString baseVersion; QString generatedVersion; QString commitHash; - uint commitDate; - QString buildDate; - bool isSourceDirty; - uint protocolVersion; - uint clientNeedsProtocol; - uint coreNeedsProtocol; + QString commitDate; + + uint protocolVersion; // deprecated QString applicationName; QString coreApplicationName; @@ -61,32 +65,85 @@ public: QString organizationDomain; }; - //! A list of features that are optional in core and/or client, but need runtime checking - /** Some features require an uptodate counterpart, but don't justify a protocol break. - * This is what we use this enum for. Add such features to it and check at runtime on the other - * side for their existence. + /** + * This enum defines the optional features supported by cores/clients prior to version 0.13. + * + * Since the number of features declared this way is limited to 16 (due to the enum not having a defined + * width in cores/clients prior to 0.13), and for more robustness when negotiating features on connect, + * the bitfield-based representation was replaced by a string-based representation in 0.13, support for + * which is indicated by having the ExtendedFeatures flag set. Extended features are defined in the Feature + * enum. + * + * @warning Do not alter this enum; new features must be added (only) to the @a Feature enum. * - * This list should be cleaned up after every protocol break, as we can assume them to be present then. + * @sa Feature */ - enum Feature { + enum class LegacyFeature : quint32 { SynchronizedMarkerLine = 0x0001, - SaslAuthentication = 0x0002, - SaslExternal = 0x0004, - - NumFeatures = 0x0004 + SaslAuthentication = 0x0002, + SaslExternal = 0x0004, + HideInactiveNetworks = 0x0008, + PasswordChange = 0x0010, + CapNegotiation = 0x0020, + VerifyServerSSL = 0x0040, + CustomRateLimits = 0x0080, + // DccFileTransfer = 0x0100, // never in use + AwayFormatTimestamp = 0x0200, + Authenticators = 0x0400, + BufferActivitySync = 0x0800, + CoreSideHighlights = 0x1000, + SenderPrefixes = 0x2000, + RemoteDisconnect = 0x4000, + ExtendedFeatures = 0x8000, }; - Q_DECLARE_FLAGS(Features, Feature); + Q_FLAGS(LegacyFeature) + Q_DECLARE_FLAGS(LegacyFeatures, LegacyFeature) - //! The features the current version of Quassel supports (\sa Feature) - /** \return An ORed list of all enum values in Feature + /** + * A list of features that are optional in core and/or client, but need runtime checking. + * + * Some features require an uptodate counterpart, but don't justify a protocol break. + * This is what we use this enum for. Add such features to it and check at runtime on the other + * side for their existence. + * + * For feature negotiation, these enum values are serialized as strings, so order does not matter. However, + * do not rename existing enum values to avoid breaking compatibility. + * + * This list should be cleaned up after every protocol break, as we can assume them to be present then. */ - static Features features(); + #if QT_VERSION >= 0x050000 + enum class Feature : uint32_t { + #else + enum Feature { + #endif + SynchronizedMarkerLine, + SaslAuthentication, + SaslExternal, + HideInactiveNetworks, + PasswordChange, ///< Remote password change + CapNegotiation, ///< IRCv3 capability negotiation, account tracking + VerifyServerSSL, ///< IRC server SSL validation + CustomRateLimits, ///< IRC server custom message rate limits + AwayFormatTimestamp, ///< Timestamp formatting in away (e.g. %%hh:mm%%) + Authenticators, ///< Whether or not the core supports auth backends + BufferActivitySync, ///< Sync buffer activity status + CoreSideHighlights, ///< Core-Side highlight configuration and matching + SenderPrefixes, ///< Show prefixes for senders in backlog + RemoteDisconnect, ///< Allow this peer to be remotely disconnected + ExtendedFeatures, ///< Extended features +#if QT_VERSION >= 0x050500 + EcdsaCertfpKeys, ///< ECDSA keys for CertFP in identities +#endif + }; + Q_ENUMS(Feature) - virtual ~Quassel(); + class Features; - static void setupBuildInfo(const QString &generated); - static inline const BuildInfo &buildInfo(); - static inline RunMode runMode(); + static Quassel *instance(); + + static void setupBuildInfo(); + static const BuildInfo &buildInfo(); + static RunMode runMode(); static QString configDirPath(); @@ -116,14 +173,9 @@ public: static void loadTranslation(const QLocale &locale); - static inline void setCliParser(AbstractCliParser *cliParser); - static inline AbstractCliParser *cliParser(); - static inline QString optionValue(const QString &option); - static inline bool isOptionSet(const QString &option); - - static const QString &coreDumpFileName(); - - static bool DEBUG; + static void setCliParser(std::shared_ptr cliParser); + static QString optionValue(const QString &option); + static bool isOptionSet(const QString &option); enum LogLevel { DebugLevel, @@ -132,61 +184,150 @@ public: ErrorLevel }; - static inline LogLevel logLevel(); - static inline QFile *logFile(); - static inline bool logToSyslog(); + static LogLevel logLevel(); + static void setLogLevel(LogLevel logLevel); + static QFile *logFile(); + static bool logToSyslog(); static void logFatalMessage(const char *msg); + using ReloadHandler = std::function; + + static void registerReloadHandler(ReloadHandler handler); + + using QuitHandler = std::function; + + static void registerQuitHandler(QuitHandler quitHandler); + protected: - Quassel(); - virtual bool init(); - virtual void quit(); + static bool init(); + static void destroy(); + + static void setRunMode(Quassel::RunMode runMode); - inline void setRunMode(RunMode mode); - inline void setDataDirPaths(const QStringList &paths); - QStringList findDataDirPaths() const; - inline void disableCrashhandler(); + static void setDataDirPaths(const QStringList &paths); + static QStringList findDataDirPaths(); + static void disableCrashHandler(); + + friend class CoreApplication; + friend class QtUiApplication; + friend class MonolithicApplication; private: + Quassel(); + void setupEnvironment(); void registerMetaTypes(); + const QString &coreDumpFileName(); + + /** + * Requests a reload of relevant runtime configuration. + * + * Calls any registered reload handlers, and returns the cumulative result. If no handlers are registered, + * does nothing and returns true. + * + * @returns True if configuration reload successful, otherwise false + */ + bool reloadConfig(); + + /** + * Requests to quit the application. + * + * Calls any registered quit handlers. If no handlers are registered, calls QCoreApplication::quit(). + */ + void quit(); + + void logBacktrace(const QString &filename); + static void handleSignal(int signal); - static void logBacktrace(const QString &filename); - - static Quassel *_instance; - static BuildInfo _buildInfo; - static AbstractCliParser *_cliParser; - static RunMode _runMode; - static bool _initialized; - static bool _handleCrashes; - - static QString _coreDumpFileName; - static QString _configDirPath; - static QStringList _dataDirPaths; - static QString _translationDirPath; - - static LogLevel _logLevel; - static QFile *_logFile; - static bool _logToSyslog; + +private: + BuildInfo _buildInfo; + RunMode _runMode; + bool _initialized{false}; + bool _handleCrashes{true}; + + QString _coreDumpFileName; + QString _configDirPath; + QStringList _dataDirPaths; + QString _translationDirPath; + + LogLevel _logLevel{InfoLevel}; + bool _logToSyslog{false}; + std::unique_ptr _logFile; + + std::shared_ptr _cliParser; + + std::vector _reloadHandlers; + std::vector _quitHandlers; }; +// -------------------------------------------------------------------------------------------------------------------- -Q_DECLARE_OPERATORS_FOR_FLAGS(Quassel::Features); +/** + * Class representing a set of supported core/client features. + * + * @sa Quassel::Feature + */ +class Quassel::Features +{ +public: + /** + * Default constructor. + * + * Creates a Feature instance with all known features (i.e., all values declared in the Quassel::Feature enum) set. + * This is useful for easily creating a Feature instance that represent the current version's capabilities. + */ + Features(); -const Quassel::BuildInfo &Quassel::buildInfo() { return _buildInfo; } -Quassel::RunMode Quassel::runMode() { return _runMode; } -void Quassel::setRunMode(Quassel::RunMode mode) { _runMode = mode; } -void Quassel::setDataDirPaths(const QStringList &paths) { _dataDirPaths = paths; } -void Quassel::disableCrashhandler() { _handleCrashes = false; } + /** + * Constructs a Feature instance holding the given list of features. + * + * Both the @a features and the @a legacyFeatures arguments are considered (additively). + * This is useful when receiving a list of features from another peer. + * + * @param features A list of strings matching values in the Quassel::Feature enum. Strings that don't match are + * can be accessed after construction via unknownFeatures(), but are otherwise ignored. + * @param legacyFeatures Holds a bit-wise combination of LegacyFeature flag values, which are each added to the list of + * features represented by this Features instance. + */ + Features(const QStringList &features, LegacyFeatures legacyFeatures); -void Quassel::setCliParser(AbstractCliParser *parser) { _cliParser = parser; } -AbstractCliParser *Quassel::cliParser() { return _cliParser; } -QString Quassel::optionValue(const QString &key) { return cliParser()->value(key); } -bool Quassel::isOptionSet(const QString &key) { return cliParser()->isSet(key); } + /** + * Check if a given feature is marked as enabled in this Features instance. + * + * @param feature The feature to be queried + * @returns Whether the given feature is marked as enabled + */ + bool isEnabled(Feature feature) const; -Quassel::LogLevel Quassel::logLevel() { return _logLevel; } -QFile *Quassel::logFile() { return _logFile; } -bool Quassel::logToSyslog() { return _logToSyslog; } + /** + * Provides a list of all features marked as either enabled or disabled (as indicated by the @a enabled argument) as strings. + * + * @param enabled Whether to return the enabled or the disabled features + * @return A string list containing all enabled or disabled features + */ + QStringList toStringList(bool enabled = true) const; -#endif + /** + * Provides a list of all enabled legacy features (i.e. features defined prior to v0.13) as bit-wise combination in a + * LegacyFeatures type. + * + * @note Extended features cannot be represented this way, and are thus ignored even if set. + * @return A LegacyFeatures type holding the bit-wise combination of all legacy features enabled in this Features instance + */ + LegacyFeatures toLegacyFeatures() const; + + /** + * Provides the list of strings that could not be mapped to Quassel::Feature enum values on construction. + * + * Useful for debugging/logging purposes. + * + * @returns A list of strings that could not be mapped to the Feature enum on construction of this Features instance, if any + */ + QStringList unknownFeatures() const; + +private: + std::vector _features; + QStringList _unknownFeatures; +};