X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fsignalproxy.cpp;h=0357c96242465a2b0526838b0ba1dd47f90de783;hp=76fccb73eb7013865015f9a5b0d5d3b6e2f2468a;hb=6efa7d5a4cd38bc21ecfafd04d25a6c952d1e097;hpb=fe313ca8ab4c082c63b27f5e1c23541975c7f47f

diff --git a/src/common/signalproxy.cpp b/src/common/signalproxy.cpp
index 76fccb73..0357c962 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,28 @@
 #include <QMetaProperty>
 #include <QRegExp>
 #include <QThread>
+#include <QTime>
+#include <QEvent>
+#include <QCoreApplication>
 
 #include "syncableobject.h"
 #include "util.h"
 
-class SignalRelay: public QObject {
+// ==================================================
+//  PeerSignalEvent
+// ==================================================
+class PeerSignalEvent : public QEvent {
+public:
+  PeerSignalEvent(SignalProxy *sender, SignalProxy::RequestType requestType, const QVariantList &params) : QEvent(QEvent::User), sender(sender), requestType(requestType), params(params) {}
+  SignalProxy *sender;
+  SignalProxy::RequestType requestType;
+  QVariantList params;
+};
 
+// ==================================================
+//  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)
@@ -50,12 +67,12 @@ public:
 
   void setSynchronize(bool);
   bool synchronize() const;
-  
+
   int sigCount() const;
-  
+
 private:
   bool isSyncMethod(int i);
-  
+
   SignalProxy* proxy;
   QObject* caller;
   QMultiHash<int, QByteArray> sigNames;
@@ -93,7 +110,7 @@ int SignalRelay::qt_metacall(QMetaObject::Call _c, int _id, void **_a) {
         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);
@@ -145,7 +162,7 @@ bool SignalRelay::isSyncMethod(int i) {
   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;
 
@@ -178,24 +195,52 @@ void SignalRelay::attachSignal(int methodId, const QByteArray &func) {
   }
   sigNames.insert(methodId, fn);
 }
-// ====================
-//  /SIGNALRELAY
-// ====================
 
+// ==================================================
+//  Peers
+// ==================================================
+void SignalProxy::IODevicePeer::dispatchSignal(const RequestType &requestType, const QVariantList &params) {
+  QVariantList packedFunc;
+  packedFunc << (qint16)requestType
+	     << params;
+  dispatchPackedFunc(QVariant(packedFunc));
+}
+
+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
+    : Qt::QueuedConnection;
+
+  if(type == Qt::DirectConnection) {
+    receiver->receivePeerSignal(sender, requestType, params);
+  } else {
+    QCoreApplication::postEvent(receiver, new PeerSignalEvent(sender, requestType, params));
+  }
+}
 
-// ====================
+// ==================================================
 //  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)
