Fix nasty bug that made the client sometimes crash at sync.

[quassel.git] / src / common / signalproxy.cpp

diff --git a/src/common/signalproxy.cpp b/src/common/signalproxy.cpp
index f6f75d6..e934a05 100644 (file)
--- a/src/common/signalproxy.cpp
+++ b/src/common/signalproxy.cpp
@@ -80,11 +80,17 @@ int SignalRelay::qt_metacall(QMetaObject::Call _c, int _id, void **_a) {
       const QList<int> &argTypes = proxy->argTypes(caller, _id);
       QVariantList params;
       int n = argTypes.size();
-      for(int i=0; i<n; i++)
-        params.append(QVariant(argTypes[i], _a[i+1]));
+      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(funcIter.value(), params);
+        proxy->dispatchSignal(SignalProxy::RpcCall, QVariantList() << funcIter.value() << params);
         funcIter++;
       }
       
@@ -100,10 +106,10 @@ int SignalRelay::qt_metacall(QMetaObject::Call _c, int _id, void **_a) {
        params.prepend(signature);
        params.prepend(caller->objectName());
        params.prepend(caller->metaObject()->className());
-       proxy->dispatchSignal((int)SignalProxy::Sync, params);
+       proxy->dispatchSignal(SignalProxy::Sync, params);
       }
     }
-    _id -= 1;
+    _id -= QObject::staticMetaObject.methodCount();
   }
   return _id;
 }
