History

replace lingering PacketTypes in old format

Stephen Birarda committed 11 years ago

Commit 74940a21 parent a489c3539 files · +141 −141Browse files

Showing the changes to assignment-client/src/AssignmentClient.cpp (1 of 39 files). Show all

Unified · Split

assignment-client/src/AssignmentClient.cpp+4−4
@@ -218,9 +218,9 @@ void AssignmentClient::readPendingDatagrams() { · 217 unmodified lines
218 senderSockAddr.getAddressPointer(), senderSockAddr.getPortPointer());218 senderSockAddr.getAddressPointer(), senderSockAddr.getPortPointer());
219 219
220 if (nodeList->packetVersionAndHashMatch(receivedPacket)) {220 if (nodeList->packetVersionAndHashMatch(receivedPacket)) {
221 if (packetTypeForPacket(receivedPacket) == PacketTypeCreateAssignment) {221 if (packetTypeForPacket(receivedPacket) == PacketType::CreateAssignment) {
222 222
223 qDebug() << "Received a PacketTypeCreateAssignment - attempting to unpack.";223 qDebug() << "Received a PacketType::CreateAssignment - attempting to unpack.";
224 224
225 // construct the deployed assignment from the packet data225 // construct the deployed assignment from the packet data
226 _currentAssignment = AssignmentFactory::unpackAssignment(receivedPacket);226 _currentAssignment = AssignmentFactory::unpackAssignment(receivedPacket);
@@ -271,10 +271,10 @@ void AssignmentClient::readPendingDatagrams() { · 44 unmodified lines
271 } else {271 } else {
272 qDebug() << "Received an assignment that could not be unpacked. Re-requesting.";272 qDebug() << "Received an assignment that could not be unpacked. Re-requesting.";
273 }273 }
274 } else if (packetTypeForPacket(receivedPacket) == PacketTypeStopNode) {274 } else if (packetTypeForPacket(receivedPacket) == PacketType::StopNode) {
275 if (senderSockAddr.getAddress() == QHostAddress::LocalHost ||275 if (senderSockAddr.getAddress() == QHostAddress::LocalHost ||
276 senderSockAddr.getAddress() == QHostAddress::LocalHostIPv6) {276 senderSockAddr.getAddress() == QHostAddress::LocalHostIPv6) {
277 qDebug() << "AssignmentClientMonitor at" << senderSockAddr << "requested stop via PacketTypeStopNode.";277 qDebug() << "AssignmentClientMonitor at" << senderSockAddr << "requested stop via PacketType::StopNode.";
278 278
279 QCoreApplication::quit();279 QCoreApplication::quit();
280 } else {280 } else {