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

Send address and port with each metaverse heartbeat.

Browse source
This commit is contained in:
Kalila L 2020-11-20 03:19:19 -05:00
parent db2133115d
commit cfc7309c96
4 changed files with 54 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
domain-server/resources/describe-settings.json
View file

@ -2013,6 +2013,23 @@
} }
] ]
}, },
{
"name": "domain_server",
"label": "Setup Domain Server",
"restart": false,
"hidden": true,
"settings": [
{
"name": "network_address",
"default": ""
},
{
"name": "port",
"type": "int",
"default": 0
}
]
},
{ {
"name": "installed_content", "name": "installed_content",
"label": "Installed Content", "label": "Installed Content",

7
domain-server/resources/web/js/shared.js
View file

@ -129,9 +129,10 @@ function getCurrentDomainIDType() {
return DOMAIN_ID_TYPE_UNKNOWN; return DOMAIN_ID_TYPE_UNKNOWN;
} }
if (DomainInfo !== null) { if (DomainInfo !== null) {
if (DomainInfo.name !== undefined) { // Disabled because detecting as temp domain... and we're not even using temp domains right now.
return DOMAIN_ID_TYPE_TEMP; // if (DomainInfo.name !== undefined) {
} // return DOMAIN_ID_TYPE_TEMP;
// }
return DOMAIN_ID_TYPE_FULL; return DOMAIN_ID_TYPE_FULL;
} }
return DOMAIN_ID_TYPE_UNKNOWN; return DOMAIN_ID_TYPE_UNKNOWN;

36
domain-server/src/DomainServer.cpp
View file

@ -1507,10 +1507,23 @@ QJsonObject jsonForDomainSocketUpdate(const HifiSockAddr& socket) {
const QString DOMAIN_UPDATE_AUTOMATIC_NETWORKING_KEY = "automatic_networking"; const QString DOMAIN_UPDATE_AUTOMATIC_NETWORKING_KEY = "automatic_networking";
void DomainServer::performIPAddressUpdate(const HifiSockAddr& newPublicSockAddr) { void DomainServer::performIPAddressUpdate(const HifiSockAddr& newPublicSockAddr) {
sendHeartbeatToMetaverse(newPublicSockAddr.getAddress().toString()); static const QString PUBLIC_SOCKET_ADDRESS_KEY = "network_address";
static const QString PUBLIC_SOCKET_PORT_KEY = "port";
const QString& publicSocketAddress = newPublicSockAddr.getAddress().toString();
const int publicSocketPort = newPublicSockAddr.getPort();
sendHeartbeatToMetaverse(publicSocketAddress, publicSocketPort);
QString newSettingsJSON = QString("{\"domain_server\": { \"%1\": \"%2\", \"%3\": %4}}")
.arg(PUBLIC_SOCKET_ADDRESS_KEY)
.arg(publicSocketAddress)
.arg(PUBLIC_SOCKET_PORT_KEY)
.arg(publicSocketPort);
auto settingsDocument = QJsonDocument::fromJson(newSettingsJSON.toUtf8());
_settingsManager.recurseJSONObjectAndOverwriteSettings(settingsDocument.object(), DomainSettings);
} }
void DomainServer::sendHeartbeatToMetaverse(const QString& networkAddress) { void DomainServer::sendHeartbeatToMetaverse(const QString& networkAddress, const int port) {
// Setup the domain object to send to the data server // Setup the domain object to send to the data server
QJsonObject domainObject; QJsonObject domainObject;
@ -1520,10 +1533,23 @@ void DomainServer::sendHeartbeatToMetaverse(const QString& networkAddress) {
static const QString PROTOCOL_VERSION_KEY = "protocol"; static const QString PROTOCOL_VERSION_KEY = "protocol";
domainObject[PROTOCOL_VERSION_KEY] = protocolVersionsSignatureBase64(); domainObject[PROTOCOL_VERSION_KEY] = protocolVersionsSignatureBase64();
// add networking static const QString PUBLIC_SOCKET_ADDRESS_KEY = "network_address";
static const QString PUBLIC_SOCKET_PORT_KEY = "port";
static const QString NETWORK_ADDRESS_SETTINGS_KEY = "domain_server." + PUBLIC_SOCKET_ADDRESS_KEY;
const QString networkAddressFromSettings = _settingsManager.valueForKeyPath(NETWORK_ADDRESS_SETTINGS_KEY).toString();
if (!networkAddress.isEmpty()) { if (!networkAddress.isEmpty()) {
static const QString PUBLIC_NETWORK_ADDRESS_KEY = "network_address"; domainObject[PUBLIC_SOCKET_ADDRESS_KEY] = networkAddress;
domainObject[PUBLIC_NETWORK_ADDRESS_KEY] = networkAddress; } else if (!networkAddressFromSettings.isEmpty()) {
domainObject[PUBLIC_SOCKET_ADDRESS_KEY] = networkAddressFromSettings;
}
static const QString PORT_SETTINGS_KEY = "domain_server." + PUBLIC_SOCKET_PORT_KEY;
const int portFromSettings = _settingsManager.valueForKeyPath(PORT_SETTINGS_KEY).toInt();
if (port != NULL) {
domainObject[PUBLIC_SOCKET_PORT_KEY] = port;
} else if (portFromSettings != NULL) {
domainObject[PUBLIC_SOCKET_PORT_KEY] = portFromSettings;
} }
static const QString AUTOMATIC_NETWORKING_KEY = "automatic_networking"; static const QString AUTOMATIC_NETWORKING_KEY = "automatic_networking";

4
domain-server/src/DomainServer.h
View file

@ -113,7 +113,7 @@ private slots:
void sendPendingTransactionsToServer(); void sendPendingTransactionsToServer();
void performIPAddressUpdate(const HifiSockAddr& newPublicSockAddr); void performIPAddressUpdate(const HifiSockAddr& newPublicSockAddr);
void sendHeartbeatToMetaverse() { sendHeartbeatToMetaverse(QString()); } void sendHeartbeatToMetaverse() { sendHeartbeatToMetaverse(QString(), int()); }
void sendHeartbeatToIceServer(); void sendHeartbeatToIceServer();
void nodePingMonitor(); void nodePingMonitor();
@ -176,7 +176,7 @@ private:
void setupAutomaticNetworking(); void setupAutomaticNetworking();
void setupICEHeartbeatForFullNetworking(); void setupICEHeartbeatForFullNetworking();
void setupHeartbeatToMetaverse(); void setupHeartbeatToMetaverse();
void sendHeartbeatToMetaverse(const QString& networkAddress); void sendHeartbeatToMetaverse(const QString& networkAddress, const int port);
void randomizeICEServerAddress(bool shouldTriggerHostLookup); void randomizeICEServerAddress(bool shouldTriggerHostLookup);