X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fpeer.h;h=ce5851d6ac45d20c79994e93067b3d5933ffc4e9;hp=79204b4f9996a33b2e4cf312ef1eed2f7e1c3caf;hb=1f21c1f9613031ae263eeed0c4883bfcd5488343;hpb=8cece06596c290d69c1f32b7221c796437f5fabb diff --git a/src/common/peer.h b/src/common/peer.h index 79204b4f..ce5851d6 100644 --- a/src/common/peer.h +++ b/src/common/peer.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2015 by the Quassel Project * + * Copyright (C) 2005-2019 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -18,8 +18,9 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#ifndef PEER_H -#define PEER_H +#pragma once + +#include "common-export.h" #include #include @@ -27,22 +28,39 @@ #include "authhandler.h" #include "protocol.h" +#include "quassel.h" #include "signalproxy.h" -class Peer : public QObject +class COMMON_EXPORT Peer : public QObject { Q_OBJECT public: - Peer(AuthHandler *authHandler, QObject *parent = 0); + explicit Peer(AuthHandler* authHandler, QObject* parent = nullptr); virtual Protocol::Type protocol() const = 0; virtual QString description() const = 0; - virtual SignalProxy *signalProxy() const = 0; - virtual void setSignalProxy(SignalProxy *proxy) = 0; + virtual SignalProxy* signalProxy() const = 0; + virtual void setSignalProxy(SignalProxy* proxy) = 0; + + QDateTime connectedSince() const; + void setConnectedSince(const QDateTime& connectedSince); + + QString buildDate() const; + void setBuildDate(const QString& buildDate); + + QString clientVersion() const; + void setClientVersion(const QString& clientVersion); - AuthHandler *authHandler() const; + bool hasFeature(Quassel::Feature feature) const; + Quassel::Features features() const; + void setFeatures(Quassel::Features features); + + int id() const; + void setId(int id); + + AuthHandler* authHandler() const; virtual bool isOpen() const = 0; virtual bool isSecure() const = 0; @@ -50,26 +68,29 @@ public: virtual int lag() const = 0; + virtual QString address() const = 0; + virtual quint16 port() const = 0; + public slots: /* Handshake messages */ - virtual void dispatch(const Protocol::RegisterClient &) = 0; - virtual void dispatch(const Protocol::ClientDenied &) = 0; - virtual void dispatch(const Protocol::ClientRegistered &) = 0; - virtual void dispatch(const Protocol::SetupData &) = 0; - virtual void dispatch(const Protocol::SetupFailed &) = 0; - virtual void dispatch(const Protocol::SetupDone &) = 0; - virtual void dispatch(const Protocol::Login &) = 0; - virtual void dispatch(const Protocol::LoginFailed &) = 0; - virtual void dispatch(const Protocol::LoginSuccess &) = 0; - virtual void dispatch(const Protocol::SessionState &) = 0; + virtual void dispatch(const Protocol::RegisterClient&) = 0; + virtual void dispatch(const Protocol::ClientDenied&) = 0; + virtual void dispatch(const Protocol::ClientRegistered&) = 0; + virtual void dispatch(const Protocol::SetupData&) = 0; + virtual void dispatch(const Protocol::SetupFailed&) = 0; + virtual void dispatch(const Protocol::SetupDone&) = 0; + virtual void dispatch(const Protocol::Login&) = 0; + virtual void dispatch(const Protocol::LoginFailed&) = 0; + virtual void dispatch(const Protocol::LoginSuccess&) = 0; + virtual void dispatch(const Protocol::SessionState&) = 0; /* Sigproxy messages */ - virtual void dispatch(const Protocol::SyncMessage &) = 0; - virtual void dispatch(const Protocol::RpcCall &) = 0; - virtual void dispatch(const Protocol::InitRequest &) = 0; - virtual void dispatch(const Protocol::InitData &) = 0; + virtual void dispatch(const Protocol::SyncMessage&) = 0; + virtual void dispatch(const Protocol::RpcCall&) = 0; + virtual void dispatch(const Protocol::InitRequest&) = 0; + virtual void dispatch(const Protocol::InitData&) = 0; - virtual void close(const QString &reason = QString()) = 0; + virtual void close(const QString& reason = QString()) = 0; signals: void disconnected(); @@ -78,45 +99,50 @@ signals: protected: template - void handle(const T &protoMessage); + void handle(const T& protoMessage); private: QPointer _authHandler; + + QDateTime _connectedSince; + + QString _buildDate; + QString _clientVersion; + Quassel::Features _features; + + int _id = -1; }; // We need to special-case Peer* in attached signals/slots, so typedef it for the meta type system -typedef Peer * PeerPtr; +using PeerPtr = Peer*; Q_DECLARE_METATYPE(PeerPtr) -QDataStream &operator<<(QDataStream &out, PeerPtr ptr); -QDataStream &operator>>(QDataStream &in, PeerPtr &ptr); - +QDataStream& operator<<(QDataStream& out, PeerPtr ptr); +QDataStream& operator>>(QDataStream& in, PeerPtr& ptr); // Template method needed in the header -template inline -void Peer::handle(const T &protoMessage) +template +inline void Peer::handle(const T& protoMessage) { - switch(protoMessage.handler()) { - case Protocol::SignalProxy: - if (!signalProxy()) { - qWarning() << Q_FUNC_INFO << "Cannot handle message without a SignalProxy!"; - return; - } - signalProxy()->handle(this, protoMessage); - break; - - case Protocol::AuthHandler: - if (!authHandler()) { - qWarning() << Q_FUNC_INFO << "Cannot handle auth messages without an active AuthHandler!"; - return; - } - authHandler()->handle(protoMessage); - break; - - default: - qWarning() << Q_FUNC_INFO << "Unknown handler for protocol message!"; + switch (protoMessage.handler()) { + case Protocol::Handler::SignalProxy: + if (!signalProxy()) { + qWarning() << Q_FUNC_INFO << "Cannot handle message without a SignalProxy!"; return; + } + signalProxy()->handle(this, protoMessage); + break; + + case Protocol::Handler::AuthHandler: + if (!authHandler()) { + qWarning() << Q_FUNC_INFO << "Cannot handle auth messages without an active AuthHandler!"; + return; + } + authHandler()->handle(protoMessage); + break; + + default: + qWarning() << Q_FUNC_INFO << "Unknown handler for protocol message!"; + return; } } - -#endif