Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-26 01:55:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

compile fixes for AC status packet

Browse source
This commit is contained in:
Stephen Birarda 2015-07-13 16:03:05 -07:00
parent 8d38cd5670
commit 1c9f43e5aa
4 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
assignment-client/src/AssignmentClient.cpp
View file

@ -118,7 +118,7 @@ AssignmentClient::AssignmentClient(Assignment::Type requestAssignmentType, QStri
qDebug() << "Assignment-client monitor socket is" << _assignmentClientMonitorSocket; qDebug() << "Assignment-client monitor socket is" << _assignmentClientMonitorSocket;
// Hook up a timer to send this child's status to the Monitor once per second // Hook up a timer to send this child's status to the Monitor once per second
setUpStatsToMonitor(); setUpStatusToMonitor();
} }
auto& packetReceiver = DependencyManager::get<NodeList>()->getPacketReceiver(); auto& packetReceiver = DependencyManager::get<NodeList>()->getPacketReceiver();
packetReceiver.registerPacketListener(PacketType::CreateAssignment, this, "handleCreateAssignmentPacket"); packetReceiver.registerPacketListener(PacketType::CreateAssignment, this, "handleCreateAssignmentPacket");
@ -181,7 +181,7 @@ void AssignmentClient::sendStatusPacketToACM() {
statusPacket->write(nodeList->getSessionUUID().toRfc4122()); statusPacket->write(nodeList->getSessionUUID().toRfc4122());
statusPacket->writePrimitive(assignmentType); statusPacket->writePrimitive(assignmentType);
nodeList->sendPacket(statusPacket, _assignmentClientMonitorSocket); nodeList->sendPacket(std::move(statusPacket), _assignmentClientMonitorSocket);
} }
void AssignmentClient::sendAssignmentRequest() { void AssignmentClient::sendAssignmentRequest() {

2
assignment-client/src/AssignmentClientChildData.cpp
View file

@ -12,7 +12,7 @@
#include "AssignmentClientChildData.h" #include "AssignmentClientChildData.h"
AssignmentClientChildData::AssignmentClientChildData(QString childType) : AssignmentClientChildData::AssignmentClientChildData(Assignment::Type childType) :
_childType(childType) _childType(childType)
{ {

2
assignment-client/src/AssignmentClientChildData.h
View file

@ -17,7 +17,7 @@
class AssignmentClientChildData : public NodeData { class AssignmentClientChildData : public NodeData {
public: public:
AssignmentClientChildData(QString childType); AssignmentClientChildData(Assignment::Type childType);
Assignment::Type getChildType() { return _childType; } Assignment::Type getChildType() { return _childType; }
void setChildType(Assignment::Type childType) { _childType = childType; } void setChildType(Assignment::Type childType) { _childType = childType; }

18
assignment-client/src/AssignmentClientMonitor.cpp
View file

@ -175,7 +175,7 @@ void AssignmentClientMonitor::checkSpares() {
nodeList->eachNode([&](const SharedNodePointer& node) { nodeList->eachNode([&](const SharedNodePointer& node) {
AssignmentClientChildData *childData = static_cast<AssignmentClientChildData*>(node->getLinkedData()); AssignmentClientChildData *childData = static_cast<AssignmentClientChildData*>(node->getLinkedData());
totalCount ++; totalCount ++;
if (childData->getChildType() == "none") { if (childData->getChildType() == Assignment::Type::AllTypes) {
spareCount ++; spareCount ++;
aSpareId = node->getUUID(); aSpareId = node->getUUID();
} }
@ -203,12 +203,12 @@ void AssignmentClientMonitor::checkSpares() {
} }
void AssignmentClientMonitor::handleChildStatusPacket(QSharedPointer<NLPacket> packet) { 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>(); auto nodeList = DependencyManager::get<NodeList>();
SharedNodePointer matchingNode = nodeList->nodeWithUUID(senderUUID); SharedNodePointer matchingNode = nodeList->nodeWithUUID(senderID);
const HifiSockAddr* senderSockAddr = packet->getSendingSockAddr(); const HifiSockAddr& senderSockAddr = packet->getSenderSockAddr();
AssignmentClientChildData *childData = nullptr; AssignmentClientChildData *childData = nullptr;
@ -217,13 +217,13 @@ void AssignmentClientMonitor::handleChildStatusPacket(QSharedPointer<NLPacket> p
if (senderSockAddr.getAddress() == QHostAddress::LocalHost || if (senderSockAddr.getAddress() == QHostAddress::LocalHost ||
senderSockAddr.getAddress() == QHostAddress::LocalHostIPv6) { senderSockAddr.getAddress() == QHostAddress::LocalHostIPv6) {
if (!senderUUID.isNull()) { if (!senderID.isNull()) {
// We don't have this node yet - we should add it // We don't have this node yet - we should add it
matchingNode = DependencyManager::get<LimitedNodeList>()->addOrUpdateNode matchingNode = DependencyManager::get<LimitedNodeList>()->addOrUpdateNode
(packetUUID, NodeType::Unassigned, senderSockAddr, senderSockAddr, false, false); (senderID, NodeType::Unassigned, senderSockAddr, senderSockAddr, false, false);
childData = new AssignmentClientChildData("unknown"); childData = new AssignmentClientChildData(Assignment::Type::AllTypes);
senderNode->setLinkedData(childData); matchingNode->setLinkedData(childData);
} else { } else {
// tell unknown assignment-client child to exit. // tell unknown assignment-client child to exit.
qDebug() << "Asking unknown child at" << senderSockAddr << "to exit."; qDebug() << "Asking unknown child at" << senderSockAddr << "to exit.";
@ -235,7 +235,7 @@ void AssignmentClientMonitor::handleChildStatusPacket(QSharedPointer<NLPacket> p
} }
} }
} else { } else {
childData = dynamic_cast<AssignmentClientChildData*>(senderNode->getLinkedData()); childData = dynamic_cast<AssignmentClientChildData*>(matchingNode->getLinkedData());
} }
if (childData) { if (childData) {