Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-20 04:44:11 +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;
// 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() {

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

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

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

@ -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; }

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

@ -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) {