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

diff --git a/src/common/signalproxy.cpp b/src/common/signalproxy.cpp
index 83f10e3e..85f053b2 100644
--- a/src/common/signalproxy.cpp
+++ b/src/common/signalproxy.cpp
@@ -23,6 +23,7 @@
 #include <QObject>
 #include <QIODevice>
 #include <QAbstractSocket>
+#include <QHostAddress>
 #include <QHash>
 #include <QMultiHash>
 #include <QList>
@@ -32,12 +33,16 @@
 #include <QMetaProperty>
 #include <QRegExp>
 #include <QThread>
+#include <QTime>
 
 #include "syncableobject.h"
 #include "util.h"
 
-class SignalRelay: public QObject {
 
+// ==================================================
+//  SIGNALRELAY
+// ==================================================
+class 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)
@@ -90,13 +95,14 @@ int SignalRelay::qt_metacall(QMetaObject::Call _c, int _id, void **_a) {
       }
       QMultiHash<int, QByteArray>::const_iterator funcIter = sigNames.constFind(_id);
       while(funcIter != sigNames.constEnd() && funcIter.key() == _id) {
-        proxy->dispatchSignal(funcIter.value(), params);
+        proxy->dispatchSignal(SignalProxy::RpcCall, QVariantList() << funcIter.value() << params);
         funcIter++;
       }
       
       // dispatch Sync Signal if necessary
       QByteArray signature(caller->metaObject()->method(_id).signature());
