History

Fix ESS remote method calls for connect only users

Clement committed 8 years ago

Commit cb07fc41 parent 0862f342 files · +4 −43Browse files

Showing the changes to assignment-client/src/scripts/EntityScriptServer.cpp (1 of 2 files). Show all

Unified · Split

assignment-client/src/scripts/EntityScriptServer.cpp+2−7
@@ -105,8 +105,6 @@ EntityScriptServer::~EntityScriptServer() { · 104 unmodified lines
105static const QString ENTITY_SCRIPT_SERVER_LOGGING_NAME = "entity-script-server";105static const QString ENTITY_SCRIPT_SERVER_LOGGING_NAME = "entity-script-server";
106 106
107void EntityScriptServer::handleReloadEntityServerScriptPacket(QSharedPointer<ReceivedMessage> message, SharedNodePointer senderNode) {107void EntityScriptServer::handleReloadEntityServerScriptPacket(QSharedPointer<ReceivedMessage> message, SharedNodePointer senderNode) {
108 // These are temporary checks until we can ensure that nodes eventually disconnect if the Domain Server stops telling them
109 // about each other.
110 if (senderNode->getCanRez() || senderNode->getCanRezTmp() || senderNode->getCanRezCertified() || senderNode->getCanRezTmpCertified()) {108 if (senderNode->getCanRez() || senderNode->getCanRezTmp() || senderNode->getCanRezCertified() || senderNode->getCanRezTmpCertified()) {
111 auto entityID = QUuid::fromRfc4122(message->read(NUM_BYTES_RFC4122_UUID));109 auto entityID = QUuid::fromRfc4122(message->read(NUM_BYTES_RFC4122_UUID));
112 110
@@ -119,8 +117,6 @@ void EntityScriptServer::handleReloadEntityServerScriptPacket(QSharedPointer<Rec · 6 unmodified lines
119}117}
120 118
121void EntityScriptServer::handleEntityScriptGetStatusPacket(QSharedPointer<ReceivedMessage> message, SharedNodePointer senderNode) {119void EntityScriptServer::handleEntityScriptGetStatusPacket(QSharedPointer<ReceivedMessage> message, SharedNodePointer senderNode) {
122 // These are temporary checks until we can ensure that nodes eventually disconnect if the Domain Server stops telling them
123 // about each other.
124 if (senderNode->getCanRez() || senderNode->getCanRezTmp() || senderNode->getCanRezCertified() || senderNode->getCanRezTmpCertified()) {120 if (senderNode->getCanRez() || senderNode->getCanRezTmp() || senderNode->getCanRezCertified() || senderNode->getCanRezTmpCertified()) {
125 MessageID messageID;121 MessageID messageID;
126 message->readPrimitive(&messageID);122 message->readPrimitive(&messageID);
@@ -190,15 +186,14 @@ void EntityScriptServer::updateEntityPPS() { · 63 unmodified lines
190}186}
191 187
192void EntityScriptServer::handleEntityServerScriptLogPacket(QSharedPointer<ReceivedMessage> message, SharedNodePointer senderNode) {188void EntityScriptServer::handleEntityServerScriptLogPacket(QSharedPointer<ReceivedMessage> message, SharedNodePointer senderNode) {
193 // These are temporary checks until we can ensure that nodes eventually disconnect if the Domain Server stops telling them189 bool canRezAny = senderNode->getCanRez() || senderNode->getCanRezTmp() || senderNode->getCanRezCertified() || senderNode->getCanRezTmpCertified();
194 // about each other.
195 bool enable = false;190 bool enable = false;
196 message->readPrimitive(&enable);191 message->readPrimitive(&enable);
197 192
198 auto senderUUID = senderNode->getUUID();193 auto senderUUID = senderNode->getUUID();
199 auto it = _logListeners.find(senderUUID);194 auto it = _logListeners.find(senderUUID);
200 195
201 if (enable && senderNode->getCanRez()) {196 if (enable && canRezAny) {
202 if (it == std::end(_logListeners)) {197 if (it == std::end(_logListeners)) {
203 _logListeners.insert(senderUUID);198 _logListeners.insert(senderUUID);
204 qCInfo(entity_script_server) << "Node" << senderUUID << "subscribed to log stream";199 qCInfo(entity_script_server) << "Node" << senderUUID << "subscribed to log stream";