* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
-#include <QCoreApplication>
-#include <QThread>
-
#include "internalpeer.h"
using namespace Protocol;
-template<class T>
-class PeerMessageEvent : public QEvent
-{
-public:
- PeerMessageEvent(InternalPeer *sender, InternalPeer::EventType eventType, const T &message)
- : QEvent(QEvent::Type(eventType)), sender(sender), message(message)
- {}
-
- InternalPeer *sender;
- T message;
-};
-
-
InternalPeer::InternalPeer(QObject *parent)
- : Peer(0, parent),
- _proxy(0),
- _peer(0),
- _isOpen(true)
+ : Peer(nullptr, parent)
{
+ static bool registered = []() {
+ qRegisterMetaType<Protocol::SyncMessage>();
+ qRegisterMetaType<Protocol::RpcCall>();
+ qRegisterMetaType<Protocol::InitRequest>();
+ qRegisterMetaType<Protocol::InitData>();
+ return true;
+ }();
+ Q_UNUSED(registered)
+
setFeatures(Quassel::Features{});
}
InternalPeer::~InternalPeer()
{
- if (_isOpen)
+ if (_isOpen) {
emit disconnected();
+ }
}
return tr("internal connection");
}
+
QString InternalPeer::address() const
{
return tr("internal connection");
}
+
quint16 InternalPeer::port() const
{
return 0;
}
+
bool InternalPeer::isOpen() const
{
return true;
void InternalPeer::setSignalProxy(::SignalProxy *proxy)
{
if (!proxy && _proxy) {
- _proxy = 0;
+ _proxy = nullptr;
if (_isOpen) {
_isOpen = false;
emit disconnected();
void InternalPeer::setPeer(InternalPeer *peer)
{
- if (_peer) {
- qWarning() << Q_FUNC_INFO << "Peer already set, ignoring!";
- return;
- }
- _peer = peer;
+ connect(peer, SIGNAL(dispatchMessage(Protocol::SyncMessage)), SLOT(handleMessage(Protocol::SyncMessage)));
+ connect(peer, SIGNAL(dispatchMessage(Protocol::RpcCall)) , SLOT(handleMessage(Protocol::RpcCall)));
+ connect(peer, SIGNAL(dispatchMessage(Protocol::InitRequest)), SLOT(handleMessage(Protocol::InitRequest)));
+ connect(peer, SIGNAL(dispatchMessage(Protocol::InitData)) , SLOT(handleMessage(Protocol::InitData)));
+
connect(peer, SIGNAL(disconnected()), SLOT(peerDisconnected()));
+
+ _isOpen = true;
}
void InternalPeer::peerDisconnected()
{
- disconnect(_peer, 0, this, 0);
- _peer = 0;
+ disconnect(sender(), nullptr, this, nullptr);
if (_isOpen) {
_isOpen = false;
emit disconnected();
void InternalPeer::dispatch(const SyncMessage &msg)
{
- dispatch(SyncMessageEvent, msg);
+ emit dispatchMessage(msg);
}
void InternalPeer::dispatch(const RpcCall &msg)
{
- dispatch(RpcCallEvent, msg);
+ emit dispatchMessage(msg);
}
void InternalPeer::dispatch(const InitRequest &msg)
{
- dispatch(InitRequestEvent, msg);
+ emit dispatchMessage(msg);
}
void InternalPeer::dispatch(const InitData &msg)
{
- dispatch(InitDataEvent, msg);
+ emit dispatchMessage(msg);
}
-namespace {
-
-void setSourcePeer(Peer* peer)
+void InternalPeer::handleMessage(const Protocol::SyncMessage &msg)
{
- auto p = SignalProxy::current();
- if (p)
- p->setSourcePeer(peer);
+ handle(msg);
}
-} // anon
-
-template<class T>
-void InternalPeer::dispatch(EventType eventType, const T &msg)
+void InternalPeer::handleMessage(const Protocol::RpcCall &msg)
{
- if (!_peer) {
- qWarning() << Q_FUNC_INFO << "Cannot dispatch a message without a peer!";
- return;
- }
+ handle(msg);
+}
+
- // The peers always live in different threads, so use an event for thread-safety
- QCoreApplication::postEvent(_peer, new PeerMessageEvent<T>(this, eventType, msg));
+void InternalPeer::handleMessage(const Protocol::InitRequest &msg)
+{
+ handle(msg);
}
-void InternalPeer::customEvent(QEvent *event)
+void InternalPeer::handleMessage(const Protocol::InitData &msg)
{
- setSourcePeer(this);
+ handle(msg);
+}
- switch ((int)event->type()) {
- case SyncMessageEvent: {
- handle(static_cast<PeerMessageEvent<SyncMessage> *>(event)->message);
- break;
- }
- case RpcCallEvent: {
- handle(static_cast<PeerMessageEvent<RpcCall> *>(event)->message);
- break;
- }
- case InitRequestEvent: {
- handle(static_cast<PeerMessageEvent<InitRequest> *>(event)->message);
- break;
- }
- case InitDataEvent: {
- handle(static_cast<PeerMessageEvent<InitData> *>(event)->message);
- break;
- }
- default:
- qWarning() << Q_FUNC_INFO << "Received unknown custom event:" << event->type();
- setSourcePeer(nullptr);
- return;
- }
+template<class T>
+void InternalPeer::handle(const T &msg)
+{
+ static auto setSourcePeer = [](Peer *peer) {
+ auto p = SignalProxy::current();
+ if (p) {
+ p->setSourcePeer(peer);
+ }
+ };
+ setSourcePeer(this);
+ Peer::handle(msg);
setSourcePeer(nullptr);
- event->accept();
}
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
-#ifndef INTERNALPEER_H
-#define INTERNALPEER_H
+#pragma once
+
+#include <QString>
#include "peer.h"
#include "protocol.h"
#include "signalproxy.h"
-class QEvent;
-
class InternalPeer : public Peer
{
Q_OBJECT
public:
- enum EventType {
- SyncMessageEvent = QEvent::User,
- RpcCallEvent,
- InitRequestEvent,
- InitDataEvent
- };
-
- InternalPeer(QObject *parent = 0);
- virtual ~InternalPeer();
+ InternalPeer(QObject *parent = nullptr);
+ ~InternalPeer() override;
- Protocol::Type protocol() const { return Protocol::InternalProtocol; }
- QString description() const;
+ Protocol::Type protocol() const override { return Protocol::InternalProtocol; }
+ QString description() const override;
- virtual QString address() const;
- virtual quint16 port() const;
+ QString address() const override;
+ quint16 port() const override;
- SignalProxy *signalProxy() const;
- void setSignalProxy(SignalProxy *proxy);
+ SignalProxy *signalProxy() const override;
+ void setSignalProxy(SignalProxy *proxy) override;
InternalPeer *peer() const;
void setPeer(InternalPeer *peer);
- bool isOpen() const;
- bool isSecure() const;
- bool isLocal() const;
+ bool isOpen() const override;
+ bool isSecure() const override;
+ bool isLocal() const override;
- int lag() const;
+ int lag() const override;
- void dispatch(const Protocol::SyncMessage &msg);
- void dispatch(const Protocol::RpcCall &msg);
- void dispatch(const Protocol::InitRequest &msg);
- void dispatch(const Protocol::InitData &msg);
+ void dispatch(const Protocol::SyncMessage &msg) override;
+ void dispatch(const Protocol::RpcCall &msg) override;
+ void dispatch(const Protocol::InitRequest &msg) override;
+ void dispatch(const Protocol::InitData &msg) override;
/* These are not needed for InternalPeer */
- void dispatch(const Protocol::RegisterClient &) {}
- void dispatch(const Protocol::ClientDenied &) {}
- void dispatch(const Protocol::ClientRegistered &) {}
- void dispatch(const Protocol::SetupData &) {}
- void dispatch(const Protocol::SetupFailed &) {}
- void dispatch(const Protocol::SetupDone &) {}
- void dispatch(const Protocol::Login &) {}
- void dispatch(const Protocol::LoginFailed &) {}
- void dispatch(const Protocol::LoginSuccess &) {}
- void dispatch(const Protocol::SessionState &) {}
+ void dispatch(const Protocol::RegisterClient &) override {}
+ void dispatch(const Protocol::ClientDenied &) override {}
+ void dispatch(const Protocol::ClientRegistered &) override {}
+ void dispatch(const Protocol::SetupData &) override {}
+ void dispatch(const Protocol::SetupFailed &) override {}
+ void dispatch(const Protocol::SetupDone &) override {}
+ void dispatch(const Protocol::Login &) override {}
+ void dispatch(const Protocol::LoginFailed &) override {}
+ void dispatch(const Protocol::LoginSuccess &) override {}
+ void dispatch(const Protocol::SessionState &) override {}
public slots:
- void close(const QString &reason = QString());
+ void close(const QString &reason = QString()) override;
-protected:
- void customEvent(QEvent *event);
+signals:
+ void dispatchMessage(const Protocol::SyncMessage &msg);
+ void dispatchMessage(const Protocol::RpcCall &msg);
+ void dispatchMessage(const Protocol::InitRequest &msg);
+ void dispatchMessage(const Protocol::InitData &msg);
private slots:
void peerDisconnected();
+ void handleMessage(const Protocol::SyncMessage &msg);
+ void handleMessage(const Protocol::RpcCall &msg);
+ void handleMessage(const Protocol::InitRequest &msg);
+ void handleMessage(const Protocol::InitData &msg);
+
private:
- template<class T>
- void dispatch(EventType eventType, const T &msg);
+ template<typename T>
+ void handle(const T &msg);
private:
- SignalProxy *_proxy;
- InternalPeer *_peer;
- bool _isOpen;
+ SignalProxy *_proxy{nullptr};
+ bool _isOpen{false};
};
-
-
-#endif
struct SyncMessage : public SignalProxyMessage
{
- inline SyncMessage(const QByteArray &className, const QString &objectName, const QByteArray &slotName, const QVariantList ¶ms)
- : className(className), objectName(objectName), slotName(slotName), params(params) {}
+ SyncMessage() = default;
+ SyncMessage(const QByteArray &className, const QString &objectName, const QByteArray &slotName, const QVariantList ¶ms)
+ : className(className), objectName(objectName), slotName(slotName), params(params) {}
QByteArray className;
QString objectName;
struct RpcCall : public SignalProxyMessage
{
- inline RpcCall(const QByteArray &slotName, const QVariantList ¶ms)
- : slotName(slotName), params(params) {}
+ RpcCall() = default;
+ RpcCall(const QByteArray &slotName, const QVariantList ¶ms)
+ : slotName(slotName), params(params) {}
QByteArray slotName;
QVariantList params;
struct InitRequest : public SignalProxyMessage
{
- inline InitRequest(const QByteArray &className, const QString &objectName)
- : className(className), objectName(objectName) {}
+ InitRequest() = default;
+ InitRequest(const QByteArray &className, const QString &objectName)
+ : className(className), objectName(objectName) {}
QByteArray className;
QString objectName;
struct InitData : public SignalProxyMessage
{
- inline InitData(const QByteArray &className, const QString &objectName, const QVariantMap &initData)
- : className(className), objectName(objectName), initData(initData) {}
+ InitData() = default;
+ InitData(const QByteArray &className, const QString &objectName, const QVariantMap &initData)
+ : className(className), objectName(objectName), initData(initData) {}
QByteArray className;
QString objectName;
};
+
+// Required for InternalPeer
+Q_DECLARE_METATYPE(Protocol::SyncMessage)
+Q_DECLARE_METATYPE(Protocol::RpcCall)
+Q_DECLARE_METATYPE(Protocol::InitRequest)
+Q_DECLARE_METATYPE(Protocol::InitData)