X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fsignalproxy.h;h=bac48db83fcea1d9dd86ff57bf2c108fa7d3b2b5;hp=76ed4d54d5008a14ab49b22dc01022b900ba9e3e;hb=79fbcfb49f7cc92a89f0158ebac1a3006a559e8a;hpb=cd862242358f1c5456c8c305c6b225fe9770ebb2 diff --git a/src/common/signalproxy.h b/src/common/signalproxy.h index 76ed4d54..bac48db8 100644 --- a/src/common/signalproxy.h +++ b/src/common/signalproxy.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-08 by the Quassel Project * + * Copyright (C) 2005-09 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -21,6 +21,7 @@ #ifndef SIGNALPROXY_H #define SIGNALPROXY_H +#include #include #include #include @@ -30,7 +31,6 @@ #include #include -class SignalRelay; class SyncableObject; struct QMetaObject; @@ -39,6 +39,11 @@ class SignalProxy : public QObject { class AbstractPeer; class IODevicePeer; + class SignalProxyPeer; + + class Relay; + class SignalRelay; + class SyncRelay; public: enum ProxyMode { @@ -60,6 +65,11 @@ public: IODeviceConnection }; + enum CustomEvents { + PeerSignal = QEvent::User, + RemovePeer + }; + SignalProxy(QObject *parent); SignalProxy(ProxyMode mode, QObject *parent); SignalProxy(ProxyMode mode, QIODevice *device, QObject *parent); @@ -72,21 +82,12 @@ public: bool addPeer(SignalProxy *proxy); void removePeer(QObject *peer); void removeAllPeers(); - + bool attachSignal(QObject *sender, const char *signal, const QByteArray& sigName = QByteArray()); bool attachSlot(const QByteArray& sigName, QObject *recv, const char *slot); void synchronize(SyncableObject *obj); -// void setInitialized(SyncableObject *obj); -// bool isInitialized(SyncableObject *obj) const; - void requestInit(SyncableObject *obj); - - void detachObject(QObject *obj); - void detachSignals(QObject *sender); - void detachSlots(QObject *receiver); - void stopSync(SyncableObject *obj); - //! Writes a QVariant to a device. /** The data item is prefixed with the resulting blocksize, * so the corresponding function readDataFromDevice() can check if enough data is available @@ -100,66 +101,50 @@ public: */ static bool readDataFromDevice(QIODevice *dev, quint32 &blockSize, QVariant &item, bool compressed = false); - static QString methodBaseName(const QMetaMethod &method); + class ExtendedMetaObject; + ExtendedMetaObject *extendedMetaObject(const QMetaObject *meta) const; + ExtendedMetaObject *createExtendedMetaObject(const QMetaObject *meta); + inline ExtendedMetaObject *extendedMetaObject(const QObject *obj) const { return extendedMetaObject(metaObject(obj)); } + inline ExtendedMetaObject *createExtendedMetaObject(const QObject *obj) { return createExtendedMetaObject(metaObject(obj)); } - const QList &argTypes(QObject *obj, int methodId); - const int &returnType(QObject *obj, int methodId); - const int &minArgCount(QObject *obj, int methodId); - const QByteArray &methodName(QObject *obj, int methodId); - const QHash &syncMap(SyncableObject *obj); - const QHash &receiveMap(SyncableObject *obj); - int updatedRemotelyId(SyncableObject *obj); + bool isSecure() const { return _secure; } + void dumpProxyStats(); - typedef QHash > ArgHash; - typedef QHash MethodNameHash; - struct ClassInfo { - ArgHash argTypes; - QHash returnType; - QHash minArgCount; - MethodNameHash methodNames; - int updatedRemotelyId; // id of the updatedRemotely() signal - makes things faster - QHash syncMap; - QHash receiveMap; - }; +public slots: + void detachObject(QObject *obj); + void detachSignals(QObject *sender); + void detachSlots(QObject *receiver); + void stopSync(QObject *obj); - void dumpProxyStats(); - protected: void customEvent(QEvent *event); private slots: void dataAvailable(); - void detachSender(); void removePeerBySender(); void objectRenamed(const QString &newname, const QString &oldname); void objectRenamed(const QByteArray &classname, const QString &newname, const QString &oldname); void sendHeartBeat(); void receiveHeartBeat(AbstractPeer *peer, const QVariantList ¶ms); void receiveHeartBeatReply(AbstractPeer *peer, const QVariantList ¶ms); - + + void updateSecureState(); + signals: void peerRemoved(QIODevice *dev); void connected(); void disconnected(); void objectInitialized(SyncableObject *); void lagUpdated(int lag); - + void securityChanged(bool); + void secureStateChanged(bool); + private: void init(); void initServer(); void initClient(); - - const QMetaObject *metaObject(QObject *obj); - void createClassInfo(QObject *obj); - void setArgTypes(QObject *obj, int methodId); - void setReturnType(QObject *obj, int methodId); - void setMinArgCount(QObject *obj, int methodId); - void setMethodName(QObject *obj, int methodId); - void setSyncMap(SyncableObject *obj); - void setReceiveMap(SyncableObject *obj); - void setUpdatedRemotelyId(SyncableObject *obj); - - bool methodsMatch(const QMetaMethod &signal, const QMetaMethod &slot) const; + + static const QMetaObject *metaObject(const QObject *obj); void dispatchSignal(QIODevice *receiver, const RequestType &requestType, const QVariantList ¶ms); void dispatchSignal(const RequestType &requestType, const QVariantList ¶ms); @@ -175,6 +160,7 @@ private: bool invokeSlot(QObject *receiver, int methodId, const QVariantList ¶ms, QVariant &returnValue); bool invokeSlot(QObject *receiver, int methodId, const QVariantList ¶ms = QVariantList()); + void requestInit(SyncableObject *obj); QVariantMap initData(SyncableObject *obj) const; void setInitData(SyncableObject *obj, const QVariantMap &properties); @@ -183,63 +169,22 @@ private: public: void dumpSyncMap(SyncableObject *object); inline int peerCount() const { return _peers.size(); } - + private: static void disconnectDevice(QIODevice *dev, const QString &reason = QString()); - class AbstractPeer { - public: - enum PeerType { - NotAPeer = 0, - IODevicePeer = 1, - SignalProxyPeer = 2 - }; - AbstractPeer() : _type(NotAPeer) {} - AbstractPeer(PeerType type) : _type(type) {} - virtual ~AbstractPeer() {} - inline PeerType type() const { return _type; } - virtual void dispatchSignal(const RequestType &requestType, const QVariantList ¶ms) = 0; - private: - PeerType _type; - }; - - class IODevicePeer : public AbstractPeer { - public: - IODevicePeer(QIODevice *device, bool compress) : AbstractPeer(AbstractPeer::IODevicePeer), _device(device), byteCount(0), usesCompression(compress), sentHeartBeats(0), lag(0) {} - virtual void dispatchSignal(const RequestType &requestType, const QVariantList ¶ms); - inline void dispatchPackedFunc(const QVariant &packedFunc) { SignalProxy::writeDataToDevice(_device, packedFunc, usesCompression); } - QString address() const; - inline bool isOpen() const { return _device->isOpen(); } - inline void close() const { _device->close(); } - inline bool readData(QVariant &item) { return SignalProxy::readDataFromDevice(_device, byteCount, item, usesCompression); } - private: - QIODevice *_device; - quint32 byteCount; - bool usesCompression; - public: - int sentHeartBeats; - int lag; - }; - - class SignalProxyPeer : public AbstractPeer { - public: - SignalProxyPeer(SignalProxy *sender, SignalProxy *receiver) : AbstractPeer(AbstractPeer::SignalProxyPeer), sender(sender), receiver(receiver) {} - virtual void dispatchSignal(const RequestType &requestType, const QVariantList ¶ms); - private: - SignalProxy *sender; - SignalProxy *receiver; - }; - // a Hash of the actual used communication object to it's corresponding peer // currently a communication object can either be an arbitrary QIODevice or another SignalProxy typedef QHash PeerHash; PeerHash _peers; // containg a list of argtypes for fast access - QHash _classInfo; + QHash _extendedMetaObjects; - // we use one SignalRelay per QObject - QHash _relayHash; + // SignalRelay for all manually attached signals + SignalRelay *_signalRelay; + // one SyncRelay per class + QHash _syncRelays; // RPC function -> (object, slot ID) typedef QPair MethodId; @@ -253,8 +198,96 @@ private: ProxyMode _proxyMode; QTimer _heartBeatTimer; - + + bool _secure; // determines if all connections are in a secured state (using ssl or internal connections) + friend class SignalRelay; }; + +// ================================================== +// ExtendedMetaObject +// ================================================== +class SignalProxy::ExtendedMetaObject { +public: + ExtendedMetaObject(const QMetaObject *meta); + + const QList &argTypes(int methodId); + const int &returnType(int methodId); + const int &minArgCount(int methodId); + const QByteArray &methodName(int methodId); + const QHash &syncMap(); + const QHash &receiveMap(); + int updatedRemotelyId(); + + const QMetaObject *metaObject() const { return _meta; } + + static QByteArray methodName(const QMetaMethod &method); + static bool methodsMatch(const QMetaMethod &signal, const QMetaMethod &slot); + static QString methodBaseName(const QMetaMethod &method); + +private: + typedef QHash > ArgHash; + typedef QHash MethodNameHash; + + const QMetaObject *_meta; + ArgHash _argTypes; + QHash _returnType; + QHash _minArgCount; + MethodNameHash _methodNames; + int _updatedRemotelyId; // id of the updatedRemotely() signal - makes things faster + QHash _syncMap; + QHash _receiveMap; +}; + + +// ================================================== +// Peers +// ================================================== +class SignalProxy::AbstractPeer { +public: + enum PeerType { + NotAPeer = 0, + IODevicePeer = 1, + SignalProxyPeer = 2 + }; + AbstractPeer() : _type(NotAPeer) {} + AbstractPeer(PeerType type) : _type(type) {} + virtual ~AbstractPeer() {} + inline PeerType type() const { return _type; } + virtual void dispatchSignal(const RequestType &requestType, const QVariantList ¶ms) = 0; + virtual bool isSecure() const = 0; +private: + PeerType _type; +}; + +class SignalProxy::IODevicePeer : public SignalProxy::AbstractPeer { +public: + IODevicePeer(QIODevice *device, bool compress) : AbstractPeer(AbstractPeer::IODevicePeer), _device(device), byteCount(0), usesCompression(compress), sentHeartBeats(0), lag(0) {} + virtual void dispatchSignal(const RequestType &requestType, const QVariantList ¶ms); + virtual bool isSecure() const; + inline void dispatchPackedFunc(const QVariant &packedFunc) { SignalProxy::writeDataToDevice(_device, packedFunc, usesCompression); } + QString address() const; + inline bool isOpen() const { return _device->isOpen(); } + inline void close() const { _device->close(); } + inline bool readData(QVariant &item) { return SignalProxy::readDataFromDevice(_device, byteCount, item, usesCompression); } +private: + QIODevice *_device; + quint32 byteCount; + bool usesCompression; +public: + int sentHeartBeats; + int lag; +}; + +class SignalProxy::SignalProxyPeer : public SignalProxy::AbstractPeer { +public: + SignalProxyPeer(SignalProxy *sender, SignalProxy *receiver) : AbstractPeer(AbstractPeer::SignalProxyPeer), sender(sender), receiver(receiver) {} + virtual void dispatchSignal(const RequestType &requestType, const QVariantList ¶ms); + virtual inline bool isSecure() const { return true; } +private: + SignalProxy *sender; + SignalProxy *receiver; +}; + #endif