/***************************************************************************
- * Copyright (C) 2005-2013 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 *
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
-#include "signalproxy.h"
-
-#include <QObject>
-#include <QIODevice>
-#include <QAbstractSocket>
+#include <QCoreApplication>
#include <QHostAddress>
-#include <QHash>
-#include <QMultiHash>
-#include <QList>
-#include <QSet>
-#include <QDebug>
#include <QMetaMethod>
#include <QMetaProperty>
-#include <QRegExp>
+#include <QThread>
+
#ifdef HAVE_SSL
-#include <QSslSocket>
+ #include <QSslSocket>
#endif
-#include <QThread>
-#include <QTime>
-#include <QEvent>
-#include <QCoreApplication>
+#include "signalproxy.h"
+
+#include "peer.h"
#include "protocol.h"
#include "syncableobject.h"
#include "util.h"
+#include "types.h"
using namespace Protocol;
class RemovePeerEvent : public QEvent
{
public:
- RemovePeerEvent(SignalProxy::AbstractPeer *peer) : QEvent(QEvent::Type(SignalProxy::RemovePeerEvent)), peer(peer) {}
- SignalProxy::AbstractPeer *peer;
+ RemovePeerEvent(Peer *peer) : QEvent(QEvent::Type(SignalProxy::RemovePeerEvent)), peer(peer) {}
+ Peer *peer;
};
}
else {
fn = SIGNAL(fakeMethodSignature());
+#if QT_VERSION >= 0x050000
+ fn = fn.replace("fakeMethodSignature()", sender->metaObject()->method(signalId).methodSignature());
+#else
fn = fn.replace("fakeMethodSignature()", sender->metaObject()->method(signalId).signature());
+#endif
}
_slots[slotId] = Signal(sender, signalId, fn);
break;
}
else {
- slotIter++;
+ ++slotIter;
}
}
}
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());
+#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(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(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]);
}
- proxy()->dispatch(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));
}
_id -= _slots.count();
}
objIter = classIter->erase(objIter);
obj->stopSynchronize(this);
}
- classIter++;
+ ++classIter;
}
_syncSlave.clear();
}
-bool SignalProxy::addPeer(AbstractPeer *peer)
+bool SignalProxy::addPeer(Peer *peer)
{
if (!peer)
return false;
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);
{
Q_ASSERT(proxyMode() == Server || _peers.count() <= 1);
// wee need to copy that list since we modify it in the loop
- QSet<AbstractPeer *> peers = _peers;
- foreach(AbstractPeer *peer, peers) {
+ QSet<Peer *> peers = _peers;
+ foreach(Peer *peer, peers) {
removePeer(peer);
}
}
-void SignalProxy::removePeer(AbstractPeer *peer)
+void SignalProxy::removePeer(Peer *peer)
{
if (!peer) {
qWarning() << Q_FUNC_INFO << "Trying to remove a null peer!";
disconnect(peer, 0, this, 0);
peer->setSignalProxy(0);
+ _peerMap.remove(peer->_id);
_peers.remove(peer);
emit peerRemoved(peer);
void SignalProxy::removePeerBySender()
{
- removePeer(qobject_cast<SignalProxy::AbstractPeer *>(sender()));
+ removePeer(qobject_cast<Peer *>(sender()));
}
slotIter = _attachedSlots.erase(slotIter);
}
else
- slotIter++;
+ ++slotIter;
}
}
classIter->remove(obj->objectName());
break;
}
- classIter++;
+ ++classIter;
}
obj->stopSynchronize(this);
}
template<class T>
void SignalProxy::dispatch(const T &protoMessage)
{
- foreach (AbstractPeer *peer, _peers) {
+ foreach (Peer *peer, _peers) {
if (peer->isOpen())
peer->dispatch(protoMessage);
else
}
-void SignalProxy::handle(SignalProxy::AbstractPeer *peer, const SyncMessage &syncMessage)
+template<class T>
+void SignalProxy::dispatch(Peer *peer, const T &protoMessage)
{
- if (!_syncSlave.contains(syncMessage.className()) || !_syncSlave[syncMessage.className()].contains(syncMessage.objectName())) {
- qWarning() << QString("no registered receiver for sync call: %1::%2 (objectName=\"%3\"). Params are:").arg(syncMessage.className(), syncMessage.slotName(), syncMessage.objectName())
- << syncMessage.params();
+ if (peer && peer->isOpen())
+ peer->dispatch(protoMessage);
+ else
+ QCoreApplication::postEvent(this, new ::RemovePeerEvent(peer));
+}
+
+
+void SignalProxy::handle(Peer *peer, const SyncMessage &syncMessage)
+{
+ if (!_syncSlave.contains(syncMessage.className) || !_syncSlave[syncMessage.className].contains(syncMessage.objectName)) {
+ qWarning() << QString("no registered receiver for sync call: %1::%2 (objectName=\"%3\"). Params are:").arg(syncMessage.className, syncMessage.slotName, syncMessage.objectName)
+ << syncMessage.params;
return;
}
- SyncableObject *receiver = _syncSlave[syncMessage.className()][syncMessage.objectName()];
+ SyncableObject *receiver = _syncSlave[syncMessage.className][syncMessage.objectName];
ExtendedMetaObject *eMeta = extendedMetaObject(receiver);
- if (!eMeta->slotMap().contains(syncMessage.slotName())) {
- qWarning() << QString("no matching slot for sync call: %1::%2 (objectName=\"%3\"). Params are:").arg(syncMessage.className(), syncMessage.slotName(), syncMessage.objectName())
- << syncMessage.params();
+ if (!eMeta->slotMap().contains(syncMessage.slotName)) {
+ qWarning() << QString("no matching slot for sync call: %1::%2 (objectName=\"%3\"). Params are:").arg(syncMessage.className, syncMessage.slotName, syncMessage.objectName)
+ << syncMessage.params;
return;
}
- int slotId = eMeta->slotMap()[syncMessage.slotName()];
+ int slotId = eMeta->slotMap()[syncMessage.slotName];
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, syncMessage.params(), returnValue)) {
+ // We can no longer construct a QVariant from QMetaType::Void
+ QVariant returnValue;
+ int returnType = eMeta->returnType(slotId);
+ if (returnType != QMetaType::Void)
+ returnValue = QVariant(static_cast<QVariant::Type>(returnType));
+
+ if (!invokeSlot(receiver, slotId, syncMessage.params, returnValue, peer)) {
qWarning("SignalProxy::handleSync(): invokeMethod for \"%s\" failed ", eMeta->methodName(slotId).constData());
return;
}
int receiverId = eMeta->receiveMap()[slotId];
QVariantList returnParams;
if (eMeta->argTypes(receiverId).count() > 1)
- returnParams << syncMessage.params();
+ returnParams << syncMessage.params;
returnParams << returnValue;
- peer->dispatch(SyncMessage(syncMessage.className(), syncMessage.objectName(), eMeta->methodName(receiverId), returnParams));
+ peer->dispatch(SyncMessage(syncMessage.className, syncMessage.objectName, eMeta->methodName(receiverId), returnParams));
}
// send emit update signal
}
-void SignalProxy::handle(SignalProxy::AbstractPeer *peer, const InitRequest &initRequest)
+void SignalProxy::handle(Peer *peer, const InitRequest &initRequest)
{
- if (!_syncSlave.contains(initRequest.className())) {
+ if (!_syncSlave.contains(initRequest.className)) {
qWarning() << "SignalProxy::handleInitRequest() received initRequest for unregistered Class:"
- << initRequest.className();
+ << initRequest.className;
return;
}
- if (!_syncSlave[initRequest.className()].contains(initRequest.objectName())) {
+ if (!_syncSlave[initRequest.className].contains(initRequest.objectName)) {
qWarning() << "SignalProxy::handleInitRequest() received initRequest for unregistered Object:"
- << initRequest.className() << initRequest.objectName();
+ << initRequest.className << initRequest.objectName;
return;
}
- SyncableObject *obj = _syncSlave[initRequest.className()][initRequest.objectName()];
- peer->dispatch(InitData(initRequest.className(), initRequest.objectName(), initData(obj)));
+ SyncableObject *obj = _syncSlave[initRequest.className][initRequest.objectName];
+ peer->dispatch(InitData(initRequest.className, initRequest.objectName, initData(obj)));
}
-void SignalProxy::handle(SignalProxy::AbstractPeer *peer, const InitData &initData)
+void SignalProxy::handle(Peer *peer, const InitData &initData)
{
Q_UNUSED(peer)
- if (!_syncSlave.contains(initData.className())) {
+ if (!_syncSlave.contains(initData.className)) {
qWarning() << "SignalProxy::handleInitData() received initData for unregistered Class:"
- << initData.className();
+ << initData.className;
return;
}
- if (!_syncSlave[initData.className()].contains(initData.objectName())) {
+ if (!_syncSlave[initData.className].contains(initData.objectName)) {
qWarning() << "SignalProxy::handleInitData() received initData for unregistered Object:"
- << initData.className() << initData.objectName();
+ << initData.className << initData.objectName;
return;
}
- SyncableObject *obj = _syncSlave[initData.className()][initData.objectName()];
- setInitData(obj, initData.initData());
+ SyncableObject *obj = _syncSlave[initData.className][initData.objectName];
+ setInitData(obj, initData.initData);
}
-void SignalProxy::handle(SignalProxy::AbstractPeer *peer, const RpcCall &rpcCall)
+void SignalProxy::handle(Peer *peer, const RpcCall &rpcCall)
{
- Q_UNUSED(peer)
-
QObject *receiver;
int methodId;
- SlotHash::const_iterator slot = _attachedSlots.constFind(rpcCall.slotName());
- while (slot != _attachedSlots.constEnd() && slot.key() == rpcCall.slotName()) {
+ SlotHash::const_iterator slot = _attachedSlots.constFind(rpcCall.slotName);
+ while (slot != _attachedSlots.constEnd() && slot.key() == rpcCall.slotName) {
receiver = (*slot).first;
methodId = (*slot).second;
- if (!invokeSlot(receiver, methodId, rpcCall.params())) {
+ if (!invokeSlot(receiver, methodId, rpcCall.params, peer)) {
ExtendedMetaObject *eMeta = extendedMetaObject(receiver);
qWarning("SignalProxy::handleSignal(): invokeMethod for \"%s\" failed ", eMeta->methodName(methodId).constData());
}
}
-bool SignalProxy::invokeSlot(QObject *receiver, int methodId, const QVariantList ¶ms, QVariant &returnValue)
+bool SignalProxy::invokeSlot(QObject *receiver, int methodId, const QVariantList ¶ms, QVariant &returnValue, Peer *peer)
{
ExtendedMetaObject *eMeta = extendedMetaObject(receiver);
const QList<int> args = eMeta->argTypes(methodId);
// check for argument compatibility and build params array
for (int i = 0; i < numArgs; i++) {
if (!params[i].isValid()) {
+#if QT_VERSION >= 0x050000
+ qWarning() << "SignalProxy::invokeSlot(): received invalid data for argument number" << i << "of method" << QString("%1::%2()").arg(receiver->metaObject()->className()).arg(receiver->metaObject()->method(methodId).methodSignature().constData());
+#else
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());
+#endif
qWarning() << " - make sure all your data types are known by the Qt MetaSystem";
return false;
}
qWarning() << "SignalProxy::invokeSlot(): incompatible param types to invoke" << eMeta->methodName(methodId);
return false;
}
+
_a[i+1] = const_cast<void *>(params[i].constData());
}
: 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;
}
-bool SignalProxy::invokeSlot(QObject *receiver, int methodId, const QVariantList ¶ms)
+bool SignalProxy::invokeSlot(QObject *receiver, int methodId, const QVariantList ¶ms, Peer *peer)
{
QVariant ret;
- return invokeSlot(receiver, methodId, params, ret);
+ return invokeSlot(receiver, methodId, params, ret, peer);
}
params << QVariant(argTypes[i], va_arg(ap, void *));
}
- dispatch(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));
}
bool wasSecure = _secure;
_secure = !_peers.isEmpty();
- foreach (const AbstractPeer *peer, _peers) {
+ foreach (const Peer *peer, _peers) {
_secure &= peer->isSecure();
}
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
if (_meta->method(i).methodType() != QMetaMethod::Slot)
continue;
+#if QT_VERSION >= 0x050000
+ if (_meta->method(i).methodSignature().contains('*'))
+#else
if (QByteArray(_meta->method(i).signature()).contains('*'))
+#endif
continue; // skip methods with ptr params
QByteArray method = methodName(_meta->method(i));
}
if (checkConflicts) {
qWarning() << "class" << meta->className() << "contains overloaded methods which is currently not supported!";
+#if QT_VERSION >= 0x050000
+ qWarning() << " - " << _meta->method(i).methodSignature() << "conflicts with" << _meta->method(_methodIds[method]).methodSignature();
+#else
qWarning() << " - " << _meta->method(i).signature() << "conflicts with" << _meta->method(_methodIds[method]).signature();
+#endif
}
continue;
}
if (QMetaType::Void == (QMetaType::Type)returnType(i))
continue;
+#if QT_VERSION >= 0x050000
+ signature = requestSlot.methodSignature();
+#else
signature = QByteArray(requestSlot.signature());
+#endif
if (!signature.startsWith("request"))
continue;
QByteArray SignalProxy::ExtendedMetaObject::methodName(const QMetaMethod &method)
{
+#if QT_VERSION >= 0x050000
+ QByteArray sig(method.methodSignature());
+#else
QByteArray sig(method.signature());
+#endif
return sig.left(sig.indexOf("("));
}
QString SignalProxy::ExtendedMetaObject::methodBaseName(const QMetaMethod &method)
{
+#if QT_VERSION >= 0x050000
+ QString methodname = QString(method.methodSignature()).section("(", 0, 0);
+#else
QString methodname = QString(method.signature()).section("(", 0, 0);
+#endif
// determine where we have to chop:
int upperCharPos;
_argTypes = argTypes;
// determine minArgCount
+#if QT_VERSION >= 0x050000
+ QString signature(method.methodSignature());
+#else
QString signature(method.signature());
+#endif
_minArgCount = method.parameterTypes().count() - signature.count("=");
_receiverMode = (_methodName.startsWith("request"))
projects / quassel.git / blobdiff