X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fsignalproxy.cpp;h=058e3cd887927ef4a0c149066bf00c986518f3c1;hp=b3ea4ffbc9e0b30b7180c23708ac283a32e0fd35;hb=79fbcfb49f7cc92a89f0158ebac1a3006a559e8a;hpb=efe20e20080a0c22e1a7b8b84ef622130dbf116e

diff --git a/src/common/signalproxy.cpp b/src/common/signalproxy.cpp
index b3ea4ffb..058e3cd8 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-09 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -32,6 +32,9 @@
 #include <QMetaMethod>
 #include <QMetaProperty>
 #include <QRegExp>
+#ifdef HAVE_SSL
+#include <QSslSocket>
+#endif
 #include <QThread>
 #include <QTime>
 #include <QEvent>
@@ -45,155 +48,207 @@
 // ==================================================
 class PeerSignalEvent : public QEvent {
 public:
-  PeerSignalEvent(SignalProxy *sender, SignalProxy::RequestType requestType, const QVariantList &params) : QEvent(QEvent::User), sender(sender), requestType(requestType), params(params) {}
+  PeerSignalEvent(SignalProxy *sender, SignalProxy::RequestType requestType, const QVariantList &params) : QEvent(QEvent::Type(SignalProxy::PeerSignal)), sender(sender), requestType(requestType), params(params) {}
   SignalProxy *sender;
   SignalProxy::RequestType requestType;
   QVariantList params;
 };
 
+class RemovePeerEvent : public QEvent {
+public:
+  RemovePeerEvent(QObject *peer) : QEvent(QEvent::Type(SignalProxy::RemovePeer)), peer(peer) {}
+  QObject *peer;
+};
+
 // ==================================================
-//  SIGNALRELAY
+//  Relays
 // ==================================================
-class SignalRelay: public QObject {
+class SignalProxy::Relay : 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);
+  Relay(SignalProxy *parent) : QObject(parent), _proxy(parent) {}
+
+  inline SignalProxy *proxy() const { return _proxy; }
+
+private:
+  SignalProxy *_proxy;
+};
+
+class SignalProxy::SyncRelay : public SignalProxy::Relay {
+public:
+  SyncRelay(SignalProxy::ExtendedMetaObject *eMeta, SignalProxy *parent);
+
   int qt_metacall(QMetaObject::Call _c, int _id, void **_a);
 
-  void attachSignal(int methodId, const QByteArray &func);
+  void synchronize(SyncableObject *object);
+
+  int signalCount() const { return _signalCount; }
 
-  void setSynchronize(bool);
-  bool synchronize() const;
-  
-  int sigCount() const;
-  
 private:
-  bool isSyncMethod(int i);
-  
-  SignalProxy* proxy;
-  QObject* caller;
-  QMultiHash<int, QByteArray> sigNames;
-  bool _sync;
+  ExtendedMetaObject *_eMeta;
+  QSet<int> _signalIds;
+  int _signalCount;
 };
 
-SignalRelay::SignalRelay(SignalProxy* parent, QObject* source)
-  : QObject(parent),
-    proxy(parent),
-    caller(source),
-    _sync(false)
+class SignalProxy::SignalRelay : public SignalProxy::Relay {
+public:
+  SignalRelay(SignalProxy *parent) : Relay(parent) {}
+
+  int qt_metacall(QMetaObject::Call _c, int _id, void **_a);
+
+  void attachSignal(QObject *sender, int signalId, const QByteArray &funcName);
+  void detachSignal(QObject *sender, int signalId = -1);
+
+private:
+  struct Signal {
+    QObject *sender;
+    int signalId;
+    QByteArray signature;
+    Signal(QObject *sender, int sigId, const QByteArray &signature) : sender(sender), signalId(sigId), signature(signature) {}
+    Signal() : sender(0), signalId(-1) {}
+  };
+
+  QHash<int, Signal> _slots;
+};
+
+SignalProxy::SyncRelay::SyncRelay(SignalProxy::ExtendedMetaObject *eMeta, SignalProxy *parent)
+  : Relay(parent),
+    _eMeta(eMeta)
 {
-  QObject::connect(source, SIGNAL(destroyed()), parent, SLOT(detachSender()));
+  QByteArray signature;
+  for(int i = 0; i < eMeta->metaObject()->methodCount(); i++ ) {
+    signature = eMeta->metaObject()->method(i).signature();
+    if(!eMeta->syncMap().contains(signature))
+      continue;
+
+    if((proxy()->proxyMode() == SignalProxy::Server && !signature.contains("Requested")) ||
+       (proxy()->proxyMode() == SignalProxy::Client && signature.contains("Requested"))) {
+      _signalIds << i;
+    }
+  }
+  _signalCount = _signalIds.count();
+}
+
+void SignalProxy::SyncRelay::synchronize(SyncableObject *object) {
+  if(object->syncMetaObject() != _eMeta->metaObject()) {
+    qWarning() << Q_FUNC_INFO << "can't use SyncRelay of class" << _eMeta->metaObject()->className()
+	       << "for SyncableObject" << object << "with syncMetaObject of class" << object->syncMetaObject()->className();
+    return;
+  }
+
+  QSet<int>::const_iterator sigIter = _signalIds.constBegin();
+  while(sigIter != _signalIds.constEnd()) {
+    QMetaObject::connect(object, *sigIter, this, QObject::staticMetaObject.methodCount() + *sigIter);
+    sigIter++;
+  }
 }
 
