/***************************************************************************
- * Copyright (C) 2005-2015 by the Quassel Project *
+ * Copyright (C) 2005-2016 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
break;
}
else {
- slotIter++;
+ ++slotIter;
}
}
}
for (int i = 0; i < argTypes.size(); i++) {
if (argTypes[i] == 0) {
#if QT_VERSION >= 0x050000
- 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).methodSignature().constData());
+ qWarning() << "SignalRelay::qt_metacall(): received invalid data for argument number" << i << "of signal" << QString("%1::%2").arg(caller->metaObject()->className()).arg(caller->metaObject()->method(signal.signalId).methodSignature().constData());
#else
- 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() << "SignalRelay::qt_metacall(): received invalid data for argument number" << i << "of signal" << QString("%1::%2").arg(caller->metaObject()->className()).arg(caller->metaObject()->method(signal.signalId).signature());
#endif
qWarning() << " - make sure all your data types are known by the Qt MetaSystem";
return _id;
params << QVariant(argTypes[i], _a[i+1]);
}
- if (argTypes.size() >= 1 && argTypes[0] == qMetaTypeId<PeerPtr>() && proxy()->proxyMode() == SignalProxy::Server) {
- Peer *peer = params[0].value<PeerPtr>();
- proxy()->dispatch(peer, RpcCall(signal.signature, params));
+ if (proxy()->_restrictMessageTarget) {
+ for (auto peer : proxy()->_restrictedTargets) {
+ if (peer != nullptr)
+ proxy()->dispatch(peer, RpcCall(signal.signature, params));
+ }
} else
proxy()->dispatch(RpcCall(signal.signature, params));
}
objIter = classIter->erase(objIter);
obj->stopSynchronize(this);
}
- classIter++;
+ ++classIter;
}
_syncSlave.clear();
if (!peer->parent())
peer->setParent(this);
+ if (peer->_id < 0) {
+ peer->_id = nextPeerId();
+ peer->_connectedSince = QDateTime::currentDateTimeUtc();
+ }
+
_peers.insert(peer);
+ _peerMap[peer->_id] = peer;
peer->setSignalProxy(this);
disconnect(peer, 0, this, 0);
peer->setSignalProxy(0);
+ _peerMap.remove(peer->_id);
_peers.remove(peer);
emit peerRemoved(peer);
slotIter = _attachedSlots.erase(slotIter);
}
else
- slotIter++;
+ ++slotIter;
}
}
classIter->remove(obj->objectName());
break;
}
- classIter++;
+ ++classIter;
}
obj->stopSynchronize(this);
}
qWarning() << "SignalProxy::invokeSlot(): incompatible param types to invoke" << eMeta->methodName(methodId);
return false;
}
- // if first arg is a PeerPtr, replace it by the address of the peer originally receiving the RpcCall
- if (peer && i == 0 && args[0] == qMetaTypeId<PeerPtr>()) {
- QVariant v = QVariant::fromValue<PeerPtr>(peer);
- _a[1] = const_cast<void*>(v.constData());
- } else
- _a[i+1] = const_cast<void *>(params[i].constData());
+
+ _a[i+1] = const_cast<void *>(params[i].constData());
}
if (returnValue.type() != QVariant::Invalid)
: Qt::QueuedConnection;
if (type == Qt::DirectConnection) {
- return receiver->qt_metacall(QMetaObject::InvokeMetaMethod, methodId, _a) < 0;
- }
- else {
+ _sourcePeer = peer;
+ auto result = receiver->qt_metacall(QMetaObject::InvokeMetaMethod, methodId, _a) < 0;
+ _sourcePeer = nullptr;
+ return result;
+ } else {
qWarning() << "Queued Connections are not implemented yet";
// note to self: qmetaobject.cpp:990 ff
return false;
params << QVariant(argTypes[i], va_arg(ap, void *));
}
- if (argTypes.size() >= 1 && argTypes[0] == qMetaTypeId<PeerPtr>() && proxyMode() == SignalProxy::Server) {
- Peer *peer = params[0].value<PeerPtr>();
- dispatch(peer, SyncMessage(eMeta->metaObject()->className(), obj->objectName(), QByteArray(funcname), params));
+ if (_restrictMessageTarget) {
+ for (auto peer : _restrictedTargets) {
+ if (peer != nullptr)
+ dispatch(peer, SyncMessage(eMeta->metaObject()->className(), obj->objectName(), QByteArray(funcname), params));
+ }
} else
dispatch(SyncMessage(eMeta->metaObject()->className(), obj->objectName(), QByteArray(funcname), params));
}
emit secureStateChanged(_secure);
}
+QVariantList SignalProxy::peerData() {
+ QVariantList result;
+ for (auto peer : _peers) {
+ QVariantMap data;
+ data["id"] = peer->_id;
+ data["clientVersion"] = peer->_clientVersion;
+ data["clientVersionDate"] = peer->_buildDate;
+ data["remoteAddress"] = peer->address();
+ data["connectedSince"] = peer->_connectedSince;
+ data["secure"] = peer->isSecure();
+ result << data;
+ }
+ return result;
+}
+
+Peer *SignalProxy::peerById(int peerId) {
+ return _peerMap[peerId];
+}
+
+void SignalProxy::restrictTargetPeers(QSet<Peer*> peers, std::function<void()> closure)
+{
+ auto previousRestrictMessageTarget = _restrictMessageTarget;
+ auto previousRestrictedTargets = _restrictedTargets;
+ _restrictMessageTarget = true;
+ _restrictedTargets = peers;
+
+ closure();
+
+ _restrictMessageTarget = previousRestrictMessageTarget;
+ _restrictedTargets = previousRestrictedTargets;
+}
// ==================================================
// ExtendedMetaObject