Merge pull request #15828 from roxanneskelly/bugz812

BUGZ-812 - Log system info on domain connect or connect refusal

domain-server/src/DomainGatekeeper.cpp

@@ -136,7 +136,8 @@ void DomainGatekeeper::processConnectRequestPacket(QSharedPointer<ReceivedMessag
     } else {
         qDebug() << "Refusing connection from node at" << message->getSenderSockAddr()
             << "with hardware address" << nodeConnection.hardwareAddress
-            << "and machine fingerprint" << nodeConnection.machineFingerprint;
+            << "and machine fingerprint" << nodeConnection.machineFingerprint
+            << "sysinfo" << nodeConnection.SystemInfo;
     }
 }
 

domain-server/src/NodeConnectionData.cpp

@@ -37,7 +37,11 @@ NodeConnectionData NodeConnectionData::fromDataStream(QDataStream& dataStream, c
         dataStream >> newHeader.machineFingerprint;
 
         // and the operating system type
-        dataStream >> newHeader.SystemInfo;
+        QByteArray compressedSystemInfo;
+        dataStream >> compressedSystemInfo;
+        if (!compressedSystemInfo.isEmpty()) {
+            newHeader.SystemInfo = qUncompress(compressedSystemInfo);
+        }
 
         dataStream >> newHeader.connectReason;
 

libraries/networking/CMakeLists.txt

@@ -1,6 +1,6 @@
 set(TARGET_NAME networking)
 setup_hifi_library(Network)
-link_hifi_libraries(shared)
+link_hifi_libraries(shared platform)
 
 target_openssl()
 target_tbb()

libraries/networking/src/NodeList.cpp

@@ -26,6 +26,8 @@
 #include <ThreadHelpers.h>
 #include <LogHandler.h>
 #include <UUID.h>
+#include <platform/Platform.h>
+#include <platform/PlatformKeys.h>
 
 #include "AccountManager.h"
 #include "AddressManager.h"
@@ -42,6 +44,7 @@
 using namespace std::chrono;
 
 const int KEEPALIVE_PING_INTERVAL_MS = 1000;
+const int MAX_SYSTEM_INFO_SIZE = 1000;
 
 NodeList::NodeList(char newOwnerType, int socketListenPort, int dtlsListenPort) :
     LimitedNodeList(socketListenPort, dtlsListenPort),
@@ -418,19 +421,20 @@ void NodeList::sendDomainServerCheckIn() {
             auto accountManager = DependencyManager::get<AccountManager>();
             packetStream << FingerprintUtils::getMachineFingerprint();
 
-            QString systemInfo;
+            auto desc = platform::getAll();
-#if defined Q_OS_WIN
+
-            systemInfo = "OS:Windows";
+            QByteArray systemInfo(desc.dump().c_str());
-#elif defined Q_OS_OSX
+            QByteArray compressedSystemInfo = qCompress(systemInfo);
-            systemInfo = "OS:OSX";
+
-#elif defined Q_OS_LINUX
+            if (compressedSystemInfo.size() > MAX_SYSTEM_INFO_SIZE) {
-            systemInfo = "OS:Linux";
+                // Highly unlikely, as not even unreasonable machines will
-#elif defined Q_OS_ANDROID
+                // overflow the max size, but prevent MTU overflow anyway.
-            systemInfo = "OS:Android";
+                // We could do something sophisticated like clearing specific
-#else
+                // values if they're too big, but we'll save that for later.
-            systemInfo = "OS:Unknown";
+                compressedSystemInfo.clear();
-#endif
+            }
-            packetStream << systemInfo;
+
+            packetStream << compressedSystemInfo;
 
             packetStream << _connectReason;
 

libraries/networking/src/ThreadedAssignment.cpp

@@ -20,6 +20,7 @@
 #include <LogHandler.h>
 #include <shared/QtHelpers.h>
 
+#include <platform/Platform.h>
 #include "NetworkLogging.h"
 
 ThreadedAssignment::ThreadedAssignment(ReceivedMessage& message) :
@@ -38,6 +39,16 @@ ThreadedAssignment::ThreadedAssignment(ReceivedMessage& message) :
     // if the NL tells us we got a DS response, clear our member variable of queued check-ins
     auto nodeList = DependencyManager::get<NodeList>();
     connect(nodeList.data(), &NodeList::receivedDomainServerList, this, &ThreadedAssignment::clearQueuedCheckIns);
+
+    platform::create();
+    if (!platform::enumeratePlatform()) {
+        qCDebug(networking) << "Failed to enumerate platform.";
+    }
+}
+
+ThreadedAssignment::~ThreadedAssignment() {
+    stop();
+    platform::destroy();
 }
 
 void ThreadedAssignment::setFinished(bool isFinished) {

libraries/networking/src/ThreadedAssignment.h

@@ -22,7 +22,7 @@ class ThreadedAssignment : public Assignment {
     Q_OBJECT
 public:
     ThreadedAssignment(ReceivedMessage& message);
-    ~ThreadedAssignment() { stop(); }
+    ~ThreadedAssignment();
 
     virtual void aboutToFinish() { };
     void addPacketStatsAndSendStatsPacket(QJsonObject statsObject);

libraries/networking/src/udt/PacketHeaders.cpp

@@ -72,7 +72,7 @@ PacketVersion versionForPacketType(PacketType packetType) {
             return static_cast<PacketVersion>(DomainConnectionDeniedVersion::IncludesExtraInfo);
 
         case PacketType::DomainConnectRequest:
-            return static_cast<PacketVersion>(DomainConnectRequestVersion::HasSystemInfo);
+            return static_cast<PacketVersion>(DomainConnectRequestVersion::HasCompressedSystemInfo);
 
         case PacketType::DomainServerAddedNode:
             return static_cast<PacketVersion>(DomainServerAddedNodeVersion::PermissionsGrid);

libraries/networking/src/udt/PacketHeaders.h

@@ -347,7 +347,8 @@ enum class DomainConnectRequestVersion : PacketVersion {
     AlwaysHasMachineFingerprint,
     HasTimestamp,
     HasReason,
-    HasSystemInfo
+    HasSystemInfo,
+    HasCompressedSystemInfo
 };
 
 enum class DomainConnectionDeniedVersion : PacketVersion {

libraries/platform/CMakeLists.txt

@@ -5,3 +5,11 @@ link_hifi_libraries(shared)
 
 GroupSources("src")
 target_json()
+
+if (APPLE)
+  # link in required OS X frameworks and include the right GL headers
+  find_library(OpenGL OpenGL)
+  find_library(AppKit AppKit)
+
+  target_link_libraries(${TARGET_NAME} ${OpenGL} ${AppKit})
+endif ()