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

CR feedback

Browse source
This commit is contained in:
David Kelly 2016-12-16 17:17:10 -08:00
parent 126ae52cb4
commit 0553dbdcb7
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
domain-server/src/DomainGatekeeper.cpp
View file

@ -121,7 +121,7 @@ void DomainGatekeeper::processConnectRequestPacket(QSharedPointer<ReceivedMessag
qDebug() << "Allowed connection from node" << uuidStringWithoutCurlyBraces(node->getUUID()) qDebug() << "Allowed connection from node" << uuidStringWithoutCurlyBraces(node->getUUID())
<< "on" << message->getSenderSockAddr() << "with MAC" << nodeConnection.hardwareAddress << "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 // signal that we just connected a node so the DomainServer can get it a list
// and broadcast its presence right away // and broadcast its presence right away
@ -129,7 +129,7 @@ void DomainGatekeeper::processConnectRequestPacket(QSharedPointer<ReceivedMessag
} else { } else {
qDebug() << "Refusing connection from node at" << message->getSenderSockAddr() qDebug() << "Refusing connection from node at" << message->getSenderSockAddr()
<< "with hardware address" << nodeConnection.hardwareAddress << "with hardware address" << nodeConnection.hardwareAddress
<< " and machine fingerprint " << nodeConnection.machineFingerprint; << "and machine fingerprint" << nodeConnection.machineFingerprint;
} }
} }

2
domain-server/src/DomainGatekeeper.h
View file

@ -108,7 +108,7 @@ private:
QSet<QString> _inFlightGroupMembershipsRequests; // keep track of which we've already asked for QSet<QString> _inFlightGroupMembershipsRequests; // keep track of which we've already asked for
NodePermissions setPermissionsForUser(bool isLocalUser, QString verifiedUsername, const QHostAddress& senderAddress, 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 getGroupMemberships(const QString& username);
// void getIsGroupMember(const QString& username, const QUuid groupID); // void getIsGroupMember(const QString& username, const QUuid groupID);

3
libraries/networking/src/FingerprintUtils.cpp
View file

@ -49,7 +49,8 @@ QString FingerprintUtils::getMachineFingerprintString() {
HRESULT hres; HRESULT hres;
IWbemLocator *pLoc = NULL; 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); hres = CoInitializeEx(0, COINIT_MULTITHREADED);
if (FAILED(hres)) { if (FAILED(hres)) {
qDebug() << "Failed to initialize COM library!"; qDebug() << "Failed to initialize COM library!";