X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fsignalproxy.cpp;h=8935538370348d5dbe1661cbfd7de05288cb2721;hp=85f053b25fae92ed30af9e81bd1a53b41d9a0c21;hb=e2188dc438be6f3eb0d9cdf47d28821aefe9835e;hpb=5c35ac3ee6f951d39cc052925aa224debfa148a8

diff --git a/src/common/signalproxy.cpp b/src/common/signalproxy.cpp
index 85f053b2..89355383 100644
--- a/src/common/signalproxy.cpp
+++ b/src/common/signalproxy.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel Project                          *
+ *   Copyright (C) 2005-2018 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -15,1149 +15,1037 @@
  *   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.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#include "signalproxy.h"
+#include <utility>
 
-#include <QObject>
-#include <QIODevice>
-#include <QAbstractSocket>
+#include <QCoreApplication>
 #include <QHostAddress>
-#include <QHash>
-#include <QMultiHash>
-#include <QList>
-#include <QSet>
-#include <QDebug>
 #include <QMetaMethod>
 #include <QMetaProperty>
-#include <QRegExp>
 #include <QThread>
-#include <QTime>
 
+#ifdef HAVE_SSL
+    #include <QSslSocket>
+#endif
+
+#include "signalproxy.h"
+
+#include "peer.h"
+#include "protocol.h"
 #include "syncableobject.h"
 #include "util.h"
+#include "types.h"
+
+using namespace Protocol;
+
+class RemovePeerEvent : public QEvent
+{
+public:
+    RemovePeerEvent(Peer *peer) : QEvent(QEvent::Type(SignalProxy::RemovePeerEvent)), peer(peer) {}
+    Peer *peer;
+};
 
 
 // ==================================================
-//  SIGNALRELAY
+//  SignalRelay
 // ==================================================
-class SignalRelay: public QObject {
+class SignalProxy::SignalRelay : public QObject
+{
 /* 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)
 */
 public:
-  SignalRelay(SignalProxy* parent, QObject* source);
-  int qt_metacall(QMetaObject::Call _c, int _id, void **_a);
+    SignalRelay(SignalProxy *parent) : QObject(parent), _proxy(parent) {}
+    inline SignalProxy *proxy() const { return _proxy; }
+
+    int qt_metacall(QMetaObject::Call _c, int _id, void **_a) override;
 
-  void attachSignal(int methodId, const QByteArray &func);
+    void attachSignal(QObject *sender, int signalId, const QByteArray &funcName);
+    void detachSignal(QObject *sender, int signalId = -1);
 
-  void setSynchronize(bool);
-  bool synchronize() const;
-  
-  int sigCount() const;
-  
 private:
-  bool isSyncMethod(int i);
-  
-  SignalProxy* proxy;
-  QObject* caller;
-  QMultiHash<int, QByteArray> sigNames;
-  bool _sync;
+    struct Signal {
+        QObject *sender{nullptr};
+        int signalId{-1};
+        QByteArray signature;
+        Signal(QObject *sender, int sigId, QByteArray signature) : sender(sender), signalId(sigId), signature(std::move(signature)) {}
+        Signal() = default;
+    };
+
+    SignalProxy *_proxy;
+    QHash<int, Signal> _slots;
 };
 
-SignalRelay::SignalRelay(SignalProxy* parent, QObject* source)
-  : QObject(parent),
-    proxy(parent),
-    caller(source),
-    _sync(false)
+
+void SignalProxy::SignalRelay::attachSignal(QObject *sender, int signalId, const QByteArray &funcName)
 {
-  QObject::connect(source, SIGNAL(destroyed()), parent, SLOT(detachSender()));
-}
+    // 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
+    int slotId;
+    for (int i = 0;; i++) {
+        if (!_slots.contains(i)) {
+            slotId = i;
+            break;
+        }
+    }
 
-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) || synchronize()) {
-      const QList<int> &argTypes = proxy->argTypes(caller, _id);
-      QVariantList params;
-      int n = argTypes.size();
-      for(int i=0; i<n; i++) {
-	if(argTypes[i] == 0) {
-	  qWarning() << "SignalRelay::qt_metacall(): received invalid data for argument number" << i << "of signal" << QString("%1::%2").arg(caller->metaObject()->className()).arg(caller->metaObject()->method(_id).signature());
-	  qWarning() << "                            - make sure all your data types are known by the Qt MetaSystem";
-	  return _id;
-	}
-	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->dispatchSignal(SignalProxy::RpcCall, QVariantList() << funcIter.value() << params);
-        funcIter++;
-      }
-      
-      // dispatch Sync Signal if necessary
-      QByteArray signature(caller->metaObject()->method(_id).signature());
-      SyncableObject *syncObject = qobject_cast<SyncableObject *>(caller);
-      if(synchronize() && proxy->syncMap(syncObject).contains(signature)) {
-	 //qDebug() << "__SYNC__ >>>"
-	 //	 << caller->metaObject()->className()
-	 //	 << caller->objectName()
-	 //	 << signature
-	 //	 << params;
-	// params.prepend(QVariant(_id));
-	params.prepend(signature);
-	params.prepend(syncObject->objectName());
-	params.prepend(syncObject->syncMetaObject()->className());
-	proxy->dispatchSignal(SignalProxy::Sync, params);
-      }
+    QByteArray fn;
+    if (!funcName.isEmpty()) {
+        fn = QMetaObject::normalizedSignature(funcName);
+    }
+    else {
+        fn = SIGNAL(fakeMethodSignature());
+        fn = fn.replace("fakeMethodSignature()", sender->metaObject()->method(signalId).methodSignature());
     }
-    _id -= QObject::staticMetaObject.methodCount();
-  }
-  return _id;
+
+    _slots[slotId] = Signal(sender, signalId, fn);
+
+    QMetaObject::connect(sender, signalId, this, QObject::staticMetaObject.methodCount() + slotId);
 }
 
