// ==================================================
class PeerSignalEvent : public QEvent {
public:
- PeerSignalEvent(SignalProxy *sender, SignalProxy::RequestType requestType, const QVariantList ¶ms) : QEvent(QEvent::User), sender(sender), requestType(requestType), params(params) {}
+ PeerSignalEvent(SignalProxy *sender, SignalProxy::RequestType requestType, const QVariantList ¶ms) : QEvent(QEvent::Type(SignalProxy::PeerSignal)), sender(sender), requestType(requestType), params(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
// ==================================================
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()));
- }
-
- if(!sock->parent())
- sock->setParent(this);
+ if(!iodev->parent())
+ iodev->setParent(this);
_peers[iodev] = new IODevicePeer(iodev, iodev->property("UseCompression").toBool());
proxy->removePeer(this);
}
-
if(dev->parent() == this)
dev->deleteLater();
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:
}
if(blockSize > 1 << 22) {
- qWarning() << qPrintable(tr("Client tried to send package larger than max package size!"));
- QAbstractSocket *sock = qobject_cast<QAbstractSocket *>(dev);
- qWarning() << qPrintable(tr("Disconnecting")) << (sock ? qPrintable(sock->peerAddress().toString()) : qPrintable(tr("local client")));
- dev->close();
+ disconnectDevice(dev, tr("Client tried to send package larger than max package size!"));
+ return false;
+ }
+
+ if(blockSize == 0) {
+ disconnectDevice(dev, tr("Client tried to send 0 byte package!"));
return false;
}
if(dev->bytesAvailable() < blockSize)
return false;
+ blockSize = 0;
+
if(compressed) {
QByteArray rawItem;
in >> rawItem;
- // debug check
+
int nbytes = rawItem.size();
- if (nbytes <= 4) {
+ if(nbytes <= 4) {
const char *data = rawItem.constData();
- if (nbytes < 4 || (data[0]!=0 || data[1]!=0 || data[2]!=0 || data[3]!=0))
- qWarning() << "receieved corrupted compressed data:"
- << blockSize << rawItem << rawItem.size() << dev;
+ if(nbytes < 4 || (data[0]!=0 || data[1]!=0 || data[2]!=0 || data[3]!=0)) {
+ disconnectDevice(dev, tr("Client sent corrupted compressed data!"));
+ return false;
+ }
}
- // end
+
rawItem = qUncompress(rawItem);
QDataStream itemStream(&rawItem, QIODevice::ReadOnly);
in >> item;
}
- blockSize = 0;
+ if(!item.isValid()) {
+ disconnectDevice(dev, tr("Client sent corrupt data: unable to load QVariant!"));
+ return false;
+ }
return true;
}
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;
+ case RemovePeer:
+ {
+ RemovePeerEvent *e = static_cast<RemovePeerEvent *>(event);
+ removePeer(e->peer);
+ }
+ event->accept();
default:
return;
}
}
+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) {