Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 19:52:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixes

Browse source
This commit is contained in:
Zach Fox 2017-10-31 12:55:41 -07:00
parent f5ada4fe62
commit e9c144892a
4 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
assignment-client/src/entities/EntityServer.cpp
View file

@ -41,8 +41,14 @@ EntityServer::EntityServer(ReceivedMessage& message) :
DependencyManager::set<ScriptCache>(); DependencyManager::set<ScriptCache>();
auto& packetReceiver = DependencyManager::get<NodeList>()->getPacketReceiver(); auto& packetReceiver = DependencyManager::get<NodeList>()->getPacketReceiver();
packetReceiver.registerListenerForTypes({ PacketType::EntityAdd, PacketType::EntityEdit, PacketType::EntityErase, PacketType::EntityPhysics, PacketType::ChallengeOwnership }, packetReceiver.registerListenerForTypes({ PacketType::EntityAdd,
this, "handleEntityPacket"); PacketType::EntityEdit,
PacketType::EntityErase,
PacketType::EntityPhysics,
PacketType::ChallengeOwnership,
PacketType::ChallengeOwnershipRequest },
this,
"handleEntityPacket");
connect(&_dynamicDomainVerificationTimer, &QTimer::timeout, this, &EntityServer::startDynamicDomainVerification); connect(&_dynamicDomainVerificationTimer, &QTimer::timeout, this, &EntityServer::startDynamicDomainVerification);
_dynamicDomainVerificationTimer.setSingleShot(true); _dynamicDomainVerificationTimer.setSingleShot(true);

2
interface/src/commerce/Wallet.cpp
View file

@ -734,7 +734,7 @@ void Wallet::handleChallengeOwnershipPacket(QSharedPointer<ReceivedMessage> pack
QByteArray encryptedText = packet->read(encryptedTextByteArraySize); QByteArray encryptedText = packet->read(encryptedTextByteArraySize);
QByteArray senderNodeUUID; QByteArray senderNodeUUID;
if (challengeOriginatedFromClient) { if (challengeOriginatedFromClient) {
packet->readPrimitive(&senderNodeUUID); senderNodeUUID = packet->read(senderNodeUUIDByteArraySize);
} }
RSA* rsa = readKeys(keyFilePath().toStdString().c_str()); RSA* rsa = readKeys(keyFilePath().toStdString().c_str());

3
interface/src/ui/overlays/ContextOverlayInterface.cpp
View file

@ -337,7 +337,8 @@ void ContextOverlayInterface::openInspectionCertificate() {
//} //}
} }
} else { } else {
qCDebug(entities) << "Call to" << networkReply->url() << "failed with error" << networkReply->error(); qCDebug(entities) << "Call to" << networkReply->url() << "failed with error" << networkReply->error() <<
"More info:" << networkReply->readAll();
} }
networkReply->deleteLater(); networkReply->deleteLater();

4
libraries/entities/src/EntityTree.cpp
View file

@ -1238,13 +1238,13 @@ void EntityTree::processChallengeOwnershipRequestPacket(ReceivedMessage& message
message.readPrimitive(&certIDByteArraySize); message.readPrimitive(&certIDByteArraySize);
message.readPrimitive(&ownerKeyByteArraySize); message.readPrimitive(&ownerKeyByteArraySize);
message.readPrimitive(&encryptedTextByteArraySize);
message.readPrimitive(&nodeToChallengeByteArraySize); message.readPrimitive(&nodeToChallengeByteArraySize);
message.readPrimitive(&encryptedTextByteArraySize);
QString certID(message.read(certIDByteArraySize)); QString certID(message.read(certIDByteArraySize));
QString ownerKey(message.read(ownerKeyByteArraySize)); QString ownerKey(message.read(ownerKeyByteArraySize));
QString encryptedText(message.read(encryptedTextByteArraySize));
QUuid nodeToChallenge = QUuid::fromRfc4122(message.read(nodeToChallengeByteArraySize)); QUuid nodeToChallenge = QUuid::fromRfc4122(message.read(nodeToChallengeByteArraySize));
QString encryptedText(message.read(encryptedTextByteArraySize));
sendChallengeOwnershipRequestPacket(certID, ownerKey, encryptedText, sourceNode, nodeToChallenge); sendChallengeOwnershipRequestPacket(certID, ownerKey, encryptedText, sourceNode, nodeToChallenge);
} }