SignanlProxy does no longer try to write to closed devices. Also closed devices can...

diff --git a/src/common/signalproxy.cpp b/src/common/signalproxy.cpp
index 82db1ab..7808ad1 100644 (file)
--- a/src/common/signalproxy.cpp
+++ b/src/common/signalproxy.cpp
@@ -45,12 +45,18 @@
 // ==================================================
 class PeerSignalEvent : public QEvent {
 public:
 // ==================================================
 class PeerSignalEvent : public QEvent {
 public:

-  PeerSignalEvent(SignalProxy *sender, SignalProxy::RequestType requestType, const QVariantList &params) : QEvent(QEvent::User), sender(sender), requestType(requestType), params(params) {}
+  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;
 };
 
   SignalProxy *sender;
   SignalProxy::RequestType requestType;
   QVariantList params;
 };
 

+class RemovePeerEvent : public QEvent {
+public:
+  RemovePeerEvent(QObject *peer) : QEvent(QEvent::Type(SignalProxy::RemovePeer)), peer(peer) {}
+  QObject *peer;
+};
+

 // ==================================================
 //  SIGNALRELAY
 // ==================================================
 // ==================================================
 //  SIGNALRELAY
 // ==================================================


@@ -306,19 +312,16 @@ bool SignalProxy::addPeer(QIODevice* iodev) {
     return false;
   }
 
     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()));
 
 
   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()));
-  }
-
-  if(!sock->parent())
-    sock->setParent(this);
+  if(!iodev->parent())
+    iodev->setParent(this);

 
   _peers[iodev] = new IODevicePeer(iodev, iodev->property("UseCompression").toBool());
 
 
   _peers[iodev] = new IODevicePeer(iodev, iodev->property("UseCompression").toBool());
 


@@ -759,7 +762,10 @@ void SignalProxy::dispatchSignal(const RequestType &requestType, const QVariantL
     case AbstractPeer::IODevicePeer:
       {
        IODevicePeer *ioPeer = static_cast<IODevicePeer *>(*peer);
     case AbstractPeer::IODevicePeer:
       {
        IODevicePeer *ioPeer = static_cast<IODevicePeer *>(*peer);

-       ioPeer->dispatchPackedFunc(packedFunc);
+       if(ioPeer->isOpen())
+         ioPeer->dispatchPackedFunc(packedFunc);
+       else
+         QCoreApplication::postEvent(this, new RemovePeerEvent(peer.key()));

       }
       break;
     case AbstractPeer::SignalProxyPeer:
       }
       break;
     case AbstractPeer::SignalProxyPeer:


@@ -1201,13 +1207,19 @@ void SignalProxy::receiveHeartBeatReply(AbstractPeer *peer, const QVariantList &
 
 void SignalProxy::customEvent(QEvent *event) {
   switch(event->type()) {
 
 void SignalProxy::customEvent(QEvent *event) {
   switch(event->type()) {

-  case QEvent::User:
+  case PeerSignal:

     {
     {

-      PeerSignalEvent *sig = static_cast<PeerSignalEvent *>(event);
-      receivePeerSignal(sig->sender, sig->requestType, sig->params);
+      PeerSignalEvent *e = static_cast<PeerSignalEvent *>(event);
+      receivePeerSignal(e->sender, e->requestType, e->params);

     }
     event->accept();
     break;
     }
     event->accept();
     break;

+  case RemovePeer:
+    {
+      RemovePeerEvent *e = static_cast<RemovePeerEvent *>(event);
+      removePeer(e->peer);
+    }
+    event->accept();

   default:
     return;
   }
   default:
     return;
   }

diff --git a/src/common/signalproxy.h b/src/common/signalproxy.h
index 76ed4d5..755461e 100644 (file)
--- a/src/common/signalproxy.h
+++ b/src/common/signalproxy.h
@@ -21,6 +21,7 @@
 #ifndef SIGNALPROXY_H
 #define SIGNALPROXY_H
 
 #ifndef SIGNALPROXY_H
 #define SIGNALPROXY_H
 

+#include <QEvent>

 #include <QList>
 #include <QHash>
 #include <QVariant>
 #include <QList>
 #include <QHash>
 #include <QVariant>


@@ -60,6 +61,11 @@ public:
     IODeviceConnection
   };
 
     IODeviceConnection
   };
 

+  enum CustomEvents {
+    PeerSignal = QEvent::User,
+    RemovePeer
+  };
+

   SignalProxy(QObject *parent);
   SignalProxy(ProxyMode mode, QObject *parent);
   SignalProxy(ProxyMode mode, QIODevice *device, QObject *parent);
   SignalProxy(QObject *parent);
   SignalProxy(ProxyMode mode, QObject *parent);
   SignalProxy(ProxyMode mode, QIODevice *device, QObject *parent);