X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcommon%2Fsignalproxy.cpp;h=1b05ab43fb786bcf4465feaa505de4c7e6e3a846;hb=1a5c1814a0c52f6f35e65c7033b2f896bf1188e3;hp=290e517f88b604dbb9408089828ac4d8e46341d1;hpb=8f6eddce9d6375240c60860752e952aa1b2e3a84;p=quassel.git

diff --git a/src/common/signalproxy.cpp b/src/common/signalproxy.cpp
index 290e517f..963092c6 100644
--- a/src/common/signalproxy.cpp
+++ b/src/common/signalproxy.cpp
@@ -1,11 +1,11 @@
 /***************************************************************************
- *   Copyright (C) 2005-07 by the Quassel IRC Team                         *
+ *   Copyright (C) 2005-2020 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
+ *   (at your option) version 3.                                           *
  *                                                                         *
  *   This program is distributed in the hope that it will be useful,       *
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
@@ -15,439 +15,868 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
- ***************************************************************************
- *   SignalProxy has been inspired by QxtRPCPeer, part of libqxt,          *
- *   the Qt eXTension Library <http://www.libqxt.org>. We would like to    *
- *   thank Arvid "aep" Picciani and Adam "ahigerd" Higerd for providing    *
- *   QxtRPCPeer, valuable input and the genius idea to (ab)use Qt's        *
- *   Meta Object System for transmitting signals over the network.         *
- *                                                                         *
- *   To make contribution back into libqxt possible, redistribution and    *
- *   modification of this file is additionally allowed under the terms of  *
- *   the Common Public License, version 1.0, as published by IBM.          *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#include "signalproxy.h"
-#include <QObject>
-#include <QIODevice>
-#include <QAbstractSocket>
-#include <QHash>
-#include <QMultiHash>
-#include <QList>
-#include <QSet>
-#include <QDebug>
+#include <algorithm>
+#include <utility>
+
+#include <QCoreApplication>
+#include <QHostAddress>
 #include <QMetaMethod>
+#include <QMetaProperty>
+#include <QSslSocket>
+#include <QThread>
 
-class SignalRelay: public QObject {
+#include "peer.h"
+#include "protocol.h"
+#include "signalproxy.h"
+#include "syncableobject.h"
+#include "types.h"
+#include "util.h"
 
-/* Q_OBJECT is not necessary or even allowed, because we implement
-   qt_metacall ourselves (and don't use any other features of the meta
-   object system)
-*/
+using namespace Protocol;
+
+class RemovePeerEvent : public QEvent
+{
 public:
-  SignalRelay(SignalProxy* parent, QObject* source);
-  int qt_metacall(QMetaObject::Call _c, int _id, void **_a);
-
-  void attachSignal(int methodId, const QByteArray &func);
-  
-private:
-  SignalProxy* proxy;
-  QObject* caller;
-  QMultiHash<int, QByteArray> sigNames;
+    RemovePeerEvent(Peer* peer)
+        : QEvent(QEvent::Type(SignalProxy::RemovePeerEvent))
+        , peer(peer)
+    {}
+    Peer* peer;
 };
 
-SignalRelay::SignalRelay(SignalProxy* parent, QObject* source)
-  : QObject(parent),
-    proxy(parent),
-    caller(source)
-{
-  QObject::connect(source, SIGNAL(destroyed()), parent, SLOT(detachSender()));
-}
-
-int SignalRelay::qt_metacall(QMetaObject::Call _c, int _id, void **_a) {
-  _id = QObject::qt_metacall(_c, _id, _a);
-  if(_id < 0)
-    return _id;
-  if(_c == QMetaObject::InvokeMetaMethod) {
-    if(sigNames.contains(_id)) {
-      const QList<int> &argTypes = proxy->argTypes(caller, _id);
-      QVariantList params;
-      int n = argTypes.size();
-      for(int i=0; i<n; i++)
-        params.append(QVariant(argTypes[i], _a[i+1]));
-      QMultiHash<int, QByteArray>::const_iterator funcIter = sigNames.constFind(_id);
-      while(funcIter != sigNames.constEnd() && funcIter.key() == _id) {
-        proxy->call(funcIter.value(), params);
-        funcIter++;
-      }
-    }
-    _id -= 1;
-  }
-  return _id;
-}
-
-void SignalRelay::attachSignal(int methodId, const QByteArray &func) {
-  // we ride without safetybelts here... all checking for valid method etc pp has to be done by the caller
-  // all connected methodIds are offset by the standard methodCount of QObject
-  if(!sigNames.contains(methodId))
-    QMetaObject::connect(caller, methodId, this, QObject::staticMetaObject.methodCount() + methodId);
-
-  QByteArray fn;
-  if(!func.isEmpty()) {
-    fn = QMetaObject::normalizedSignature(func);
-  } else {
-    fn = QByteArray("2") + caller->metaObject()->method(methodId).signature();
-  }
-  sigNames.insert(methodId, fn);
-}
-// ====================
-// END SIGNALRELAY
-// ====================
-
-
-// ====================
+// ==================================================
 //  SignalProxy
-// ====================
+// ==================================================
+
+namespace {
+thread_local SignalProxy* _current{nullptr};
+}
+
 SignalProxy::SignalProxy(QObject* parent)
-  : QObject(parent),
-    _proxyMode(Client),
-    _maxClients(-1)
+    : QObject(parent)
 {
+    setProxyMode(Client);
+    init();
 }
 
 SignalProxy::SignalProxy(ProxyMode mode, QObject* parent)
-  : QObject(parent),
-    _proxyMode(mode),
-    _maxClients(-1)
+    : QObject(parent)
 {
+    setProxyMode(mode);
+    init();
 }
 
