From e52e9be44ce26dedd5a3b380f3294f3c11004ba9 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 12 Nov 2015 17:23:39 -0800
Subject: [PATCH] re-broadcast disconnects from domain-server

---
 domain-server/src/DomainServer.cpp             | 18 ++++++++++++++++--
 libraries/networking/src/DomainHandler.h       |  2 +-
 .../networking/src/ThreadedAssignment.cpp      |  9 +++++++--
 3 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index b0aacd23f7..790548c5b3 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -1832,7 +1832,21 @@ void DomainServer::processNodeDisconnectRequestPacket(QSharedPointer<NLPacket> p
     // This packet has been matched to a source node and they're asking not to be in the domain anymore
     auto limitedNodeList = DependencyManager::get<LimitedNodeList>();
     
-    qDebug() << "Received a disconnect request from node with UUID" << packet->getSourceID();
+    const QUuid& nodeUUID = packet->getSourceID();
     
-    limitedNodeList->killNodeWithUUID(packet->getSourceID());
+    qDebug() << "Received a disconnect request from node with UUID" << nodeUUID;
+    
+    if (limitedNodeList->nodeWithUUID(nodeUUID)) {
+        limitedNodeList->killNodeWithUUID(nodeUUID);
+        
+        static auto removedNodePacket = NLPacket::create(PacketType::DomainServerRemovedNode, NUM_BYTES_RFC4122_UUID);
+        
+        removedNodePacket->reset();
+        removedNodePacket->write(nodeUUID.toRfc4122());
+    
+        // broadcast out the DomainServerRemovedNode message
+        limitedNodeList->eachNode([&limitedNodeList](const SharedNodePointer& otherNode){
+            limitedNodeList->sendUnreliablePacket(*removedNodePacket, *otherNode);
+        });
+    }
 }
diff --git a/libraries/networking/src/DomainHandler.h b/libraries/networking/src/DomainHandler.h
index da22c4527d..49bab6dc28 100644
--- a/libraries/networking/src/DomainHandler.h
+++ b/libraries/networking/src/DomainHandler.h
@@ -35,6 +35,7 @@ class DomainHandler : public QObject {
 public:
     DomainHandler(QObject* parent = 0);
     
+    void disconnect();
     void clearSettings();
 
     const QUuid& getUUID() const { return _uuid; }
@@ -112,7 +113,6 @@ signals:
     void settingsReceiveFail();
 
 private:
-    void disconnect();
     void sendDisconnectPacket();
     void hardReset();
 
diff --git a/libraries/networking/src/ThreadedAssignment.cpp b/libraries/networking/src/ThreadedAssignment.cpp
index 0422c03297..6855c2eec3 100644
--- a/libraries/networking/src/ThreadedAssignment.cpp
+++ b/libraries/networking/src/ThreadedAssignment.cpp
@@ -33,14 +33,19 @@ void ThreadedAssignment::setFinished(bool isFinished) {
         if (_isFinished) {
 
             qDebug() << "ThreadedAssignment::setFinished(true) called - finishing up.";
-
-            auto& packetReceiver = DependencyManager::get<NodeList>()->getPacketReceiver();
+            
+            auto nodeList = DependencyManager::get<NodeList>();
+            
+            auto& packetReceiver = nodeList->getPacketReceiver();
 
             // we should de-register immediately for any of our packets
             packetReceiver.unregisterListener(this);
 
             // we should also tell the packet receiver to drop packets while we're cleaning up
             packetReceiver.setShouldDropPackets(true);
+            
+            // send a disconnect packet to the domain
+            nodeList->getDomainHandler().disconnect();
 
             if (_domainServerTimer) {
                 // stop the domain-server check in timer by calling deleteLater so it gets cleaned up on NL thread