-void SignalRelay::setSynchronize(bool sync) {
-  SyncableObject *syncObject = qobject_cast<SyncableObject *>(caller);
-  if(!syncObject)
-    return;
-
-  const QMetaObject *meta = syncObject->syncMetaObject();
-  if(!_sync && sync) {
-    // enable Sync
-    for(int i = 0; i < meta->methodCount(); i++ ) {
-      if(isSyncMethod(i))
-	QMetaObject::connect(caller, i, this, QObject::staticMetaObject.methodCount() + i);
+
+void SignalProxy::SignalRelay::detachSignal(QObject *sender, int signalId)
+{
+    QHash<int, Signal>::iterator slotIter = _slots.begin();
+    while (slotIter != _slots.end()) {
+        if (slotIter->sender == sender && (signalId == -1 || slotIter->signalId == signalId)) {
+            slotIter = _slots.erase(slotIter);
+            if (signalId != -1)
+                break;
+        }
+        else {
+            ++slotIter;
+        }
     }
-  } else if (_sync && !sync) {
-    // disable Sync
-    for(int i = 0; i < meta->methodCount(); i++ ) {
-      if(isSyncMethod(i))
-	QMetaObject::disconnect(caller, i, this, QObject::staticMetaObject.methodCount() + i);
+}
+
+
+int SignalProxy::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 (_slots.contains(_id)) {
+            QObject *caller = sender();
+
+            SignalProxy::ExtendedMetaObject *eMeta = proxy()->extendedMetaObject(caller->metaObject());
+            Q_ASSERT(eMeta);
+
+            const Signal &signal = _slots[_id];
+
+            QVariantList params;
+
+            const QList<int> &argTypes = eMeta->argTypes(signal.signalId);
+            for (int i = 0; i < argTypes.size(); i++) {
+                if (argTypes[i] == 0) {
+                    qWarning() << "SignalRelay::qt_metacall(): received invalid data for argument number" << i << "of signal" << QString("%1::%2").arg(caller->metaObject()->className()).arg(caller->metaObject()->method(signal.signalId).methodSignature().constData());
+                    qWarning() << "                            - make sure all your data types are known by the Qt MetaSystem";
+                    return _id;
+                }
+                params << QVariant(argTypes[i], _a[i+1]);
+            }
+
+            if (proxy()->_restrictMessageTarget) {
+                for (auto peer : proxy()->_restrictedTargets) {
+                    if (peer != nullptr)
+                        proxy()->dispatch(peer, RpcCall(signal.signature, params));
+                }
+            } else
+                proxy()->dispatch(RpcCall(signal.signature, params));
+        }
+        _id -= _slots.count();
     }
-  }
-  _sync = sync;
+    return _id;
 }
 
-bool SignalRelay::isSyncMethod(int i) {
-  SyncableObject *syncObject = qobject_cast<SyncableObject *>(caller);
-  if(!syncObject)
-    return false;
 
-  QByteArray signature = syncObject->syncMetaObject()->method(i).signature();
-  if(!proxy->syncMap(syncObject).contains(signature))
-    return false;
-  
-  if(proxy->proxyMode() == SignalProxy::Server && !signature.contains("Requested"))
-    return true;
+// ==================================================
+//  SignalProxy
+// ==================================================
 
-  if(proxy->proxyMode() == SignalProxy::Client && signature.contains("Requested"))
-    return true;
+namespace {
+thread_local SignalProxy *_current{nullptr};
+}
 
-  return false;
+SignalProxy::SignalProxy(QObject *parent)
+    : QObject(parent)
+{
+    setProxyMode(Client);
+    init();
 }
 
-bool SignalRelay::synchronize() const {
-  return _sync;
+
+SignalProxy::SignalProxy(ProxyMode mode, QObject *parent)
+    : QObject(parent)
+{
+    setProxyMode(mode);
+    init();
 }
 
-int SignalRelay::sigCount() const {
-  // only for debuging purpose
-  return sigNames.count();
+
+SignalProxy::~SignalProxy()
+{
+    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();
+
+    removeAllPeers();
+
+    _current = nullptr;
 }
 
-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);
+
+SignalProxy *SignalProxy::current()
+{
+    return _current;
 }
 
-// ==================================================
-//  Peers
-// ==================================================
-void SignalProxy::IODevicePeer::dispatchSignal(const RequestType &requestType, const QVariantList &params) {
-  QVariantList packedFunc;
-  packedFunc << (qint16)requestType
-	     << params;
-  dispatchPackedFunc(QVariant(packedFunc));
+
+void SignalProxy::setProxyMode(ProxyMode mode)
+{
+    if (!_peerMap.empty()) {
+        qWarning() << Q_FUNC_INFO << "Cannot change proxy mode while connected";
+        return;
+    }
+
+    _proxyMode = mode;
+    if (mode == Server)
+        initServer();
+    else
+        initClient();
 }
 
-// ==================================================
-//  SignalProxy
-// ==================================================
-SignalProxy::SignalProxy(QObject* parent)
-  : QObject(parent)
+void SignalProxy::init()
 {
-  setProxyMode(Client);
-  init();
+    _heartBeatInterval = 0;
+    _maxHeartBeatCount = 0;
+    _signalRelay = new SignalRelay(this);
+    setHeartBeatInterval(30);
+    setMaxHeartBeatCount(2);
+    _secure = false;
+    _current = this;
+    updateSecureState();
 }
 
-SignalProxy::SignalProxy(ProxyMode mode, QObject* parent)
-  : QObject(parent)
+
+void SignalProxy::initServer()
 {
-  setProxyMode(mode);
-  init();
 }
 
-SignalProxy::SignalProxy(ProxyMode mode, QIODevice* device, QObject* parent)
-  : QObject(parent)
+
+void SignalProxy::initClient()
 {
-  setProxyMode(mode);
-  addPeer(device);
-  init();
-} 
-
-SignalProxy::~SignalProxy() {
-  QList<QObject*> senders = _relayHash.keys();
-  foreach(QObject* sender, senders)
-    detachObject(sender);
-  removeAllPeers();
+    attachSlot("__objectRenamed__", this, SLOT(objectRenamed(QByteArray,QString,QString)));
 }
 
-void SignalProxy::setProxyMode(ProxyMode mode) {
-  PeerHash::iterator peer = _peers.begin();
-  while(peer != _peers.end()) {
-    if((*peer)->type() != AbstractPeer::IODevicePeer) {
-      IODevicePeer *ioPeer = static_cast<IODevicePeer *>(*peer);
-      if(ioPeer->isOpen()) {
-	qWarning() << "SignalProxy: Cannot change proxy mode while connected";
-	return;
-      }
-    }
-    if((*peer)->type() != AbstractPeer::SignalProxyPeer) {
-      qWarning() << "SignalProxy: Cannot change proxy mode while connected to another internal SignalProxy";
-      return;
+
+void SignalProxy::setHeartBeatInterval(int secs)
+{
+    if (_heartBeatInterval != secs) {
+        _heartBeatInterval = secs;
+        emit heartBeatIntervalChanged(secs);
     }
-    peer++;
-  }
-
-  _proxyMode = mode;
-  if(mode == Server)
-    initServer();
-  else
-    initClient();
 }
 
-void SignalProxy::init() {
-  connect(&_heartBeatTimer, SIGNAL(timeout()), this, SLOT(sendHeartBeat()));
-  _heartBeatTimer.start(30 * 1000);
-}
 
-void SignalProxy::initServer() {
+void SignalProxy::setMaxHeartBeatCount(int max)
+{
+    if (_maxHeartBeatCount != max) {
+        _maxHeartBeatCount = max;
+        emit maxHeartBeatCountChanged(max);
+    }
 }
 
-void SignalProxy::initClient() {
-  attachSlot("__objectRenamed__", this, SLOT(objectRenamed(QByteArray, QString, QString)));
-}
 
-bool SignalProxy::addPeer(QIODevice* iodev) {
-  if(!iodev)
-    return false;
-  
-  if(_peers.contains(iodev))
-    return true;
+bool SignalProxy::addPeer(Peer *peer)
+{
+    if (!peer)
+        return false;
 
-  if(proxyMode() == Client && !_peers.isEmpty()) {
-    qWarning("SignalProxy: only one peer allowed in client mode!");
-    return false;
-  }
+    if (_peerMap.values().contains(peer))
+        return true;
 
-  if(!iodev->isOpen())
-    qWarning("SignalProxy::the device you passed is not open!");
+    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, SIGNAL(lagUpdated(int)), SIGNAL(lagUpdated(int)));
+    }
 
-  connect(iodev, SIGNAL(disconnected()), this, SLOT(removePeerBySender()));
-  connect(iodev, SIGNAL(readyRead()), this, SLOT(dataAvailable()));
+    connect(peer, SIGNAL(disconnected()), SLOT(removePeerBySender()));
+    connect(peer, SIGNAL(secureStateChanged(bool)), SLOT(updateSecureState()));
 
-  QAbstractSocket* sock  = qobject_cast<QAbstractSocket*>(iodev);
-  if(sock) {
-    connect(sock, SIGNAL(disconnected()), this, SLOT(removePeerBySender()));
-  }
+    if (!peer->parent())
+        peer->setParent(this);
 
-  _peers[iodev] = new IODevicePeer(iodev, iodev->property("UseCompression").toBool());
+    if (peer->id() < 0) {
+        peer->setId(nextPeerId());
+        peer->setConnectedSince(QDateTime::currentDateTimeUtc());
+    }
 
-  if(_peers.count() == 1)
-    emit connected();
+    _peerMap[peer->id()] = peer;
 
-  return true;
+    peer->setSignalProxy(this);
+
+    if (peerCount() == 1)
+        emit connected();
+
+    updateSecureState();
+    return true;
 }
 
-void SignalProxy::removeAllPeers() {
-  Q_ASSERT(proxyMode() == Server || _peers.count() <= 1);
-  // wee need to copy that list since we modify it in the loop
-  QList<QObject *> peers = _peers.keys();
-  foreach(QObject *peer, peers) {
-    removePeer(peer);
-  }
+
+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);
+    }
 }
 
-void SignalProxy::removePeer(QObject* dev) {
-  if(_peers.isEmpty()) {
-    qWarning() << "SignalProxy::removePeer(): No peers in use!";
-    return;
-  }
 
-  Q_ASSERT(dev);
-  if(!_peers.contains(dev)) {
-    qWarning() << "SignalProxy: unknown Peer" << dev;
-    return;
-  }
+void SignalProxy::removePeer(Peer *peer)
+{
+    if (!peer) {
+        qWarning() << Q_FUNC_INFO << "Trying to remove a null peer!";
+        return;
+    }
 
-  AbstractPeer *peer = _peers[dev];
-  _peers.remove(dev);
+    if (_peerMap.isEmpty()) {
+        qWarning() << "SignalProxy::removePeer(): No peers in use!";
+        return;
+    }
 
-  disconnect(dev, 0, this, 0);
-  if(peer->type() == AbstractPeer::IODevicePeer)
-    emit peerRemoved(static_cast<QIODevice *>(dev));
+    if (!_peerMap.values().contains(peer)) {
+        qWarning() << "SignalProxy: unknown Peer" << peer;
+        return;
+    }
 
-  delete peer;
+    disconnect(peer, nullptr, this, nullptr);
+    peer->setSignalProxy(nullptr);
 
-  if(_peers.isEmpty())
-    emit disconnected();
-}
+    _peerMap.remove(peer->id());
+    emit peerRemoved(peer);
 
-void SignalProxy::removePeerBySender() {
-  removePeer(sender());
-}
+    if (peer->parent() == this)
+        peer->deleteLater();
 
-void SignalProxy::objectRenamed(const QString &newname, const QString &oldname) {
-  SyncableObject *syncObject = qobject_cast<SyncableObject *>(sender());
-  const QMetaObject *meta = syncObject->metaObject();
-  const QByteArray className(meta->className());
-  objectRenamed(className, newname, oldname);
-
-  if(proxyMode() == Client)
-    return;
-  
-  QVariantList params;
-  params << "__objectRenamed__" << className << newname << oldname;
-  dispatchSignal(RpcCall, params);
-}
+    updateSecureState();
 
-void SignalProxy::objectRenamed(const QByteArray &classname, const QString &newname, const QString &oldname) {
-  if(_syncSlave.contains(classname) && _syncSlave[classname].contains(oldname) && oldname != newname) {
-    SyncableObject *obj = _syncSlave[classname][newname] = _syncSlave[classname].take(oldname);
-    requestInit(obj);
-  }
+    if (_peerMap.isEmpty())
+        emit disconnected();
 }
 
-void SignalProxy::setArgTypes(QObject* obj, int methodId) {
-  const QMetaObject *meta = metaObject(obj);
-  QList<QByteArray> p = meta->method(methodId).parameterTypes();
-  QList<int> argTypes;
-  int ct = p.count();
-  for(int i=0; i<ct; i++)
-    argTypes.append(QMetaType::type(p.value(i)));
 
-  Q_ASSERT(!_classInfo[meta]->argTypes.contains(methodId));
-  _classInfo[meta]->argTypes[methodId] = argTypes;
+void SignalProxy::removePeerBySender()
+{
+    removePeer(qobject_cast<Peer *>(sender()));
 }
 
-const QList<int> &SignalProxy::argTypes(QObject *obj, int methodId) {
-  const QMetaObject *meta = metaObject(obj);
-  Q_ASSERT(_classInfo.contains(meta));
-  if(!_classInfo[meta]->argTypes.contains(methodId))
-    setArgTypes(obj, methodId);
-  return _classInfo[meta]->argTypes[methodId];
-}
 
-void SignalProxy::setReturnType(QObject *obj, int methodId) {
-  const QMetaObject *meta = metaObject(obj);
-  int returnType = QMetaType::type(meta->method(methodId).typeName());
+void SignalProxy::renameObject(const SyncableObject *obj, const QString &newname, const QString &oldname)
+{
+    if (proxyMode() == Client)
+        return;
 
-  Q_ASSERT(!_classInfo[meta]->returnType.contains(methodId));
-  _classInfo[meta]->returnType[methodId] = returnType;
-}
+    const QMetaObject *meta = obj->syncMetaObject();
+    const QByteArray className(meta->className());
+    objectRenamed(className, newname, oldname);
 
-const int &SignalProxy::returnType(QObject *obj, int methodId) {
-  const QMetaObject *meta = metaObject(obj);
-  Q_ASSERT(_classInfo.contains(meta));
-  if(!_classInfo[meta]->returnType.contains(methodId))
-    setReturnType(obj, methodId);
-  return _classInfo[meta]->returnType[methodId];
+    dispatch(RpcCall("__objectRenamed__", QVariantList() << className << newname << oldname));
 }
 
-void SignalProxy::setMinArgCount(QObject *obj, int methodId) {
-  const QMetaObject *meta = metaObject(obj);
-  QString signature(meta->method(methodId).signature());
-  int minCount = meta->method(methodId).parameterTypes().count() - signature.count("=");
-  Q_ASSERT(!_classInfo[meta]->minArgCount.contains(methodId));
-  _classInfo[meta]->minArgCount[methodId] = minCount;
-}
 
-const int &SignalProxy::minArgCount(QObject *obj, int methodId) {
-  const QMetaObject *meta = metaObject(obj);
-  Q_ASSERT(_classInfo.contains(meta));
-  if(!_classInfo[meta]->minArgCount.contains(methodId))
-    setMinArgCount(obj, methodId);
-  return _classInfo[meta]->minArgCount[methodId];
+void SignalProxy::objectRenamed(const QByteArray &classname, const QString &newname, const QString &oldname)
+{
+    if (_syncSlave.contains(classname) && _syncSlave[classname].contains(oldname) && oldname != newname) {
+        SyncableObject *obj = _syncSlave[classname][newname] = _syncSlave[classname].take(oldname);
+        requestInit(obj);
+    }
 }
 
-void SignalProxy::setMethodName(QObject *obj, int methodId) {
-  const QMetaObject *meta = metaObject(obj);
-  QByteArray method(::methodName(meta->method(methodId)));
-  Q_ASSERT(!_classInfo[meta]->methodNames.contains(methodId));
-  _classInfo[meta]->methodNames[methodId] = method;
+
+const QMetaObject *SignalProxy::metaObject(const QObject *obj)
+{
+    if (const auto *syncObject = qobject_cast<const SyncableObject *>(obj))
+        return syncObject->syncMetaObject();
+    else
+        return obj->metaObject();
 }
 
-const QByteArray &SignalProxy::methodName(QObject *obj, int methodId) {
-  const QMetaObject *meta = metaObject(obj);
-  Q_ASSERT(_classInfo.contains(meta));
-  if(!_classInfo[meta]->methodNames.contains(methodId))
-    setMethodName(obj, methodId);
-  return _classInfo[meta]->methodNames[methodId];
+
+SignalProxy::ExtendedMetaObject *SignalProxy::extendedMetaObject(const QMetaObject *meta) const
+{
+    if (_extendedMetaObjects.contains(meta))
+        return _extendedMetaObjects[meta];
+    else
+        return nullptr;
 }
 
 
-void SignalProxy::setSyncMap(SyncableObject *obj) {
-  const QMetaObject *meta = obj->syncMetaObject();
-  QHash<QByteArray, int> syncMap;
-  
-  QList<int> slotIndexes;
-  for(int i = 0; i < meta->methodCount(); i++) {
-    if(meta->method(i).methodType() == QMetaMethod::Slot)
-      slotIndexes << i;
-  }
-
-  // we're faking sync pairs for sync replies
-  QByteArray slotSignature;
-  foreach(int slotIdx, slotIndexes) {
-    slotSignature = QByteArray(meta->method(slotIdx).signature());
-    if(!slotSignature.startsWith("receive"))
-      continue;
-    syncMap[slotSignature] = slotIdx;
-  }
-
-  QMetaMethod signal, slot;
-  int matchIdx;
-  for(int signalIdx = 0; signalIdx < meta->methodCount(); signalIdx++) {
-    signal = meta->method(signalIdx);
-    if(signal.methodType() != QMetaMethod::Signal)
-      continue;
-
-    matchIdx = -1;
-    foreach(int slotIdx, slotIndexes) {
-      slot = meta->method(slotIdx);
-      if(methodsMatch(signal, slot)) {
-	matchIdx = slotIdx;
-	break;
-      }
+SignalProxy::ExtendedMetaObject *SignalProxy::createExtendedMetaObject(const QMetaObject *meta, bool checkConflicts)
+{
+    if (!_extendedMetaObjects.contains(meta)) {
+        _extendedMetaObjects[meta] = new ExtendedMetaObject(meta, checkConflicts);
     }
-    if(matchIdx != -1) {
-      slotIndexes.removeAt(slotIndexes.indexOf(matchIdx));
-      syncMap[QByteArray(signal.signature())] = matchIdx;
+    return _extendedMetaObjects[meta];
+}
+
+
+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;
     }
-  }
 
-  Q_ASSERT(_classInfo[meta]->syncMap.isEmpty());
-  _classInfo[meta]->syncMap = syncMap;
-}
+    createExtendedMetaObject(meta);
+    _signalRelay->attachSignal(sender, methodId, sigName);
 
-const QHash<QByteArray,int> &SignalProxy::syncMap(SyncableObject *obj) {
-  const QMetaObject *meta = obj->syncMetaObject();
-  Q_ASSERT(_classInfo.contains(meta));
-  if(_classInfo[meta]->syncMap.isEmpty())
-    setSyncMap(obj);
-  return _classInfo[meta]->syncMap;
+    disconnect(sender, SIGNAL(destroyed(QObject *)), this, SLOT(detachObject(QObject *)));
+    connect(sender, SIGNAL(destroyed(QObject *)), this, SLOT(detachObject(QObject *)));
+    return true;
 }
 
-void SignalProxy::setReceiveMap(SyncableObject *obj) {
-  const QMetaObject *meta = obj->syncMetaObject();
-  Q_ASSERT(_classInfo.contains(meta));
-
-  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(obj, i))
-      continue;
-
-    signature = QByteArray(requestSlot.signature());
-    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);
+
+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;
     }
 
-    if(receiverId != -1)
-      receiveMap[i] = receiverId;
-  }
-  _classInfo[meta]->receiveMap = receiveMap;  
+    createExtendedMetaObject(meta);
+
+    QByteArray funcName = QMetaObject::normalizedSignature(sigName.constData());
+    _attachedSlots.insert(funcName, qMakePair(recv, methodId));
+
+    disconnect(recv, SIGNAL(destroyed(QObject *)), this, SLOT(detachObject(QObject *)));
+    connect(recv, SIGNAL(destroyed(QObject *)), this, SLOT(detachObject(QObject *)));
+    return true;
 }
 
-const QHash<int, int> &SignalProxy::receiveMap(SyncableObject *obj) {
-  const QMetaObject *meta = obj->syncMetaObject();
-  Q_ASSERT(_classInfo.contains(meta));
-  if(_classInfo[meta]->receiveMap.isEmpty())
-    setReceiveMap(obj);
-  return _classInfo[meta]->receiveMap;
+
+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::setUpdatedRemotelyId(SyncableObject *obj) {
-  const QMetaObject *meta = obj->syncMetaObject();
-  Q_ASSERT(_classInfo.contains(meta));
-  _classInfo[meta]->updatedRemotelyId = meta->indexOfSignal("updatedRemotely()");
+
+void SignalProxy::detachObject(QObject *obj)
+{
+    // Don't try to connect SignalProxy from itself on shutdown
+    if (obj != this) {
+        detachSignals(obj);
+        detachSlots(obj);
+    }
 }
 
-int SignalProxy::updatedRemotelyId(SyncableObject *obj) {
-  Q_ASSERT(_classInfo.contains(obj->syncMetaObject()));
-  return _classInfo[obj->syncMetaObject()]->updatedRemotelyId;
+
+void SignalProxy::detachSignals(QObject *sender)
+{
+    _signalRelay->detachSignal(sender);
 }
 
-const QMetaObject *SignalProxy::metaObject(QObject *obj) {
-  if(SyncableObject *syncObject = qobject_cast<SyncableObject *>(obj))
-    return syncObject->syncMetaObject();
-  else
-    return obj->metaObject();
+
+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::createClassInfo(QObject *obj) {
-  const QMetaObject *meta = metaObject(obj);
-  if(_classInfo.contains(meta))
-    return;
 
-  ClassInfo *classInfo = new ClassInfo();
-  _classInfo[meta] = classInfo;
+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);
 }
 
-bool SignalProxy::attachSignal(QObject* sender, const char* signal, const QByteArray& sigName) {
-  const QMetaObject* meta = metaObject(sender);
-  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;
-  }
 
-  createClassInfo(sender);
+template<class T>
+void SignalProxy::dispatch(const T &protoMessage)
+{
+    for (auto&& peer : _peerMap.values()) {
+        dispatch(peer, protoMessage);
+    }
+}
+
 
-  SignalRelay* relay;
-  if(_relayHash.contains(sender))
-    relay = _relayHash[sender];
-  else
-    relay = _relayHash[sender] = new SignalRelay(this, sender);
+template<class T>
+void SignalProxy::dispatch(Peer *peer, const T &protoMessage)
+{
+    _targetPeer = peer;
 
-  relay->attachSignal(methodId, sigName);
+    if (peer && peer->isOpen())
+        peer->dispatch(protoMessage);
+    else
+        QCoreApplication::postEvent(this, new ::RemovePeerEvent(peer));
 
-  return true;
+    _targetPeer = nullptr;
 }
 
 
-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;
-  }
+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;
+    }
 
-  createClassInfo(recv);
+    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;
+    }
 
-  QByteArray funcName = QMetaObject::normalizedSignature(sigName.constData());
-  _attachedSlots.insert(funcName, qMakePair(recv, methodId));
+    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;
+    }
 
-  QObject::disconnect(recv, SIGNAL(destroyed()), this, SLOT(detachSender()));
-  QObject::connect(recv, SIGNAL(destroyed()), this, SLOT(detachSender()));
-  return true;
-}
+    // 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));
 
-void SignalProxy::synchronize(SyncableObject *obj) {
-  createClassInfo(obj);
-  setUpdatedRemotelyId(obj);
-  
-  // attaching all the Signals
-  SignalRelay* relay;
-  if(_relayHash.contains(obj))
-    relay = _relayHash[obj];
-  else
-    relay = _relayHash[obj] = new SignalRelay(this, obj);
-
-  relay->setSynchronize(true);
-
-  // attaching as slave to receive sync Calls
-  QByteArray className(obj->syncMetaObject()->className());
-  _syncSlave[className][obj->objectName()] = obj;
-
-  if(proxyMode() == Server) {
-    connect(obj, SIGNAL(objectRenamed(QString, QString)), this, SLOT(objectRenamed(QString, QString)));
-    obj->setInitialized();
-    emit objectInitialized(obj);
-  } else {
-    if(obj->isInitialized())
-      emit objectInitialized(obj);
-    else
-      requestInit(obj);
-  }
-}
+    if (!invokeSlot(receiver, slotId, syncMessage.params, returnValue, peer)) {
+        qWarning("SignalProxy::handleSync(): invokeMethod for \"%s\" failed ", eMeta->methodName(slotId).constData());
+        return;
+    }
 
-void SignalProxy::requestInit(SyncableObject *obj) {
-  if(proxyMode() == Server || obj->isInitialized())
-    return;
+    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;
+    }
 
-  QVariantList params;
-  params << obj->syncMetaObject()->className()
-	 << obj->objectName();
-  dispatchSignal(InitRequest, params);
+    // send emit update signal
+    invokeSlot(receiver, eMeta->updatedRemotelyId());
 }
 
-void SignalProxy::detachSender() {
-  detachObject(sender());
-}
 
-void SignalProxy::detachObject(QObject* obj) {
-  detachSignals(obj);
-  detachSlots(obj);
-  stopSync(static_cast<SyncableObject *>(obj));
-}
+void SignalProxy::handle(Peer *peer, const InitRequest &initRequest)
+{
+   if (!_syncSlave.contains(initRequest.className)) {
+        qWarning() << "SignalProxy::handleInitRequest() received initRequest for unregistered Class:"
+                   << initRequest.className;
+        return;
+    }
 
-void SignalProxy::detachSignals(QObject* sender) {
-  if(!_relayHash.contains(sender))
-    return;
-  _relayHash.take(sender)->deleteLater();
-}
+    if (!_syncSlave[initRequest.className].contains(initRequest.objectName)) {
+        qWarning() << "SignalProxy::handleInitRequest() received initRequest for unregistered Object:"
+                   << initRequest.className << initRequest.objectName;
+        return;
+    }
 
-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++;
-  }
+    SyncableObject *obj = _syncSlave[initRequest.className][initRequest.objectName];
+    _targetPeer = peer;
+    peer->dispatch(InitData(initRequest.className, initRequest.objectName, initData(obj)));
+    _targetPeer = nullptr;
 }
 
-void SignalProxy::stopSync(SyncableObject* obj) {
-  if(_relayHash.contains(obj))
-    _relayHash[obj]->setSynchronize(false);
-
-  // 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;
+
+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;
     }
-    classIter++;
-  }
+
+    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::dispatchSignal(const RequestType &requestType, const QVariantList &params) {
-  QVariant packedFunc(QVariantList() << (qint16)requestType << params);
-  PeerHash::iterator peer = _peers.begin();
-  while(peer != _peers.end()) {
-    switch((*peer)->type()) {
-    case AbstractPeer::IODevicePeer:
-      {
-	IODevicePeer *ioPeer = static_cast<IODevicePeer *>(*peer);
-	ioPeer->dispatchPackedFunc(packedFunc);
-      }
-      break;
-    case AbstractPeer::SignalProxyPeer:
-      (*peer)->dispatchSignal(requestType, params);
-      break;
-    default:
-      Q_ASSERT(false); // there shouldn't be any peers with wrong / unknown type
+
+void SignalProxy::handle(Peer *peer, const RpcCall &rpcCall)
+{
+    QObject *receiver;
+    int methodId;
+    SlotHash::const_iterator slot = _attachedSlots.constFind(rpcCall.slotName);
+    while (slot != _attachedSlots.constEnd() && slot.key() == rpcCall.slotName) {
+        receiver = (*slot).first;
+        methodId = (*slot).second;
+        if (!invokeSlot(receiver, methodId, rpcCall.params, peer)) {
+            ExtendedMetaObject *eMeta = extendedMetaObject(receiver);
+            qWarning("SignalProxy::handleSignal(): invokeMethod for \"%s\" failed ", eMeta->methodName(methodId).constData());
+        }
+        ++slot;
     }
-    peer++;
-  }
 }
 
-void SignalProxy::receivePackedFunc(AbstractPeer *sender, const QVariant &packedFunc) {
-  QVariantList params(packedFunc.toList());
 
-  if(params.isEmpty()) {
-    qWarning() << "SignalProxy::receivePeerSignal(): received incompatible Data:" << packedFunc;
-    return;
-  }
+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();
+
+    if (eMeta->minArgCount(methodId) > params.count()) {
+        qWarning() << "SignalProxy::invokeSlot(): not enough params to invoke" << eMeta->methodName(methodId);
+        return false;
+    }
 
-  RequestType requestType = (RequestType)params.takeFirst().value<int>();
-  receivePeerSignal(sender, requestType, params);
-}
-  
-void SignalProxy::receivePeerSignal(AbstractPeer *sender, const RequestType &requestType, const QVariantList &params) {
-  switch(requestType) {
-  case RpcCall:
-    if(params.empty())
-      qWarning() << "SignalProxy::receivePeerSignal(): received empty RPC-Call";
-    else
-      handleSignal(params);
-      //handleSignal(params.takeFirst().toByteArray(), params);
-    break;
-
-  case Sync:
-    handleSync(sender, params);
-    break;
-    
-  case InitRequest:
-    handleInitRequest(sender, params);
-    break;
-    
-  case InitData:
-    handleInitData(sender, params);
-    break;
-    
-  case HeartBeat:
-    receiveHeartBeat(sender, params);
-    break;
-
-  case HeartBeatReply:
-    receiveHeartBeatReply(sender, params);
-    break;
-
-  default:
-    qWarning() << "SignalProxy::receivePeerSignal(): received undefined CallType" << requestType << params;
-  }
+    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;
+    }
 }
 
-void SignalProxy::handleSync(AbstractPeer *sender, QVariantList params) {
-  if(params.count() < 3) {
-    qWarning() << "received invalid Sync call" << params;
-    return;
-  }
-  
-  QByteArray className = params.takeFirst().toByteArray();
-  QString objectName = params.takeFirst().toString();
-  QByteArray signal = params.takeFirst().toByteArray();
-
-  if(!_syncSlave.contains(className) || !_syncSlave[className].contains(objectName)) {
-    qWarning() << QString("no registered receiver for sync call: %1::%2 (objectName=\"%3\"). Params are:").arg(QString(className)).arg(QString(signal)).arg(objectName)
-	       << params;
-    return;
-  }
-
-  SyncableObject *receiver = _syncSlave[className][objectName];
-  if(!syncMap(receiver).contains(signal)) {
-    qWarning() << QString("no matching slot for sync call: %1::%2 (objectName=\"%3\"). Params are:").arg(QString(className)).arg(QString(signal)).arg(objectName)
-	       << params;
-    return;
-  }
-
-  int slotId = syncMap(receiver)[signal];
-
-  QVariant returnValue((QVariant::Type)returnType(receiver, slotId));
-  if(!invokeSlot(receiver, slotId, params, returnValue)) {
-    qWarning("SignalProxy::handleSync(): invokeMethod for \"%s\" failed ", methodName(receiver, slotId).constData());
-    return;
-  }
-
-  if(returnValue.type() != QVariant::Invalid && receiveMap(receiver).contains(slotId)) {
-    int receiverId = receiveMap(receiver)[slotId];
-    QVariantList returnParams;
-    returnParams << className
-		 << objectName
-		 << QByteArray(receiver->metaObject()->method(receiverId).signature());
-    if(argTypes(receiver, receiverId).count() > 1)
-      returnParams << params;
-    returnParams << returnValue;
-    sender->dispatchSignal(Sync, returnParams);
-  }
-  
-  // send emit update signal
-  invokeSlot(receiver, updatedRemotelyId(receiver));
+
+bool SignalProxy::invokeSlot(QObject *receiver, int methodId, const QVariantList &params, Peer *peer)
+{
+    QVariant ret;
+    return invokeSlot(receiver, methodId, params, ret, peer);
 }
 
-void SignalProxy::handleInitRequest(AbstractPeer *sender, const QVariantList &params) {
-  if(params.count() != 2) {
-    qWarning() << "SignalProxy::handleInitRequest() received initRequest with invalid param Count:"
-	       << params;
-    return;
-  }
-  
-  QByteArray className(params[0].toByteArray());
-  QString objectName(params[1].toString());
-  
-  if(!_syncSlave.contains(className)) {
-    qWarning() << "SignalProxy::handleInitRequest() received initRequest for unregistered Class:"
-	       << className;
-    return;
-  }
-
-  if(!_syncSlave[className].contains(objectName)) {
-    qWarning() << "SignalProxy::handleInitRequest() received initRequest for unregistered Object:"
-	       << className << objectName;
-    return;
-  }
-  
-  SyncableObject *obj = _syncSlave[className][objectName];
-
-  QVariantList params_;
-  params_ << className
-	  << objectName
-	  << initData(obj);
-
-  sender->dispatchSignal(InitData, params_);
+
+void SignalProxy::requestInit(SyncableObject *obj)
+{
+    if (proxyMode() == Server || obj->isInitialized())
+        return;
+
+    dispatch(InitRequest(obj->syncMetaObject()->className(), obj->objectName()));
 }
 
-void SignalProxy::handleInitData(AbstractPeer *sender, const QVariantList &params) {
-  Q_UNUSED(sender)
-  if(params.count() != 3) {
-    qWarning() << "SignalProxy::handleInitData() received initData with invalid param Count:"
-	       << params;
-    return;
-  }
-  
-  QByteArray className(params[0].toByteArray());
-  QString objectName(params[1].toString());
-  QVariantMap propertyMap(params[2].toMap());
-
-  if(!_syncSlave.contains(className)) {
-    qWarning() << "SignalProxy::handleInitData() received initData for unregistered Class:"
-	       << className;
-    return;
-  }
-
-  if(!_syncSlave[className].contains(objectName)) {
-    qWarning() << "SignalProxy::handleInitData() received initData for unregistered Object:"
-	       << className << objectName;
-    return;
-  }
-
-  SyncableObject *obj = _syncSlave[className][objectName];
-  setInitData(obj, propertyMap);
+
+QVariantMap SignalProxy::initData(SyncableObject *obj) const
+{
+    return obj->toVariantMap();
 }
 
-//void SignalProxy::handleSignal(const QByteArray &funcName, const QVariantList &params) {
-void SignalProxy::handleSignal(const QVariantList &data) {
-  QVariantList params = data;
-  QByteArray funcName = params.takeFirst().toByteArray();
-
-  QObject* receiver;
-  int methodId;
-  SlotHash::const_iterator slot = _attachedSlots.constFind(funcName);
-  while(slot != _attachedSlots.constEnd() && slot.key() == funcName) {
-    receiver = (*slot).first;
-    methodId = (*slot).second;
-    if(!invokeSlot(receiver, methodId, params))
-      qWarning("SignalProxy::handleSignal(): invokeMethod for \"%s\" failed ", methodName(receiver, methodId).constData());
-    slot++;
-  }
+
+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::invokeSlot(QObject *receiver, int methodId, const QVariantList &params, QVariant &returnValue) {
-  const QList<int> args = argTypes(receiver, methodId);
-  const int numArgs = params.count() < args.count()
-    ? params.count()
-    : args.count();
-
-  if(minArgCount(receiver, methodId) > params.count()) {
-      qWarning() << "SignalProxy::invokeSlot(): not enough params to invoke" << methodName(receiver, methodId);
-      return false;
-  }
-
-  void *_a[] = {0,              // return type... 
-		0, 0, 0, 0 , 0, // and 10 args - that's the max size qt can handle with signals and slots
-		0, 0, 0, 0 , 0};
-
-  // 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).signature());
-      qWarning() << "                            - make sure all your data types are known by the Qt MetaSystem";
-      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;
     }
-    if(args[i] != QMetaType::type(params[i].typeName())) {
-      qWarning() << "SignalProxy::invokeSlot(): incompatible param types to invoke" << methodName(receiver, methodId);
-      return false;
+
+    default:
+        qWarning() << Q_FUNC_INFO << "Received unknown custom event:" << event->type();
+        return;
     }
-    _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) {
-    return receiver->qt_metacall(QMetaObject::InvokeMetaMethod, methodId, _a) < 0;
-  } else {
-    qWarning() << "Queued Connections are not implemented yet";
-    // note to self: qmetaobject.cpp:990 ff
-    return false;
-  }
-  
 }
 
-bool SignalProxy::invokeSlot(QObject *receiver, int methodId, const QVariantList &params) {
-  QVariant ret;
-  return invokeSlot(receiver, methodId, params, ret);
-}
 
-void SignalProxy::dataAvailable() {
-  // yet again. it's a private slot. no need for checks.
-  QIODevice* ioDev = qobject_cast<QIODevice* >(sender());
-  Q_ASSERT(_peers.contains(ioDev) && _peers[ioDev]->type() == AbstractPeer::IODevicePeer);
-  IODevicePeer *peer = static_cast<IODevicePeer *>(_peers[ioDev]);
-  QVariant var;
-  while(peer->readData(var))
-    receivePackedFunc(peer, var);
-}
+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;
 
-void SignalProxy::writeDataToDevice(QIODevice *dev, const QVariant &item, bool compressed) {
-  QAbstractSocket* sock  = qobject_cast<QAbstractSocket*>(dev);
-  if(!dev->isOpen() || (sock && sock->state()!=QAbstractSocket::ConnectedState)) {
-    qWarning("SignalProxy: Can't call write on a closed device");
-    return;
-  }
+    ExtendedMetaObject *eMeta = extendedMetaObject(obj);
 
-  QByteArray block;
-  QDataStream out(&block, QIODevice::WriteOnly);
-  out.setVersion(QDataStream::Qt_4_2);
-  out << (quint32)0;
-  
-  if(compressed) {
-    QByteArray rawItem;
-    QDataStream itemStream(&rawItem, QIODevice::WriteOnly);
+    QVariantList params;
 
-    itemStream.setVersion(QDataStream::Qt_4_2);
-    itemStream << item;
+    const QList<int> &argTypes = eMeta->argTypes(eMeta->methodId(QByteArray(funcname)));
 
-    rawItem = qCompress(rawItem);
+    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 *));
+    }
 
-    out << rawItem;
-  } else {
-    out << item;
-  }
+    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));
+}
 
