From 5ab876114f86a715cc380c5214848a797dd9cf99 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Tue, 10 May 2016 13:47:14 -0700
Subject: [PATCH] send hostname to DS with every DS packet to handle changes
---
domain-server/src/DomainGatekeeper.cpp | 4 ++--
domain-server/src/DomainServer.cpp | 3 +++
domain-server/src/NodeConnectionData.cpp | 3 +--
libraries/networking/src/NodeList.cpp | 9 ++++-----
4 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/domain-server/src/DomainGatekeeper.cpp b/domain-server/src/DomainGatekeeper.cpp
index e974ab26f4..61cc775e08 100644
--- a/domain-server/src/DomainGatekeeper.cpp
+++ b/domain-server/src/DomainGatekeeper.cpp
@@ -55,9 +55,9 @@ void DomainGatekeeper::processConnectRequestPacket(QSharedPointer<ReceivedMessag
if (message->getSize() == 0) {
return;
}
-
+
QDataStream packetStream(message->getMessage());
-
+
// read a NodeConnectionData object from the packet so we can pass around this data while we're inspecting it
NodeConnectionData nodeConnection = NodeConnectionData::fromDataStream(packetStream, message->getSenderSockAddr());
diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index 75f1c9f6b6..cfec72a24b 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -678,6 +678,9 @@ void DomainServer::processListRequestPacket(QSharedPointer<ReceivedMessage> mess
DomainServerNodeData* nodeData = reinterpret_cast<DomainServerNodeData*>(sendingNode->getLinkedData());
nodeData->setNodeInterestSet(nodeRequestData.interestList.toSet());
+ // update the connecting hostname in case it has changed
+ nodeData->setPlaceName(nodeRequestData.placeName);
+
sendDomainListToNode(sendingNode, message->getSenderSockAddr());
}
diff --git a/domain-server/src/NodeConnectionData.cpp b/domain-server/src/NodeConnectionData.cpp
index eabcfaacc6..28f769298c 100644
--- a/domain-server/src/NodeConnectionData.cpp
+++ b/domain-server/src/NodeConnectionData.cpp
@@ -19,12 +19,11 @@ NodeConnectionData NodeConnectionData::fromDataStream(QDataStream& dataStream, c
if (isConnectRequest) {
dataStream >> newHeader.connectUUID;
- dataStream >> newHeader.placeName;
}
dataStream >> newHeader.nodeType
>> newHeader.publicSockAddr >> newHeader.localSockAddr
- >> newHeader.interestList;
+ >> newHeader.interestList >> newHeader.placeName;
newHeader.senderSockAddr = senderSockAddr;
diff --git a/libraries/networking/src/NodeList.cpp b/libraries/networking/src/NodeList.cpp
index cee6404755..c295ffc700 100644
--- a/libraries/networking/src/NodeList.cpp
+++ b/libraries/networking/src/NodeList.cpp
@@ -312,13 +312,12 @@ void NodeList::sendDomainServerCheckIn() {
// pack the connect UUID for this connect request
packetStream << connectUUID;
-
- // pack the hostname information (so the domain-server can see which place name we came in on)
- packetStream << DependencyManager::get<AddressManager>()->getPlaceName();
}
- // pack our data to send to the domain-server
- packetStream << _ownerType << _publicSockAddr << _localSockAddr << _nodeTypesOfInterest.toList();
+ // pack our data to send to the domain-server including
+ // the hostname information (so the domain-server can see which place name we came in on)
+ packetStream << _ownerType << _publicSockAddr << _localSockAddr << _nodeTypesOfInterest.toList()
+ << DependencyManager::get<AddressManager>()->getPlaceName();
if (!_domainHandler.isConnected()) {
DataServerAccountInfo& accountInfo = accountManager->getAccountInfo();