From e53ad09b3f8218b4465591e6f64c237f5872b123 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Mon, 3 Nov 2014 12:24:17 -0800
Subject: [PATCH] rename the automatic networking update method to heartbeat

---
 domain-server/src/DomainServer.cpp | 16 ++++++++--------
 domain-server/src/DomainServer.h   |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index f99c1d280e..22c194ffb0 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -361,11 +361,11 @@ void DomainServer::setupAutomaticNetworking() {
                 iceHeartbeatTimer->start(ICE_HEARBEAT_INTERVAL_MSECS);
                 
                 // call our sendHeartbeaToIceServer immediately anytime a local or public socket changes
-                connect(nodeList, &LimitedNodeList::localSockAddrChanged, this, &DomainServer::sendHearbeatToIceServer);
-                connect(nodeList, &LimitedNodeList::publicSockAddrChanged, this, &DomainServer::sendHearbeatToIceServer);
+                connect(nodeList, &LimitedNodeList::localSockAddrChanged, this, &DomainServer::sendHeartbeatToIceServer);
+                connect(nodeList, &LimitedNodeList::publicSockAddrChanged, this, &DomainServer::sendHeartbeatToIceServer);
                 
                 // tell the data server which type of automatic networking we are using
-                updateNetworkingInfoWithDataServer(automaticNetworkValue);
+                sendHeartbeatToDataServer(automaticNetworkValue);
             }
             
             // attempt to update our sockets now
@@ -378,7 +378,7 @@ void DomainServer::setupAutomaticNetworking() {
             return;
         }
     } else {
-        updateNetworkingInfoWithDataServer(automaticNetworkValue);
+        sendHeartbeatToDataServer(automaticNetworkValue);
     }
 }
 
@@ -1081,10 +1081,10 @@ QJsonObject jsonForDomainSocketUpdate(const HifiSockAddr& socket) {
 const QString DOMAIN_UPDATE_AUTOMATIC_NETWORKING_KEY = "automatic_networking";
 
 void DomainServer::performIPAddressUpdate(const HifiSockAddr& newPublicSockAddr) {
-    updateNetworkingInfoWithDataServer(IP_ONLY_AUTOMATIC_NETWORKING_VALUE, newPublicSockAddr.getAddress().toString());
+    sendHeartbeatToDataServer(IP_ONLY_AUTOMATIC_NETWORKING_VALUE, newPublicSockAddr.getAddress().toString());
 }
 
-void DomainServer::updateNetworkingInfoWithDataServer(const QString& newSetting, const QString& networkAddress) {
+void DomainServer::sendHeartbeatToDataServer(const QString& newSetting, const QString& networkAddress) {
     const QString DOMAIN_UPDATE = "/api/v1/domains/%1";
     const QUuid& domainID = LimitedNodeList::getInstance()->getSessionUUID();
     
@@ -1112,11 +1112,11 @@ void DomainServer::updateNetworkingInfoWithDataServer(const QString& newSetting,
 // todo: have data-web respond with ice-server hostname to use
 
 void DomainServer::performICEUpdates() {
-    sendHearbeatToIceServer();
+    sendHeartbeatToIceServer();
     sendICEPingPackets();
 }
 
-void DomainServer::sendHearbeatToIceServer() {
+void DomainServer::sendHeartbeatToIceServer() {
     const HifiSockAddr ICE_SERVER_SOCK_ADDR = HifiSockAddr("ice.highfidelity.io", ICE_SERVER_DEFAULT_PORT);
     LimitedNodeList::getInstance()->sendHeartbeatToIceServer(ICE_SERVER_SOCK_ADDR);
 }
diff --git a/domain-server/src/DomainServer.h b/domain-server/src/DomainServer.h
index 5e4da00601..13bc4a0474 100644
--- a/domain-server/src/DomainServer.h
+++ b/domain-server/src/DomainServer.h
@@ -66,7 +66,8 @@ private slots:
     void requestCurrentPublicSocketViaSTUN();
     void performIPAddressUpdate(const HifiSockAddr& newPublicSockAddr);
     void performICEUpdates();
-    void sendHearbeatToIceServer();
+    void sendHeartbeatToDataServer(const QString& newSetting, const QString& networkAddress = QString());
+    void sendHeartbeatToIceServer();
     void sendICEPingPackets();
 private:
     void setupNodeListAndAssignments(const QUuid& sessionUUID = QUuid::createUuid());
@@ -76,7 +77,6 @@ private:
     bool optionallySetupAssignmentPayment();
     
     void setupAutomaticNetworking();
-    void updateNetworkingInfoWithDataServer(const QString& newSetting, const QString& networkAddress = QString());
     void processICEPingReply(const QByteArray& packet, const HifiSockAddr& senderSockAddr);
     void processICEHeartbeatResponse(const QByteArray& packet);