From cec112dd286c034d2f078262e9a90415cbcf587f Mon Sep 17 00:00:00 2001 From: Kalila L Date: Wed, 25 Nov 2020 15:19:35 -0500 Subject: [PATCH] "port" -> "network_port" --- domain-server/resources/describe-settings.json | 2 +- domain-server/src/DomainServer.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/domain-server/resources/describe-settings.json b/domain-server/resources/describe-settings.json index 2cef93ad53..bb7acf344c 100644 --- a/domain-server/resources/describe-settings.json +++ b/domain-server/resources/describe-settings.json @@ -2024,7 +2024,7 @@ "default": "" }, { - "name": "port", + "name": "network_port", "type": "int", "default": 0 } diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp index 66bb06b2d6..9f5c7e0bb0 100644 --- a/domain-server/src/DomainServer.cpp +++ b/domain-server/src/DomainServer.cpp @@ -1507,7 +1507,7 @@ const QString DOMAIN_UPDATE_AUTOMATIC_NETWORKING_KEY = "automatic_networking"; void DomainServer::performIPAddressPortUpdate(const HifiSockAddr& newPublicSockAddr) { static const QString PUBLIC_SOCKET_ADDRESS_KEY = "network_address"; - static const QString PUBLIC_SOCKET_PORT_KEY = "port"; + static const QString PUBLIC_SOCKET_PORT_KEY = "network_port"; const QString& publicSocketAddress = newPublicSockAddr.getAddress().toString(); const int publicSocketPort = newPublicSockAddr.getPort(); @@ -1533,7 +1533,7 @@ void DomainServer::sendHeartbeatToMetaverse(const QString& networkAddress, const domainObject[PROTOCOL_VERSION_KEY] = protocolVersionsSignatureBase64(); static const QString PUBLIC_SOCKET_ADDRESS_KEY = "network_address"; - static const QString PUBLIC_SOCKET_PORT_KEY = "port"; + static const QString PUBLIC_SOCKET_PORT_KEY = "network_port"; static const QString NETWORK_ADDRESS_SETTINGS_KEY = "domain_server." + PUBLIC_SOCKET_ADDRESS_KEY; const QString networkAddressFromSettings = _settingsManager.valueForKeyPath(NETWORK_ADDRESS_SETTINGS_KEY).toString();