X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fsignalproxy.cpp;h=ac39e3640b6a22117bb24e1bd24585536a232e48;hp=c8f753da4bc90295cf4ba41cab026f03ddd4bd75;hb=dfcf836c5f1f57cadcdbea5c5a7a7034d21ce332;hpb=0ff076706c3d353ec9b098b1eca270195288774e

diff --git a/src/common/signalproxy.cpp b/src/common/signalproxy.cpp
index c8f753da..ac39e364 100644
--- a/src/common/signalproxy.cpp
+++ b/src/common/signalproxy.cpp
@@ -1,11 +1,11 @@
 /***************************************************************************
- *   Copyright (C) 2005-07 by the Quassel IRC Team                         *
+ *   Copyright (C) 2005-09 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
+ *   (at your option) version 3.                                           *
  *                                                                         *
  *   This program is distributed in the hope that it will be useful,       *
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
@@ -16,270 +16,448 @@
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
- ***************************************************************************
- *   SignalProxy has been inspired by QxtRPCPeer, part of libqxt,          *
- *   the Qt eXTension Library <http://www.libqxt.org>. We would like to    *
- *   thank Arvid "aep" Picciani and Adam "ahigerd" Higerd for providing    *
- *   QxtRPCPeer, valuable input and the genius idea to (ab)use Qt's        *
- *   Meta Object System for transmitting signals over the network.         *
- *                                                                         *
- *   To make contribution back into libqxt possible, redistribution and    *
- *   modification of this file is additionally allowed under the terms of  *
- *   the Common Public License, version 1.0, as published by IBM.          *
  ***************************************************************************/
 
 #include "signalproxy.h"
+
 #include <QObject>
 #include <QIODevice>
 #include <QAbstractSocket>
+#include <QHostAddress>
 #include <QHash>
 #include <QMultiHash>
 #include <QList>
 #include <QSet>
 #include <QDebug>
 #include <QMetaMethod>
+#include <QMetaProperty>
+#include <QRegExp>
+#ifdef HAVE_SSL
+#include <QSslSocket>
+#endif
+#include <QThread>
+#include <QTime>
+#include <QEvent>
+#include <QCoreApplication>
+
+#include "syncableobject.h"
+#include "util.h"
+
+// ==================================================
+//  PeerSignalEvent
+// ==================================================
+class PeerSignalEvent : public QEvent {
+public:
+  PeerSignalEvent(SignalProxy *sender, SignalProxy::RequestType requestType, const QVariantList &params) : QEvent(QEvent::Type(SignalProxy::PeerSignal)), sender(sender), requestType(requestType), params(params) {}
+  SignalProxy *sender;
+  SignalProxy::RequestType requestType;
+  QVariantList params;
+};
 
-class SignalRelay: public QObject {
+class RemovePeerEvent : public QEvent {
+public:
+  RemovePeerEvent(QObject *peer) : QEvent(QEvent::Type(SignalProxy::RemovePeer)), peer(peer) {}
+  QObject *peer;
+};
 
+// ==================================================
+//  SignalRelay
+// ==================================================
+class SignalProxy::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)
 */
 public:
-  SignalRelay(SignalProxy* parent, QObject* source);
+  SignalRelay(SignalProxy *parent) : QObject(parent), _proxy(parent) {}
+  inline SignalProxy *proxy() const { return _proxy; }
+
   int qt_metacall(QMetaObject::Call _c, int _id, void **_a);
 
-  void attachSignal(int methodId, const QByteArray &func);
+  void attachSignal(QObject *sender, int signalId, const QByteArray &funcName);
+  void detachSignal(QObject *sender, int signalId = -1);
 
-  int sigCount() const;
-  
 private:
-  SignalProxy* proxy;
-  QObject* caller;
-  QMultiHash<int, QByteArray> sigNames;
+  struct Signal {
+    QObject *sender;
+    int signalId;
+    QByteArray signature;
+    Signal(QObject *sender, int sigId, const QByteArray &signature) : sender(sender), signalId(sigId), signature(signature) {}
+    Signal() : sender(0), signalId(-1) {}
+  };
+
+  SignalProxy *_proxy;
+  QHash<int, Signal> _slots;
 };
 
