From 22f4e8ec70de07655644ea44bba6ab77864828c7 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Mon, 3 Nov 2014 14:37:56 -0800
Subject: [PATCH 1/2] cleanup heartbeat method names

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

diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index c6ab0285ea..ed0fd60ae5 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -388,7 +388,7 @@ void DomainServer::setupAutomaticNetworking() {
     const int DOMAIN_SERVER_DATA_WEB_HEARTBEAT_MSECS = 15 * 1000;
     
     QTimer* dataHeartbeatTimer = new QTimer(this);
-    connect(dataHeartbeatTimer, &QTimer::timeout, this, &DomainServer::sendHeartbeatToDataServer);
+    connect(dataHeartbeatTimer, SIGNAL(timeout()), this, SLOT(sendHeartbeatToDataServer()));
     dataHeartbeatTimer->start(DOMAIN_SERVER_DATA_WEB_HEARTBEAT_MSECS);
 }
 
@@ -1091,10 +1091,10 @@ QJsonObject jsonForDomainSocketUpdate(const HifiSockAddr& socket) {
 const QString DOMAIN_UPDATE_AUTOMATIC_NETWORKING_KEY = "automatic_networking";
 
 void DomainServer::performIPAddressUpdate(const HifiSockAddr& newPublicSockAddr) {
-    updateDomainInDataServer(newPublicSockAddr.getAddress().toString());
+    sendHeartbeatToDataServer(newPublicSockAddr.getAddress().toString());
 }
 
-void DomainServer::updateDomainInDataServer(const QString& networkAddress) {
+void DomainServer::sendHeartbeatToDataServer(const QString& networkAddress) {
     const QString DOMAIN_UPDATE = "/api/v1/domains/%1";
     const QUuid& domainID = LimitedNodeList::getInstance()->getSessionUUID();
     
diff --git a/domain-server/src/DomainServer.h b/domain-server/src/DomainServer.h
index e5f321639c..de485da5e7 100644
--- a/domain-server/src/DomainServer.h
+++ b/domain-server/src/DomainServer.h
@@ -66,7 +66,7 @@ private slots:
     void requestCurrentPublicSocketViaSTUN();
     void performIPAddressUpdate(const HifiSockAddr& newPublicSockAddr);
     void performICEUpdates();
-    void sendHeartbeatToDataServer() { updateDomainInDataServer(); }
+    void sendHeartbeatToDataServer() { sendHeartbeatToDataServer(QString()); }
     void sendHeartbeatToIceServer();
     void sendICEPingPackets();
 private:
@@ -77,7 +77,7 @@ private:
     bool optionallySetupAssignmentPayment();
     
     void setupAutomaticNetworking();
-    void updateDomainInDataServer(const QString& networkAddress = QString());
+    void sendHeartbeatToDataServer(const QString& networkAddress);
     void processICEPingReply(const QByteArray& packet, const HifiSockAddr& senderSockAddr);
     void processICEHeartbeatResponse(const QByteArray& packet);
     

From 2250cdfcc2a750f9778925f7d89234c60997d78f Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Mon, 3 Nov 2014 14:50:45 -0800
Subject: [PATCH 2/2] have the domain-server unverifiably heartbeat the number
 of connected users

---
 domain-server/src/DomainServer.cpp | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index ed0fd60ae5..198c61bcba 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -1109,8 +1109,25 @@ void DomainServer::sendHeartbeatToDataServer(const QString& networkAddress) {
     
     domainObject[AUTOMATIC_NETWORKING_KEY] = _automaticNetworkingSetting;
     
+    // add the number of currently connected agent users
+    int numConnectedAuthedUsers = 0;
+    foreach(const SharedNodePointer& node, LimitedNodeList::getInstance()->getNodeHash()) {
+        if (node->getLinkedData() && !static_cast<DomainServerNodeData*>(node->getLinkedData())->getUsername().isEmpty()) {
+            ++numConnectedAuthedUsers;
+        }
+    }
+    
+    const QString DOMAIN_HEARTBEAT_KEY = "heartbeat";
+    const QString HEARTBEAT_NUM_USERS_KEY = "num_users";
+    
+    QJsonObject heartbeatObject;
+    heartbeatObject[HEARTBEAT_NUM_USERS_KEY] = numConnectedAuthedUsers;
+    domainObject[DOMAIN_HEARTBEAT_KEY] = heartbeatObject;
+    
     QString domainUpdateJSON = QString("{\"domain\": %1 }").arg(QString(QJsonDocument(domainObject).toJson()));
     
+    qDebug() << domainUpdateJSON;
+    
     AccountManager::getInstance().authenticatedRequest(DOMAIN_UPDATE.arg(uuidStringWithoutCurlyBraces(domainID)),
                                                        QNetworkAccessManager::PutOperation,
                                                        JSONCallbackParameters(),