-int SignalRelay::qt_metacall(QMetaObject::Call _c, int _id, void **_a) {
+int SignalProxy::SyncRelay::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);
+    if(!_signalIds.contains(_id)) {
+      qWarning() << Q_FUNC_INFO << "_id" << _id << "is not a valid SyncMethod!";
+      return _id;
+    }
+
+    QVariantList params;
+
+    params << _eMeta->metaObject()->className()
+	   << sender()->objectName()
+	   << _eMeta->metaObject()->method(_id).signature();
+
+    const QList<int> &argTypes = _eMeta->argTypes(_id);
+    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(_eMeta->metaObject()->method(_id).signature());
+	qWarning() << "        - make sure all your data types are known by the Qt MetaSystem";
+	return _id;
       }
+      params << QVariant(argTypes[i], _a[i+1]);
     }
-    _id -= QObject::staticMetaObject.methodCount();
+
+    proxy()->dispatchSignal(SignalProxy::Sync, params);
   }
+  _id -= _signalCount;
   return _id;
 }
 
-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);
-    }
-  } 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);
+void SignalProxy::SignalRelay::attachSignal(QObject *sender, int signalId, const QByteArray &funcName) {
+  // 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;
     }
   }
-  _sync = sync;
-}
 
-bool SignalRelay::isSyncMethod(int i) {
-  SyncableObject *syncObject = qobject_cast<SyncableObject *>(caller);
-  if(!syncObject)
-    return false;
+  QByteArray fn;
+  if(!funcName.isEmpty()) {
+    fn = QMetaObject::normalizedSignature(funcName);
+  } else {
+    fn = SIGNAL(fakeMethodSignature());
+    fn = fn.replace("fakeMethodSignature()", sender->metaObject()->method(signalId).signature());
+  }
 
-  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;
+  _slots[slotId] = Signal(sender, signalId, fn);
 
-  if(proxy->proxyMode() == SignalProxy::Client && signature.contains("Requested"))
-    return true;
-
-  return false;
+  QMetaObject::connect(sender, signalId, this, QObject::staticMetaObject.methodCount() + slotId);
 }
 
-bool SignalRelay::synchronize() const {
-  return _sync;
+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++;
+    }
+  }
 }
 
-int SignalRelay::sigCount() const {
-  // only for debuging purpose
-  return sigNames.count();
-}
+int SignalProxy::SignalRelay::qt_metacall(QMetaObject::Call _c, int _id, void **_a) {
+  _id = QObject::qt_metacall(_c, _id, _a);
+  if(_id < 0)
+    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);
+  if(_c == QMetaObject::InvokeMetaMethod) {
+    if(_slots.contains(_id)) {
+      QObject *caller = sender();
 
-  QByteArray fn;
-  if(!func.isEmpty()) {
-    fn = QMetaObject::normalizedSignature(func);
-  } else {
-    fn = QByteArray("2") + caller->metaObject()->method(methodId).signature();
+      SignalProxy::ExtendedMetaObject *eMeta = proxy()->extendedMetaObject(caller->metaObject());
+      Q_ASSERT(eMeta);
+
+      const Signal &signal = _slots[_id];
+
+      QVariantList params;
+      params << signal.signature;
+
+      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(_id).signature());
+	  qWarning() << "                            - make sure all your data types are known by the Qt MetaSystem";
+	  return _id;
+	}
+	params << QVariant(argTypes[i], _a[i+1]);
+      }
+
+      proxy()->dispatchSignal(SignalProxy::RpcCall, params);
+    }
+    _id -= _slots.count();
   }
-  sigNames.insert(methodId, fn);
+  return _id;
 }
 
 // ==================================================
@@ -206,6 +261,28 @@ void SignalProxy::IODevicePeer::dispatchSignal(const RequestType &requestType, c
   dispatchPackedFunc(QVariant(packedFunc));
 }
 
+bool SignalProxy::IODevicePeer::isSecure() const {
+#ifdef HAVE_SSL
+  QSslSocket *sslSocket = qobject_cast<QSslSocket *>(_device);
+  if(sslSocket)
+    return sslSocket->isEncrypted() || sslSocket->localAddress() == QHostAddress::LocalHost || sslSocket->localAddress() == QHostAddress::LocalHostIPv6;
+#endif
+
+  QAbstractSocket *socket = qobject_cast<QAbstractSocket *>(_device);
+  if(socket)
+    return socket->localAddress() == QHostAddress::LocalHost || socket->localAddress() == QHostAddress::LocalHostIPv6;
+
+  return false;
+}
+
+QString SignalProxy::IODevicePeer::address() const {
+  QAbstractSocket *socket = qobject_cast<QAbstractSocket *>(_device);
+  if(socket)
+    return socket->peerAddress().toString();
+  else
+    return QString();
+}
+
 void SignalProxy::SignalProxyPeer::dispatchSignal(const RequestType &requestType, const QVariantList &params) {
   Qt::ConnectionType type = QThread::currentThread() == receiver->thread()
     ? Qt::DirectConnection
@@ -241,12 +318,9 @@ SignalProxy::SignalProxy(ProxyMode mode, QIODevice* device, QObject* parent)
   setProxyMode(mode);
   addPeer(device);
   init();
-} 
+}
 
 SignalProxy::~SignalProxy() {
-  QList<QObject*> senders = _relayHash.keys();
-  foreach(QObject* sender, senders)
-    detachObject(sender);
   removeAllPeers();
 }
 
