The Client sends now a heartbeat to the server once per minute.

diff --git a/src/common/signalproxy.cpp b/src/common/signalproxy.cpp
index 83f10e3..3718fde 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((int)SignalProxy::RpcCall, QVariantList() << funcIter.value() << params);
         funcIter++;
       }
       
@@ -221,10 +221,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) {
@@ -582,19 +587,26 @@ 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);
+  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;
     return;
   }
 }
@@ -832,6 +844,10 @@ void SignalProxy::setInitData(SyncableObject *obj, const QVariantMap &properties
   invokeSlot(obj, updatedRemotelyId(obj));
 }
 
+void SignalProxy::sendHeartBeat() {
+  dispatchSignal((int)SignalProxy::HeartBeat, QVariantList());
+}
+
 void SignalProxy::dumpProxyStats() {
   QString mode;
   if(proxyMode() == Server)

diff --git a/src/common/signalproxy.h b/src/common/signalproxy.h
index 04ff7a5..1c991ae 100644 (file)
--- a/src/common/signalproxy.h
+++ b/src/common/signalproxy.h
@@ -28,6 +28,7 @@
 #include <QPair>
 #include <QString>
 #include <QByteArray>
+#include <QTimer>
 
 class SignalRelay;
 class SyncableObject;
@@ -43,9 +44,11 @@ public:
   };
 
   enum RequestType {
-    Sync = 0,
+    Sync = 1,
+    RpcCall,
     InitRequest,
-    InitData
+    InitData,
+    HeartBeat
   };
 
   SignalProxy(QObject *parent);
@@ -112,6 +115,7 @@ private slots:
   void removePeerBySender();
   void objectRenamed(QString oldname, QString newname);
   void objectRenamed(QByteArray classname, QString oldname, QString newname);
+  void sendHeartBeat();
 
 signals:
   void peerRemoved(QIODevice *obj);
@@ -170,6 +174,7 @@ private:
 
 
   ProxyMode _proxyMode;
+  QTimer _heartBeatTimer;
   
   friend class SignalRelay;
 };

diff --git a/version.inc b/version.inc
index 31b1f4f..f746329 100644 (file)
--- a/version.inc
+++ b/version.inc
@@ -5,14 +5,14 @@
 
   quasselVersion = "0.2.0-pre";
   quasselDate = "2008-02-05";
-  quasselBuild = 461;
+  quasselBuild = 462;
 
   //! Minimum client build number the core needs
-  clientBuildNeeded = 461;
+  clientBuildNeeded = 462;
   clientVersionNeeded = quasselVersion;
 
   //! Minimum core build number the client needs
-  coreBuildNeeded = 461;
+  coreBuildNeeded = 462;
   coreVersionNeeded = quasselVersion;
 
 }