From ff2800e8d587fabc566cde169226ad0d1bc7ca54 Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Mon, 12 Jun 2017 11:49:48 -0700 Subject: [PATCH] Add isReplicant to Node --- domain-server/src/DomainServer.cpp | 5 +++++ libraries/networking/src/Node.cpp | 2 ++ libraries/networking/src/Node.h | 4 ++++ 3 files changed, 11 insertions(+) diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp index d637a20454..c9005c42e4 100644 --- a/domain-server/src/DomainServer.cpp +++ b/domain-server/src/DomainServer.cpp @@ -2211,6 +2211,11 @@ void DomainServer::refreshStaticAssignmentAndAddToQueue(SharedAssignmentPointer& } void DomainServer::nodeAdded(SharedNodePointer node) { + // TODO Check to see if node is in list of replicant nodes + if (node->getType() == NodeType::Agent) { + node->setIsReplicant(true); + } + // we don't use updateNodeWithData, so add the DomainServerNodeData to the node here node->setLinkedData(std::unique_ptr { new DomainServerNodeData() }); } diff --git a/libraries/networking/src/Node.cpp b/libraries/networking/src/Node.cpp index 60227eeaa1..baad621cd6 100644 --- a/libraries/networking/src/Node.cpp +++ b/libraries/networking/src/Node.cpp @@ -135,6 +135,7 @@ QDataStream& operator<<(QDataStream& out, const Node& node) { out << node._publicSocket; out << node._localSocket; out << node._permissions; + out << node._isReplicant; return out; } @@ -144,6 +145,7 @@ QDataStream& operator>>(QDataStream& in, Node& node) { in >> node._publicSocket; in >> node._localSocket; in >> node._permissions; + in >> node._isReplicant; return in; } diff --git a/libraries/networking/src/Node.h b/libraries/networking/src/Node.h index f7afbdd864..2c8270071c 100644 --- a/libraries/networking/src/Node.h +++ b/libraries/networking/src/Node.h @@ -48,6 +48,9 @@ public: char getType() const { return _type; } void setType(char type); + bool isReplicant() const { return _isReplicant; } + void setIsReplicant(bool isReplicant) { _isReplicant = isReplicant; } + const QUuid& getConnectionSecret() const { return _connectionSecret; } void setConnectionSecret(const QUuid& connectionSecret) { _connectionSecret = connectionSecret; } @@ -89,6 +92,7 @@ private: Node& operator=(Node otherNode); NodeType_t _type; + bool _isReplicant { false }; QUuid _connectionSecret; std::unique_ptr _linkedData;