From 76d47eb4e7401a8479279fd031f795c9d7a56cbb Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 16 Jul 2015 13:22:18 -0700
Subject: [PATCH 1/2] mark the DataServerConfirm packet unused

---
 libraries/networking/src/udt/PacketHeaders.cpp | 1 -
 libraries/networking/src/udt/PacketHeaders.h   | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/libraries/networking/src/udt/PacketHeaders.cpp b/libraries/networking/src/udt/PacketHeaders.cpp
index ccbd56c674..9a39b6f5eb 100644
--- a/libraries/networking/src/udt/PacketHeaders.cpp
+++ b/libraries/networking/src/udt/PacketHeaders.cpp
@@ -135,7 +135,6 @@ QString nameForPacketType(PacketType::Value packetType) {
             PACKET_TYPE_NAME_LOOKUP(DomainConnectionDenied);
             PACKET_TYPE_NAME_LOOKUP(MuteEnvironment);
             PACKET_TYPE_NAME_LOOKUP(AudioStreamStats);
-            PACKET_TYPE_NAME_LOOKUP(DataServerConfirm);
             PACKET_TYPE_NAME_LOOKUP(OctreeStats);
             PACKET_TYPE_NAME_LOOKUP(Jurisdiction);
             PACKET_TYPE_NAME_LOOKUP(JurisdictionRequest);
diff --git a/libraries/networking/src/udt/PacketHeaders.h b/libraries/networking/src/udt/PacketHeaders.h
index a133654b05..5f63a2c840 100644
--- a/libraries/networking/src/udt/PacketHeaders.h
+++ b/libraries/networking/src/udt/PacketHeaders.h
@@ -48,7 +48,7 @@ namespace PacketType {
         DomainConnectionDenied,
         MuteEnvironment,
         AudioStreamStats,
-        DataServerConfirm, // 20
+        UNUSED, // 20
         DomainServerPathQuery,
         DomainServerPathResponse,
         DomainServerAddedNode,

From 5d84d2ec3072853b63ad200ccba90e6dbd69e84a Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 16 Jul 2015 13:39:14 -0700
Subject: [PATCH 2/2] add port to current address if not default

---
 libraries/networking/src/AddressManager.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/libraries/networking/src/AddressManager.cpp b/libraries/networking/src/AddressManager.cpp
index 21bbbc82f6..2b9b8d42fb 100644
--- a/libraries/networking/src/AddressManager.cpp
+++ b/libraries/networking/src/AddressManager.cpp
@@ -548,7 +548,13 @@ void AddressManager::setHost(const QString& host, LookupTrigger trigger) {
 
 
 void AddressManager::setDomainInfo(const QString& hostname, quint16 port, LookupTrigger trigger) {
-    setHost(hostname, trigger);
+    
+    QString domainHostString = hostname;
+    if (port != DEFAULT_DOMAIN_SERVER_PORT) {
+        domainHostString.append(QString(":%1").arg(port));
+    }
+    
+    setHost(domainHostString, trigger);
 
     _rootPlaceID = QUuid();