From 7bbaaf6b78a4461f6b43ef0d5543fb6b10d03675 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Thu, 16 Oct 2014 11:54:55 -0700 Subject: [PATCH] cleanup some username signature debug, fix interest list pull --- domain-server/src/DomainServer.cpp | 13 ++++++++----- interface/src/DatagramProcessor.cpp | 1 + libraries/networking/src/DataServerAccountInfo.cpp | 3 --- libraries/networking/src/NodeList.cpp | 2 -- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp index bbfa01c709..74bb3b6a2b 100644 --- a/domain-server/src/DomainServer.cpp +++ b/domain-server/src/DomainServer.cpp @@ -1205,17 +1205,20 @@ void DomainServer::processDatagram(const QByteArray& receivedPacket, const HifiS QDataStream packetStream(receivedPacket); packetStream.skipRawData(numBytesForPacketHeader(receivedPacket)); - int numNodeInfoBytes = parseNodeDataFromByteArray(packetStream, throwawayNodeType, - nodePublicAddress, nodeLocalAddress, - senderSockAddr); + parseNodeDataFromByteArray(packetStream, throwawayNodeType, nodePublicAddress, nodeLocalAddress, + senderSockAddr); - SharedNodePointer checkInNode = nodeList->updateSocketsForNode(nodeUUID, nodePublicAddress, nodeLocalAddress); + SharedNodePointer checkInNode = nodeList->updateSocketsForNode(nodeUUID, + nodePublicAddress, nodeLocalAddress); // update last receive to now quint64 timeNow = usecTimestampNow(); checkInNode->setLastHeardMicrostamp(timeNow); - sendDomainListToNode(checkInNode, senderSockAddr, nodeInterestListFromPacket(receivedPacket, numNodeInfoBytes)); + QList nodeInterestList; + packetStream >> nodeInterestList; + + sendDomainListToNode(checkInNode, senderSockAddr, nodeInterestList.toSet()); } break; diff --git a/interface/src/DatagramProcessor.cpp b/interface/src/DatagramProcessor.cpp index 0232e0e71d..3334219dbd 100644 --- a/interface/src/DatagramProcessor.cpp +++ b/interface/src/DatagramProcessor.cpp @@ -140,6 +140,7 @@ void DatagramProcessor::processDatagrams() { // output to the log so the user knows they got a denied connection request // and check and signal for an access token so that we can make sure they are logged in qDebug() << "The domain-server denied a connection request."; + qDebug() << "You may need to re-log to generate a keypair so you can provide a username signature."; AccountManager::getInstance().checkAndSignalForAccessToken(); break; } diff --git a/libraries/networking/src/DataServerAccountInfo.cpp b/libraries/networking/src/DataServerAccountInfo.cpp index 61b1bbf418..600eb57166 100644 --- a/libraries/networking/src/DataServerAccountInfo.cpp +++ b/libraries/networking/src/DataServerAccountInfo.cpp @@ -150,9 +150,6 @@ const QByteArray& DataServerAccountInfo::getUsernameSignature() { qDebug() << "Could not create RSA struct from QByteArray private key."; qDebug() << "Will re-attempt on next domain-server check in."; } - } else { - qDebug() << "No private key present in DataServerAccountInfo. Re-log to generate new key."; - qDebug() << "Returning empty username signature."; } } diff --git a/libraries/networking/src/NodeList.cpp b/libraries/networking/src/NodeList.cpp index 13ebfb59b8..f8da7cdbfa 100644 --- a/libraries/networking/src/NodeList.cpp +++ b/libraries/networking/src/NodeList.cpp @@ -315,8 +315,6 @@ void NodeList::sendDomainServerCheckIn() { if (!usernameSignature.isEmpty()) { qDebug() << "Including username signature in domain connect request."; packetStream << usernameSignature; - } else { - qDebug() << "Private key not present - domain connect request cannot include username signature"; } }