-SignalProxy::SignalProxy(ProxyMode mode, QIODevice* device, QObject* parent)
-  : QObject(parent),
-    _proxyMode(mode),
-    _maxClients(-1)
+SignalProxy::~SignalProxy()
 {
-  addPeer(device);
-} 
+    QHash<QByteArray, ObjectId>::iterator classIter = _syncSlave.begin();
+    while (classIter != _syncSlave.end()) {
+        ObjectId::iterator objIter = classIter->begin();
+        while (objIter != classIter->end()) {
+            SyncableObject* obj = objIter.value();
+            objIter = classIter->erase(objIter);
+            obj->stopSynchronize(this);
+        }
+        ++classIter;
+    }
+    _syncSlave.clear();
 
-SignalProxy::~SignalProxy() {
-  QList<QObject*> senders = _relayHash.keys();
-  foreach(QObject* sender, senders)
-    detachObject(sender);
+    removeAllPeers();
+
+    // Ensure that we don't try to clean up while destroying ourselves
+    disconnect(this, &QObject::destroyed, this, &SignalProxy::detachSlotObjects);
+
+    _current = nullptr;
 }
 
-void SignalProxy::setProxyMode(ProxyMode mode) {
-  foreach(QIODevice* peer, _peerByteCount.keys()) {
-    if(peer->isOpen()) {
-      qWarning() << "SignalProxy: Cannot change proxy mode while connected";
-      return;
+SignalProxy* SignalProxy::current()
+{
+    return _current;
+}
+
+void SignalProxy::setProxyMode(ProxyMode mode)
+{
+    if (!_peerMap.empty()) {
+        qWarning() << Q_FUNC_INFO << "Cannot change proxy mode while connected";
+        return;
     }
-  }
-  _proxyMode = mode;
+
+    _proxyMode = mode;
+    if (mode == Server)
+        initServer();
+    else
+        initClient();
+}
+
+void SignalProxy::init()
+{
+    _heartBeatInterval = 0;
+    _maxHeartBeatCount = 0;
+    setHeartBeatInterval(30);
+    setMaxHeartBeatCount(2);
+    _secure = false;
+    _current = this;
+    updateSecureState();
 }
 
+void SignalProxy::initServer() {}
 
-SignalProxy::ProxyMode SignalProxy::proxyMode() const {
-  return _proxyMode;
+void SignalProxy::initClient()
+{
+    attachSlot("__objectRenamed__", this, &SignalProxy::objectRenamed);
 }
 
-bool SignalProxy::maxPeersReached() {
-  if(_peerByteCount.empty())
-    return false;
-  if(proxyMode() != Server)
-    return true;
-  if(_maxClients == -1)
-    return false;
+void SignalProxy::setHeartBeatInterval(int secs)
+{
+    if (_heartBeatInterval != secs) {
+        _heartBeatInterval = secs;
+        emit heartBeatIntervalChanged(secs);
+    }
+}
 
-  return (_maxClients <= _peerByteCount.count());
+void SignalProxy::setMaxHeartBeatCount(int max)
+{
+    if (_maxHeartBeatCount != max) {
+        _maxHeartBeatCount = max;
+        emit maxHeartBeatCountChanged(max);
+    }
 }
 
-bool SignalProxy::addPeer(QIODevice* iodev) {
-  if(!iodev)
-    return false;
-  
-  if(_peerByteCount.contains(iodev))
+bool SignalProxy::addPeer(Peer* peer)
+{
+    if (!peer)
+        return false;
+
+    if (_peerMap.values().contains(peer))
+        return true;
+
+    if (!peer->isOpen()) {
+        qWarning("SignalProxy: peer needs to be open!");
+        return false;
+    }
+
+    if (proxyMode() == Client) {
+        if (!_peerMap.isEmpty()) {
+            qWarning("SignalProxy: only one peer allowed in client mode!");
+            return false;
+        }
+        connect(peer, &Peer::lagUpdated, this, &SignalProxy::lagUpdated);
+    }
+
+    connect(peer, &Peer::disconnected, this, &SignalProxy::removePeerBySender);
+    connect(peer, &Peer::secureStateChanged, this, &SignalProxy::updateSecureState);
+
+    if (!peer->parent())
+        peer->setParent(this);
+
+    if (peer->id() < 0) {
+        peer->setId(nextPeerId());
+        peer->setConnectedSince(QDateTime::currentDateTimeUtc());
+    }
+
+    _peerMap[peer->id()] = peer;
+
+    peer->setSignalProxy(this);
+
+    if (peerCount() == 1)
+        emit connected();
+
+    updateSecureState();
     return true;
+}
 
-  if(maxPeersReached()) {
-    qWarning("SignalProxy: max peer count reached");
-    return false;
-  }
+void SignalProxy::removeAllPeers()
+{
+    Q_ASSERT(proxyMode() == Server || peerCount() <= 1);
+    // wee need to copy that list since we modify it in the loop
+    QList<Peer*> peers = _peerMap.values();
+    for (auto peer : peers) {
+        removePeer(peer);
+    }
+}
 
-  if(!iodev->isOpen())
-    qWarning("SignalProxy::the device you passed is not open!");
+void SignalProxy::removePeer(Peer* peer)
+{
+    if (!peer) {
+        qWarning() << Q_FUNC_INFO << "Trying to remove a null peer!";
+        return;
+    }
 
-  connect(iodev, SIGNAL(disconnected()), this, SLOT(removePeerBySender()));
-  connect(iodev, SIGNAL(readyRead()), this, SLOT(dataAvailable()));
+    if (_peerMap.isEmpty()) {
+        qWarning() << "SignalProxy::removePeer(): No peers in use!";
+        return;
+    }
 
-  QAbstractSocket* sock  = qobject_cast<QAbstractSocket*>(iodev);
-  if(sock) {
-    connect(sock, SIGNAL(disconnected()), this, SLOT(removePeerBySender()));
-  }
+    if (!_peerMap.values().contains(peer)) {
+        qWarning() << "SignalProxy: unknown Peer" << peer;
+        return;
+    }
 
-  _peerByteCount[iodev] = 0;
+    disconnect(peer, nullptr, this, nullptr);
+    peer->setSignalProxy(nullptr);
 
-  if(_peerByteCount.count() == 1)
-    emit connected();
+    _peerMap.remove(peer->id());
+    emit peerRemoved(peer);
 
-  return true;
+    if (peer->parent() == this)
+        peer->deleteLater();
+
+    updateSecureState();
+
+    if (_peerMap.isEmpty())
+        emit disconnected();
 }
 
-void SignalProxy::removePeerBySender() {
-  // OK we're brutal here... but since it's a private slot we know what we've got connected to it...
-  QIODevice *ioDev = (QIODevice *)(sender());
-  removePeer(ioDev);
+void SignalProxy::removePeerBySender()
+{
+    removePeer(qobject_cast<Peer*>(sender()));
 }
 
-void SignalProxy::removePeer(QIODevice* iodev) {
-  if(_peerByteCount.isEmpty()) {
-    qWarning() << "SignalProxy: No peers in use!";
-    return;
-  }
+void SignalProxy::renameObject(const SyncableObject* obj, const QString& newname, const QString& oldname)
+{
+    if (proxyMode() == Client)
+        return;
 
-  if(proxyMode() == Server && !iodev) {
-    // disconnect all
-    QList<QIODevice *> peers = _peerByteCount.keys();
-    foreach(QIODevice *peer, peers)
-      removePeer(peer);
-  }
+    const QMetaObject* meta = obj->syncMetaObject();
+    const QByteArray className(meta->className());
+    objectRenamed(className, newname, oldname);
 
-  if(proxyMode() != Server && !iodev)
-    iodev = _peerByteCount.keys().first();
+    dispatch(RpcCall("__objectRenamed__", QVariantList() << className << newname << oldname));
+}
+
+void SignalProxy::objectRenamed(const QByteArray& classname, const QString& newname, const QString& oldname)
+{
+    if (newname != oldname) {
+        if (_syncSlave.contains(classname) && _syncSlave[classname].contains(oldname)) {
+            SyncableObject* obj = _syncSlave[classname][newname] = _syncSlave[classname].take(oldname);
+            obj->setObjectName(newname);
+            requestInit(obj);
+        }
+    }
+}
+
+const QMetaObject* SignalProxy::metaObject(const QObject* obj)
+{
+    if (const auto* syncObject = qobject_cast<const SyncableObject*>(obj))
+        return syncObject->syncMetaObject();
+    else
+        return obj->metaObject();
+}
+
+SignalProxy::ExtendedMetaObject* SignalProxy::extendedMetaObject(const QMetaObject* meta) const
+{
+    if (_extendedMetaObjects.contains(meta))
+        return _extendedMetaObjects[meta];
+    else
+        return nullptr;
+}
+
+SignalProxy::ExtendedMetaObject* SignalProxy::createExtendedMetaObject(const QMetaObject* meta, bool checkConflicts)
+{
+    if (!_extendedMetaObjects.contains(meta)) {
+        _extendedMetaObjects[meta] = new ExtendedMetaObject(meta, checkConflicts);
+    }
+    return _extendedMetaObjects[meta];
+}
+
+void SignalProxy::attachSlotObject(const QByteArray& signalName, std::unique_ptr<SlotObjectBase> slotObject)
+{
+    // Remove all attached slots related to the context upon its destruction
+    connect(slotObject->context(), &QObject::destroyed, this, &SignalProxy::detachSlotObjects, Qt::UniqueConnection);
+
+    _attachedSlots.emplace(QMetaObject::normalizedSignature(signalName.constData()), std::move(slotObject));
+}
+
+void SignalProxy::detachSlotObjects(const QObject *context)
+{
+    for (auto&& it = _attachedSlots.begin(); it != _attachedSlots.end(); ) {
+        if (it->second->context() == context) {
+            it = _attachedSlots.erase(it);
+        }
+        else {
+            ++it;
+        }
+    }
+}
+
+void SignalProxy::synchronize(SyncableObject* obj)
+{
+    createExtendedMetaObject(obj, true);
+
+    // attaching as slave to receive sync Calls
+    QByteArray className(obj->syncMetaObject()->className());
+    _syncSlave[className][obj->objectName()] = obj;
+
+    if (proxyMode() == Server) {
+        obj->setInitialized();
+        emit objectInitialized(obj);
+    }
+    else {
+        if (obj->isInitialized())
+            emit objectInitialized(obj);
+        else
+            requestInit(obj);
+    }
+
+    obj->synchronize(this);
+}
+
+void SignalProxy::stopSynchronize(SyncableObject* obj)
+{
+    // we can't use a className here, since it might be effed up, if we receive the call as a result of a decon
+    // gladly the objectName() is still valid. So we have only to iterate over the classes not each instance! *sigh*
+    QHash<QByteArray, ObjectId>::iterator classIter = _syncSlave.begin();
+    while (classIter != _syncSlave.end()) {
+        if (classIter->contains(obj->objectName()) && classIter.value()[obj->objectName()] == obj) {
+            classIter->remove(obj->objectName());
+            break;
+        }
+        ++classIter;
+    }
+    obj->stopSynchronize(this);
+}
+
+void SignalProxy::dispatchSignal(QByteArray sigName, QVariantList params)
+{
+    RpcCall rpcCall{std::move(sigName), std::move(params)};
+    if (_restrictMessageTarget) {
+        for (auto&& peer : _restrictedTargets) {
+            dispatch(peer, rpcCall);
+        }
+    }
+    else {
+        dispatch(rpcCall);
+    }
+}
+
+template<class T>
+void SignalProxy::dispatch(const T& protoMessage)
+{
+    for (auto&& peer : _peerMap.values()) {
+        dispatch(peer, protoMessage);
+    }
+}
 
-  Q_ASSERT(iodev);
+template<class T>
+void SignalProxy::dispatch(Peer* peer, const T& protoMessage)
+{
+    _targetPeer = peer;
 
-  if(!_peerByteCount.contains(iodev)) {
-    qWarning() << "SignalProxy: unknown QIODevice" << iodev;
-    return;
-  }
-     
-  // take a last gasp
-  while(true) {
-    QVariant var;
-    if(readDataFromDevice(iodev, _peerByteCount[iodev], var))
-      receivePeerSignal(var);
+    if (peer && peer->isOpen())
+        peer->dispatch(protoMessage);
     else
-      break;
-  }
-  _peerByteCount.remove(iodev);
+        QCoreApplication::postEvent(this, new ::RemovePeerEvent(peer));
+
+    _targetPeer = nullptr;
+}
+
+void SignalProxy::handle(Peer* peer, const SyncMessage& syncMessage)
+{
+    if (!_syncSlave.contains(syncMessage.className) || !_syncSlave[syncMessage.className].contains(syncMessage.objectName)) {
+        qWarning() << QString("no registered receiver for sync call: %1::%2 (objectName=\"%3\"). Params are:")
+                          .arg(syncMessage.className, syncMessage.slotName, syncMessage.objectName)
+                   << syncMessage.params;
+        return;
+    }
 
-  disconnect(iodev, 0, this, 0);
-  emit peerRemoved(iodev);
+    SyncableObject* receiver = _syncSlave[syncMessage.className][syncMessage.objectName];
+    ExtendedMetaObject* eMeta = extendedMetaObject(receiver);
+    if (!eMeta->slotMap().contains(syncMessage.slotName)) {
+        qWarning() << QString("no matching slot for sync call: %1::%2 (objectName=\"%3\"). Params are:")
+                          .arg(syncMessage.className, syncMessage.slotName, syncMessage.objectName)
+                   << syncMessage.params;
+        return;
+    }
+
+    int slotId = eMeta->slotMap()[syncMessage.slotName];
+    if (proxyMode() != eMeta->receiverMode(slotId)) {
+        qWarning("SignalProxy::handleSync(): invokeMethod for \"%s\" failed. Wrong ProxyMode!", eMeta->methodName(slotId).constData());
+        return;
+    }
+
+    // We can no longer construct a QVariant from QMetaType::Void
+    QVariant returnValue;
+    int returnType = eMeta->returnType(slotId);
+    if (returnType != QMetaType::Void)
+        returnValue = QVariant(static_cast<QVariant::Type>(returnType));
+
+    if (!invokeSlot(receiver, slotId, syncMessage.params, returnValue, peer)) {
+        qWarning("SignalProxy::handleSync(): invokeMethod for \"%s\" failed ", eMeta->methodName(slotId).constData());
+        return;
+    }
 
-  if(_peerByteCount.isEmpty())
-    emit disconnected();
+    if (returnValue.type() != QVariant::Invalid && eMeta->receiveMap().contains(slotId)) {
+        int receiverId = eMeta->receiveMap()[slotId];
+        QVariantList returnParams;
+        if (eMeta->argTypes(receiverId).count() > 1)
+            returnParams << syncMessage.params;
+        returnParams << returnValue;
+        _targetPeer = peer;
+        peer->dispatch(SyncMessage(syncMessage.className, syncMessage.objectName, eMeta->methodName(receiverId), returnParams));
+        _targetPeer = nullptr;
+    }
+
+    // send emit update signal
+    invokeSlot(receiver, eMeta->updatedRemotelyId());
+}
+
+void SignalProxy::handle(Peer* peer, const RpcCall& rpcCall)
+{
+    Q_UNUSED(peer)
+
+    auto range = _attachedSlots.equal_range(rpcCall.signalName);
+    std::for_each(range.first, range.second, [&rpcCall](const auto& p) {
+        if (!p.second->invoke(rpcCall.params)) {
+            qWarning() << "Could not invoke slot for remote signal" << rpcCall.signalName;
+        }
+    });
 }
 
-void SignalProxy::setArgTypes(QObject* obj, int methodId) {
-  QList<QByteArray> p = obj->metaObject()->method(methodId).parameterTypes();
-  QList<int> argTypes;
-  int ct = p.count();
-  for(int i=0; i<ct; i++)
-    argTypes.append(QMetaType::type(p.value(i)));
+void SignalProxy::handle(Peer* peer, const InitRequest& initRequest)
+{
+    if (!_syncSlave.contains(initRequest.className)) {
+        qWarning() << "SignalProxy::handleInitRequest() received initRequest for unregistered Class:" << initRequest.className;
+        return;
+    }
+
+    if (!_syncSlave[initRequest.className].contains(initRequest.objectName)) {
+        qWarning() << "SignalProxy::handleInitRequest() received initRequest for unregistered Object:" << initRequest.className
+                   << initRequest.objectName;
+        return;
+    }
 
-  const QByteArray &className(obj->metaObject()->className());
-  Q_ASSERT(_classInfo.contains(className));
-  Q_ASSERT(!_classInfo[className]->argTypes.contains(methodId));
-  _classInfo[className]->argTypes[methodId] = argTypes;
+    SyncableObject* obj = _syncSlave[initRequest.className][initRequest.objectName];
+    _targetPeer = peer;
+    peer->dispatch(InitData(initRequest.className, initRequest.objectName, initData(obj)));
+    _targetPeer = nullptr;
 }
 
-const QList<int> &SignalProxy::argTypes(QObject *obj, int methodId) {
-  const QByteArray &className(obj->metaObject()->className());
-  Q_ASSERT(_classInfo.contains(className));
-  if(!_classInfo[className]->argTypes.contains(methodId))
-    setArgTypes(obj, methodId);
-  return _classInfo[className]->argTypes[methodId];
+void SignalProxy::handle(Peer* peer, const InitData& initData)
+{
+    Q_UNUSED(peer)
+
+    if (!_syncSlave.contains(initData.className)) {
+        qWarning() << "SignalProxy::handleInitData() received initData for unregistered Class:" << initData.className;
+        return;
+    }
+
+    if (!_syncSlave[initData.className].contains(initData.objectName)) {
+        qWarning() << "SignalProxy::handleInitData() received initData for unregistered Object:" << initData.className << initData.objectName;
+        return;
+    }
+
+    SyncableObject* obj = _syncSlave[initData.className][initData.objectName];
+    setInitData(obj, initData.initData);
 }
 
-void SignalProxy::setMethodName(QObject *obj, int methodId) {
-  const QByteArray &className(obj->metaObject()->className());
-  QByteArray method = obj->metaObject()->method(methodId).signature();
-  method = method.left(method.indexOf('('));
+bool SignalProxy::invokeSlot(QObject* receiver, int methodId, const QVariantList& params, QVariant& returnValue, Peer* peer)
+{
+    ExtendedMetaObject* eMeta = extendedMetaObject(receiver);
+    const QList<int> args = eMeta->argTypes(methodId);
+    const int numArgs = params.count() < args.count() ? params.count() : args.count();
 
-  Q_ASSERT(_classInfo.contains(className));
-  Q_ASSERT(!_classInfo[className]->methodNames.contains(methodId));
-  _classInfo[className]->methodNames[methodId] = method;
+    if (eMeta->minArgCount(methodId) > params.count()) {
+        qWarning() << "SignalProxy::invokeSlot(): not enough params to invoke" << eMeta->methodName(methodId);
+        return false;
+    }
+
+    void* _a[] = {nullptr,  // return type...
+                  nullptr,
+                  nullptr,
+                  nullptr,
+                  nullptr,
+                  nullptr,  // and 10 args - that's the max size qt can handle with signals and slots
+                  nullptr,
+                  nullptr,
+                  nullptr,
+                  nullptr,
+                  nullptr};
+
+    // check for argument compatibility and build params array
+    for (int i = 0; i < numArgs; i++) {
+        if (!params[i].isValid()) {
+            qWarning() << "SignalProxy::invokeSlot(): received invalid data for argument number" << i << "of method"
+                       << QString("%1::%2()")
+                              .arg(receiver->metaObject()->className())
+                              .arg(receiver->metaObject()->method(methodId).methodSignature().constData());
+            qWarning() << "                            - make sure all your data types are known by the Qt MetaSystem";
+            return false;
+        }
+        if (args[i] != QMetaType::type(params[i].typeName())) {
+            qWarning() << "SignalProxy::invokeSlot(): incompatible param types to invoke" << eMeta->methodName(methodId);
+            return false;
+        }
+
+        _a[i + 1] = const_cast<void*>(params[i].constData());
+    }
+
+    if (returnValue.type() != QVariant::Invalid)
+        _a[0] = const_cast<void*>(returnValue.constData());
+
+    Qt::ConnectionType type = QThread::currentThread() == receiver->thread() ? Qt::DirectConnection : Qt::QueuedConnection;
+
+    if (type == Qt::DirectConnection) {
+        _sourcePeer = peer;
+        auto result = receiver->qt_metacall(QMetaObject::InvokeMetaMethod, methodId, _a) < 0;
+        _sourcePeer = nullptr;
+        return result;
+    }
+    else {
+        qWarning() << "Queued Connections are not implemented yet";
+        // note to self: qmetaobject.cpp:990 ff
+        return false;
+    }
 }
 
-const QByteArray &SignalProxy::methodName(QObject *obj, int methodId) {
-  QByteArray className(obj->metaObject()->className());
-  Q_ASSERT(_classInfo.contains(className));
-  if(!_classInfo[className]->methodNames.contains(methodId))
-    setMethodName(obj, methodId);
-  return _classInfo[className]->methodNames[methodId];
+bool SignalProxy::invokeSlot(QObject* receiver, int methodId, const QVariantList& params, Peer* peer)
+{
+    QVariant ret;
+    return invokeSlot(receiver, methodId, params, ret, peer);
 }
 
+void SignalProxy::requestInit(SyncableObject* obj)
+{
+    if (proxyMode() == Server || obj->isInitialized())
+        return;
+
+    dispatch(InitRequest(obj->syncMetaObject()->className(), obj->objectName()));
+}
+
+QVariantMap SignalProxy::initData(SyncableObject* obj) const
+{
+    return obj->toVariantMap();
+}
 
-void SignalProxy::createClassInfo(QObject *obj) {
-  QByteArray className(obj->metaObject()->className());
-  if(!_classInfo.contains(className))
-    _classInfo[className] = new ClassInfo();
+void SignalProxy::setInitData(SyncableObject* obj, const QVariantMap& properties)
+{
+    if (obj->isInitialized())
+        return;
+    obj->fromVariantMap(properties);
+    obj->setInitialized();
+    emit objectInitialized(obj);
+    invokeSlot(obj, extendedMetaObject(obj)->updatedRemotelyId());
 }
 
-bool SignalProxy::attachSignal(QObject* sender, const char* signal, const QByteArray& sigName) {
-  const QMetaObject* meta = sender->metaObject();
-  QByteArray sig(meta->normalizedSignature(signal).mid(1));
-  int methodId = meta->indexOfMethod(sig.constData());
-  if(methodId == -1 || meta->method(methodId).methodType() != QMetaMethod::Signal) {
-    qWarning() << "SignalProxy::attachSignal(): No such signal" << signal;
-    return false;
-  }
+void SignalProxy::customEvent(QEvent* event)
+{
+    switch ((int)event->type()) {
+    case RemovePeerEvent: {
+        auto* e = static_cast<::RemovePeerEvent*>(event);
+        removePeer(e->peer);
+        event->accept();
+        break;
+    }
 
-  createClassInfo(sender);
+    default:
+        qWarning() << Q_FUNC_INFO << "Received unknown custom event:" << event->type();
+        return;
+    }
+}
 
-  SignalRelay* relay;
-  if(_relayHash.contains(sender))
-    relay = _relayHash[sender];
-  else
-    relay = _relayHash[sender] = new SignalRelay(this, sender);
+void SignalProxy::sync_call__(const SyncableObject* obj, SignalProxy::ProxyMode modeType, const char* funcname, va_list ap)
+{
+    // qDebug() << obj << modeType << "(" << _proxyMode << ")" << funcname;
+    if (modeType != _proxyMode)
+        return;
 
-  relay->attachSignal(methodId, sigName);
+    ExtendedMetaObject* eMeta = extendedMetaObject(obj);
 
-  return true;
+    QVariantList params;
+
+    const QList<int>& argTypes = eMeta->argTypes(eMeta->methodId(QByteArray(funcname)));
+
+    for (int i = 0; i < argTypes.size(); i++) {
+        if (argTypes[i] == 0) {
+            qWarning() << Q_FUNC_INFO << "received invalid data for argument number" << i << "of signal"
+                       << QString("%1::%2").arg(eMeta->metaObject()->className()).arg(funcname);
+            qWarning() << "        - make sure all your data types are known by the Qt MetaSystem";
+            return;
+        }
+        params << QVariant(argTypes[i], va_arg(ap, void*));
+    }
+
+    if (_restrictMessageTarget) {
+        for (auto peer : _restrictedTargets) {
+            if (peer != nullptr)
+                dispatch(peer, SyncMessage(eMeta->metaObject()->className(), obj->objectName(), QByteArray(funcname), params));
+        }
+    }
+    else
+        dispatch(SyncMessage(eMeta->metaObject()->className(), obj->objectName(), QByteArray(funcname), params));
 }
 
+void SignalProxy::disconnectDevice(QIODevice* dev, const QString& reason)
+{
+    if (!reason.isEmpty())
+        qWarning() << qPrintable(reason);
+    auto* sock = qobject_cast<QAbstractSocket*>(dev);
+    if (sock)
+        qWarning() << qPrintable(tr("Disconnecting")) << qPrintable(sock->peerAddress().toString());
+    dev->close();
+}
+
+void SignalProxy::dumpProxyStats()
+{
+    QString mode;
+    if (proxyMode() == Server)
+        mode = "Server";
+    else
+        mode = "Client";
 
-bool SignalProxy::attachSlot(const QByteArray& sigName, QObject* recv, const char* slot) {
-  const QMetaObject* meta = recv->metaObject();
-  int methodId = meta->indexOfMethod(meta->normalizedSignature(slot).mid(1));
-  if(methodId == -1 || meta->method(methodId).methodType() == QMetaMethod::Method) {
-    qWarning() << "SignalProxy::attachSlot(): No such slot" << slot;
-    return false;
-  }
+    int slaveCount = 0;
+    foreach (ObjectId oid, _syncSlave.values())
+        slaveCount += oid.count();
 
-  createClassInfo(recv);
+    qDebug() << this;
+    qDebug() << "              Proxy Mode:" << mode;
+    qDebug() << "          attached Slots:" << _attachedSlots.size();
+    qDebug() << " number of synced Slaves:" << slaveCount;
+    qDebug() << "number of Classes cached:" << _extendedMetaObjects.count();
+}
 
-  QByteArray funcName = QMetaObject::normalizedSignature(sigName.constData());
-  _attachedSlots.insert(funcName, qMakePair(recv, methodId));
+void SignalProxy::updateSecureState()
+{
+    bool wasSecure = _secure;
 
-  QObject::disconnect(recv, SIGNAL(destroyed()), this, SLOT(detachSender()));
-  QObject::connect(recv, SIGNAL(destroyed()), this, SLOT(detachSender()));
-  return true;
+    _secure = !_peerMap.isEmpty();
+    for (auto peer : _peerMap.values()) {
+        _secure &= peer->isSecure();
+    }
+
+    if (wasSecure != _secure)
+        emit secureStateChanged(_secure);
 }
 
+QVariantList SignalProxy::peerData()
+{
+    QVariantList result;
+    for (auto&& peer : _peerMap.values()) {
+        QVariantMap data;
+        data["id"] = peer->id();
+        data["clientVersion"] = peer->clientVersion();
+        // We explicitly rename this, as, due to the Debian reproducability changes, buildDate isn’t actually the build
+        // date anymore, but on newer clients the date of the last git commit
+        data["clientVersionDate"] = peer->buildDate();
+        data["remoteAddress"] = peer->address();
+        data["connectedSince"] = peer->connectedSince();
+        data["secure"] = peer->isSecure();
+        data["features"] = static_cast<quint32>(peer->features().toLegacyFeatures());
+        data["featureList"] = peer->features().toStringList();
+        result << data;
+    }
+    return result;
+}
 
-void SignalProxy::detachSender() {
-  // this is a slot so we can bypass the QueuedConnection
-  _detachSignals(sender());
-  _detachSlots(sender());
+Peer* SignalProxy::peerById(int peerId)
+{
+    // We use ::value() here instead of the [] operator because the latter has the side-effect
+    // of automatically inserting a null value with the passed key into the map.  See
+    // https://doc.qt.io/qt-5/qhash.html#operator-5b-5d and https://doc.qt.io/qt-5/qhash.html#value.
+    return _peerMap.value(peerId);
 }
 
-// detachObject/Signals/Slots() can be called as a result of an incoming call
-// this might destroy our the iterator used for delivery
-// thus we wrap the actual disconnection by using QueuedConnections
-void SignalProxy::detachObject(QObject* obj) {
-  detachSignals(obj);
-  detachSlots(obj);
+void SignalProxy::restrictTargetPeers(QSet<Peer*> peers, std::function<void()> closure)
+{
+    auto previousRestrictMessageTarget = _restrictMessageTarget;
+    auto previousRestrictedTargets = _restrictedTargets;
+    _restrictMessageTarget = true;
+    _restrictedTargets = peers;
+
+    closure();
+
+    _restrictMessageTarget = previousRestrictMessageTarget;
+    _restrictedTargets = previousRestrictedTargets;
 }
 
-void SignalProxy::detachSignals(QObject* sender) {
-  QMetaObject::invokeMethod(this, "_detachSignals",
-			    Qt::QueuedConnection,
-			    Q_ARG(QObject*, sender));
+Peer* SignalProxy::sourcePeer()
+{
+    return _sourcePeer;
 }
 
-void SignalProxy::_detachSignals(QObject* sender) {
-  if(!_relayHash.contains(sender))
-    return;
-  _relayHash.take(sender)->deleteLater();
+void SignalProxy::setSourcePeer(Peer* sourcePeer)
+{
+    _sourcePeer = sourcePeer;
 }
 
-void SignalProxy::detachSlots(QObject* receiver) {
-  QMetaObject::invokeMethod(this, "_detachSlots",
-			    Qt::QueuedConnection,
-			    Q_ARG(QObject*, receiver));
+Peer* SignalProxy::targetPeer()
+{
+    return _targetPeer;
 }
 
-void SignalProxy::_detachSlots(QObject* receiver) {
-  SlotHash::iterator slotIter = _attachedSlots.begin();
-  while(slotIter != _attachedSlots.end()) {
-    if(slotIter.value().first == receiver) {
-      slotIter = _attachedSlots.erase(slotIter);
-    } else
-      slotIter++;
-  }
+void SignalProxy::setTargetPeer(Peer* targetPeer)
+{
+    _targetPeer = targetPeer;
+}
+
+// ---- SlotObjectBase ---------------------------------------------------------------------------------------------------------------------
+
+SignalProxy::SlotObjectBase::SlotObjectBase(const QObject* context)
+    : _context{context}
+{}
+
+const QObject* SignalProxy::SlotObjectBase::context() const
+{
+    return _context;
 }
 
+//  ---- ExtendedMetaObject ----------------------------------------------------------------------------------------------------------------
 
-void SignalProxy::call(const char*  signal, QVariant p1, QVariant p2, QVariant p3, QVariant p4, QVariant p5, QVariant p6, QVariant p7, QVariant p8, QVariant p9) {
-  QByteArray func = QMetaObject::normalizedSignature(signal);
-  QVariantList params;
-  params << p1 << p2 << p3 << p4 << p5 << p6 << p7 << p8 << p9;
-  call(func, params);
+SignalProxy::ExtendedMetaObject::ExtendedMetaObject(const QMetaObject* meta, bool checkConflicts)
+    : _meta(meta)
+    , _updatedRemotelyId(_meta->indexOfSignal("updatedRemotely()"))
+{
+    for (int i = 0; i < _meta->methodCount(); i++) {
+        if (_meta->method(i).methodType() != QMetaMethod::Slot)
+            continue;
+
+        if (_meta->method(i).methodSignature().contains('*'))
+            continue;  // skip methods with ptr params
+
+        QByteArray method = methodName(_meta->method(i));
+        if (method.startsWith("init"))
+            continue;  // skip initializers
+
+        if (_methodIds.contains(method)) {
+            /* funny... moc creates for methods containing default parameters multiple metaMethod with separate methodIds.
+               we don't care... we just need the full fledged version
+             */
+            const QMetaMethod& current = _meta->method(_methodIds[method]);
+            const QMetaMethod& candidate = _meta->method(i);
+            if (current.parameterTypes().count() > candidate.parameterTypes().count()) {
+                int minCount = candidate.parameterTypes().count();
+                QList<QByteArray> commonParams = current.parameterTypes().mid(0, minCount);
+                if (commonParams == candidate.parameterTypes())
+                    continue;  // we already got the full featured version
+            }
+            else {
+                int minCount = current.parameterTypes().count();
+                QList<QByteArray> commonParams = candidate.parameterTypes().mid(0, minCount);
+                if (commonParams == current.parameterTypes()) {
+                    _methodIds[method] = i;  // use the new one
+                    continue;
+                }
+            }
+            if (checkConflicts) {
+                qWarning() << "class" << meta->className() << "contains overloaded methods which is currently not supported!";
+                qWarning() << " - " << _meta->method(i).methodSignature() << "conflicts with"
+                           << _meta->method(_methodIds[method]).methodSignature();
+            }
+            continue;
+        }
+        _methodIds[method] = i;
+    }
+}
+
+const SignalProxy::ExtendedMetaObject::MethodDescriptor& SignalProxy::ExtendedMetaObject::methodDescriptor(int methodId)
+{
+    if (!_methods.contains(methodId)) {
+        _methods[methodId] = MethodDescriptor(_meta->method(methodId));
+    }
+    return _methods[methodId];
 }
 
-void SignalProxy::call(const QByteArray &funcName, const QVariantList &params) {
-  QVariantList packedFunc;
-  packedFunc << funcName;
-  packedFunc << params;
-  foreach(QIODevice* dev, _peerByteCount.keys())
-    writeDataToDevice(dev, QVariant(packedFunc));
+const QHash<int, int>& SignalProxy::ExtendedMetaObject::receiveMap()
+{
+    if (_receiveMap.isEmpty()) {
+        QHash<int, int> receiveMap;
+
+        QMetaMethod requestSlot;
+        QByteArray returnTypeName;
+        QByteArray signature;
+        QByteArray methodName;
+        QByteArray params;
+        int paramsPos;
+        int receiverId;
+        const int methodCount = _meta->methodCount();
+        for (int i = 0; i < methodCount; i++) {
+            requestSlot = _meta->method(i);
+            if (requestSlot.methodType() != QMetaMethod::Slot)
+                continue;
+
+            returnTypeName = requestSlot.typeName();
+            if (QMetaType::Void == (QMetaType::Type)returnType(i))
+                continue;
+
+            signature = requestSlot.methodSignature();
+            if (!signature.startsWith("request"))
+                continue;
+
+            paramsPos = signature.indexOf('(');
+            if (paramsPos == -1)
+                continue;
+
+            methodName = signature.left(paramsPos);
+            params = signature.mid(paramsPos);
+
+            methodName = methodName.replace("request", "receive");
+            params = params.left(params.count() - 1) + ", " + returnTypeName + ")";
+
+            signature = QMetaObject::normalizedSignature(methodName + params);
+            receiverId = _meta->indexOfSlot(signature);
+
+            if (receiverId == -1) {
+                signature = QMetaObject::normalizedSignature(methodName + "(" + returnTypeName + ")");
+                receiverId = _meta->indexOfSlot(signature);
+            }
+
+            if (receiverId != -1) {
+                receiveMap[i] = receiverId;
+            }
+        }
+        _receiveMap = receiveMap;
+    }
+    return _receiveMap;
 }
 
-void SignalProxy::receivePeerSignal(const QVariant &packedFunc) {
-  QVariantList params(packedFunc.toList());
-  QByteArray funcName = params.takeFirst().toByteArray();
-  int numParams, methodId;
-  QObject* receiver;
+QByteArray SignalProxy::ExtendedMetaObject::methodName(const QMetaMethod& method)
+{
+    QByteArray sig(method.methodSignature());
+    return sig.left(sig.indexOf("("));
+}
 
-  SlotHash::const_iterator slot = _attachedSlots.constFind(funcName);
-  while(slot != _attachedSlots.constEnd() && slot.key() == funcName) {
-    receiver = (*slot).first;
-    methodId = (*slot).second;
-    numParams = argTypes(receiver, methodId).count();
-    QGenericArgument args[9];
-    for(int i = 0; i < numParams; i++)
-      args[i] = QGenericArgument(params[i].typeName(), params[i].constData());
-    if(!QMetaObject::invokeMethod(receiver, methodName(receiver, methodId),
-				  args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7], args[8])) {
-      qWarning("SignalProxy::receivePeerSignal(): invokeMethod for \"%s\" failed ", methodName(receiver, methodId).constData());
+QString SignalProxy::ExtendedMetaObject::methodBaseName(const QMetaMethod& method)
+{
+    QString methodname = QString(method.methodSignature()).section("(", 0, 0);
+
+    // determine where we have to chop:
+    int upperCharPos;
+    if (method.methodType() == QMetaMethod::Slot) {
+        // we take evertyhing from the first uppercase char if it's slot
+        upperCharPos = methodname.indexOf(QRegExp("[A-Z]"));
+        if (upperCharPos == -1)
+            return QString();
+        methodname = methodname.mid(upperCharPos);
+    }
+    else {
+        // and if it's a signal we discard everything from the last uppercase char
+        upperCharPos = methodname.lastIndexOf(QRegExp("[A-Z]"));
+        if (upperCharPos == -1)
+            return QString();
+        methodname = methodname.left(upperCharPos);
     }
-    slot++;
-  }
+
+    methodname[0] = methodname[0].toUpper();
+
+    return methodname;
 }
 
-void SignalProxy::dataAvailable() {
-  QIODevice* ioDev = qobject_cast<QIODevice* >(sender());
-  Q_ASSERT(ioDev);
-  if(!_peerByteCount.contains(ioDev)) {
-    qWarning() << "SignalProxy: Unrecognized client object connected to dataAvailable";
-    return;
-  } else {
-    QVariant var;
-    while(readDataFromDevice(ioDev, _peerByteCount[ioDev], var))
-      receivePeerSignal(var);
-  }
-}
-
-void SignalProxy::writeDataToDevice(QIODevice *dev, const QVariant &item) {
-  QAbstractSocket* sock  = qobject_cast<QAbstractSocket*>(dev);
-  if(!dev->isOpen() || (sock && sock->state()!=QAbstractSocket::ConnectedState)) {
-    qWarning("SignalProxy: Can't call on a closed device");
-    return;
-  }
-  QByteArray block;
-  QDataStream out(&block, QIODevice::WriteOnly);
-  out.setVersion(QDataStream::Qt_4_2);
-  out << (quint32)0 << item;
-  out.device()->seek(0);
-  out << (quint32)(block.size() - sizeof(quint32));
-  dev->write(block);
-}
-
-bool SignalProxy::readDataFromDevice(QIODevice *dev, quint32 &blockSize, QVariant &item) {
-  QDataStream in(dev);
-  in.setVersion(QDataStream::Qt_4_2);
-
-  if(blockSize == 0) {
-    if(dev->bytesAvailable() < (int)sizeof(quint32)) return false;
-    in >> blockSize;
-  }
-
-  if(dev->bytesAvailable() < blockSize)
-    return false;
-  in >> item;
-  blockSize = 0;
-  return true;
+SignalProxy::ExtendedMetaObject::MethodDescriptor::MethodDescriptor(const QMetaMethod& method)
+    : _methodName(SignalProxy::ExtendedMetaObject::methodName(method))
+    , _returnType(QMetaType::type(method.typeName()))
+{
+    // determine argTypes
+    QList<QByteArray> paramTypes = method.parameterTypes();
+    QList<int> argTypes;
+    for (int i = 0; i < paramTypes.count(); i++) {
+        argTypes.append(QMetaType::type(paramTypes[i]));
+    }
+    _argTypes = argTypes;
+
+    // determine minArgCount
+    QString signature(method.methodSignature());
+    _minArgCount = method.parameterTypes().count() - signature.count("=");
+
+    _receiverMode = (_methodName.startsWith("request")) ? SignalProxy::Server : SignalProxy::Client;
 }