@@ -275,8 +349,11 @@ void SignalProxy::setProxyMode(ProxyMode mode) {
 }
 
 void SignalProxy::init() {
+  _signalRelay = new SignalRelay(this);
   connect(&_heartBeatTimer, SIGNAL(timeout()), this, SLOT(sendHeartBeat()));
   _heartBeatTimer.start(30 * 1000);
+  _secure = false;
+  updateSecureState();
 }
 
 void SignalProxy::initServer() {
@@ -289,7 +366,7 @@ void SignalProxy::initClient() {
 bool SignalProxy::addPeer(QIODevice* iodev) {
   if(!iodev)
     return false;
-  
+
   if(_peers.contains(iodev))
     return true;
 
@@ -298,22 +375,30 @@ bool SignalProxy::addPeer(QIODevice* iodev) {
     return false;
   }
 
-  if(!iodev->isOpen())
-    qWarning("SignalProxy::the device you passed is not open!");
+  if(!iodev->isOpen()) {
+    qWarning("SignalProxy::addPeer(QIODevice *iodev): iodev needs to be open!");
+    return false;
+  }
 
   connect(iodev, SIGNAL(disconnected()), this, SLOT(removePeerBySender()));
   connect(iodev, SIGNAL(readyRead()), this, SLOT(dataAvailable()));
 
-  QAbstractSocket* sock  = qobject_cast<QAbstractSocket*>(iodev);
-  if(sock) {
-    connect(sock, SIGNAL(disconnected()), this, SLOT(removePeerBySender()));
+#ifdef HAVE_SSL
+  QSslSocket *sslSocket = qobject_cast<QSslSocket *>(iodev);
+  if(sslSocket) {
+    connect(iodev, SIGNAL(encrypted()), this, SLOT(updateSecureState()));
   }
+#endif
+
+  if(!iodev->parent())
+    iodev->setParent(this);
 
   _peers[iodev] = new IODevicePeer(iodev, iodev->property("UseCompression").toBool());
 
   if(_peers.count() == 1)
     emit connected();
 
+  updateSecureState();
   return true;
 }
 
@@ -336,12 +421,12 @@ bool SignalProxy::addPeer(SignalProxy* proxy) {
   }
 
   _peers[proxy] = new SignalProxyPeer(this, proxy);
-
   proxy->addPeer(this);
 
   if(_peers.count() == 1)
     emit connected();
 
+  updateSecureState();
   return true;
 }
 
@@ -373,8 +458,19 @@ void SignalProxy::removePeer(QObject* dev) {
   if(peer->type() == AbstractPeer::IODevicePeer)
     emit peerRemoved(static_cast<QIODevice *>(dev));
 
+  if(peer->type() == AbstractPeer::SignalProxyPeer) {
+    SignalProxy *proxy = static_cast<SignalProxy *>(dev);
+    if(proxy->_peers.contains(this))
+      proxy->removePeer(this);
+  }
+
+  if(dev->parent() == this)
+    dev->deleteLater();
+
   delete peer;
 
+  updateSecureState();
+
   if(_peers.isEmpty())
     emit disconnected();
 }
@@ -385,13 +481,13 @@ void SignalProxy::removePeerBySender() {
 
 void SignalProxy::objectRenamed(const QString &newname, const QString &oldname) {
   SyncableObject *syncObject = qobject_cast<SyncableObject *>(sender());
-  const QMetaObject *meta = syncObject->metaObject();
+  const QMetaObject *meta = syncObject->syncMetaObject();
   const QByteArray className(meta->className());
   objectRenamed(className, newname, oldname);
 
   if(proxyMode() == Client)
     return;
-  
+
   QVariantList params;
   params << "__objectRenamed__" << className << newname << oldname;
   dispatchSignal(RpcCall, params);
@@ -404,214 +500,29 @@ void SignalProxy::objectRenamed(const QByteArray &classname, const QString &newn
   }
 }
 
-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;
-}
-
-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());
-
-  Q_ASSERT(!_classInfo[meta]->returnType.contains(methodId));
-  _classInfo[meta]->returnType[methodId] = returnType;
-}
-
-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];
-}
-
-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::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 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];
-}
-
-
-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;
-      }
-    }
-    if(matchIdx != -1) {
-      slotIndexes.removeAt(slotIndexes.indexOf(matchIdx));
-      syncMap[QByteArray(signal.signature())] = matchIdx;
-    }
-  }
-
-  Q_ASSERT(_classInfo[meta]->syncMap.isEmpty());
-  _classInfo[meta]->syncMap = syncMap;
-}
-
-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;
-}
-
-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);
-    }
-
-    if(receiverId != -1)
-      receiveMap[i] = receiverId;
-  }
-  _classInfo[meta]->receiveMap = receiveMap;  
-}
-
-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::setUpdatedRemotelyId(SyncableObject *obj) {
-  const QMetaObject *meta = obj->syncMetaObject();
-  Q_ASSERT(_classInfo.contains(meta));
-  _classInfo[meta]->updatedRemotelyId = meta->indexOfSignal("updatedRemotely()");
-}
-
-int SignalProxy::updatedRemotelyId(SyncableObject *obj) {
-  Q_ASSERT(_classInfo.contains(obj->syncMetaObject()));
-  return _classInfo[obj->syncMetaObject()]->updatedRemotelyId;
-}
-
-const QMetaObject *SignalProxy::metaObject(QObject *obj) {
-  if(SyncableObject *syncObject = qobject_cast<SyncableObject *>(obj))
+const QMetaObject *SignalProxy::metaObject(const QObject *obj) {
+  if(const SyncableObject *syncObject = qobject_cast<const SyncableObject *>(obj))
     return syncObject->syncMetaObject();
   else
     return obj->metaObject();
 }
 
-void SignalProxy::createClassInfo(QObject *obj) {
-  const QMetaObject *meta = metaObject(obj);
-  if(_classInfo.contains(meta))
-    return;
+SignalProxy::ExtendedMetaObject *SignalProxy::extendedMetaObject(const QMetaObject *meta) const {
+  if(_extendedMetaObjects.contains(meta))
+    return _extendedMetaObjects[meta];
+  else
+    return 0;
+}
 
-  ClassInfo *classInfo = new ClassInfo();
-  _classInfo[meta] = classInfo;
+SignalProxy::ExtendedMetaObject *SignalProxy::createExtendedMetaObject(const QMetaObject *meta) {
+  if(!_extendedMetaObjects.contains(meta)) {
+    _extendedMetaObjects[meta] = new ExtendedMetaObject(meta);
+  }
+  return _extendedMetaObjects[meta];
 }
 
-bool SignalProxy::attachSignal(QObject* sender, const char* signal, const QByteArray& sigName) {
-  const QMetaObject* meta = metaObject(sender);
+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) {
@@ -619,20 +530,14 @@ bool SignalProxy::attachSignal(QObject* sender, const char* signal, const QByteA
     return false;
   }
 
-  createClassInfo(sender);
-
-  SignalRelay* relay;
-  if(_relayHash.contains(sender))
-    relay = _relayHash[sender];
-  else
-    relay = _relayHash[sender] = new SignalRelay(this, sender);
-
-  relay->attachSignal(methodId, sigName);
+  createExtendedMetaObject(meta);
+  _signalRelay->attachSignal(sender, methodId, sigName);
 
+  disconnect(sender, SIGNAL(destroyed(QObject *)), this, SLOT(detachObject(QObject *)));
+  connect(sender, SIGNAL(destroyed(QObject *)), this, SLOT(detachObject(QObject *)));
   return true;
 }
 
-
 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));
