From 1c9f43e5aa6a576723fcefd89e3ee1f6d8f00f1e Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Mon, 13 Jul 2015 16:03:05 -0700
Subject: [PATCH] compile fixes for AC status packet

---
 assignment-client/src/AssignmentClient.cpp     |  4 ++--
 .../src/AssignmentClientChildData.cpp          |  2 +-
 .../src/AssignmentClientChildData.h            |  2 +-
 .../src/AssignmentClientMonitor.cpp            | 18 +++++++++---------
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/assignment-client/src/AssignmentClient.cpp b/assignment-client/src/AssignmentClient.cpp
index 2f5dacc52a..9957619134 100644
--- a/assignment-client/src/AssignmentClient.cpp
+++ b/assignment-client/src/AssignmentClient.cpp
@@ -118,7 +118,7 @@ AssignmentClient::AssignmentClient(Assignment::Type requestAssignmentType, QStri
         qDebug() << "Assignment-client monitor socket is" << _assignmentClientMonitorSocket;
 
         // Hook up a timer to send this child's status to the Monitor once per second
-        setUpStatsToMonitor();
+        setUpStatusToMonitor();
     }
     auto& packetReceiver = DependencyManager::get<NodeList>()->getPacketReceiver();
     packetReceiver.registerPacketListener(PacketType::CreateAssignment, this, "handleCreateAssignmentPacket");
@@ -181,7 +181,7 @@ void AssignmentClient::sendStatusPacketToACM() {
     statusPacket->write(nodeList->getSessionUUID().toRfc4122());
     statusPacket->writePrimitive(assignmentType);
     
-    nodeList->sendPacket(statusPacket, _assignmentClientMonitorSocket);
+    nodeList->sendPacket(std::move(statusPacket), _assignmentClientMonitorSocket);
 }
 
 void AssignmentClient::sendAssignmentRequest() {
diff --git a/assignment-client/src/AssignmentClientChildData.cpp b/assignment-client/src/AssignmentClientChildData.cpp
index cc714e629d..577124c982 100644
--- a/assignment-client/src/AssignmentClientChildData.cpp
+++ b/assignment-client/src/AssignmentClientChildData.cpp
@@ -12,7 +12,7 @@
 #include "AssignmentClientChildData.h"
 
 
-AssignmentClientChildData::AssignmentClientChildData(QString childType) :
+AssignmentClientChildData::AssignmentClientChildData(Assignment::Type childType) :
     _childType(childType)
 {
     
diff --git a/assignment-client/src/AssignmentClientChildData.h b/assignment-client/src/AssignmentClientChildData.h
index 77d8bd7e31..926a160d08 100644
--- a/assignment-client/src/AssignmentClientChildData.h
+++ b/assignment-client/src/AssignmentClientChildData.h
@@ -17,7 +17,7 @@
 
 class AssignmentClientChildData : public NodeData {
  public:
-    AssignmentClientChildData(QString childType);
+    AssignmentClientChildData(Assignment::Type childType);
 
     Assignment::Type getChildType() { return _childType; }
     void setChildType(Assignment::Type childType) { _childType = childType; }
diff --git a/assignment-client/src/AssignmentClientMonitor.cpp b/assignment-client/src/AssignmentClientMonitor.cpp
index 6cc1577dea..df912ef519 100644
--- a/assignment-client/src/AssignmentClientMonitor.cpp
+++ b/assignment-client/src/AssignmentClientMonitor.cpp
@@ -175,7 +175,7 @@ void AssignmentClientMonitor::checkSpares() {
     nodeList->eachNode([&](const SharedNodePointer& node) {
         AssignmentClientChildData *childData = static_cast<AssignmentClientChildData*>(node->getLinkedData());
         totalCount ++;
-        if (childData->getChildType() == "none") {
+        if (childData->getChildType() == Assignment::Type::AllTypes) {
             spareCount ++;
             aSpareId = node->getUUID();
         }
@@ -203,12 +203,12 @@ void AssignmentClientMonitor::checkSpares() {
 }
 
 void AssignmentClientMonitor::handleChildStatusPacket(QSharedPointer<NLPacket> packet) {
-    QUuid senderUUID = QUuid::fromRfc4122(packet->read(NUM_BYTES_RFC4122_UUID));
+    QUuid senderID = QUuid::fromRfc4122(packet->read(NUM_BYTES_RFC4122_UUID));
 
     auto nodeList = DependencyManager::get<NodeList>();
 
-    SharedNodePointer matchingNode = nodeList->nodeWithUUID(senderUUID);
-    const HifiSockAddr* senderSockAddr = packet->getSendingSockAddr();
+    SharedNodePointer matchingNode = nodeList->nodeWithUUID(senderID);
+    const HifiSockAddr& senderSockAddr = packet->getSenderSockAddr();
 
     AssignmentClientChildData *childData = nullptr;
 
@@ -217,13 +217,13 @@ void AssignmentClientMonitor::handleChildStatusPacket(QSharedPointer<NLPacket> p
         if (senderSockAddr.getAddress() == QHostAddress::LocalHost ||
                 senderSockAddr.getAddress() == QHostAddress::LocalHostIPv6) {
              
-            if (!senderUUID.isNull()) {
+            if (!senderID.isNull()) {
                 // We don't have this node yet - we should add it
                 matchingNode = DependencyManager::get<LimitedNodeList>()->addOrUpdateNode
-                    (packetUUID, NodeType::Unassigned, senderSockAddr, senderSockAddr, false, false);
+                    (senderID, NodeType::Unassigned, senderSockAddr, senderSockAddr, false, false);
                 
-                childData = new AssignmentClientChildData("unknown");
-                senderNode->setLinkedData(childData);
+                childData = new AssignmentClientChildData(Assignment::Type::AllTypes);
+                matchingNode->setLinkedData(childData);
             } else {
                 // tell unknown assignment-client child to exit.
                 qDebug() << "Asking unknown child at" << senderSockAddr << "to exit.";
@@ -235,7 +235,7 @@ void AssignmentClientMonitor::handleChildStatusPacket(QSharedPointer<NLPacket> p
             }
         }
     } else {
-        childData = dynamic_cast<AssignmentClientChildData*>(senderNode->getLinkedData());
+        childData = dynamic_cast<AssignmentClientChildData*>(matchingNode->getLinkedData());
     }
 
     if (childData) {