From 5f7c4278b872ca0a843b2fe7e30ac6627672b78e Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Mon, 9 Feb 2015 13:01:38 -0800 Subject: [PATCH] handle custom domain-server port if it is present --- libraries/networking/src/AddressManager.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/libraries/networking/src/AddressManager.cpp b/libraries/networking/src/AddressManager.cpp index 9d947dd24a..9bcdcbe9a4 100644 --- a/libraries/networking/src/AddressManager.cpp +++ b/libraries/networking/src/AddressManager.cpp @@ -202,14 +202,19 @@ void AddressManager::goToAddressFromObject(const QVariantMap& dataObject, const if (!domainObject.isEmpty()) { const QString DOMAIN_NETWORK_ADDRESS_KEY = "network_address"; + const QString DOMAIN_NETWORK_PORT_KEY = "network_port"; const QString DOMAIN_ICE_SERVER_ADDRESS_KEY = "ice_server_address"; if (domainObject.contains(DOMAIN_NETWORK_ADDRESS_KEY)) { QString domainHostname = domainObject[DOMAIN_NETWORK_ADDRESS_KEY].toString(); + quint16 domainPort = domainObject.contains(DOMAIN_NETWORK_PORT_KEY) + ? domainObject[DOMAIN_NETWORK_PORT_KEY].toUInt() + : DEFAULT_DOMAIN_SERVER_PORT; + qDebug() << "Possible domain change required to connect to" << domainHostname - << "on" << DEFAULT_DOMAIN_SERVER_PORT; - emit possibleDomainChangeRequired(domainHostname, DEFAULT_DOMAIN_SERVER_PORT); + << "on" << domainPort; + emit possibleDomainChangeRequired(domainHostname, domainPort); } else { QString iceServerAddress = domainObject[DOMAIN_ICE_SERVER_ADDRESS_KEY].toString();