bump packet versions. change how domainObject[RESTRICTED_ACCESS_FLAG] is decided

domain-server/src/DomainServer.cpp

@@ -1087,7 +1087,9 @@ void DomainServer::sendHeartbeatToMetaverse(const QString& networkAddress) {
     // add a flag to indicate if this domain uses restricted access - for now that will exclude it from listings
     const QString RESTRICTED_ACCESS_FLAG = "restricted";
 
-    domainObject[RESTRICTED_ACCESS_FLAG] = _settingsManager.getAllNames().length() > 0;
+    // consider the domain to have restricted access if "anonymous" connections can't connect to the domain.
+    NodePermissions anonymousPermissions = _settingsManager.getPermissionsForName(NodePermissions::standardNameAnonymous);
+    domainObject[RESTRICTED_ACCESS_FLAG] = !anonymousPermissions.canConnectToDomain;
 
     // figure out the breakdown of currently connected interface clients
     int numConnectedUnassigned = 0;

libraries/networking/src/NodePermissions.cpp

@@ -17,6 +17,10 @@ QString NodePermissions::standardNameLocalhost = QString("localhost");
 QString NodePermissions::standardNameLoggedIn = QString("logged-in");
 QString NodePermissions::standardNameAnonymous = QString("anonymous");
 
+QList<QString> NodePermissions::standardNames = QList<QString>()
+    << NodePermissions::standardNameLocalhost
+    << NodePermissions::standardNameLoggedIn
+    << NodePermissions::standardNameAnonymous;
 
 NodePermissions& NodePermissions::operator|=(const NodePermissions& rhs) {
     this->canConnectToDomain |= rhs.canConnectToDomain;

libraries/networking/src/NodePermissions.h

@@ -41,6 +41,7 @@ public:
     static QString standardNameLocalhost;
     static QString standardNameLoggedIn;
     static QString standardNameAnonymous;
+    static QList<QString> standardNames;
 
     // the initializations here should match the defaults in describe-settings.json
     bool canConnectToDomain { true };

libraries/networking/src/udt/PacketHeaders.cpp

@@ -45,7 +45,7 @@ const QSet<PacketType> RELIABLE_PACKETS = QSet<PacketType>();
 PacketVersion versionForPacketType(PacketType packetType) {
     switch (packetType) {
         case PacketType::DomainList:
-            return 18;
+            return static_cast<PacketVersion>(DomainListVersion::PermissionsGrid);
         case PacketType::EntityAdd:
         case PacketType::EntityEdit:
         case PacketType::EntityData:
@@ -69,6 +69,9 @@ PacketVersion versionForPacketType(PacketType packetType) {
         case PacketType::DomainConnectRequest:
             return static_cast<PacketVersion>(DomainConnectRequestVersion::HasProtocolVersions);
 
+        case PacketType::DomainServerAddedNode:
+            return static_cast<PacketVersion>(DomainServerAddedNodeVersion::PermissionsGrid);
+
         default:
             return 17;
     }

libraries/networking/src/udt/PacketHeaders.h

@@ -199,4 +199,14 @@ enum class DomainConnectionDeniedVersion : PacketVersion {
     IncludesReasonCode
 };
 
+enum class DomainServerAddedNodeVersion : PacketVersion {
+    PrePermissionsGrid = 17,
+    PermissionsGrid
+};
+
+enum class DomainListVersion : PacketVersion {
+    PrePermissionsGrid = 18,
+    PermissionsGrid
+};
+
 #endif // hifi_PacketHeaders_h