@@ -641,32 +546,32 @@ bool SignalProxy::attachSlot(const QByteArray& sigName, QObject* recv, const cha
     return false;
   }
 
-  createClassInfo(recv);
+  createExtendedMetaObject(meta);
 
   QByteArray funcName = QMetaObject::normalizedSignature(sigName.constData());
   _attachedSlots.insert(funcName, qMakePair(recv, methodId));
 
-  QObject::disconnect(recv, SIGNAL(destroyed()), this, SLOT(detachSender()));
-  QObject::connect(recv, SIGNAL(destroyed()), this, SLOT(detachSender()));
+  disconnect(recv, SIGNAL(destroyed(QObject *)), this, SLOT(detachObject(QObject *)));
+  connect(recv, SIGNAL(destroyed(QObject *)), this, SLOT(detachObject(QObject *)));
   return true;
 }
 
 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);
+  ExtendedMetaObject *eMeta = createExtendedMetaObject(obj);
+
+  SyncRelay *relay;
+  if(!_syncRelays.contains(obj->syncMetaObject())) {
+    _syncRelays[obj->syncMetaObject()] = new SyncRelay(eMeta, this);
+  }
+  relay = _syncRelays[obj->syncMetaObject()];
 
-  relay->setSynchronize(true);
+  relay->synchronize(obj);
 
   // attaching as slave to receive sync Calls
   QByteArray className(obj->syncMetaObject()->className());
   _syncSlave[className][obj->objectName()] = obj;
+  disconnect(obj, SIGNAL(destroyed(QObject *)), this, SLOT(detachObject(QObject *)));
+  connect(obj, SIGNAL(destroyed(QObject *)), this, SLOT(detachObject(QObject *)));
 
   if(proxyMode() == Server) {
     connect(obj, SIGNAL(objectRenamed(QString, QString)), this, SLOT(objectRenamed(QString, QString)));
@@ -680,30 +585,14 @@ void SignalProxy::synchronize(SyncableObject *obj) {
   }
 }
 