-SignalRelay::SignalRelay(SignalProxy* parent, QObject* source)
-  : QObject(parent),
-    proxy(parent),
-    caller(source)
-{
-  QObject::connect(source, SIGNAL(destroyed()), parent, SLOT(detachSender()));
+void SignalProxy::SignalRelay::attachSignal(QObject *sender, int signalId, const QByteArray &funcName) {
+  // we ride without safetybelts here... all checking for valid method etc pp has to be done by the caller
+  // all connected methodIds are offset by the standard methodCount of QObject
+  int slotId;
+  for(int i = 0;; i++) {
+    if(!_slots.contains(i)) {
+      slotId = i;
+      break;
+    }
+  }
+
+  QByteArray fn;
+  if(!funcName.isEmpty()) {
+    fn = QMetaObject::normalizedSignature(funcName);
+  } else {
+    fn = SIGNAL(fakeMethodSignature());
+    fn = fn.replace("fakeMethodSignature()", sender->metaObject()->method(signalId).signature());
+  }
+
+  _slots[slotId] = Signal(sender, signalId, fn);
+
+  QMetaObject::connect(sender, signalId, this, QObject::staticMetaObject.methodCount() + slotId);
 }
 
-int SignalRelay::qt_metacall(QMetaObject::Call _c, int _id, void **_a) {
+void SignalProxy::SignalRelay::detachSignal(QObject *sender, int signalId) {
+  QHash<int, Signal>::iterator slotIter = _slots.begin();
+  while(slotIter != _slots.end()) {
+    if(slotIter->sender == sender && (signalId == -1 || slotIter->signalId == signalId)) {
+      slotIter = _slots.erase(slotIter);
+      if(signalId != -1)
+        break;
+    } else {
+      slotIter++;
+    }
+  }
+}
+
+int SignalProxy::SignalRelay::qt_metacall(QMetaObject::Call _c, int _id, void **_a) {
   _id = QObject::qt_metacall(_c, _id, _a);
   if(_id < 0)
     return _id;
+
   if(_c == QMetaObject::InvokeMetaMethod) {
-    if(sigNames.contains(_id)) {
-      const QList<int> &argTypes = proxy->argTypes(caller, _id);
+    if(_slots.contains(_id)) {
+      QObject *caller = sender();
+
+      SignalProxy::ExtendedMetaObject *eMeta = proxy()->extendedMetaObject(caller->metaObject());
+      Q_ASSERT(eMeta);
+
+      const Signal &signal = _slots[_id];
+
       QVariantList params;
-      int n = argTypes.size();
-      for(int i=0; i<n; i++)
-        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->call(funcIter.value(), params);
-        funcIter++;
+      params << signal.signature;
+
+      const QList<int> &argTypes = eMeta->argTypes(signal.signalId);
+      for(int i = 0; i < argTypes.size(); 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 << QVariant(argTypes[i], _a[i+1]);
       }
+
+      proxy()->dispatchSignal(SignalProxy::RpcCall, params);
     }
-    _id -= 1;
+    _id -= _slots.count();
   }
   return _id;
 }
 
-int SignalRelay::sigCount() const {
-  // only for debuging purpose
-  return sigNames.count();
+// ==================================================
+//  Peers
+// ==================================================
+void SignalProxy::IODevicePeer::dispatchSignal(const RequestType &requestType, const QVariantList &params) {
+  QVariantList packedFunc;
+  packedFunc << (qint16)requestType
+             << params;
+  dispatchPackedFunc(QVariant(packedFunc));
 }
 
-void SignalRelay::attachSignal(int methodId, const QByteArray &func) {
-  // we ride without safetybelts here... all checking for valid method etc pp has to be done by the caller
-  // all connected methodIds are offset by the standard methodCount of QObject
-  if(!sigNames.contains(methodId))
-    QMetaObject::connect(caller, methodId, this, QObject::staticMetaObject.methodCount() + methodId);
+bool SignalProxy::IODevicePeer::isSecure() const {
+#ifdef HAVE_SSL
+  QSslSocket *sslSocket = qobject_cast<QSslSocket *>(_device);
+  if(sslSocket)
+    return sslSocket->isEncrypted() || sslSocket->localAddress() == QHostAddress::LocalHost || sslSocket->localAddress() == QHostAddress::LocalHostIPv6;
+#endif
 
-  QByteArray fn;
-  if(!func.isEmpty()) {
-    fn = QMetaObject::normalizedSignature(func);
+  QAbstractSocket *socket = qobject_cast<QAbstractSocket *>(_device);
+  if(socket)
+    return socket->localAddress() == QHostAddress::LocalHost || socket->localAddress() == QHostAddress::LocalHostIPv6;
+
+  return false;
+}
+
+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 {
-    fn = QByteArray("2") + caller->metaObject()->method(methodId).signature();
+    QCoreApplication::postEvent(receiver, new PeerSignalEvent(sender, requestType, params));
   }
-  sigNames.insert(methodId, fn);
 }
-// ====================
-// END SIGNALRELAY
-// ====================
-
 
-// ====================
+// ==================================================
 //  SignalProxy
-// ====================
+// ==================================================
 SignalProxy::SignalProxy(QObject* parent)
   : QObject(parent),
-    _proxyMode(Client)
+  _heartBeatInterval(30),
+  _maxHeartBeatCount(2)
 {
+  setProxyMode(Client);
+  init();
 }
 
 SignalProxy::SignalProxy(ProxyMode mode, QObject* parent)
-  : QObject(parent),
-    _proxyMode(mode)
+  : QObject(parent)
 {
+  setProxyMode(mode);
+  init();
 }
 
 SignalProxy::SignalProxy(ProxyMode mode, QIODevice* device, QObject* parent)
-  : QObject(parent),
-    _proxyMode(mode)
+  : QObject(parent)
 {
+  setProxyMode(mode);
   addPeer(device);
-} 
+  init();
+}
 
 SignalProxy::~SignalProxy() {
-  QList<QObject*> senders = _relayHash.keys();
-  foreach(QObject* sender, senders)
-    detachObject(sender);
+  QHash<QByteArray, ObjectId>::iterator classIter = _syncSlave.begin();
+  while(classIter != _syncSlave.end()) {
+    ObjectId::iterator objIter = classIter->begin();
+    while(objIter != classIter->end()) {
+      SyncableObject *obj = objIter.value();
+      objIter = classIter->erase(objIter);
+      obj->stopSynchronize(this);
+    }
+    classIter++;
+  }
+  _syncSlave.clear();
+
+  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();
+  else
+    initClient();
 }
 
+void SignalProxy::init() {
+  _signalRelay = new SignalRelay(this);
+  connect(&_heartBeatTimer, SIGNAL(timeout()), this, SLOT(sendHeartBeat()));
+  setHeartBeatInterval(30);
+  setMaxHeartBeatCount(2);
+  _heartBeatTimer.start();
+  _secure = false;
+  updateSecureState();
+}
 
-SignalProxy::ProxyMode SignalProxy::proxyMode() const {
-  return _proxyMode;
+void SignalProxy::initServer() {
+}
+
+void SignalProxy::initClient() {
+  attachSlot("__objectRenamed__", this, SLOT(objectRenamed(QByteArray, QString, QString)));
 }
 
 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;
   }
 
-  if(!iodev->isOpen())
-    qWarning("SignalProxy::the device you passed is not open!");
+  if(!iodev->isOpen()) {
+    qWarning("SignalProxy::addPeer(QIODevice *iodev): iodev needs to be open!");
+    return false;
+  }
 
   connect(iodev, SIGNAL(disconnected()), this, SLOT(removePeerBySender()));
   connect(iodev, SIGNAL(readyRead()), this, SLOT(dataAvailable()));
 
-  QAbstractSocket* sock  = qobject_cast<QAbstractSocket*>(iodev);
-  if(sock) {
-    connect(sock, SIGNAL(disconnected()), this, SLOT(removePeerBySender()));
+#ifdef HAVE_SSL
+  QSslSocket *sslSocket = qobject_cast<QSslSocket *>(iodev);
+  if(sslSocket) {
+    connect(iodev, SIGNAL(encrypted()), this, SLOT(updateSecureState()));
   }
+#endif
 
-  _peerByteCount[iodev] = 0;
+  if(!iodev->parent())
+    iodev->setParent(this);
 
-  if(_peerByteCount.count() == 1)
+  _peers[iodev] = new IODevicePeer(iodev, iodev->property("UseCompression").toBool());
+
+  if(_peers.count() == 1)
     emit connected();
 
+  updateSecureState();
   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);
+void SignalProxy::setHeartBeatInterval(int secs) {
+  if(secs != _heartBeatInterval) {
+    _heartBeatInterval = secs;
+    _heartBeatTimer.setInterval(secs * 1000);
+  }
 }
 
-void SignalProxy::removePeer(QIODevice* iodev) {
-  if(_peerByteCount.isEmpty()) {
-    qWarning() << "SignalProxy: No peers in use!";
-    return;
+void SignalProxy::setMaxHeartBeatCount(int max) {
+  _maxHeartBeatCount = max;
+}
+
+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(proxyMode() == Server && !iodev) {
-    // disconnect all
-    QList<QIODevice *> peers = _peerByteCount.keys();
-    foreach(QIODevice *peer, peers)
-      removePeer(peer);
+  if(_peers.contains(proxy)) {
+    return true;
   }
 
-  if(proxyMode() != Server && !iodev)
-    iodev = _peerByteCount.keys().first();
+  if(proxyMode() == Client && !_peers.isEmpty()) {
+    qWarning("SignalProxy: only one peer allowed in client mode!");
+    return false;
+  }
 
-  Q_ASSERT(iodev);
+  _peers[proxy] = new SignalProxyPeer(this, proxy);
+  proxy->addPeer(this);
 
-  if(!_peerByteCount.contains(iodev)) {
-    qWarning() << "SignalProxy: unknown QIODevice" << iodev;
+  if(_peers.count() == 1)
+    emit connected();
+
+  updateSecureState();
+  return true;
+}
+
+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;
   }
-     
-  // take a last gasp
-  while(true) {
-    QVariant var;
-    if(readDataFromDevice(iodev, _peerByteCount[iodev], var))
-      receivePeerSignal(var);
-    else
-      break;
+
+  Q_ASSERT(dev);
+  if(!_peers.contains(dev)) {
+    qWarning() << "SignalProxy: unknown Peer" << dev;
+    return;
   }
-  _peerByteCount.remove(iodev);
 
-  disconnect(iodev, 0, this, 0);
-  emit peerRemoved(iodev);
+  AbstractPeer *peer = _peers[dev];
+  _peers.remove(dev);
 
-  if(_peerByteCount.isEmpty())
-    emit disconnected();
-}
+  disconnect(dev, 0, this, 0);
+  if(peer->type() == AbstractPeer::IODevicePeer)
+    emit peerRemoved(static_cast<QIODevice *>(dev));
 
-void SignalProxy::setArgTypes(QObject* obj, int methodId) {
-  QList<QByteArray> p = obj->metaObject()->method(methodId).parameterTypes();
-  QList<int> argTypes;
-  int ct = p.count();
-  for(int i=0; i<ct; i++)
-    argTypes.append(QMetaType::type(p.value(i)));
+  if(peer->type() == AbstractPeer::SignalProxyPeer) {
+    SignalProxy *proxy = static_cast<SignalProxy *>(dev);
+    if(proxy->_peers.contains(this))
+      proxy->removePeer(this);
+  }
+
+  if(dev->parent() == this)
+    dev->deleteLater();
+
+  delete peer;
+
+  updateSecureState();
 
-  const QByteArray &className(obj->metaObject()->className());
-  Q_ASSERT(_classInfo.contains(className));
-  Q_ASSERT(!_classInfo[className]->argTypes.contains(methodId));
-  _classInfo[className]->argTypes[methodId] = argTypes;
+  if(_peers.isEmpty())
+    emit disconnected();
 }
 
-const QList<int> &SignalProxy::argTypes(QObject *obj, int methodId) {
-  const QByteArray &className(obj->metaObject()->className());
-  Q_ASSERT(_classInfo.contains(className));
-  if(!_classInfo[className]->argTypes.contains(methodId))
-    setArgTypes(obj, methodId);
-  return _classInfo[className]->argTypes[methodId];
+void SignalProxy::removePeerBySender() {
+  removePeer(sender());
 }
 
-void SignalProxy::setMethodName(QObject *obj, int methodId) {
-  const QByteArray &className(obj->metaObject()->className());
-  QByteArray method = obj->metaObject()->method(methodId).signature();
-  method = method.left(method.indexOf('('));
+void SignalProxy::renameObject(const SyncableObject *obj, const QString &newname, const QString &oldname) {
+  if(proxyMode() == Client)
+    return;
+
+  const QMetaObject *meta = obj->syncMetaObject();
+  const QByteArray className(meta->className());
+  objectRenamed(className, newname, oldname);
+
+  QVariantList params;
+  params << "__objectRenamed__" << className << newname << oldname;
+  dispatchSignal(RpcCall, params);
+}
 
-  Q_ASSERT(_classInfo.contains(className));
-  Q_ASSERT(!_classInfo[className]->methodNames.contains(methodId));
-  _classInfo[className]->methodNames[methodId] = method;
+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);
+  }
 }
 
-const QByteArray &SignalProxy::methodName(QObject *obj, int methodId) {
-  QByteArray className(obj->metaObject()->className());
-  Q_ASSERT(_classInfo.contains(className));
-  if(!_classInfo[className]->methodNames.contains(methodId))
-    setMethodName(obj, methodId);
-  return _classInfo[className]->methodNames[methodId];
+const QMetaObject *SignalProxy::metaObject(const QObject *obj) {
+  if(const SyncableObject *syncObject = qobject_cast<const SyncableObject *>(obj))
+    return syncObject->syncMetaObject();
+  else
+    return obj->metaObject();
 }
 
+SignalProxy::ExtendedMetaObject *SignalProxy::extendedMetaObject(const QMetaObject *meta) const {
+  if(_extendedMetaObjects.contains(meta))
+    return _extendedMetaObjects[meta];
+  else
+    return 0;
+}
 
-void SignalProxy::createClassInfo(QObject *obj) {
-  QByteArray className(obj->metaObject()->className());
-  if(!_classInfo.contains(className))
-    _classInfo[className] = new ClassInfo();
+SignalProxy::ExtendedMetaObject *SignalProxy::createExtendedMetaObject(const QMetaObject *meta, bool checkConflicts) {
+  if(!_extendedMetaObjects.contains(meta)) {
+    _extendedMetaObjects[meta] = new ExtendedMetaObject(meta, checkConflicts);
+  }
+  return _extendedMetaObjects[meta];
 }
 
-bool SignalProxy::attachSignal(QObject* sender, const char* signal, const QByteArray& sigName) {
+bool SignalProxy::attachSignal(QObject *sender, const char* signal, const QByteArray& sigName) {
   const QMetaObject* meta = sender->metaObject();
   QByteArray sig(meta->normalizedSignature(signal).mid(1));
   int methodId = meta->indexOfMethod(sig.constData());
@@ -288,20 +466,14 @@ bool SignalProxy::attachSignal(QObject* sender, const char* signal, const QByteA
     return false;
   }
 
-  createClassInfo(sender);
-
-  SignalRelay* relay;
-  if(_relayHash.contains(sender))
-    relay = _relayHash[sender];
-  else
-    relay = _relayHash[sender] = new SignalRelay(this, sender);
-
-  relay->attachSignal(methodId, sigName);
+  createExtendedMetaObject(meta);
+  _signalRelay->attachSignal(sender, methodId, sigName);
 
+  disconnect(sender, SIGNAL(destroyed(QObject *)), this, SLOT(detachObject(QObject *)));
+  connect(sender, SIGNAL(destroyed(QObject *)), this, SLOT(detachObject(QObject *)));
   return true;
 }
 
-
 bool SignalProxy::attachSlot(const QByteArray& sigName, QObject* recv, const char* slot) {
   const QMetaObject* meta = recv->metaObject();
   int methodId = meta->indexOfMethod(meta->normalizedSignature(slot).mid(1));
@@ -310,51 +482,46 @@ bool SignalProxy::attachSlot(const QByteArray& sigName, QObject* recv, const cha
     return false;
   }
 
-  createClassInfo(recv);
+  createExtendedMetaObject(meta);
 
   QByteArray funcName = QMetaObject::normalizedSignature(sigName.constData());
   _attachedSlots.insert(funcName, qMakePair(recv, methodId));
 
-  QObject::disconnect(recv, SIGNAL(destroyed()), this, SLOT(detachSender()));
-  QObject::connect(recv, SIGNAL(destroyed()), this, SLOT(detachSender()));
+  disconnect(recv, SIGNAL(destroyed(QObject *)), this, SLOT(detachObject(QObject *)));
+  connect(recv, SIGNAL(destroyed(QObject *)), this, SLOT(detachObject(QObject *)));
   return true;
 }
 
+void SignalProxy::synchronize(SyncableObject *obj) {
+  createExtendedMetaObject(obj, true);
 
-void SignalProxy::detachSender() {
-  // this is a slot so we can bypass the QueuedConnection
-  // and if someone is forcing direct connection in a multithreaded environment he's just nuts...
-  _detachSignals(sender());
-  _detachSlots(sender());
+  // attaching as slave to receive sync Calls
+  QByteArray className(obj->syncMetaObject()->className());
+  _syncSlave[className][obj->objectName()] = obj;
+
+  if(proxyMode() == Server) {
+    obj->setInitialized();
+    emit objectInitialized(obj);
+  } else {
+    if(obj->isInitialized())
+      emit objectInitialized(obj);
+    else
+      requestInit(obj);
+  }
+
+  obj->synchronize(this);
 }
 
-// detachObject/Signals/Slots() can be called as a result of an incoming call
-// this might destroy our the iterator used for delivery
-// thus we wrap the actual disconnection by using QueuedConnections
-void SignalProxy::detachObject(QObject* obj) {
+void SignalProxy::detachObject(QObject *obj) {
   detachSignals(obj);
   detachSlots(obj);
 }
 
-void SignalProxy::detachSignals(QObject* sender) {
-  QMetaObject::invokeMethod(this, "_detachSignals",
-			    Qt::QueuedConnection,
-			    Q_ARG(QObject*, sender));
+void SignalProxy::detachSignals(QObject *sender) {
+  _signalRelay->detachSignal(sender);
 }
 
 void SignalProxy::detachSlots(QObject* receiver) {
-  QMetaObject::invokeMethod(this, "_detachSlots",
-			    Qt::QueuedConnection,
-			    Q_ARG(QObject*, receiver));
-}
-
-void SignalProxy::_detachSignals(QObject* sender) {
-  if(!_relayHash.contains(sender))
-    return;
-  _relayHash.take(sender)->deleteLater();
-}
-
-void SignalProxy::_detachSlots(QObject* receiver) {
   SlotHash::iterator slotIter = _attachedSlots.begin();
   while(slotIter != _attachedSlots.end()) {
     if(slotIter.value().first == receiver) {
@@ -364,67 +531,343 @@ void SignalProxy::_detachSlots(QObject* receiver) {
   }
 }
 
-void SignalProxy::call(const char*  signal, QVariant p1, QVariant p2, QVariant p3, QVariant p4, QVariant p5, QVariant p6, QVariant p7, QVariant p8, QVariant p9) {
-  QByteArray func = QMetaObject::normalizedSignature(signal);
-  QVariantList params;
-  params << p1 << p2 << p3 << p4 << p5 << p6 << p7 << p8 << p9;
-  call(func, params);
+void SignalProxy::stopSynchronize(SyncableObject *obj) {
+  // we can't use a className here, since it might be effed up, if we receive the call as a result of a decon
+  // 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()) && classIter.value()[obj->objectName()] == obj) {
+      classIter->remove(obj->objectName());
+      break;
+    }
+    classIter++;
+  }
+  obj->stopSynchronize(this);
 }
 
-void SignalProxy::call(const QByteArray &funcName, const QVariantList &params) {
-  QVariantList packedFunc;
-  packedFunc << funcName;
-  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);
+        if(ioPeer->isOpen())
+          ioPeer->dispatchPackedFunc(packedFunc);
+        else
+          QCoreApplication::postEvent(this, new RemovePeerEvent(peer.key()));
+      }
+      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(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;
+  }
+
+  RequestType requestType = (RequestType)params.takeFirst().value<int>();
+  receivePeerSignal(sender, requestType, params);
+}
+
+void SignalProxy::receivePeerSignal(AbstractPeer *sender, const RequestType &requestType, const QVariantList &params) {
+  switch(requestType) {
+    // list all RequestTypes that shouldnot trigger a heartbeat counter reset here
+  case HeartBeatReply:
+    break;
+  default:
+    if(sender->type() == AbstractPeer::IODevicePeer) {
+      IODevicePeer *ioPeer = static_cast<IODevicePeer *>(sender);
+      ioPeer->sentHeartBeats = 0;
+    }
+  }
+
+  // qDebug() << "SignalProxy::receivePeerSignal)" << requestType << params;
+  switch(requestType) {
+  case RpcCall:
+    if(params.empty())
+      qWarning() << "SignalProxy::receivePeerSignal(): received empty RPC-Call";
+    else
+      handleSignal(params);
+      //handleSignal(params.takeFirst().toByteArray(), params);
+    break;
+
+  case Sync:
+    handleSync(sender, params);
+    break;
+
+  case InitRequest:
+    handleInitRequest(sender, params);
+    break;
+
+  case InitData:
+    handleInitData(sender, params);
+    break;
+
+  case HeartBeat:
+    receiveHeartBeat(sender, params);
+    break;
+
+  case HeartBeatReply:
+    receiveHeartBeatReply(sender, params);
+    break;
+
+  default:
+    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(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 slot = params.takeFirst().toByteArray();
+
+  if(!_syncSlave.contains(className) || !_syncSlave[className].contains(objectName)) {
+    qWarning() << QString("no registered receiver for sync call: %1::%2 (objectName=\"%3\"). Params are:").arg(QString(className)).arg(QString(slot)).arg(objectName)
+               << params;
+    return;
+  }
+
+  SyncableObject *receiver = _syncSlave[className][objectName];
+  ExtendedMetaObject *eMeta = extendedMetaObject(receiver);
+  if(!eMeta->slotMap().contains(slot)) {
+    qWarning() << QString("no matching slot for sync call: %1::%2 (objectName=\"%3\"). Params are:").arg(QString(className)).arg(QString(slot)).arg(objectName)
+               << params;
+    return;
+  }
+
+  int slotId = eMeta->slotMap()[slot];
+  if(proxyMode() != eMeta->receiverMode(slotId)) {
+    qWarning("SignalProxy::handleSync(): invokeMethod for \"%s\" failed. Wrong ProxyMode!", eMeta->methodName(slotId).constData());
+    return;
+  }
+
+  QVariant returnValue((QVariant::Type)eMeta->returnType(slotId));
+  if(!invokeSlot(receiver, slotId, params, returnValue)) {
+    qWarning("SignalProxy::handleSync(): invokeMethod for \"%s\" failed ", eMeta->methodName(slotId).constData());
+    return;
+  }
+
+
+  if(returnValue.type() != QVariant::Invalid && eMeta->receiveMap().contains(slotId)) {
+    int receiverId = eMeta->receiveMap()[slotId];
+    QVariantList returnParams;
+    returnParams << className
+                 << objectName
+                 << eMeta->methodName(receiverId);
+    //QByteArray(receiver->metaObject()->method(receiverId).signature());
+    if(eMeta->argTypes(receiverId).count() > 1)
+      returnParams << params;
+    returnParams << returnValue;
+    sender->dispatchSignal(Sync, returnParams);
+  }
+
+  // send emit update signal
+  invokeSlot(receiver, eMeta->updatedRemotelyId());
+}
+
+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;
+    return;
+  }
+
+  if(!_syncSlave[className].contains(objectName)) {
+    qWarning() << "SignalProxy::handleInitRequest() received initRequest for unregistered Object:"
+               << className << objectName;
+    return;
+  }
+
+  SyncableObject *obj = _syncSlave[className][objectName];
+
+  QVariantList params_;
+  params_ << className
+          << objectName
+          << initData(obj);
+
+  sender->dispatchSignal(InitData, 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());
+
+  if(!_syncSlave.contains(className)) {
+    qWarning() << "SignalProxy::handleInitData() received initData for unregistered Class:"
+               << className;
+    return;
+  }
+
+  if(!_syncSlave[className].contains(objectName)) {
+    qWarning() << "SignalProxy::handleInitData() received initData for unregistered Object:"
+               << className << objectName;
+    return;
+  }
+
+  SyncableObject *obj = _syncSlave[className][objectName];
+  setInitData(obj, propertyMap);
+}
+
+//void SignalProxy::handleSignal(const QByteArray &funcName, const QVariantList &params) {
+void SignalProxy::handleSignal(const QVariantList &data) {
+  QVariantList params = data;
   QByteArray funcName = params.takeFirst().toByteArray();
-  int numParams, methodId;
-  QObject* receiver;
 
+  QObject* receiver;
+  int methodId;
   SlotHash::const_iterator slot = _attachedSlots.constFind(funcName);
   while(slot != _attachedSlots.constEnd() && slot.key() == funcName) {
     receiver = (*slot).first;
     methodId = (*slot).second;
-    numParams = argTypes(receiver, methodId).count();
-    QGenericArgument args[9];
-    for(int i = 0; i < numParams; i++)
-      args[i] = QGenericArgument(params[i].typeName(), params[i].constData());
-    if(!QMetaObject::invokeMethod(receiver, methodName(receiver, methodId),
-				  args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7], args[8])) {
-      qWarning("SignalProxy::receivePeerSignal(): invokeMethod for \"%s\" failed ", methodName(receiver, methodId).constData());
+    if(!invokeSlot(receiver, methodId, params)) {
+      ExtendedMetaObject *eMeta = extendedMetaObject(receiver);
+      qWarning("SignalProxy::handleSignal(): invokeMethod for \"%s\" failed ", eMeta->methodName(methodId).constData());
     }
     slot++;
   }
 }
 
+bool SignalProxy::invokeSlot(QObject *receiver, int methodId, const QVariantList &params, QVariant &returnValue) {
+  ExtendedMetaObject *eMeta = extendedMetaObject(receiver);
+  const QList<int> args = eMeta->argTypes(methodId);
+  const int numArgs = params.count() < args.count()
+    ? params.count()
+    : args.count();
+
+  if(eMeta->minArgCount(methodId) > params.count()) {
+      qWarning() << "SignalProxy::invokeSlot(): not enough params to invoke" << eMeta->methodName(methodId);
+      return false;
+  }
+
+  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()) {
+      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" << eMeta->methodName(methodId);
+      return false;
+    }
+    _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
+    : Qt::QueuedConnection;
+
+  if(type == Qt::DirectConnection) {
+    return receiver->qt_metacall(QMetaObject::InvokeMetaMethod, methodId, _a) < 0;
+  } else {
+    qWarning() << "Queued Connections are not implemented yet";
+    // 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(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) {
+  if(!dev)
+    return false;
+
   QDataStream in(dev);
   in.setVersion(QDataStream::Qt_4_2);
 
@@ -433,13 +876,188 @@ bool SignalProxy::readDataFromDevice(QIODevice *dev, quint32 &blockSize, QVarian
     in >> blockSize;
   }
 
+  if(blockSize > 1 << 22) {
+    disconnectDevice(dev, tr("Peer tried to send package larger than max package size!"));
+    return false;
+  }
+
+  if(blockSize == 0) {
+    disconnectDevice(dev, tr("Peer tried to send 0 byte package!"));
+    return false;
+  }
+
   if(dev->bytesAvailable() < blockSize)
     return false;
-  in >> item;
+
   blockSize = 0;
+
+  if(compressed) {
+    QByteArray rawItem;
+    in >> rawItem;
+
+    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)) {
+        disconnectDevice(dev, tr("Peer sent corrupted compressed data!"));
+        return false;
+      }
+    }
+
+    rawItem = qUncompress(rawItem);
+
+    QDataStream itemStream(&rawItem, QIODevice::ReadOnly);
+    itemStream.setVersion(QDataStream::Qt_4_2);
+    itemStream >> item;
+  } else {
+    in >> item;
+  }
+
+  if(!item.isValid()) {
+    disconnectDevice(dev, tr("Peer sent corrupt data: unable to load QVariant!"));
+    return false;
+  }
+
   return true;
 }
 
+void SignalProxy::requestInit(SyncableObject *obj) {
+  if(proxyMode() == Server || obj->isInitialized())
+    return;
+
+  QVariantList params;
+  params << obj->syncMetaObject()->className()
+         << obj->objectName();
+  dispatchSignal(InitRequest, params);
+}
+
+QVariantMap SignalProxy::initData(SyncableObject *obj) const {
+  return obj->toVariantMap();
+}
+
+void SignalProxy::setInitData(SyncableObject *obj, const QVariantMap &properties) {
+  if(obj->isInitialized())
+    return;
+  obj->fromVariantMap(properties);
+  obj->setInitialized();
+  emit objectInitialized(obj);
+  invokeSlot(obj, extendedMetaObject(obj)->updatedRemotelyId());
+}
+
+void SignalProxy::sendHeartBeat() {
+  QVariantList heartBeatParams;
+  heartBeatParams << QTime::currentTime();
+  QList<IODevicePeer *> toClose;
+
+  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(maxHeartBeatCount() >= 0 && ioPeer->sentHeartBeats >= maxHeartBeatCount())
+        toClose.append(ioPeer);
+      else
+        ioPeer->sentHeartBeats++;
+    }
+    ++peer;
+  }
+
+  foreach(IODevicePeer *ioPeer, toClose) {
+    qWarning() << "SignalProxy: Disconnecting peer:" << ioPeer->address()
+               << "(didn't receive a heartbeat for over" << ioPeer->sentHeartBeats * _heartBeatTimer.interval() / 1000 << "seconds)";
+    ioPeer->close();
+  }
+}
+
+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 PeerSignal:
+    {
+      PeerSignalEvent *e = static_cast<PeerSignalEvent *>(event);
+      receivePeerSignal(e->sender, e->requestType, e->params);
+    }
+    event->accept();
+    break;
+  case RemovePeer:
+    {
+      RemovePeerEvent *e = static_cast<RemovePeerEvent *>(event);
+      removePeer(e->peer);
+    }
+    event->accept();
+  default:
+    return;
+  }
+}
+
+void SignalProxy::sync_call__(const SyncableObject *obj, SignalProxy::ProxyMode modeType, const char *funcname, va_list ap) {
+  // qDebug() << obj << modeType << "(" << _proxyMode << ")" << funcname;
+  if(modeType != _proxyMode)
+    return;
+
+  ExtendedMetaObject *eMeta = extendedMetaObject(obj);
+
+  QVariantList params;
+  params << eMeta->metaObject()->className()
+         << obj->objectName()
+         << QByteArray(funcname);
+
+  const QList<int> &argTypes = eMeta->argTypes(eMeta->methodId(QByteArray(funcname)));
+
+  for(int i = 0; i < argTypes.size(); i++) {
+    if(argTypes[i] == 0) {
+      qWarning() << Q_FUNC_INFO << "received invalid data for argument number" << i << "of signal" << QString("%1::%2").arg(eMeta->metaObject()->className()).arg(funcname);
+      qWarning() << "        - make sure all your data types are known by the Qt MetaSystem";
+      return;
+    }
+    params << QVariant(argTypes[i], va_arg(ap, void *));
+  }
+
+  dispatchSignal(Sync, params);
+}
+
+
+
+void SignalProxy::disconnectDevice(QIODevice *dev, const QString &reason) {
+  if(!reason.isEmpty())
+    qWarning() << qPrintable(reason);
+  QAbstractSocket *sock  = qobject_cast<QAbstractSocket *>(dev);
+  if(sock)
+    qWarning() << qPrintable(tr("Disconnecting")) << qPrintable(sock->peerAddress().toString());
+  dev->close();
+}
+
+void SignalProxy::updateLag(IODevicePeer *peer, int lag) {
+  peer->lag = lag;
+  if(proxyMode() == Client) {
+    emit lagUpdated(lag);
+  }
+}
+
 void SignalProxy::dumpProxyStats() {
   QString mode;
   if(proxyMode() == Server)
@@ -447,14 +1065,184 @@ void SignalProxy::dumpProxyStats() {
   else
     mode = "Client";
 
-  int sigCount = 0;
-  foreach(SignalRelay *relay, _relayHash.values())
-    sigCount += relay->sigCount();
+  int slaveCount = 0;
+  foreach(ObjectId oid, _syncSlave.values())
+    slaveCount += oid.count();
 
   qDebug() << this;
   qDebug() << "              Proxy Mode:" << mode;
-  qDebug() << "attached sending Objects:" << _relayHash.count();
-  qDebug() << "       Number of Signals:" << sigCount;
   qDebug() << "          attached Slots:" << _attachedSlots.count();
-  qDebug() << "number of Classes cached:" << _classInfo.count();
+  qDebug() << " number of synced Slaves:" << slaveCount;
+  qDebug() << "number of Classes cached:" << _extendedMetaObjects.count();
+}
+
+void SignalProxy::updateSecureState() {
+  bool wasSecure = _secure;
+
+  _secure = !_peers.isEmpty();
+  PeerHash::const_iterator peerIter;
+  for(peerIter = _peers.constBegin(); peerIter != _peers.constEnd(); peerIter++) {
+    _secure &= (*peerIter)->isSecure();
+  }
+
+  if(wasSecure != _secure)
+    emit secureStateChanged(_secure);
+}
+
+
+// ==================================================
+//  ExtendedMetaObject
+// ==================================================
+SignalProxy::ExtendedMetaObject::ExtendedMetaObject(const QMetaObject *meta, bool checkConflicts)
+  : _meta(meta),
+    _updatedRemotelyId(_meta->indexOfSignal("updatedRemotely()"))
+{
+  for(int i = 0; i < _meta->methodCount(); i++) {
+    if(_meta->method(i).methodType() != QMetaMethod::Slot)
+      continue;
+
+    if(QByteArray(_meta->method(i).signature()).contains('*'))
+      continue; // skip methods with ptr params
+
+    QByteArray method = methodName(_meta->method(i));
+    if(method.startsWith("init"))
+      continue; // skip initializers
+
+    if(_methodIds.contains(method)) {
+      /* funny... moc creates for methods containing default parameters multiple metaMethod with separate methodIds.
+         we don't care... we just need the full fledged version
+       */
+      const QMetaMethod &current = _meta->method(_methodIds[method]);
+      const QMetaMethod &candidate = _meta->method(i);
+      if(current.parameterTypes().count() > candidate.parameterTypes().count()) {
+        int minCount = candidate.parameterTypes().count();
+        QList<QByteArray> commonParams = current.parameterTypes().mid(0, minCount);
+        if(commonParams == candidate.parameterTypes())
+          continue; // we already got the full featured version
+      } else {
+        int minCount = current.parameterTypes().count();
+        QList<QByteArray> commonParams = candidate.parameterTypes().mid(0, minCount);
+        if(commonParams == current.parameterTypes()) {
+          _methodIds[method] = i; // use the new one
+          continue;
+        }
+      }
+      if(checkConflicts) {
+        qWarning() << "class" << meta->className() << "contains overloaded methods which is currently not supported!";
+        qWarning() << " - " << _meta->method(i).signature() << "conflicts with" << _meta->method(_methodIds[method]).signature();
+      }
+      continue;
+    }
+    _methodIds[method] = i;
+  }
+}
+
+const SignalProxy::ExtendedMetaObject::MethodDescriptor &SignalProxy::ExtendedMetaObject::methodDescriptor(int methodId) {
+  if(!_methods.contains(methodId)) {
+    _methods[methodId] = MethodDescriptor(_meta->method(methodId));
+  }
+  return _methods[methodId];
+}
+
+const QHash<int, int> &SignalProxy::ExtendedMetaObject::receiveMap() {
+  if(_receiveMap.isEmpty()) {
+    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(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;
+      }
+    }
+    _receiveMap = receiveMap;
+  }
+  return _receiveMap;
 }
+
+QByteArray SignalProxy::ExtendedMetaObject::methodName(const QMetaMethod &method) {
+  QByteArray sig(method.signature());
+  return sig.left(sig.indexOf("("));
+}
+
+QString SignalProxy::ExtendedMetaObject::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
+    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
+    upperCharPos = methodname.lastIndexOf(QRegExp("[A-Z]"));
+    if(upperCharPos == -1)
+      return QString();
+    methodname = methodname.left(upperCharPos);
+  }
+
+  methodname[0] = methodname[0].toUpper();
+
+  return methodname;
+}
+
+SignalProxy::ExtendedMetaObject::MethodDescriptor::MethodDescriptor(const QMetaMethod &method)
+  : _methodName(SignalProxy::ExtendedMetaObject::methodName(method)),
+    _returnType(QMetaType::type(method.typeName()))
+{
+  // determine argTypes
+  QList<QByteArray> paramTypes = method.parameterTypes();
+  QList<int> argTypes;
+  for(int i = 0; i < paramTypes.count(); i++) {
+    argTypes.append(QMetaType::type(paramTypes[i]));
+  }
+  _argTypes = argTypes;
+
+  // determine minArgCount
+  QString signature(method.signature());
+  _minArgCount = method.parameterTypes().count() - signature.count("=");
+
+  _receiverMode = (_methodName.startsWith("request"))
+    ? SignalProxy::Server
+    : SignalProxy::Client;
+}
+