// ==================================================
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
// ==================================================
void setSynchronize(bool);
bool synchronize() const;
-
+
int sigCount() const;
-
+
private:
bool isSyncMethod(int i);
-
+
SignalProxy* proxy;
QObject* caller;
QMultiHash<int, QByteArray> sigNames;
proxy->dispatchSignal(SignalProxy::RpcCall, QVariantList() << funcIter.value() << params);
funcIter++;
}
-
+
// dispatch Sync Signal if necessary
QByteArray signature(caller->metaObject()->method(_id).signature());
SyncableObject *syncObject = qobject_cast<SyncableObject *>(caller);
QByteArray signature = syncObject->syncMetaObject()->method(i).signature();
if(!proxy->syncMap(syncObject).contains(signature))
return false;
-
+
if(proxy->proxyMode() == SignalProxy::Server && !signature.contains("Requested"))
return true;
dispatchPackedFunc(QVariant(packedFunc));
}
+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 ¶ms) {
Qt::ConnectionType type = QThread::currentThread() == receiver->thread()
? Qt::DirectConnection
setProxyMode(mode);
addPeer(device);
init();
-}
+}
SignalProxy::~SignalProxy() {
QList<QObject*> senders = _relayHash.keys();
bool SignalProxy::addPeer(QIODevice* iodev) {
if(!iodev)
return false;
-
+
if(_peers.contains(iodev))
return true;
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(!iodev->parent())
+ iodev->setParent(this);
_peers[iodev] = new IODevicePeer(iodev, iodev->property("UseCompression").toBool());
}
_peers[proxy] = new SignalProxyPeer(this, proxy);
-
proxy->addPeer(this);
if(_peers.count() == 1)
if(peer->type() == AbstractPeer::IODevicePeer)
emit peerRemoved(static_cast<QIODevice *>(dev));
+ 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;
if(_peers.isEmpty())
if(proxyMode() == Client)
return;
-
+
QVariantList params;
params << "__objectRenamed__" << className << newname << oldname;
dispatchSignal(RpcCall, params);
void SignalProxy::setSyncMap(SyncableObject *obj) {
const QMetaObject *meta = obj->syncMetaObject();
QHash<QByteArray, int> syncMap;
-
+
QList<int> slotIndexes;
for(int i = 0; i < meta->methodCount(); i++) {
if(meta->method(i).methodType() == QMetaMethod::Slot)
signature = QByteArray(requestSlot.signature());
if(!signature.startsWith("request"))
continue;
-
+
paramsPos = signature.indexOf('(');
if(paramsPos == -1)
continue;
if(receiverId != -1)
receiveMap[i] = receiverId;
}
- _classInfo[meta]->receiveMap = receiveMap;
+ _classInfo[meta]->receiveMap = receiveMap;
}
const QHash<int, int> &SignalProxy::receiveMap(SyncableObject *obj) {
void SignalProxy::synchronize(SyncableObject *obj) {
createClassInfo(obj);
setUpdatedRemotelyId(obj);
-
+
// attaching all the Signals
SignalRelay* relay;
if(_relayHash.contains(obj))
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:
RequestType requestType = (RequestType)params.takeFirst().value<int>();
receivePeerSignal(sender, requestType, params);
}
-
+
void SignalProxy::receivePeerSignal(AbstractPeer *sender, const RequestType &requestType, const QVariantList ¶ms) {
switch(requestType) {
case RpcCall:
case Sync:
handleSync(sender, params);
break;
-
+
case InitRequest:
handleInitRequest(sender, params);
break;
-
+
case InitData:
handleInitData(sender, params);
break;
-
+
case HeartBeat:
receiveHeartBeat(sender, params);
break;
qWarning() << "received invalid Sync call" << params;
return;
}
-
+
QByteArray className = params.takeFirst().toByteArray();
QString objectName = params.takeFirst().toString();
QByteArray signal = params.takeFirst().toByteArray();
returnParams << returnValue;
sender->dispatchSignal(Sync, returnParams);
}
-
+
// send emit update signal
invokeSlot(receiver, updatedRemotelyId(receiver));
}
<< 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;
<< className << objectName;
return;
}
-
+
SyncableObject *obj = _syncSlave[className][objectName];
QVariantList params_;
<< params;
return;
}
-
+
QByteArray className(params[0].toByteArray());
QString objectName(params[1].toString());
QVariantMap propertyMap(params[2].toMap());
return false;
}
- void *_a[] = {0, // return type...
+ 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};
if(returnValue.type() != QVariant::Invalid)
_a[0] = const_cast<void *>(returnValue.constData());
-
+
Qt::ConnectionType type = QThread::currentThread() == receiver->thread()
? Qt::DirectConnection
: Qt::QueuedConnection;
// note to self: qmetaobject.cpp:990 ff
return false;
}
-
+
}
bool SignalProxy::invokeSlot(QObject *receiver, int methodId, const QVariantList ¶ms) {
QDataStream out(&block, QIODevice::WriteOnly);
out.setVersion(QDataStream::Qt_4_2);
out << (quint32)0;
-
+
if(compressed) {
QByteArray rawItem;
QDataStream itemStream(&rawItem, QIODevice::WriteOnly);
}
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);
itemStream.setVersion(QDataStream::Qt_4_2);
itemStream >> item;
in >> item;
}
- blockSize = 0;
+ if(!item.isValid()) {
+ disconnectDevice(dev, tr("Client sent corrupt data: unable to load QVariant!"));
+ return false;
+ }
return true;
}
}
void SignalProxy::sendHeartBeat() {
- dispatchSignal(SignalProxy::HeartBeat, QVariantList() << QTime::currentTime());
+ QVariantList heartBeatParams;
+ heartBeatParams << QTime::currentTime();
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(ioPeer->sentHeartBeats > 1) {
- //FIXME: proper disconnect.
-// QAbstractSocket *socket = qobject_cast<QAbstractSocket *>(peerIter.key());
-// qWarning() << "SignalProxy: Disconnecting peer:"
-// << (socket ? qPrintable(socket->peerAddress().toString()) : "local client")
-// << "(didn't receive a heartbeat for over" << peerIter->sentHeartBeats * _heartBeatTimer.interval() / 1000 << "seconds)";
-// peerIter.key()->close();
+ qWarning() << "SignalProxy: Disconnecting peer:" << ioPeer->address()
+ << "(didn't receive a heartbeat for over" << ioPeer->sentHeartBeats * _heartBeatTimer.interval() / 1000 << "seconds)";
+ ioPeer->close();
} else {
ioPeer->sentHeartBeats++;
}
ioPeer->sentHeartBeats = 0;
if(params.isEmpty()) {
- qWarning() << "SignalProxy: received heart beat reply with less params then sent from:" << ioPeer->device();
+ 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 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) {
int slaveCount = 0;
foreach(ObjectId oid, _syncSlave.values())
slaveCount += oid.count();
-
+
qDebug() << this;
qDebug() << " Proxy Mode:" << mode;
qDebug() << "attached sending Objects:" << _relayHash.count();
QHash<QByteArray, int> syncMap_ = syncMap(object);
QHash<QByteArray, int>::const_iterator iter = syncMap_.constBegin();
while(iter != syncMap_.constEnd()) {
- qDebug() << iter.key() << "-->" << iter.value() << meta->method(iter.value()).signature();
+ qDebug() << iter.key() << "-->" << iter.value() << meta->method(iter.value()).signature();
iter++;
}
// QHash<int, int> syncMap_ = syncMap(object);
// QHash<int, int>::const_iterator iter = syncMap_.constBegin();
// while(iter != syncMap_.constEnd()) {
-// qDebug() << iter.key() << meta->method(iter.key()).signature() << "-->" << iter.value() << meta->method(iter.value()).signature();
+// qDebug() << iter.key() << meta->method(iter.key()).signature() << "-->" << iter.value() << meta->method(iter.value()).signature();
// iter++;
// }
}
projects / quassel.git / blobdiff