@@ -194,6 +200,12 @@ SignalProxy::~SignalProxy() {
   QList<QObject*> senders = _relayHash.keys();
   foreach(QObject* sender, senders)
     detachObject(sender);
+
+  // close peer connections
+  foreach(QIODevice *device, _peerByteCount.keys()) {
+    device->close();
+    delete device;
+  }
 }
 
 void SignalProxy::setProxyMode(ProxyMode mode) {
@@ -215,10 +227,15 @@ SignalProxy::ProxyMode SignalProxy::proxyMode() const {
 }
 
 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) {
@@ -268,8 +285,8 @@ void SignalProxy::objectRenamed(QString oldname, QString newname) {
     return;
   
   QVariantList params;
-  params << className << oldname << newname;
-  dispatchSignal("__objectRenamed__", params);
+  params << "__objectRenamed__" << className << oldname << newname;
+  dispatchSignal(RpcCall, params);
 }
 
 void SignalProxy::objectRenamed(QByteArray classname, QString oldname, QString newname) {
@@ -300,7 +317,7 @@ void SignalProxy::removePeer(QIODevice* iodev) {
     qWarning() << "SignalProxy: unknown QIODevice" << iodev;
     return;
   }
-     
+
   // take a last gasp
   while(true) {
     QVariant var;
@@ -512,7 +529,7 @@ void SignalProxy::requestInit(SyncableObject *obj) {
   QVariantList params;
   params << obj->metaObject()->className()
         << obj->objectName();
-  dispatchSignal((int)InitRequest, params);
+  dispatchSignal(InitRequest, params);
 }
 
 void SignalProxy::detachSender() {
@@ -549,7 +566,7 @@ void SignalProxy::stopSync(SyncableObject* obj) {
   // gladly the objectName() is still valid. So we have only to iterate over the classes not each instance! *sigh*
   QHash<QByteArray, ObjectId>::iterator classIter = _syncSlave.begin();
   while(classIter != _syncSlave.end()) {
-    if(classIter->contains(obj->objectName())) {
+    if(classIter->contains(obj->objectName()) && classIter.value()[obj->objectName()] == obj) {
       classIter->remove(obj->objectName());
       break;
     }
@@ -557,17 +574,17 @@ void SignalProxy::stopSync(SyncableObject* obj) {
   }
 }
 
-void SignalProxy::dispatchSignal(QIODevice *receiver, const QVariant &identifier, const QVariantList &params) {
+void SignalProxy::dispatchSignal(QIODevice *receiver, const RequestType &requestType, const QVariantList &params) {
   QVariantList packedFunc;
-  packedFunc << identifier;
+  packedFunc << (qint16)requestType;
   packedFunc << params;
   writeDataToDevice(receiver, QVariant(packedFunc));
 }
 
-void SignalProxy::dispatchSignal(const QVariant &identifier, const QVariantList &params) {
+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 << identifier;
+  packedFunc << (qint16)requestType;
   packedFunc << params;
   foreach(QIODevice* dev, _peerByteCount.keys())
     writeDataToDevice(dev, QVariant(packedFunc));
@@ -576,19 +593,31 @@ void SignalProxy::dispatchSignal(const QVariant &identifier, const QVariantList
 void SignalProxy::receivePeerSignal(QIODevice *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;
+  }
+  
+  int callType = params.takeFirst().value<int>();
 
-  switch(call.toInt()) {
+  switch(callType) {
+  case RpcCall:
+    if(params.empty()) {
+      qWarning() << "SignalProxy::receivePeerSignal(): received empty RPC-Call";
+      return;
+    } else {
+      return handleSignal(params.takeFirst().toByteArray(), params);
+    }
   case Sync:
     return handleSync(params);
   case InitRequest:
     return handleInitRequest(sender, params);
   case InitData:
     return handleInitData(sender, params);
+  case HeartBeat:
+    return;
   default:
-    qWarning() << "received undefined CallType" << call.toInt();
+    qWarning() << "SignalProxy::receivePeerSignal(): received undefined CallType" << callType << params;
     return;
   }
 }
@@ -604,14 +633,14 @@ void SignalProxy::handleSync(QVariantList params) {
   QByteArray signal = params.takeFirst().toByteArray();
 
   if(!_syncSlave.contains(className) || !_syncSlave[className].contains(objectName)) {
-    qWarning() << QString("no registered receiver for sync call: %s::%s (objectName=\"%s\"). Params are:").arg(QString(className)).arg(QString(signal)).arg(objectName)
+    qWarning() << QString("no registered receiver for sync call: %1::%2 (objectName=\"%3\"). Params are:").arg(QString(className)).arg(QString(signal)).arg(objectName)
               << params;
     return;
   }
 
   SyncableObject *receiver = _syncSlave[className][objectName];
   if(!syncMap(receiver).contains(signal)) {
-    qWarning() << QString("no matching slot for sync call: %s::%s (objectName=\"%s\"). Params are:").arg(QString(className)).arg(QString(signal)).arg(objectName)
+    qWarning() << QString("no matching slot for sync call: %1::%2 (objectName=\"%3\"). Params are:").arg(QString(className)).arg(QString(signal)).arg(objectName)
               << params;
     return;
   }
@@ -653,7 +682,7 @@ void SignalProxy::handleInitRequest(QIODevice *sender, const QVariantList &param
          << obj->objectName()
          << initData(obj);
 
-  dispatchSignal(sender, (int)InitData, params_);
+  dispatchSignal(sender, InitData, params_);
 }
 
 void SignalProxy::handleInitData(QIODevice *sender, const QVariantList &params) {
@@ -703,7 +732,7 @@ bool SignalProxy::invokeSlot(QObject *receiver, int methodId, const QVariantList
     ? params.count()
     : args.count();
 
-  if(minArgCount(receiver, methodId) < params.count()) {
+  if(minArgCount(receiver, methodId) > params.count()) {
       qWarning() << "SignalProxy::invokeSlot(): not enough params to invoke" << methodName(receiver, methodId);
       return false;
   }
@@ -713,6 +742,11 @@ bool SignalProxy::invokeSlot(QObject *receiver, int methodId, const QVariantList
                0, 0, 0, 0 , 0};
   // check for argument compatibility and build params array
   for(int i = 0; i < numArgs; i++) {
+    if(!params[i].isValid()) {
+      qWarning() << "SignalProxy::invokeSlot(): received invalid data for argument number" << i << "of method" << QString("%1::%2()").arg(receiver->metaObject()->className()).arg(receiver->metaObject()->method(methodId).signature());
+      qWarning() << "                            - make sure all your data types are known by the Qt MetaSystem";
+      return false;
+    }
     if(args[i] != QMetaType::type(params[i].typeName())) {
       qWarning() << "SignalProxy::invokeSlot(): incompatible param types to invoke" << methodName(receiver, methodId);
       return false;
@@ -821,6 +855,10 @@ void SignalProxy::setInitData(SyncableObject *obj, const QVariantMap &properties
   invokeSlot(obj, updatedRemotelyId(obj));
 }
 
+void SignalProxy::sendHeartBeat() {
+  dispatchSignal(SignalProxy::HeartBeat, QVariantList());
+}
+
 void SignalProxy::dumpProxyStats() {
   QString mode;
   if(proxyMode() == Server)