-void SignalProxy::requestInit(SyncableObject *obj) {
-  if(proxyMode() == Server || obj->isInitialized())
-    return;
-
-  QVariantList params;
-  params << obj->syncMetaObject()->className()
-	 << obj->objectName();
-  dispatchSignal(InitRequest, params);
-}
-
-void SignalProxy::detachSender() {
-  detachObject(sender());
-}
-
-void SignalProxy::detachObject(QObject* obj) {
+void SignalProxy::detachObject(QObject *obj) {
+  stopSync(obj);
   detachSignals(obj);
   detachSlots(obj);
-  stopSync(static_cast<SyncableObject *>(obj));
 }
 
-void SignalProxy::detachSignals(QObject* sender) {
-  if(!_relayHash.contains(sender))
-    return;
-  _relayHash.take(sender)->deleteLater();
+void SignalProxy::detachSignals(QObject *sender) {
+  _signalRelay->detachSignal(sender);
 }
 
 void SignalProxy::detachSlots(QObject* receiver) {
@@ -716,9 +605,11 @@ void SignalProxy::detachSlots(QObject* receiver) {
   }
 }
 
-void SignalProxy::stopSync(SyncableObject* obj) {
-  if(_relayHash.contains(obj))
-    _relayHash[obj]->setSynchronize(false);
+void SignalProxy::stopSync(QObject *obj) {
+  SyncableObject *syncableObject = qobject_cast<SyncableObject *>(obj);
+  if(syncableObject && _syncRelays.contains(syncableObject->syncMetaObject())) {
+    QObject::disconnect(syncableObject, 0, _syncRelays[syncableObject->syncMetaObject()], 0);
+  }
 
   // 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*
@@ -740,7 +631,10 @@ void SignalProxy::dispatchSignal(const RequestType &requestType, const QVariantL
     case AbstractPeer::IODevicePeer:
       {
 	IODevicePeer *ioPeer = static_cast<IODevicePeer *>(*peer);
-	ioPeer->dispatchPackedFunc(packedFunc);
+	if(ioPeer->isOpen())
+	  ioPeer->dispatchPackedFunc(packedFunc);
+	else
+	  QCoreApplication::postEvent(this, new RemovePeerEvent(peer.key()));
       }
       break;
     case AbstractPeer::SignalProxyPeer:
@@ -764,8 +658,19 @@ void SignalProxy::receivePackedFunc(AbstractPeer *sender, const QVariant &packed
   RequestType requestType = (RequestType)params.takeFirst().value<int>();
   receivePeerSignal(sender, requestType, params);
 }
-  
+
 void SignalProxy::receivePeerSignal(AbstractPeer *sender, const RequestType &requestType, const QVariantList &params) {
+  switch(requestType) {
+    // list all RequestTypes that shouldnot trigger a heartbeat counter reset here
+  case HeartBeatReply:
+    break;
+  default:
+    if(sender->type() == AbstractPeer::IODevicePeer) {
+      IODevicePeer *ioPeer = static_cast<IODevicePeer *>(sender);
+      ioPeer->sentHeartBeats = 0;
+    }
+  }
+
   switch(requestType) {
   case RpcCall:
     if(params.empty())
@@ -778,15 +683,15 @@ void SignalProxy::receivePeerSignal(AbstractPeer *sender, const RequestType &req
   case Sync:
     handleSync(sender, params);
     break;
-    
+
   case InitRequest:
     handleInitRequest(sender, params);
     break;
-    
+
   case InitData:
     handleInitData(sender, params);
     break;
-    
+
   case HeartBeat:
     receiveHeartBeat(sender, params);
     break;
@@ -814,7 +719,7 @@ void SignalProxy::handleSync(AbstractPeer *sender, QVariantList params) {
     qWarning() << "received invalid Sync call" << params;
     return;
   }
-  
+
   QByteArray className = params.takeFirst().toByteArray();
   QString objectName = params.takeFirst().toString();
   QByteArray signal = params.takeFirst().toByteArray();
@@ -826,34 +731,35 @@ void SignalProxy::handleSync(AbstractPeer *sender, QVariantList params) {
   }
 
   SyncableObject *receiver = _syncSlave[className][objectName];
-  if(!syncMap(receiver).contains(signal)) {
+  ExtendedMetaObject *eMeta = extendedMetaObject(receiver);
+  if(!eMeta->syncMap().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];
+  int slotId = eMeta->syncMap()[signal];
 
-  QVariant returnValue((QVariant::Type)returnType(receiver, slotId));
+  QVariant returnValue((QVariant::Type)eMeta->returnType(slotId));
   if(!invokeSlot(receiver, slotId, params, returnValue)) {
-    qWarning("SignalProxy::handleSync(): invokeMethod for \"%s\" failed ", methodName(receiver, slotId).constData());
+    qWarning("SignalProxy::handleSync(): invokeMethod for \"%s\" failed ", eMeta->methodName(slotId).constData());
     return;
   }
 
-  if(returnValue.type() != QVariant::Invalid && receiveMap(receiver).contains(slotId)) {
-    int receiverId = receiveMap(receiver)[slotId];
+  if(returnValue.type() != QVariant::Invalid && eMeta->receiveMap().contains(slotId)) {
+    int receiverId = eMeta->receiveMap()[slotId];
     QVariantList returnParams;
     returnParams << className
 		 << objectName
 		 << QByteArray(receiver->metaObject()->method(receiverId).signature());
-    if(argTypes(receiver, receiverId).count() > 1)
+    if(eMeta->argTypes(receiverId).count() > 1)
       returnParams << params;
     returnParams << returnValue;
     sender->dispatchSignal(Sync, returnParams);
   }
-  
+
   // send emit update signal
-  invokeSlot(receiver, updatedRemotelyId(receiver));
+  invokeSlot(receiver, eMeta->updatedRemotelyId());
 }
 
 void SignalProxy::handleInitRequest(AbstractPeer *sender, const QVariantList &params) {
@@ -862,10 +768,10 @@ void SignalProxy::handleInitRequest(AbstractPeer *sender, const QVariantList &pa
 	       << 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;
@@ -877,7 +783,7 @@ void SignalProxy::handleInitRequest(AbstractPeer *sender, const QVariantList &pa
 	       << className << objectName;
     return;
   }
-  
+
   SyncableObject *obj = _syncSlave[className][objectName];
 
   QVariantList params_;
@@ -895,7 +801,7 @@ void SignalProxy::handleInitData(AbstractPeer *sender, const QVariantList &param
 	       << params;
     return;
   }
-  
+
   QByteArray className(params[0].toByteArray());
   QString objectName(params[1].toString());
   QVariantMap propertyMap(params[2].toMap());
@@ -927,24 +833,27 @@ void SignalProxy::handleSignal(const QVariantList &data) {
   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());
+    if(!invokeSlot(receiver, methodId, params)) {
+      ExtendedMetaObject *eMeta = extendedMetaObject(receiver);
+      qWarning("SignalProxy::handleSignal(): invokeMethod for \"%s\" failed ", eMeta->methodName(methodId).constData());
+    }
     slot++;
   }
 }
 
 bool SignalProxy::invokeSlot(QObject *receiver, int methodId, const QVariantList &params, QVariant &returnValue) {
-  const QList<int> args = argTypes(receiver, methodId);
+  ExtendedMetaObject *eMeta = extendedMetaObject(receiver);
+  const QList<int> args = eMeta->argTypes(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);
+  if(eMeta->minArgCount(methodId) > params.count()) {
+      qWarning() << "SignalProxy::invokeSlot(): not enough params to invoke" << eMeta->methodName(methodId);
       return false;
   }
 
-  void *_a[] = {0,              // return type... 
+  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};
 
@@ -956,7 +865,7 @@ bool SignalProxy::invokeSlot(QObject *receiver, int methodId, const QVariantList
       return false;
     }
     if(args[i] != QMetaType::type(params[i].typeName())) {
-      qWarning() << "SignalProxy::invokeSlot(): incompatible param types to invoke" << methodName(receiver, methodId);
+      qWarning() << "SignalProxy::invokeSlot(): incompatible param types to invoke" << eMeta->methodName(methodId);
       return false;
     }
     _a[i+1] = const_cast<void *>(params[i].constData());
@@ -964,19 +873,19 @@ bool SignalProxy::invokeSlot(QObject *receiver, int methodId, const QVariantList
 
   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) {
+  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) {
@@ -1005,7 +914,7 @@ void SignalProxy::writeDataToDevice(QIODevice *dev, const QVariant &item, bool c
   QDataStream out(&block, QIODevice::WriteOnly);
   out.setVersion(QDataStream::Qt_4_2);
   out << (quint32)0;
-  
+
   if(compressed) {
     QByteArray rawItem;
     QDataStream itemStream(&rawItem, QIODevice::WriteOnly);
@@ -1027,6 +936,9 @@ void SignalProxy::writeDataToDevice(QIODevice *dev, const QVariant &item, bool c
 }
 
 bool SignalProxy::readDataFromDevice(QIODevice *dev, quint32 &blockSize, QVariant &item, bool compressed) {
+  if(!dev)
+    return false;
+
   QDataStream in(dev);
   in.setVersion(QDataStream::Qt_4_2);
 
@@ -1036,30 +948,35 @@ bool SignalProxy::readDataFromDevice(QIODevice *dev, quint32 &blockSize, QVarian
   }
 
   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();
+    disconnectDevice(dev, tr("Peer tried to send package larger than max package size!"));
     return false;
   }
-    
+
+  if(blockSize == 0) {
+    disconnectDevice(dev, tr("Peer tried to send 0 byte package!"));
+    return false;
+  }
+
   if(dev->bytesAvailable() < blockSize)
     return false;
 
+  blockSize = 0;
+
   if(compressed) {
     QByteArray rawItem;
     in >> rawItem;
-    // debug check
+
     int nbytes = rawItem.size();
-    if (nbytes <= 4) {
+    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;
+      if(nbytes < 4 || (data[0]!=0 || data[1]!=0 || data[2]!=0 || data[3]!=0)) {
+	disconnectDevice(dev, tr("Peer sent corrupted compressed data!"));
+	return false;
+      }
     }
-    // end
+
     rawItem = qUncompress(rawItem);
-      
+
     QDataStream itemStream(&rawItem, QIODevice::ReadOnly);
     itemStream.setVersion(QDataStream::Qt_4_2);
     itemStream >> item;
@@ -1067,51 +984,22 @@ bool SignalProxy::readDataFromDevice(QIODevice *dev, quint32 &blockSize, QVarian
     in >> item;
   }
 
-  blockSize = 0;
-
-  return true;
-}
-
-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;
-
-  // are the signatures compatible?
-  if(!QObject::staticMetaObject.checkConnectArgs(signal.signature(), slot.signature()))
+  if(!item.isValid()) {
+    disconnectDevice(dev, tr("Peer sent corrupt data: unable to load QVariant!"));
     return false;
+  }
 
-  // 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();
-
-  uint sizediff = qAbs(slotprefix.size() - signalsuffix.size());
-  int ratio = editingDistance(slotprefix, signalsuffix) - sizediff;
-  return (ratio < 2);
+  return true;
 }
 
-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();
+void SignalProxy::requestInit(SyncableObject *obj) {
+  if(proxyMode() == Server || obj->isInitialized())
+    return;
 
-  return methodname;
+  QVariantList params;
+  params << obj->syncMetaObject()->className()
+	 << obj->objectName();
+  dispatchSignal(InitRequest, params);
 }
 
 QVariantMap SignalProxy::initData(SyncableObject *obj) const {
@@ -1124,25 +1012,24 @@ void SignalProxy::setInitData(SyncableObject *obj, const QVariantMap &properties
   obj->fromVariantMap(properties);
   obj->setInitialized();
   emit objectInitialized(obj);
-  invokeSlot(obj, updatedRemotelyId(obj));
+  invokeSlot(obj, extendedMetaObject(obj)->updatedRemotelyId());
 }
 
 void SignalProxy::sendHeartBeat() {
-  dispatchSignal(SignalProxy::HeartBeat, QVariantList() << QTime::currentTime());
+  QVariantList heartBeatParams;
+  heartBeatParams << QTime::currentTime();
   PeerHash::iterator peer = _peers.begin();
   while(peer != _peers.end()) {
     if((*peer)->type() == AbstractPeer::IODevicePeer) {
       IODevicePeer *ioPeer = static_cast<IODevicePeer *>(*peer);
+      ioPeer->dispatchSignal(SignalProxy::HeartBeat, heartBeatParams);
       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();
+	qWarning() << "SignalProxy: Disconnecting peer:" << ioPeer->address()
+		   << "(didn't receive a heartbeat for over" << ioPeer->sentHeartBeats * _heartBeatTimer.interval() / 1000 << "seconds)";
+	ioPeer->close();
       } else {
 	ioPeer->sentHeartBeats++;
       }
@@ -1165,28 +1052,43 @@ void SignalProxy::receiveHeartBeatReply(AbstractPeer *peer, const QVariantList &
   ioPeer->sentHeartBeats = 0;
 
   if(params.isEmpty()) {
-    qWarning() << "SignalProxy: received heart beat reply with less params then sent from:" << ioPeer->device();
+    qWarning() << "SignalProxy: received heart beat reply with less params then sent from:" << ioPeer->address();
     return;
   }
-  
+
   QTime sendTime = params[0].value<QTime>();
   updateLag(ioPeer, sendTime.msecsTo(QTime::currentTime()) / 2);
 }
 
 void SignalProxy::customEvent(QEvent *event) {
   switch(event->type()) {
-  case QEvent::User:
+  case PeerSignal:
     {
-      PeerSignalEvent *sig = static_cast<PeerSignalEvent *>(event);
-      receivePeerSignal(sig->sender, sig->requestType, sig->params);
+      PeerSignalEvent *e = static_cast<PeerSignalEvent *>(event);
+      receivePeerSignal(e->sender, e->requestType, e->params);
     }
     event->accept();
     break;
+  case RemovePeer:
+    {
+      RemovePeerEvent *e = static_cast<RemovePeerEvent *>(event);
+      removePeer(e->peer);
+    }
+    event->accept();
   default:
     return;
   }
 }
 
+void SignalProxy::disconnectDevice(QIODevice *dev, const QString &reason) {
+  if(!reason.isEmpty())
+    qWarning() << qPrintable(reason);
+  QAbstractSocket *sock  = qobject_cast<QAbstractSocket *>(dev);
+  if(sock)
+    qWarning() << qPrintable(tr("Disconnecting")) << qPrintable(sock->peerAddress().toString());
+  dev->close();
+}
+
 void SignalProxy::updateLag(IODevicePeer *peer, int lag) {
   peer->lag = lag;
   if(proxyMode() == Client) {
@@ -1194,7 +1096,6 @@ void SignalProxy::updateLag(IODevicePeer *peer, int lag) {
   }
 }
 
-
 void SignalProxy::dumpProxyStats() {
   QString mode;
   if(proxyMode() == Server)
@@ -1203,36 +1104,249 @@ void SignalProxy::dumpProxyStats() {
     mode = "Client";
 
   int sigCount = 0;
-  foreach(SignalRelay *relay, _relayHash.values())
-    sigCount += relay->sigCount();
+  foreach(SyncRelay *relay, _syncRelays.values())
+    sigCount += relay->signalCount();
 
   int slaveCount = 0;
   foreach(ObjectId oid, _syncSlave.values())
     slaveCount += oid.count();
-  
+
   qDebug() << this;
   qDebug() << "              Proxy Mode:" << mode;
-  qDebug() << "attached sending Objects:" << _relayHash.count();
+  // 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();
+  qDebug() << "number of Classes cached:" << _extendedMetaObjects.count();
 }
 
 void SignalProxy::dumpSyncMap(SyncableObject *object) {
   const QMetaObject *meta = object->metaObject();
+  ExtendedMetaObject *eMeta = extendedMetaObject(object);
   qDebug() << "SignalProxy: SyncMap for Class" << meta->className();
 
-  QHash<QByteArray, int> syncMap_ = syncMap(object);
+  QHash<QByteArray, int> syncMap_ = eMeta->syncMap();
   QHash<QByteArray, int>::const_iterator iter = syncMap_.constBegin();
   while(iter != syncMap_.constEnd()) {
-    qDebug() << iter.key() << "-->" << iter.value() << meta->method(iter.value()).signature();    
+    qDebug() << qPrintable(QString("%1 --> %2 %3").arg(QString(iter.key()), 40).arg(iter.value()).arg(QString(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++;
-//   }
 }
+
+void SignalProxy::updateSecureState() {
+  bool wasSecure = _secure;
+
+  _secure = !_peers.isEmpty();
+  PeerHash::const_iterator peerIter;
+  for(peerIter = _peers.constBegin(); peerIter != _peers.constEnd(); peerIter++) {
+    _secure &= (*peerIter)->isSecure();
+  }
+
+  if(wasSecure != _secure)
+    emit secureStateChanged(_secure);
+}
+
+
+// ==================================================
+//  ExtendedMetaObject
+// ==================================================
+SignalProxy::ExtendedMetaObject::ExtendedMetaObject(const QMetaObject *meta)
+  : _meta(meta),
+    _updatedRemotelyId(-1)
+{
+}
+
+const QList<int> &SignalProxy::ExtendedMetaObject::argTypes(int methodId) {
+  if(!_argTypes.contains(methodId)) {
+    QList<QByteArray> paramTypes = _meta->method(methodId).parameterTypes();
+    QList<int> argTypes;
+    for(int i = 0; i < paramTypes.count(); i++) {
+      argTypes.append(QMetaType::type(paramTypes[i]));
+    }
+    _argTypes[methodId] = argTypes;
+  }
+  return _argTypes[methodId];
+}
+
+const int &SignalProxy::ExtendedMetaObject::returnType(int methodId) {
+  if(!_returnType.contains(methodId)) {
+    _returnType[methodId] = QMetaType::type(_meta->method(methodId).typeName());
+  }
+  return _returnType[methodId];
+}
+
+const int &SignalProxy::ExtendedMetaObject::minArgCount(int methodId) {
+  if(!_minArgCount.contains(methodId)) {
+    QString signature(_meta->method(methodId).signature());
+    _minArgCount[methodId] = _meta->method(methodId).parameterTypes().count() - signature.count("=");
+  }
+  return _minArgCount[methodId];
+}
+
+const QByteArray &SignalProxy::ExtendedMetaObject::methodName(int methodId) {
+  if(!_methodNames.contains(methodId)) {
+    _methodNames[methodId] = methodName(_meta->method(methodId));
+  }
+  return _methodNames[methodId];
+}
+
+const QHash<QByteArray, int> &SignalProxy::ExtendedMetaObject::syncMap() {
+  if(_syncMap.isEmpty()) {
+    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
+    // --> we deliver to every slot starting with "receive"
+    QByteArray slotSignature;
+    QList<int>::iterator slotIter = slotIndexes.begin();
+    while(slotIter != slotIndexes.end()) {
+      slotSignature = QByteArray(_meta->method(*slotIter).signature());
+      if(slotSignature.startsWith("receive")) {
+	syncMap[slotSignature] = *slotIter;
+	slotIter = slotIndexes.erase(slotIter);
+      } else {
+	slotIter++;
+      }
+    }
+
+    // find the proper sig -> slot matches
+    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;
+	}
+      }
+      if(matchIdx != -1) {
+	slotIndexes.removeAll(matchIdx);
+	syncMap[QByteArray(signal.signature())] = matchIdx;
+      }
+    }
+    _syncMap = syncMap;
+  }
+  return _syncMap;
+}
+
+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 = 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);
+      }
+
+      if(receiverId != -1)
+	receiveMap[i] = receiverId;
+    }
+    _receiveMap = receiveMap;
+  }
+  return _receiveMap;
+}
+
+int SignalProxy::ExtendedMetaObject::updatedRemotelyId() {
+  if(_updatedRemotelyId == -1) {
+    _updatedRemotelyId = _meta->indexOfSignal("updatedRemotely()");
+  }
+  return _updatedRemotelyId;
+}
+
+QByteArray SignalProxy::ExtendedMetaObject::methodName(const QMetaMethod &method) {
+  QByteArray sig(method.signature());
+  return sig.left(sig.indexOf("("));
+}
+
+bool SignalProxy::ExtendedMetaObject::methodsMatch(const QMetaMethod &signal, const QMetaMethod &slot) {
+  // if we don't even have the same basename it's a sure NO
+  QString baseName = methodBaseName(signal);
+  if(baseName != methodBaseName(slot))
+    return false;
+
+  // are the signatures compatible?
+  if(!QObject::staticMetaObject.checkConnectArgs(signal.signature(), slot.signature()))
+    return false;
+
+  // we take an educated guess if the signals and slots match
+  QString signalsuffix = methodName(signal);
+  QString slotprefix = methodName(slot);
+  if(!baseName.isEmpty()) {
+    signalsuffix = signalsuffix.mid(baseName.count()).toLower();
+    slotprefix = slotprefix.left(slotprefix.count() - baseName.count()).toLower();
+  }
+
+  uint sizediff = qAbs(slotprefix.size() - signalsuffix.size());
+  int ratio = editingDistance(slotprefix, signalsuffix) - sizediff;
+  return (ratio < 2);
+}
+
+QString SignalProxy::ExtendedMetaObject::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;
+}
+