X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fsignalproxy.cpp;h=8499e1ada965b2e94895d41f21bd780b1b7cff35;hp=e65f09ff23240d0c17515348f9290bb3333713f3;hb=2c4e055125a3e3ab7a2bd0d9c0ea33415f6ce7cc;hpb=f44459818f34b556df8ff2f400098c50b78501eb diff --git a/src/common/signalproxy.cpp b/src/common/signalproxy.cpp index e65f09ff..8499e1ad 100644 --- a/src/common/signalproxy.cpp +++ b/src/common/signalproxy.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * 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 * @@ -96,7 +96,11 @@ void SignalProxy::SignalRelay::attachSignal(QObject *sender, int signalId, const } 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); @@ -115,7 +119,7 @@ void SignalProxy::SignalRelay::detachSignal(QObject *sender, int signalId) break; } else { - slotIter++; + ++slotIter; } } } @@ -141,16 +145,22 @@ int SignalProxy::SignalRelay::qt_metacall(QMetaObject::Call _c, int _id, void ** const QList &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]); } - if (argTypes.size() >= 1 && argTypes[0] == qMetaTypeId() && proxy()->proxyMode() == SignalProxy::Server) { - Peer *peer = params[0].value(); - 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)); } @@ -189,7 +199,7 @@ SignalProxy::~SignalProxy() objIter = classIter->erase(objIter); obj->stopSynchronize(this); } - classIter++; + ++classIter; } _syncSlave.clear(); @@ -280,7 +290,13 @@ bool SignalProxy::addPeer(Peer *peer) 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); @@ -323,6 +339,7 @@ void SignalProxy::removePeer(Peer *peer) disconnect(peer, 0, this, 0); peer->setSignalProxy(0); + _peerMap.remove(peer->_id); _peers.remove(peer); emit peerRemoved(peer); @@ -474,7 +491,7 @@ void SignalProxy::detachSlots(QObject *receiver) slotIter = _attachedSlots.erase(slotIter); } else - slotIter++; + ++slotIter; } } @@ -489,7 +506,7 @@ void SignalProxy::stopSynchronize(SyncableObject *obj) classIter->remove(obj->objectName()); break; } - classIter++; + ++classIter; } obj->stopSynchronize(this); } @@ -507,10 +524,11 @@ void SignalProxy::dispatch(const T &protoMessage) } -void SignalProxy::dispatch(Peer *peer, const RpcCall &rpcCall) +template +void SignalProxy::dispatch(Peer *peer, const T &protoMessage) { if (peer && peer->isOpen()) - peer->dispatch(rpcCall); + peer->dispatch(protoMessage); else QCoreApplication::postEvent(this, new ::RemovePeerEvent(peer)); } @@ -538,8 +556,13 @@ void SignalProxy::handle(Peer *peer, const SyncMessage &syncMessage) 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(returnType)); + + if (!invokeSlot(receiver, slotId, syncMessage.params, returnValue, peer)) { qWarning("SignalProxy::handleSync(): invokeMethod for \"%s\" failed ", eMeta->methodName(slotId).constData()); return; } @@ -635,7 +658,11 @@ bool SignalProxy::invokeSlot(QObject *receiver, int methodId, const QVariantList // 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; } @@ -643,12 +670,8 @@ bool SignalProxy::invokeSlot(QObject *receiver, int methodId, const QVariantList 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()) { - QVariant v = QVariant::fromValue(peer); - _a[1] = const_cast(v.constData()); - } else - _a[i+1] = const_cast(params[i].constData()); + + _a[i+1] = const_cast(params[i].constData()); } if (returnValue.type() != QVariant::Invalid) @@ -659,9 +682,11 @@ bool SignalProxy::invokeSlot(QObject *receiver, int methodId, const QVariantList : 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; @@ -740,7 +765,13 @@ void SignalProxy::sync_call__(const SyncableObject *obj, SignalProxy::ProxyMode 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)); } @@ -788,6 +819,37 @@ void SignalProxy::updateSecureState() 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 peers, std::function closure) +{ + auto previousRestrictMessageTarget = _restrictMessageTarget; + auto previousRestrictedTargets = _restrictedTargets; + _restrictMessageTarget = true; + _restrictedTargets = peers; + + closure(); + + _restrictMessageTarget = previousRestrictMessageTarget; + _restrictedTargets = previousRestrictedTargets; +} // ================================================== // ExtendedMetaObject @@ -800,7 +862,11 @@ SignalProxy::ExtendedMetaObject::ExtendedMetaObject(const QMetaObject *meta, boo 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)); @@ -829,7 +895,11 @@ SignalProxy::ExtendedMetaObject::ExtendedMetaObject(const QMetaObject *meta, boo } 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; } @@ -869,7 +939,11 @@ const QHash &SignalProxy::ExtendedMetaObject::receiveMap() 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; @@ -903,14 +977,22 @@ const QHash &SignalProxy::ExtendedMetaObject::receiveMap() 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; @@ -948,7 +1030,11 @@ SignalProxy::ExtendedMetaObject::MethodDescriptor::MethodDescriptor(const QMetaM _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"))