-      if(synchronize() && proxy->syncMap(qobject_cast<SyncableObject *>(caller)).contains(signature)) {
+      SyncableObject *syncObject = qobject_cast<SyncableObject *>(caller);
+      if(synchronize() && proxy->syncMap(syncObject).contains(signature)) {
 	 //qDebug() << "__SYNC__ >>>"
 	 //	 << caller->metaObject()->className()
 	 //	 << caller->objectName()
@@ -104,9 +110,9 @@ int SignalRelay::qt_metacall(QMetaObject::Call _c, int _id, void **_a) {
 	 //	 << params;
 	// params.prepend(QVariant(_id));
 	params.prepend(signature);
-	params.prepend(caller->objectName());
-	params.prepend(caller->metaObject()->className());
-	proxy->dispatchSignal((int)SignalProxy::Sync, params);
+	params.prepend(syncObject->objectName());
+	params.prepend(syncObject->syncMetaObject()->className());
+	proxy->dispatchSignal(SignalProxy::Sync, params);
       }
     }
     _id -= QObject::staticMetaObject.methodCount();
@@ -115,7 +121,11 @@ int SignalRelay::qt_metacall(QMetaObject::Call _c, int _id, void **_a) {
 }
 
 void SignalRelay::setSynchronize(bool sync) {
-  const QMetaObject *meta = caller->metaObject();
+  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++ ) {
@@ -133,8 +143,12 @@ void SignalRelay::setSynchronize(bool sync) {
 }
 
 bool SignalRelay::isSyncMethod(int i) {
-  QByteArray signature = caller->metaObject()->method(i).signature();
-  if(!proxy->syncMap(qobject_cast<SyncableObject *>(caller)).contains(signature))
+  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"))
@@ -169,24 +183,32 @@ void SignalRelay::attachSignal(int methodId, const QByteArray &func) {
   }
   sigNames.insert(methodId, fn);
 }
-// ====================
-// END SIGNALRELAY
-// ====================
 
+// ==================================================
+//  Peers
+// ==================================================
+void SignalProxy::IODevicePeer::dispatchSignal(const RequestType &requestType, const QVariantList &params) {
+  QVariantList packedFunc;
+  packedFunc << (qint16)requestType
+	     << params;
+  dispatchPackedFunc(QVariant(packedFunc));
+}
 
-// ====================
+// ==================================================
 //  SignalProxy
-// ====================
+// ==================================================
 SignalProxy::SignalProxy(QObject* parent)
   : QObject(parent)
 {
   setProxyMode(Client);
+  init();
 }
 
 SignalProxy::SignalProxy(ProxyMode mode, QObject* parent)
   : QObject(parent)
 {
   setProxyMode(mode);
+  init();
 }
 
 SignalProxy::SignalProxy(ProxyMode mode, QIODevice* device, QObject* parent)
@@ -194,21 +216,33 @@ 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();
 }
 
 void SignalProxy::setProxyMode(ProxyMode mode) {
-  foreach(QIODevice* peer, _peerByteCount.keys()) {
-    if(peer->isOpen()) {
-      qWarning() << "SignalProxy: Cannot change proxy mode while connected";
+  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;
     }
+    peer++;
   }
+
   _proxyMode = mode;
   if(mode == Server)
     initServer();
@@ -216,8 +250,9 @@ void SignalProxy::setProxyMode(ProxyMode mode) {
     initClient();
 }
 
-SignalProxy::ProxyMode SignalProxy::proxyMode() const {
-  return _proxyMode;
+void SignalProxy::init() {
+  connect(&_heartBeatTimer, SIGNAL(timeout()), this, SLOT(sendHeartBeat()));
+  _heartBeatTimer.start(30 * 1000);
 }
 
 void SignalProxy::initServer() {
@@ -231,10 +266,10 @@ bool SignalProxy::addPeer(QIODevice* iodev) {
   if(!iodev)
     return false;
   
-  if(_peerByteCount.contains(iodev))
+  if(_peers.contains(iodev))
     return true;
 
-  if(proxyMode() == Client && !_peerByteCount.isEmpty()) {
+  if(proxyMode() == Client && !_peers.isEmpty()) {
     qWarning("SignalProxy: only one peer allowed in client mode!");
     return false;
   }
@@ -250,82 +285,75 @@ bool SignalProxy::addPeer(QIODevice* iodev) {
     connect(sock, SIGNAL(disconnected()), this, SLOT(removePeerBySender()));
   }
 
-  _peerByteCount[iodev] = 0;
+  _peers[iodev] = new IODevicePeer(iodev, iodev->property("UseCompression").toBool());
 
-  if(_peerByteCount.count() == 1)
+  if(_peers.count() == 1)
     emit connected();
 
   return true;
 }
 
-void SignalProxy::removePeerBySender() {
-  // OK we're brutal here... but since it's a private slot we know what we've got connected to it...
-  QIODevice *ioDev = (QIODevice *)(sender());
-  removePeer(ioDev);
-  qDebug() << "Client disconnected.";
+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::objectRenamed(QString oldname, QString newname) {
-  const QMetaObject *meta = sender()->metaObject();
-  const QByteArray className(meta->className());
-  objectRenamed(className, oldname, newname);
+void SignalProxy::removePeer(QObject* dev) {
+  if(_peers.isEmpty()) {
+    qWarning() << "SignalProxy::removePeer(): No peers in use!";
+    return;
+  }
 
-  if(proxyMode() == Client)
+  Q_ASSERT(dev);
+  if(!_peers.contains(dev)) {
+    qWarning() << "SignalProxy: unknown Peer" << dev;
     return;
-  
-  QVariantList params;
-  params << className << oldname << newname;
-  dispatchSignal("__objectRenamed__", params);
-}
+  }
 
-void SignalProxy::objectRenamed(QByteArray classname, QString oldname, QString newname) {
-  if(_syncSlave.contains(classname) && _syncSlave[classname].contains(oldname) && oldname != newname)
-    _syncSlave[classname][newname] = _syncSlave[classname].take(oldname);
-}
+  AbstractPeer *peer = _peers[dev];
+  _peers.remove(dev);
 
+  disconnect(dev, 0, this, 0);
+  if(peer->type() == AbstractPeer::IODevicePeer)
+    emit peerRemoved(static_cast<QIODevice *>(dev));
 
-void SignalProxy::removePeer(QIODevice* iodev) {
-  if(_peerByteCount.isEmpty()) {
-    qWarning() << "SignalProxy: No peers in use!";
-    return;
-  }
+  delete peer;
 
-  if(proxyMode() == Server && !iodev) {
-    // disconnect all
-    QList<QIODevice *> peers = _peerByteCount.keys();
-    foreach(QIODevice *peer, peers)
-      removePeer(peer);
-  }
+  if(_peers.isEmpty())
+    emit disconnected();
+}
 
-  if(proxyMode() != Server && !iodev)
-    iodev = _peerByteCount.keys().first();
+void SignalProxy::removePeerBySender() {
+  removePeer(sender());
+}
 
-  Q_ASSERT(iodev);
+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(!_peerByteCount.contains(iodev)) {
-    qWarning() << "SignalProxy: unknown QIODevice" << iodev;
+  if(proxyMode() == Client)
     return;
-  }
-     
-  // take a last gasp
-  while(true) {
-    QVariant var;
-    if(readDataFromDevice(iodev, _peerByteCount[iodev], var))
-      receivePeerSignal(iodev, var);
-    else
-      break;
-  }
-  _peerByteCount.remove(iodev);
-
-  disconnect(iodev, 0, this, 0);
-  emit peerRemoved(iodev);
+  
+  QVariantList params;
+  params << "__objectRenamed__" << className << newname << oldname;
+  dispatchSignal(RpcCall, params);
+}
 
-  if(_peerByteCount.isEmpty())
-    emit disconnected();
+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::setArgTypes(QObject* obj, int methodId) {
-  const QMetaObject *meta = obj->metaObject();
+  const QMetaObject *meta = metaObject(obj);
   QList<QByteArray> p = meta->method(methodId).parameterTypes();
   QList<int> argTypes;
   int ct = p.count();
@@ -337,14 +365,31 @@ void SignalProxy::setArgTypes(QObject* obj, int methodId) {
 }
 
 const QList<int> &SignalProxy::argTypes(QObject *obj, int methodId) {
-  Q_ASSERT(_classInfo.contains(obj->metaObject()));
-  if(!_classInfo[obj->metaObject()]->argTypes.contains(methodId))
+  const QMetaObject *meta = metaObject(obj);
+  Q_ASSERT(_classInfo.contains(meta));
+  if(!_classInfo[meta]->argTypes.contains(methodId))
     setArgTypes(obj, methodId);
-  return _classInfo[obj->metaObject()]->argTypes[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 = obj->metaObject();
+  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));
@@ -352,29 +397,31 @@ void SignalProxy::setMinArgCount(QObject *obj, int methodId) {
 }
 
 const int &SignalProxy::minArgCount(QObject *obj, int methodId) {
-  Q_ASSERT(_classInfo.contains(obj->metaObject()));
-  if(!_classInfo[obj->metaObject()]->minArgCount.contains(methodId))
+  const QMetaObject *meta = metaObject(obj);
+  Q_ASSERT(_classInfo.contains(meta));
+  if(!_classInfo[meta]->minArgCount.contains(methodId))
     setMinArgCount(obj, methodId);
-  return _classInfo[obj->metaObject()]->minArgCount[methodId];
+  return _classInfo[meta]->minArgCount[methodId];
 }
 
 void SignalProxy::setMethodName(QObject *obj, int methodId) {
-  const QMetaObject *meta = obj->metaObject();
+  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) {
-  Q_ASSERT(_classInfo.contains(obj->metaObject()));
-  if(!_classInfo[obj->metaObject()]->methodNames.contains(methodId))
+  const QMetaObject *meta = metaObject(obj);
+  Q_ASSERT(_classInfo.contains(meta));
+  if(!_classInfo[meta]->methodNames.contains(methodId))
     setMethodName(obj, methodId);
-  return _classInfo[obj->metaObject()]->methodNames[methodId];
+  return _classInfo[meta]->methodNames[methodId];
 }
 
 
 void SignalProxy::setSyncMap(SyncableObject *obj) {
-  const QMetaObject *meta = obj->metaObject();
+  const QMetaObject *meta = obj->syncMetaObject();
   QHash<QByteArray, int> syncMap;
   
   QList<int> slotIndexes;
@@ -383,6 +430,15 @@ void SignalProxy::setSyncMap(SyncableObject *obj) {
       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++) {
@@ -409,34 +465,101 @@ void SignalProxy::setSyncMap(SyncableObject *obj) {
 }
 
 const QHash<QByteArray,int> &SignalProxy::syncMap(SyncableObject *obj) {
-  Q_ASSERT(_classInfo.contains(obj->metaObject()));
-  if(_classInfo[obj->metaObject()]->syncMap.isEmpty())
+  const QMetaObject *meta = obj->syncMetaObject();
+  Q_ASSERT(_classInfo.contains(meta));
+  if(_classInfo[meta]->syncMap.isEmpty())
     setSyncMap(obj);
-  return _classInfo[obj->metaObject()]->syncMap;
+  return _classInfo[meta]->syncMap;
 }
 
-void SignalProxy::setUpdatedRemotelyId(QObject *obj) {
-  const QMetaObject *meta = obj->metaObject();
+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->metaObject()));
-  return _classInfo[obj->metaObject()]->updatedRemotelyId;
+  Q_ASSERT(_classInfo.contains(obj->syncMetaObject()));
+  return _classInfo[obj->syncMetaObject()]->updatedRemotelyId;
+}
+
+const QMetaObject *SignalProxy::metaObject(QObject *obj) {
+  if(SyncableObject *syncObject = qobject_cast<SyncableObject *>(obj))
+    return syncObject->syncMetaObject();
+  else
+    return obj->metaObject();
 }
 
 void SignalProxy::createClassInfo(QObject *obj) {
-  if(_classInfo.contains(obj->metaObject()))
+  const QMetaObject *meta = metaObject(obj);
+  if(_classInfo.contains(meta))
     return;
 
   ClassInfo *classInfo = new ClassInfo();
-  _classInfo[obj->metaObject()] = classInfo;
-  setUpdatedRemotelyId(obj);
+  _classInfo[meta] = classInfo;
 }
 
 bool SignalProxy::attachSignal(QObject* sender, const char* signal, const QByteArray& sigName) {
-  const QMetaObject* meta = sender->metaObject();
+  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) {
@@ -478,7 +601,8 @@ bool SignalProxy::attachSlot(const QByteArray& sigName, QObject* recv, const cha
 
 void SignalProxy::synchronize(SyncableObject *obj) {
   createClassInfo(obj);
-
+  setUpdatedRemotelyId(obj);
+  
   // attaching all the Signals
   SignalRelay* relay;
   if(_relayHash.contains(obj))
@@ -489,36 +613,29 @@ void SignalProxy::synchronize(SyncableObject *obj) {
   relay->setSynchronize(true);
 
   // attaching as slave to receive sync Calls
-  QByteArray className(obj->metaObject()->className());
+  QByteArray className(obj->syncMetaObject()->className());
   _syncSlave[className][obj->objectName()] = obj;
 
   if(proxyMode() == Server) {
-    if(obj->metaObject()->indexOfSignal(QMetaObject::normalizedSignature("renameObject(QString, QString)")) != -1)
-      connect(obj, SIGNAL(renameObject(QString, QString)), this, SLOT(objectRenamed(QString, QString)));
-
-    setInitialized(obj);
+    connect(obj, SIGNAL(objectRenamed(QString, QString)), this, SLOT(objectRenamed(QString, QString)));
+    obj->setInitialized();
+    emit objectInitialized(obj);
   } else {
-    requestInit(obj);
+    if(obj->isInitialized())
+      emit objectInitialized(obj);
+    else
+      requestInit(obj);
   }
 }
 
-void SignalProxy::setInitialized(SyncableObject *obj) {
-  obj->setInitialized();
-  emit objectInitialized(obj);
-}
-
-bool SignalProxy::isInitialized(SyncableObject *obj) const {
-  return obj->isInitialized();
-}
-
 void SignalProxy::requestInit(SyncableObject *obj) {
-  if(proxyMode() == Server || isInitialized(obj))
+  if(proxyMode() == Server || obj->isInitialized())
     return;
 
   QVariantList params;
-  params << obj->metaObject()->className()
+  params << obj->syncMetaObject()->className()
 	 << obj->objectName();
-  dispatchSignal((int)InitRequest, params);
+  dispatchSignal(InitRequest, params);
 }
 
 void SignalProxy::detachSender() {
@@ -563,43 +680,75 @@ void SignalProxy::stopSync(SyncableObject* obj) {
   }
 }
 
-void SignalProxy::dispatchSignal(QIODevice *receiver, const QVariant &identifier, const QVariantList &params) {
-  QVariantList packedFunc;
-  packedFunc << identifier;
-  packedFunc << params;
-  writeDataToDevice(receiver, QVariant(packedFunc));
-}
-
-void SignalProxy::dispatchSignal(const QVariant &identifier, const QVariantList &params) {
-  // yes I know we have a little code duplication here... it's for the sake of performance
-  QVariantList packedFunc;
-  packedFunc << identifier;
-  packedFunc << params;
-  foreach(QIODevice* dev, _peerByteCount.keys())
-    writeDataToDevice(dev, QVariant(packedFunc));
+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
+    }
+    peer++;
+  }
 }
 
-void SignalProxy::receivePeerSignal(QIODevice *sender, const QVariant &packedFunc) {
+void SignalProxy::receivePackedFunc(AbstractPeer *sender, const QVariant &packedFunc) {
   QVariantList params(packedFunc.toList());
 
-  QVariant call = params.takeFirst();
-  if(call.type() != QVariant::Int)
-    return handleSignal(call.toByteArray(), params);
+  if(params.isEmpty()) {
+    qWarning() << "SignalProxy::receivePeerSignal(): received incompatible Data:" << packedFunc;
+    return;
+  }
+
+  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;
 
-  switch(call.toInt()) {
   case Sync:
-    return handleSync(params);
+    handleSync(sender, params);
+    break;
+    
   case InitRequest:
-    return handleInitRequest(sender, params);
+    handleInitRequest(sender, params);
+    break;
+    
   case InitData:
-    return handleInitData(sender, params);
+    handleInitData(sender, params);
+    break;
+    
+  case HeartBeat:
+    receiveHeartBeat(sender, params);
+    break;
+
+  case HeartBeatReply:
+    receiveHeartBeatReply(sender, params);
+    break;
+
   default:
-    qWarning() << "received undefined CallType" << call.toInt();
-    return;
+    qWarning() << "SignalProxy::receivePeerSignal(): received undefined CallType" << requestType << params;
   }
 }
 
-void SignalProxy::handleSync(QVariantList params) {
+void SignalProxy::handleSync(AbstractPeer *sender, QVariantList params) {
   if(params.count() < 3) {
     qWarning() << "received invalid Sync call" << params;
     return;
@@ -623,14 +772,30 @@ void SignalProxy::handleSync(QVariantList params) {
   }
 
   int slotId = syncMap(receiver)[signal];
-  if(!invokeSlot(receiver, slotId, params)) {
+
+  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));
 }
 
-void SignalProxy::handleInitRequest(QIODevice *sender, const QVariantList &params) {
+void SignalProxy::handleInitRequest(AbstractPeer *sender, const QVariantList &params) {
   if(params.count() != 2) {
     qWarning() << "SignalProxy::handleInitRequest() received initRequest with invalid param Count:"
 	       << params;
@@ -655,14 +820,14 @@ void SignalProxy::handleInitRequest(QIODevice *sender, const QVariantList &param
   SyncableObject *obj = _syncSlave[className][objectName];
 
   QVariantList params_;
-  params_ << obj->metaObject()->className()
-	  << obj->objectName()
+  params_ << className
+	  << objectName
 	  << initData(obj);
 
-  dispatchSignal(sender, (int)InitData, params_);
+  sender->dispatchSignal(InitData, params_);
 }
 
-void SignalProxy::handleInitData(QIODevice *sender, const QVariantList &params) {
+void SignalProxy::handleInitData(AbstractPeer *sender, const QVariantList &params) {
   Q_UNUSED(sender)
   if(params.count() != 3) {
     qWarning() << "SignalProxy::handleInitData() received initData with invalid param Count:"
@@ -690,7 +855,11 @@ void SignalProxy::handleInitData(QIODevice *sender, const QVariantList &params)
   setInitData(obj, propertyMap);
 }
 
-void SignalProxy::handleSignal(const QByteArray &funcName, const QVariantList &params) {
+//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);
@@ -703,7 +872,7 @@ void SignalProxy::handleSignal(const QByteArray &funcName, const QVariantList &p
   }
 }
 
-bool SignalProxy::invokeSlot(QObject *receiver, int methodId, const QVariantList &params) {
+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()
@@ -714,9 +883,10 @@ bool SignalProxy::invokeSlot(QObject *receiver, int methodId, const QVariantList
       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};
+
   // check for argument compatibility and build params array
   for(int i = 0; i < numArgs; i++) {
     if(!params[i].isValid()) {
@@ -731,6 +901,8 @@ bool SignalProxy::invokeSlot(QObject *receiver, int methodId, const QVariantList
     _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
@@ -740,36 +912,60 @@ bool SignalProxy::invokeSlot(QObject *receiver, int methodId, const QVariantList
     return receiver->qt_metacall(QMetaObject::InvokeMetaMethod, methodId, _a) < 0;
   } else {
     qWarning() << "Queued Connections are not implemented yet";
-    // not to self: qmetaobject.cpp:990 ff
+    // 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(readDataFromDevice(ioDev, _peerByteCount[ioDev], var))
-    receivePeerSignal(ioDev, var);
+  while(peer->readData(var))
+    receivePackedFunc(peer, var);
 }
 
-void SignalProxy::writeDataToDevice(QIODevice *dev, const QVariant &item) {
+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 on a closed device");
+    qWarning("SignalProxy: Can't call write on a closed device");
     return;
   }
+
   QByteArray block;
   QDataStream out(&block, QIODevice::WriteOnly);
   out.setVersion(QDataStream::Qt_4_2);
-  out << (quint32)0 << item;
+  out << (quint32)0;
+  
+  if(compressed) {
+    QByteArray rawItem;
+    QDataStream itemStream(&rawItem, QIODevice::WriteOnly);
+
+    itemStream.setVersion(QDataStream::Qt_4_2);
+    itemStream << item;
+
+    rawItem = qCompress(rawItem);
+
+    out << rawItem;
+  } else {
+    out << item;
+  }
+
   out.device()->seek(0);
   out << (quint32)(block.size() - sizeof(quint32));
+
   dev->write(block);
 }
 
-bool SignalProxy::readDataFromDevice(QIODevice *dev, quint32 &blockSize, QVariant &item) {
+bool SignalProxy::readDataFromDevice(QIODevice *dev, quint32 &blockSize, QVariant &item, bool compressed) {
   QDataStream in(dev);
   in.setVersion(QDataStream::Qt_4_2);
 
@@ -778,10 +974,40 @@ bool SignalProxy::readDataFromDevice(QIODevice *dev, quint32 &blockSize, QVarian
     in >> blockSize;
   }
 
+  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;
-  in >> item;
+
+  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;
+    }
+    // end
+    rawItem = qUncompress(rawItem);
+      
+    QDataStream itemStream(&rawItem, QIODevice::ReadOnly);
+    itemStream.setVersion(QDataStream::Qt_4_2);
+    itemStream >> item;
+  } else {
+    in >> item;
+  }
+
   blockSize = 0;
+
   return true;
 }
 
@@ -807,12 +1033,19 @@ 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
-    methodname = methodname.mid(methodname.indexOf(QRegExp("[A-Z]")));
+    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
-    methodname = methodname.left(methodname.lastIndexOf(QRegExp("[A-Z]")));
+    upperCharPos = methodname.lastIndexOf(QRegExp("[A-Z]"));
+    if(upperCharPos == -1)
+      return QString();
+    methodname = methodname.left(upperCharPos);
   }
 
   methodname[0] = methodname[0].toUpper();
@@ -825,13 +1058,68 @@ QVariantMap SignalProxy::initData(SyncableObject *obj) const {
 }
 
 void SignalProxy::setInitData(SyncableObject *obj, const QVariantMap &properties) {
-  if(isInitialized(obj))
+  if(obj->isInitialized())
     return;
   obj->fromVariantMap(properties);
-  setInitialized(obj);
+  obj->setInitialized();
+  emit objectInitialized(obj);
   invokeSlot(obj, updatedRemotelyId(obj));
 }
 
+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++;
+      }
+    }
+    peer++;
+  }
+}
+
+void SignalProxy::receiveHeartBeat(AbstractPeer *peer, const QVariantList &params) {
+  peer->dispatchSignal(SignalProxy::HeartBeatReply, params);
+}
+
+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);
+}
+
+void SignalProxy::updateLag(IODevicePeer *peer, int lag) {
+  peer->lag = lag;
+  if(proxyMode() == Client) {
+    emit lagUpdated(lag);
+  }
+}
+
+
 void SignalProxy::dumpProxyStats() {
   QString mode;
   if(proxyMode() == Server)