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

Stringmatch Domain ID instead of placename for DVV

Browse source
This commit is contained in:
Zach Fox 2017-10-18 11:21:03 -07:00
parent 3f0b08aea8
commit 952160874c
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -446,7 +446,7 @@ void EntityServer::domainSettingsRequestFailed() {
void EntityServer::startDynamicDomainVerification() {
qCDebug(entities) << "Starting Dynamic Domain Verification...";
QString thisPlaceName = DependencyManager::get<AddressManager>()->getPlaceName();
QString thisDomainID = DependencyManager::get<AddressManager>()->getDomainId();
EntityTreePointer tree = std::static_pointer_cast<EntityTree>(_tree);
QHash<QString, EntityItemID> localMap(tree->getEntityCertificateIDMap());
@ -486,9 +486,9 @@ void EntityServer::startDynamicDomainVerification() {
jsonObject = jsonObject["data"].toObject();
if (networkReply->error() == QNetworkReply::NoError) {
if (jsonObject["location"].toArray().first().toString() != thisPlaceName) {
qCDebug(entities) << "Entity's cert's place name" << jsonObject["place_name"].toString()
<< "isn't the current place name" << thisPlaceName << "; deleting entity" << i.value();
if (jsonObject["domain_id"].toString() != thisDomainID) {
qCDebug(entities) << "Entity's cert's domain ID" << jsonObject["domain_id"].toString()
<< "doesn't match the current Domain ID" << thisDomainID << "; deleting entity" << i.value();
tree->deleteEntity(i.value(), true);
} else {
qCDebug(entities) << "Entity passed dynamic domain verification:" << i.value();