-  out.device()->seek(0);
-  out << (quint32)(block.size() - sizeof(quint32));
 
-  dev->write(block);
+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();
 }
 
-bool SignalProxy::readDataFromDevice(QIODevice *dev, quint32 &blockSize, QVariant &item, bool compressed) {
-  QDataStream in(dev);
-  in.setVersion(QDataStream::Qt_4_2);
 
-  if(blockSize == 0) {
-    if(dev->bytesAvailable() < (int)sizeof(quint32)) return false;
-    in >> blockSize;
-  }
+void SignalProxy::dumpProxyStats()
+{
+    QString mode;
+    if (proxyMode() == Server)
+        mode = "Server";
+    else
+        mode = "Client";
+
+    int slaveCount = 0;
+    foreach(ObjectId oid, _syncSlave.values())
+    slaveCount += oid.count();
+
+    qDebug() << this;
+    qDebug() << "              Proxy Mode:" << mode;
+    qDebug() << "          attached Slots:" << _attachedSlots.count();
+    qDebug() << " number of synced Slaves:" << slaveCount;
+    qDebug() << "number of Classes cached:" << _extendedMetaObjects.count();
+}
 
-  if(blockSize > 1 << 22) {
-    qWarning() << qPrintable(tr("Client tried to send package larger than max package size!"));
-    QAbstractSocket *sock  = qobject_cast<QAbstractSocket *>(dev);
-    qWarning() << qPrintable(tr("Disconnecting")) << (sock ? qPrintable(sock->peerAddress().toString()) : qPrintable(tr("local client")));
-    dev->close();
-    return false;
-  }
-    
-  if(dev->bytesAvailable() < blockSize)
-    return false;
-
-  if(compressed) {
-    QByteArray rawItem;
-    in >> rawItem;
-    // debug check
-    int nbytes = rawItem.size();
-    if (nbytes <= 4) {
-      const char *data = rawItem.constData();
-      if (nbytes < 4 || (data[0]!=0 || data[1]!=0 || data[2]!=0 || data[3]!=0))
-	qWarning() << "receieved corrupted compressed data:"
-		   << blockSize << rawItem << rawItem.size() << dev;
+
+void SignalProxy::updateSecureState()
+{
+    bool wasSecure = _secure;
+
+    _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;
     }
-    // end
-    rawItem = qUncompress(rawItem);
-      
-    QDataStream itemStream(&rawItem, QIODevice::ReadOnly);
-    itemStream.setVersion(QDataStream::Qt_4_2);
-    itemStream >> item;
-  } else {
-    in >> item;
-  }
-
-  blockSize = 0;
-
-  return true;
+    return result;
 }
 
-bool SignalProxy::methodsMatch(const QMetaMethod &signal, const QMetaMethod &slot) const {
-  // if we don't even have the same basename it's a sure NO
-  if(methodBaseName(signal) != methodBaseName(slot))
-    return false;
+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);
+}
 
