From 0553dbdcb733298340d273aa8241a4b2cbc72bc3 Mon Sep 17 00:00:00 2001 From: David Kelly Date: Fri, 16 Dec 2016 17:17:10 -0800 Subject: [PATCH] CR feedback --- domain-server/src/DomainGatekeeper.cpp | 4 ++-- domain-server/src/DomainGatekeeper.h | 2 +- libraries/networking/src/FingerprintUtils.cpp | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/domain-server/src/DomainGatekeeper.cpp b/domain-server/src/DomainGatekeeper.cpp index 762871ed8b..97f3e1a697 100644 --- a/domain-server/src/DomainGatekeeper.cpp +++ b/domain-server/src/DomainGatekeeper.cpp @@ -121,7 +121,7 @@ void DomainGatekeeper::processConnectRequestPacket(QSharedPointergetUUID()) << "on" << message->getSenderSockAddr() << "with MAC" << nodeConnection.hardwareAddress - << " and machine fingerprint " << nodeConnection.machineFingerprint; + << "and machine fingerprint" << nodeConnection.machineFingerprint; // signal that we just connected a node so the DomainServer can get it a list // and broadcast its presence right away @@ -129,7 +129,7 @@ void DomainGatekeeper::processConnectRequestPacket(QSharedPointergetSenderSockAddr() << "with hardware address" << nodeConnection.hardwareAddress - << " and machine fingerprint " << nodeConnection.machineFingerprint; + << "and machine fingerprint" << nodeConnection.machineFingerprint; } } diff --git a/domain-server/src/DomainGatekeeper.h b/domain-server/src/DomainGatekeeper.h index 70f1bdaef6..163f255411 100644 --- a/domain-server/src/DomainGatekeeper.h +++ b/domain-server/src/DomainGatekeeper.h @@ -108,7 +108,7 @@ private: QSet _inFlightGroupMembershipsRequests; // keep track of which we've already asked for NodePermissions setPermissionsForUser(bool isLocalUser, QString verifiedUsername, const QHostAddress& senderAddress, - const QString& hardwareAddress, const QUuid& machineFingerprint); + const QString& hardwareAddress, const QUuid& machineFingerprint); void getGroupMemberships(const QString& username); // void getIsGroupMember(const QString& username, const QUuid groupID); diff --git a/libraries/networking/src/FingerprintUtils.cpp b/libraries/networking/src/FingerprintUtils.cpp index adafb8cf36..70a2f8ab2c 100644 --- a/libraries/networking/src/FingerprintUtils.cpp +++ b/libraries/networking/src/FingerprintUtils.cpp @@ -49,7 +49,8 @@ QString FingerprintUtils::getMachineFingerprintString() { HRESULT hres; IWbemLocator *pLoc = NULL; - // initialize com + // initialize com. Interface already does, but other + // users of this lib don't necessarily do so. hres = CoInitializeEx(0, COINIT_MULTITHREADED); if (FAILED(hres)) { qDebug() << "Failed to initialize COM library!";