Retain a shared node pointer, use the active socket. Fixed a compile warning.

Andrzej Kapolka committed 12 years ago

Commit 1e4bfff1 parent fbcd4cf4 files · +22 −21Browse files

Showing the changes to interface/src/MetavoxelSystem.cpp (1 of 4 files). Show all

Unified · Split

 //  Copyright (c) 2013 High Fidelity, Inc. All rights reserved.
 //
+#include <QMutexLocker>
 #include <QtDebug>
 #include <SharedUtil.h>
 void MetavoxelSystem::nodeAdded(SharedNodePointer node) {
     if (node->getType() == NODE_TYPE_METAVOXEL_SERVER) {
-        QMetaObject::invokeMethod(this, "addClient", Q_ARG(const QUuid&, node->getUUID()),
+        QMetaObject::invokeMethod(this, "addClient", Q_ARG(const SharedNodePointer&, node));
-            Q_ARG(const HifiSockAddr&, node->getLocalSocket()));
     }
 }
     }
 }
-void MetavoxelSystem::addClient(const QUuid& uuid, const HifiSockAddr& address) {
+void MetavoxelSystem::addClient(const SharedNodePointer& node) {
-    MetavoxelClient* client = new MetavoxelClient(address);
+    MetavoxelClient* client = new MetavoxelClient(node);
-    _clients.insert(uuid, client);
+    _clients.insert(node->getUUID(), client);
     _clientsBySessionID.insert(client->getSessionID(), client);
 }
     }
     MetavoxelClient* client = _clientsBySessionID.value(sessionID);
     if (client) {
-        client->receivedData(data, sender);
+        client->receivedData(data);
     }
 }
     return header;
 }
-MetavoxelClient::MetavoxelClient(const HifiSockAddr& address) :
+MetavoxelClient::MetavoxelClient(const SharedNodePointer& node) :
-    _address(address),
+    _node(node),
     _sessionID(QUuid::createUuid()),
     _sequencer(createDatagramHeader(_sessionID)) {
     _data.guide(visitor);
 }
-void MetavoxelClient::receivedData(const QByteArray& data, const HifiSockAddr& sender) {
+void MetavoxelClient::receivedData(const QByteArray& data) {
-    // save the most recent sender
-    _address = sender;
     // process through sequencer
     _sequencer.receivedDatagram(data);
 }
 void MetavoxelClient::sendData(const QByteArray& data) {
-    NodeList::getInstance()->getNodeSocket().writeDatagram(data, _address.getAddress(), _address.getPort());
+    QMutexLocker locker(&_node->getMutex());
+    const HifiSockAddr* address = _node->getActiveSocket();
+    if (address) {
+        NodeList::getInstance()->getNodeSocket().writeDatagram(data, address->getAddress(), address->getPort());
+    }
 }
 void MetavoxelClient::readPacket(Bitstream& in) {