-  // are the signatures compatible?
-  if(!QObject::staticMetaObject.checkConnectArgs(signal.signature(), slot.signature()))
-    return false;
+void SignalProxy::restrictTargetPeers(QSet<Peer*> peers, std::function<void()> closure)
+{
+    auto previousRestrictMessageTarget = _restrictMessageTarget;
+    auto previousRestrictedTargets = _restrictedTargets;
+    _restrictMessageTarget = true;
+    _restrictedTargets = peers;
+
+    closure();
 
-  // we take an educated guess if the signals and slots match
-  QString signalsuffix = ::methodName(signal).mid(QString(::methodName(signal)).lastIndexOf(QRegExp("[A-Z]"))).toLower();
-  QString slotprefix = ::methodName(slot).left(QString(::methodName(slot)).indexOf(QRegExp("[A-Z]"))).toLower();
+    _restrictMessageTarget = previousRestrictMessageTarget;
+    _restrictedTargets = previousRestrictedTargets;
+}
 
-  uint sizediff = qAbs(slotprefix.size() - signalsuffix.size());
-  int ratio = editingDistance(slotprefix, signalsuffix) - sizediff;
-  return (ratio < 2);
+Peer *SignalProxy::sourcePeer() {
+    return _sourcePeer;
 }
 
-QString SignalProxy::methodBaseName(const QMetaMethod &method) {
-  QString methodname = QString(method.signature()).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);
-  }
-
-  methodname[0] = methodname[0].toUpper();
-
-  return methodname;
+void SignalProxy::setSourcePeer(Peer *sourcePeer) {
+    _sourcePeer = sourcePeer;
 }
 