@@ -203,27 +248,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);
-
-  // close peer connections
-  foreach(QIODevice *device, _peers.keys()) {
-    device->close();
-    delete device;
-  }
+  removeAllPeers();
 }
 
 void SignalProxy::setProxyMode(ProxyMode mode) {
-  foreach(QIODevice* peer, _peers.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();
@@ -231,26 +282,22 @@ 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() {
-  disconnect(&_heartBeatTimer, 0, this, 0);
-  _heartBeatTimer.stop();
 }
 
 void SignalProxy::initClient() {
   attachSlot("__objectRenamed__", this, SLOT(objectRenamed(QByteArray, QString, QString)));
-  connect(&_heartBeatTimer, SIGNAL(timeout()),
-	  this, SLOT(sendHeartBeat()));
-  _heartBeatTimer.start(60 * 1000); // msecs: one beep per minute
 }
 
 bool SignalProxy::addPeer(QIODevice* iodev) {
   if(!iodev)
     return false;
-  
+
   if(_peers.contains(iodev))
     return true;
 
@@ -270,9 +317,37 @@ bool SignalProxy::addPeer(QIODevice* iodev) {
     connect(sock, SIGNAL(disconnected()), this, SLOT(removePeerBySender()));
   }
 
-  _peers[iodev] = peerInfo();
-  if(iodev->property("UseCompression").toBool())
-    _peers[iodev].usesCompression = true;
+  if(!sock->parent())
+    sock->setParent(this);
+
+  _peers[iodev] = new IODevicePeer(iodev, iodev->property("UseCompression").toBool());
+
+  if(_peers.count() == 1)
+    emit connected();
+
+  return true;
+}
+
+bool SignalProxy::addPeer(SignalProxy* proxy) {
+  if(!proxy)
+    return false;
+
+  if(proxyMode() == proxy->proxyMode()) {
+    qWarning() << "SignalProxy::addPeer(): adding a SignalProxy as peer requires one proxy to be server and one client!";
+    return false;
+  }
+
+  if(_peers.contains(proxy)) {
+    return true;
+  }
+
+  if(proxyMode() == Client && !_peers.isEmpty()) {
+    qWarning("SignalProxy: only one peer allowed in client mode!");
+    return false;
+  }
+
+  _peers[proxy] = new SignalProxyPeer(this, proxy);
+  proxy->addPeer(this);
 
   if(_peers.count() == 1)
     emit connected();
@@ -280,43 +355,52 @@ bool SignalProxy::addPeer(QIODevice* iodev) {
   return true;
 }
 
-void SignalProxy::removePeer(QIODevice* iodev) {
+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::removePeer(QObject* dev) {
   if(_peers.isEmpty()) {
     qWarning() << "SignalProxy::removePeer(): No peers in use!";
     return;
   }
 
-  if(proxyMode() == Server && !iodev) {
-    // disconnect all
-    QList<QIODevice *> peers = _peers.keys();
-    foreach(QIODevice *peer, peers)
-      removePeer(peer);
+  Q_ASSERT(dev);
+  if(!_peers.contains(dev)) {
+    qWarning() << "SignalProxy: unknown Peer" << dev;
+    return;
   }
 
-  if(proxyMode() != Server && !iodev)
-    iodev = _peers.keys().first();
+  AbstractPeer *peer = _peers[dev];
+  _peers.remove(dev);
 
-  Q_ASSERT(iodev);
+  disconnect(dev, 0, this, 0);
+  if(peer->type() == AbstractPeer::IODevicePeer)
+    emit peerRemoved(static_cast<QIODevice *>(dev));
 
-  if(!_peers.contains(iodev)) {
-    qWarning() << "SignalProxy: unknown QIODevice" << iodev;
-    return;
+  if(peer->type() == AbstractPeer::SignalProxyPeer) {
+    SignalProxy *proxy = static_cast<SignalProxy *>(dev);
+    if(proxy->_peers.contains(this))
+      proxy->removePeer(this);
   }
 
-  _peers.remove(iodev);
 
-  disconnect(iodev, 0, this, 0);
-  emit peerRemoved(iodev);
+  if(dev->parent() == this)
+    dev->deleteLater();
+
+  delete peer;
 
   if(_peers.isEmpty())
     emit disconnected();
 }
 
 void SignalProxy::removePeerBySender() {
-  // OK we're brutal here... but since it's a private slot we know what we've got connected to it...
-  // this Slot is not triggered by destroyed, so the object is still alive and can be used!
-  QIODevice *ioDev = (QIODevice *)(sender());
-  removePeer(ioDev);
+  removePeer(sender());
 }
 
 void SignalProxy::objectRenamed(const QString &newname, const QString &oldname) {
@@ -327,7 +411,7 @@ void SignalProxy::objectRenamed(const QString &newname, const QString &oldname)
 
   if(proxyMode() == Client)
     return;
-  
+
   QVariantList params;
   params << "__objectRenamed__" << className << newname << oldname;
   dispatchSignal(RpcCall, params);
@@ -411,7 +495,7 @@ const QByteArray &SignalProxy::methodName(QObject *obj, int 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)
@@ -486,7 +570,7 @@ void SignalProxy::setReceiveMap(SyncableObject *obj) {
     signature = QByteArray(requestSlot.signature());
     if(!signature.startsWith("request"))
       continue;
-    
+
     paramsPos = signature.indexOf('(');
     if(paramsPos == -1)
       continue;
@@ -508,7 +592,7 @@ void SignalProxy::setReceiveMap(SyncableObject *obj) {
     if(receiverId != -1)
       receiveMap[i] = receiverId;
   }
-  _classInfo[meta]->receiveMap = receiveMap;  
+  _classInfo[meta]->receiveMap = receiveMap;
 }
 
 const QHash<int, int> &SignalProxy::receiveMap(SyncableObject *obj) {
@@ -590,7 +674,7 @@ 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))
@@ -616,15 +700,6 @@ void SignalProxy::synchronize(SyncableObject *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 || obj->isInitialized())
     return;
@@ -677,63 +752,89 @@ void SignalProxy::stopSync(SyncableObject* obj) {
   }
 }
 
-void SignalProxy::dispatchSignal(QIODevice *receiver, const RequestType &requestType, const QVariantList &params) {
-  Q_ASSERT(_peers.contains(receiver));
-  QVariantList packedFunc;
-  packedFunc << (qint16)requestType;
-  packedFunc << params;
-  writeDataToDevice(receiver, QVariant(packedFunc), _peers[receiver].usesCompression);
-}
-
 void SignalProxy::dispatchSignal(const RequestType &requestType, const QVariantList &params) {
-  // yes I know we have a little code duplication here... it's for the sake of performance
-  QVariantList packedFunc;
-  packedFunc << (qint16)requestType;
-  packedFunc << params;
-  foreach(QIODevice* dev, _peers.keys()) {
-    Q_ASSERT(_peers.contains(dev));
-    writeDataToDevice(dev, QVariant(packedFunc), _peers[dev].usesCompression);
+  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());
 
   if(params.isEmpty()) {
     qWarning() << "SignalProxy::receivePeerSignal(): received incompatible Data:" << packedFunc;
     return;
   }
-  
-  int callType = params.takeFirst().value<int>();
 
-  switch(callType) {
+  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()) {
+    if(params.empty())
       qWarning() << "SignalProxy::receivePeerSignal(): received empty RPC-Call";
-      return;
-    } else {
-      return handleSignal(params.takeFirst().toByteArray(), params);
-    }
+    else
+      handleSignal(params);
+      //handleSignal(params.takeFirst().toByteArray(), params);
+    break;
+
   case Sync:
-    return handleSync(sender, 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:
-    return;
+    receiveHeartBeat(sender, params);
+    break;
+
+  case HeartBeatReply:
+    receiveHeartBeatReply(sender, params);
+    break;
+
   default:
-    qWarning() << "SignalProxy::receivePeerSignal(): received undefined CallType" << callType << params;
+    qWarning() << "SignalProxy::receivePeerSignal(): received undefined CallType" << requestType << params;
+  }
+}
+
+void SignalProxy::receivePeerSignal(SignalProxy *sender, const RequestType &requestType, const QVariantList &params) {
+  if(!_peers.contains(sender)) {
+    // we output only the pointer value. otherwise Qt would try to pretty print. As the object might already been destroyed, this is not a good idea.
+    qWarning() << "SignalProxy::receivePeerSignal(): received Signal from unknown Proxy" << reinterpret_cast<void *>(sender);
     return;
   }
+  receivePeerSignal(_peers[sender], requestType, params);
 }
 
-void SignalProxy::handleSync(QIODevice *sender, QVariantList params) {
+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();
@@ -768,23 +869,23 @@ void SignalProxy::handleSync(QIODevice *sender, QVariantList params) {
     if(argTypes(receiver, receiverId).count() > 1)
       returnParams << params;
     returnParams << returnValue;
-    dispatchSignal(sender, Sync, returnParams);
+    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;
     return;
   }
-  
+
   QByteArray className(params[0].toByteArray());
   QString objectName(params[1].toString());
-  
+
   if(!_syncSlave.contains(className)) {
     qWarning() << "SignalProxy::handleInitRequest() received initRequest for unregistered Class:"
 	       << className;
@@ -796,7 +897,7 @@ void SignalProxy::handleInitRequest(QIODevice *sender, const QVariantList &param
 	       << className << objectName;
     return;
   }
-  
+
   SyncableObject *obj = _syncSlave[className][objectName];
 
   QVariantList params_;
@@ -804,17 +905,17 @@ void SignalProxy::handleInitRequest(QIODevice *sender, const QVariantList &param
 	  << objectName
 	  << initData(obj);
 
-  dispatchSignal(sender, 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:"
 	       << params;
     return;
   }
-  
+
   QByteArray className(params[0].toByteArray());
   QString objectName(params[1].toString());
   QVariantMap propertyMap(params[2].toMap());
@@ -835,7 +936,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);
@@ -859,7 +964,7 @@ 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};
 
@@ -879,7 +984,7 @@ 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;
@@ -891,7 +996,7 @@ bool SignalProxy::invokeSlot(QObject *receiver, int methodId, const QVariantList
     // note to self: qmetaobject.cpp:990 ff
     return false;
   }
-  
+
 }
 
 bool SignalProxy::invokeSlot(QObject *receiver, int methodId, const QVariantList &params) {
@@ -902,16 +1007,17 @@ bool SignalProxy::invokeSlot(QObject *receiver, int methodId, const QVariantList
 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));
+  Q_ASSERT(_peers.contains(ioDev) && _peers[ioDev]->type() == AbstractPeer::IODevicePeer);
+  IODevicePeer *peer = static_cast<IODevicePeer *>(_peers[ioDev]);
   QVariant var;
-  while(readDataFromDevice(ioDev, _peers[ioDev].byteCount, var, _peers[ioDev].usesCompression))
-    receivePeerSignal(ioDev, var);
+  while(peer->readData(var))
+    receivePackedFunc(peer, var);
 }
 
 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;
   }
 
@@ -919,7 +1025,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);
@@ -949,14 +1055,31 @@ 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;
 
   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;
@@ -1025,9 +1148,72 @@ void SignalProxy::setInitData(SyncableObject *obj, const QVariantMap &properties
 }
 
 void SignalProxy::sendHeartBeat() {
-  dispatchSignal(SignalProxy::HeartBeat, QVariantList());
+  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) {
+	qWarning() << "SignalProxy: Disconnecting peer:" << ioPeer->address()
+		   << "(didn't receive a heartbeat for over" << ioPeer->sentHeartBeats * _heartBeatTimer.interval() / 1000 << "seconds)";
+	ioPeer->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->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:
+    {
+      PeerSignalEvent *sig = static_cast<PeerSignalEvent *>(event);
+      receivePeerSignal(sig->sender, sig->requestType, sig->params);
+    }
+    event->accept();
+    break;
+  default:
+    return;
+  }
+}
+
+void SignalProxy::updateLag(IODevicePeer *peer, int lag) {
+  peer->lag = lag;
+  if(proxyMode() == Client) {
+    emit lagUpdated(lag);
+  }
 }
 
+
 void SignalProxy::dumpProxyStats() {
   QString mode;
   if(proxyMode() == Server)
@@ -1042,7 +1228,7 @@ void SignalProxy::dumpProxyStats() {
   int slaveCount = 0;
   foreach(ObjectId oid, _syncSlave.values())
     slaveCount += oid.count();
-  
+
   qDebug() << this;
   qDebug() << "              Proxy Mode:" << mode;
   qDebug() << "attached sending Objects:" << _relayHash.count();
@@ -1059,13 +1245,13 @@ void SignalProxy::dumpSyncMap(SyncableObject *object) {
   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();    
+    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();    
+//     qDebug() << iter.key() << meta->method(iter.key()).signature() << "-->" << iter.value() << meta->method(iter.value()).signature();
 //     iter++;
 //   }
 }