X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fsignalproxy.h;h=129a6a292f2be1cd4718f6782e8eb7735b458fce;hp=cca2ccb5fcb9ce77845526dbe9a177faec9c2926;hb=0324c701d9cc8c656e6188b4e102e19e05c98201;hpb=8ec76e512d20ce5d1dc76de556bb98a06b75d695 diff --git a/src/common/signalproxy.h b/src/common/signalproxy.h index cca2ccb5..129a6a29 100644 --- a/src/common/signalproxy.h +++ b/src/common/signalproxy.h @@ -18,9 +18,10 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#ifndef _SIGNALPROXY_H_ -#define _SIGNALPROXY_H_ +#ifndef SIGNALPROXY_H +#define SIGNALPROXY_H +#include #include #include #include @@ -32,11 +33,14 @@ class SignalRelay; class SyncableObject; -class QMetaObject; +struct QMetaObject; class SignalProxy : public QObject { Q_OBJECT + class AbstractPeer; + class IODevicePeer; + public: enum ProxyMode { Server, @@ -48,7 +52,18 @@ public: RpcCall, InitRequest, InitData, - HeartBeat + HeartBeat, + HeartBeatReply + }; + + enum ClientConnectionType { + SignalProxyConnection, + IODeviceConnection + }; + + enum CustomEvents { + PeerSignal = QEvent::User, + RemovePeer }; SignalProxy(QObject *parent); @@ -57,18 +72,20 @@ public: virtual ~SignalProxy(); void setProxyMode(ProxyMode mode); - ProxyMode proxyMode() const; + inline ProxyMode proxyMode() const { return _proxyMode; } bool addPeer(QIODevice *iodev); - void removePeer(QIODevice *iodev = 0); - + 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 setInitialized(SyncableObject *obj); +// bool isInitialized(SyncableObject *obj) const; void requestInit(SyncableObject *obj); void detachObject(QObject *obj); @@ -81,14 +98,16 @@ public: * so the corresponding function readDataFromDevice() can check if enough data is available * at the device to reread the item. */ - static void writeDataToDevice(QIODevice *dev, const QVariant &item); + static void writeDataToDevice(QIODevice *dev, const QVariant &item, bool compressed = false); //! Reads a data item from a device that has been written by writeDataToDevice(). /** If not enough data bytes are available, the function returns false and the QVariant reference * remains untouched. */ - static bool readDataFromDevice(QIODevice *dev, quint32 &blockSize, QVariant &item); + static bool readDataFromDevice(QIODevice *dev, quint32 &blockSize, QVariant &item, bool compressed = false); + bool isSecure() const { return _secure; } + static QString methodBaseName(const QMetaMethod &method); const QList &argTypes(QObject *obj, int methodId); @@ -113,6 +132,9 @@ public: void dumpProxyStats(); +protected: + void customEvent(QEvent *event); + private slots: void dataAvailable(); void detachSender(); @@ -120,14 +142,22 @@ private slots: 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 *obj); + 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(); @@ -145,12 +175,14 @@ private: void dispatchSignal(QIODevice *receiver, const RequestType &requestType, const QVariantList ¶ms); void dispatchSignal(const RequestType &requestType, const QVariantList ¶ms); - - void receivePeerSignal(QIODevice *sender, const QVariant &packedFunc); - void handleSync(QIODevice *sender, QVariantList params); - void handleInitRequest(QIODevice *sender, const QVariantList ¶ms); - void handleInitData(QIODevice *sender, const QVariantList ¶ms); - void handleSignal(const QByteArray &funcName, const QVariantList ¶ms); + + void receivePackedFunc(AbstractPeer *sender, const QVariant &packedFunc); + void receivePeerSignal(AbstractPeer *sender, const RequestType &requestType, const QVariantList ¶ms); + void receivePeerSignal(SignalProxy *sender, const RequestType &requestType, const QVariantList ¶ms); + void handleSync(AbstractPeer *sender, QVariantList params); + void handleInitRequest(AbstractPeer *sender, const QVariantList ¶ms); + void handleInitData(AbstractPeer *sender, const QVariantList ¶ms); + void handleSignal(const QVariantList &data); bool invokeSlot(QObject *receiver, int methodId, const QVariantList ¶ms, QVariant &returnValue); bool invokeSlot(QObject *receiver, int methodId, const QVariantList ¶ms = QVariantList()); @@ -158,12 +190,65 @@ private: QVariantMap initData(SyncableObject *obj) const; void setInitData(SyncableObject *obj, const QVariantMap &properties); + void updateLag(IODevicePeer *peer, int lag); + public: void dumpSyncMap(SyncableObject *object); + inline int peerCount() const { return _peers.size(); } private: - // Hash of used QIODevices - QHash _peerByteCount; + 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; + virtual bool isSecure() const = 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); + 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 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); + virtual inline bool isSecure() const { return true; } + 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; @@ -183,6 +268,8 @@ private: ProxyMode _proxyMode; QTimer _heartBeatTimer; + + bool _secure; // determines if all connections are in a secured state (using ssl or internal connections) friend class SignalRelay; };