-QVariantMap SignalProxy::initData(SyncableObject *obj) const {
-  return obj->toVariantMap();
+Peer *SignalProxy::targetPeer() {
+    return _targetPeer;
 }
 
-void SignalProxy::setInitData(SyncableObject *obj, const QVariantMap &properties) {
-  if(obj->isInitialized())
-    return;
-  obj->fromVariantMap(properties);
-  obj->setInitialized();
-  emit objectInitialized(obj);
-  invokeSlot(obj, updatedRemotelyId(obj));
+void SignalProxy::setTargetPeer(Peer *targetPeer) {
+    _targetPeer = targetPeer;
 }
 
-void SignalProxy::sendHeartBeat() {
-  dispatchSignal(SignalProxy::HeartBeat, QVariantList() << QTime::currentTime());
-  PeerHash::iterator peer = _peers.begin();
-  while(peer != _peers.end()) {
-    if((*peer)->type() == AbstractPeer::IODevicePeer) {
-      IODevicePeer *ioPeer = static_cast<IODevicePeer *>(*peer);
-      if(ioPeer->sentHeartBeats > 0) {
-	updateLag(ioPeer, ioPeer->sentHeartBeats * _heartBeatTimer.interval());
-      }
-      if(ioPeer->sentHeartBeats > 1) {
-	//FIXME: proper disconnect.
-// 	QAbstractSocket *socket = qobject_cast<QAbstractSocket *>(peerIter.key());
-// 	qWarning() << "SignalProxy: Disconnecting peer:"
-// 		   << (socket ? qPrintable(socket->peerAddress().toString()) : "local client")
-// 		   << "(didn't receive a heartbeat for over" << peerIter->sentHeartBeats * _heartBeatTimer.interval() / 1000 << "seconds)";      
-// 	peerIter.key()->close();
-      } else {
-	ioPeer->sentHeartBeats++;
-      }
+// ==================================================
+//  ExtendedMetaObject
+// ==================================================
+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;
     }
-    peer++;
-  }
 }
 
-void SignalProxy::receiveHeartBeat(AbstractPeer *peer, const QVariantList &params) {
-  peer->dispatchSignal(SignalProxy::HeartBeatReply, params);
+
+const SignalProxy::ExtendedMetaObject::MethodDescriptor &SignalProxy::ExtendedMetaObject::methodDescriptor(int methodId)
+{
+    if (!_methods.contains(methodId)) {
+        _methods[methodId] = MethodDescriptor(_meta->method(methodId));
+    }
+    return _methods[methodId];
 }
 
-void SignalProxy::receiveHeartBeatReply(AbstractPeer *peer, const QVariantList &params) {
-  if(peer->type() != AbstractPeer::IODevicePeer) {
-    qWarning() << "SignalProxy::receiveHeartBeatReply: received heart beat from a non IODevicePeer!";
-    return;
-  }
-
-  IODevicePeer *ioPeer = static_cast<IODevicePeer *>(peer);
-  ioPeer->sentHeartBeats = 0;
-
-  if(params.isEmpty()) {
-    qWarning() << "SignalProxy: received heart beat reply with less params then sent from:" << ioPeer->device();
-    return;
-  }
-  
-  QTime sendTime = params[0].value<QTime>();
-  updateLag(ioPeer, sendTime.msecsTo(QTime::currentTime()) / 2);
+
+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::updateLag(IODevicePeer *peer, int lag) {
-  peer->lag = lag;
-  if(proxyMode() == Client) {
-    emit lagUpdated(lag);
-  }
+
+QByteArray SignalProxy::ExtendedMetaObject::methodName(const QMetaMethod &method)
+{
+    QByteArray sig(method.methodSignature());
+    return sig.left(sig.indexOf("("));
 }
 
 
-void SignalProxy::dumpProxyStats() {
-  QString mode;
-  if(proxyMode() == Server)
-    mode = "Server";
-  else
-    mode = "Client";
+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);
+    }
 
-  int sigCount = 0;
-  foreach(SignalRelay *relay, _relayHash.values())
-    sigCount += relay->sigCount();
+    methodname[0] = methodname[0].toUpper();
 
-  int slaveCount = 0;
-  foreach(ObjectId oid, _syncSlave.values())
-    slaveCount += oid.count();
-  
-  qDebug() << this;
-  qDebug() << "              Proxy Mode:" << mode;
-  qDebug() << "attached sending Objects:" << _relayHash.count();
-  qDebug() << "       number of Signals:" << sigCount;
-  qDebug() << "          attached Slots:" << _attachedSlots.count();
-  qDebug() << " number of synced Slaves:" << slaveCount;
-  qDebug() << "number of Classes cached:" << _classInfo.count();
+    return methodname;
 }
 
-void SignalProxy::dumpSyncMap(SyncableObject *object) {
-  const QMetaObject *meta = object->metaObject();
-  qDebug() << "SignalProxy: SyncMap for Class" << meta->className();
-
-  QHash<QByteArray, int> syncMap_ = syncMap(object);
-  QHash<QByteArray, int>::const_iterator iter = syncMap_.constBegin();
-  while(iter != syncMap_.constEnd()) {
-    qDebug() << iter.key() << "-->" << iter.value() << meta->method(iter.value()).signature();    
-    iter++;
-  }
-//   QHash<int, int> syncMap_ = syncMap(object);
-//   QHash<int, int>::const_iterator iter = syncMap_.constBegin();
-//   while(iter != syncMap_.constEnd()) {
-//     qDebug() << iter.key() << meta->method(iter.key()).signature() << "-->" << iter.value() << meta->method(iter.value()).signature();    
-//     iter++;
-//   }
+
+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;
 }