Breaking protocol with alpha2.... and it won't be the last one...

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

diff --git a/src/common/signalproxy.cpp b/src/common/signalproxy.cpp
index 83f10e3..794e878 100644 (file)
--- a/src/common/signalproxy.cpp
+++ b/src/common/signalproxy.cpp
@@ -90,7 +90,7 @@ 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++;
       }
       
@@ -106,7 +106,7 @@ 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 -= QObject::staticMetaObject.methodCount();
@@ -200,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) {
@@ -221,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) {
@@ -258,35 +269,9 @@ bool SignalProxy::addPeer(QIODevice* iodev) {
   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::objectRenamed(QString oldname, QString newname) {
-  const QMetaObject *meta = sender()->metaObject();
-  const QByteArray className(meta->className());
-  objectRenamed(className, oldname, newname);
-
-  if(proxyMode() == Client)
-    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);
-}
-
-
 void SignalProxy::removePeer(QIODevice* iodev) {
   if(_peerByteCount.isEmpty()) {
-    qWarning() << "SignalProxy: No peers in use!";
+    qWarning() << "SignalProxy::removePeer(): No peers in use!";
     return;
   }
 
@@ -306,15 +291,7 @@ void SignalProxy::removePeer(QIODevice* iodev) {
     qWarning() << "SignalProxy: unknown QIODevice" << iodev;
     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);
@@ -324,6 +301,33 @@ void SignalProxy::removePeer(QIODevice* iodev) {
     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...
+  QIODevice *ioDev = (QIODevice *)(sender());
+  removePeer(ioDev);
+  qDebug() << "Client disconnected.";
+}
+
+void SignalProxy::objectRenamed(const QString &newname, const QString &oldname) {
+  const QMetaObject *meta = sender()->metaObject();
+  const QByteArray className(meta->className());
+  objectRenamed(className, oldname, newname);
+
+  if(proxyMode() == Client)
+    return;
+  
+  QVariantList params;
+  params << "__objectRenamed__" << className << newname << oldname;
+  dispatchSignal(RpcCall, params);
+}
+
+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();
   QList<QByteArray> p = meta->method(methodId).parameterTypes();
@@ -493,9 +497,7 @@ void SignalProxy::synchronize(SyncableObject *obj) {
   _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)));
-
+    connect(obj, SIGNAL(objectRenamed(QString, QString)), this, SLOT(objectRenamed(QString, QString)));
     setInitialized(obj);
   } else {
     requestInit(obj);
@@ -518,7 +520,7 @@ void SignalProxy::requestInit(SyncableObject *obj) {
   QVariantList params;
   params << obj->metaObject()->className()
         << obj->objectName();
-  dispatchSignal((int)InitRequest, params);
+  dispatchSignal(InitRequest, params);
 }
 
 void SignalProxy::detachSender() {
@@ -563,17 +565,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));
@@ -582,19 +584,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;
   }
 }
@@ -659,7 +673,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) {
@@ -832,6 +846,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)