From ee6a90dd546d4ca3b454e9f77f7a5dddd4a08bf3 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Wed, 10 Sep 2014 15:13:02 -0700
Subject: [PATCH] allow domain to pass down its ID from config

---
 domain-server/src/DomainServer.cpp    | 6 ++++++
 libraries/networking/src/NodeList.cpp | 5 ++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index 56570a4b82..d17caf24f0 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -189,6 +189,12 @@ void DomainServer::setupNodeListAndAssignments(const QUuid& sessionUUID) {
     populateDefaultStaticAssignmentsExcludingTypes(parsedTypes);
 
     LimitedNodeList* nodeList = LimitedNodeList::createInstance(domainServerPort, domainServerDTLSPort);
+    
+    const QString DOMAIN_CONFIG_ID_KEY = "id";
+    
+    // set our LimitedNodeList UUID to match the UUID from our config
+    // nodes will currently use this to add resources to data-web that relate to our domain
+    nodeList->setSessionUUID(_argumentVariantMap.value(DOMAIN_CONFIG_ID_KEY).toString());
 
     connect(nodeList, &LimitedNodeList::nodeAdded, this, &DomainServer::nodeAdded);
     connect(nodeList, &LimitedNodeList::nodeKilled, this, &DomainServer::nodeKilled);
diff --git a/libraries/networking/src/NodeList.cpp b/libraries/networking/src/NodeList.cpp
index d77ef321a8..79a399c621 100644
--- a/libraries/networking/src/NodeList.cpp
+++ b/libraries/networking/src/NodeList.cpp
@@ -397,7 +397,10 @@ int NodeList::processDomainServerList(const QByteArray& packet) {
     _numNoReplyDomainCheckIns = 0;
     
     // if this was the first domain-server list from this domain, we've now connected
-    _domainHandler.setIsConnected(true);
+    if (!_domainHandler.isConnected()) {
+        _domainHandler.setUUID(uuidFromPacketHeader(packet));
+        _domainHandler.setIsConnected(true);
+    }
 
     int readNodes = 0;