From 1b31b8cff8066a1e102c18e1b9b6d669b44f7093 Mon Sep 17 00:00:00 2001
From: Roxanne Skelly <roxanne@highfidelity.io>
Date: Fri, 14 Jun 2019 13:23:33 -0700
Subject: [PATCH] CR fixes

---
 domain-server/src/DomainServer.cpp           |  2 +-
 libraries/networking/src/DomainHandler.cpp   |  4 +++-
 libraries/networking/src/LimitedNodeList.cpp |  7 +++++--
 libraries/networking/src/NodeList.cpp        | 11 -----------
 4 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index 5dd98c2ae7..358b05222c 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -1737,7 +1737,7 @@ void DomainServer::nodePingMonitor() {
         if (lastHeard > 2 * USECS_PER_SECOND) {
             QString username;
             DomainServerNodeData* nodeData = static_cast<DomainServerNodeData*>(node->getLinkedData());
-            if(nodeData) {
+            if (nodeData) {
                 username = nodeData->getUsername();
             }
             qCDebug(domain_server) << "Haven't heard from " << node->getPublicSocket() << username << " in " << lastHeard / USECS_PER_MSEC << " msec";
diff --git a/libraries/networking/src/DomainHandler.cpp b/libraries/networking/src/DomainHandler.cpp
index 5f8aceca35..3512b02d11 100644
--- a/libraries/networking/src/DomainHandler.cpp
+++ b/libraries/networking/src/DomainHandler.cpp
@@ -559,6 +559,8 @@ void DomainHandler::processDomainServerConnectionDeniedPacket(QSharedPointer<Rec
     }
 }
 
+static const int SILENT_DOMAIN_TRAFFIC_DROP_MIN = 2;
+
 bool DomainHandler::checkInPacketTimeout() {
     ++_checkInPacketsSinceLastReply;
 
@@ -568,7 +570,7 @@ bool DomainHandler::checkInPacketTimeout() {
 
     auto nodeList = DependencyManager::get<NodeList>();
 
-    if(_checkInPacketsSinceLastReply > 2) {
+    if (_checkInPacketsSinceLastReply > SILENT_DOMAIN_TRAFFIC_DROP_MIN) {
         qCDebug(networking_ice) << _checkInPacketsSinceLastReply << "seconds since last domain list request, squelching traffic";
         nodeList->setDropOutgoingNodeTraffic(true);
     }
diff --git a/libraries/networking/src/LimitedNodeList.cpp b/libraries/networking/src/LimitedNodeList.cpp
index 6faaca219c..8fefe5820c 100644
--- a/libraries/networking/src/LimitedNodeList.cpp
+++ b/libraries/networking/src/LimitedNodeList.cpp
@@ -409,9 +409,12 @@ qint64 LimitedNodeList::sendUnreliablePacket(const NLPacket& packet, const HifiS
     Q_ASSERT_X(!packet.isReliable(), "LimitedNodeList::sendUnreliablePacket",
                "Trying to send a reliable packet unreliably.");
 
-    if(_dropOutgoingNodeTraffic) {
+    if (_dropOutgoingNodeTraffic) {
         auto destinationNode = findNodeWithAddr(sockAddr);
-        if (!destinationNode.isNull() && (destinationNode->getType() != NodeType::DomainServer)) {
+
+        // findNodeWithAddr returns null for the address of the domain server
+        if (!destinationNode.isNull()) {
+            // This only suppresses individual unreliable packets, not unreliable packet lists
             return ERROR_SENDING_PACKET_BYTES;
         }
     }
diff --git a/libraries/networking/src/NodeList.cpp b/libraries/networking/src/NodeList.cpp
index 7dd9ee21b7..3d367bc761 100644
--- a/libraries/networking/src/NodeList.cpp
+++ b/libraries/networking/src/NodeList.cpp
@@ -453,17 +453,6 @@ void NodeList::sendDomainServerCheckIn() {
         static const int MAX_CHECKINS_TOGETHER = 20;
         int outstandingCheckins = _domainHandler.getCheckInPacketsSinceLastReply();
 
-        /*
-        static const int WARNING_CHECKIN_COUNT = 2;
-        if (outstandingCheckins > WARNING_CHECKIN_COUNT) {
-            // We may be headed for a disconnect, as we've written two DomainListRequests without getting anything back.
-            // In some cases, we've found that nothing is going out on the wire despite not getting any errors from 
-            // sendPacket => writeDatagram, below. In at least some such cases, we've found that the DomainDisconnectRequest
-            // does go through, so let's at least try to mix it up with a different safe packet.
-            // TODO: send ICEPing, and later on tell the other nodes to shut up for a moment.
-
-        }*/
-
         int checkinCount = outstandingCheckins > 1 ? std::pow(2, outstandingCheckins - 2) : 1;
         checkinCount = std::min(checkinCount, MAX_CHECKINS_TOGETHER);
         for (int i = 1; i < checkinCount; ++i) {