From 0262184c12dcb93918627acc254b103e14c1be6f Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 6 Sep 2013 11:29:04 -0700
Subject: [PATCH] put back DS port numbers, remove magic IPv numbers

---
 domain-server/src/main.cpp          | 2 +-
 libraries/shared/src/Assignment.cpp | 7 +++++--
 libraries/shared/src/NodeList.cpp   | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/domain-server/src/main.cpp b/domain-server/src/main.cpp
index 3ef424b5c0..882fa85098 100644
--- a/domain-server/src/main.cpp
+++ b/domain-server/src/main.cpp
@@ -32,7 +32,7 @@
 #include "PacketHeaders.h"
 #include "SharedUtil.h"
 
-const int DOMAIN_LISTEN_PORT = 39999;
+const int DOMAIN_LISTEN_PORT = 40102;
 unsigned char packetData[MAX_PACKET_SIZE];
 
 const int NODE_COUNT_STAT_INTERVAL_MSECS = 5000;
diff --git a/libraries/shared/src/Assignment.cpp b/libraries/shared/src/Assignment.cpp
index 20c88700d6..3c6e432f2c 100644
--- a/libraries/shared/src/Assignment.cpp
+++ b/libraries/shared/src/Assignment.cpp
@@ -12,6 +12,9 @@
 
 #include "Assignment.h"
 
+const char IPv4_ADDRESS_DESIGNATOR = 4;
+const char IPv6_ADDRESS_DESIGNATOR = 6;
+
 Assignment::Assignment(Assignment::Direction direction, Assignment::Type type, const char* pool) :
     _direction(direction),
     _type(type),
@@ -63,7 +66,7 @@ Assignment::Assignment(const unsigned char* dataBuffer, int numBytes) :
     }
     
     if (numBytes > numBytesRead) {
-        if (dataBuffer[numBytesRead++] == 4) {
+        if (dataBuffer[numBytesRead++] == IPv4_ADDRESS_DESIGNATOR) {
             // IPv4 address
             sockaddr_in destinationSocket = {};
             memcpy(&destinationSocket, dataBuffer + numBytesRead, sizeof(sockaddr_in));
@@ -100,7 +103,7 @@ int Assignment::packToBuffer(unsigned char* buffer) {
     }
     
     if (_domainSocket) {
-        buffer[numPackedBytes++] = (_domainSocket->sa_family == AF_INET) ? 4 : 6;
+        buffer[numPackedBytes++] = (_domainSocket->sa_family == AF_INET) ? IPv4_ADDRESS_DESIGNATOR : IPv6_ADDRESS_DESIGNATOR;
         
         int numSocketBytes = (_domainSocket->sa_family == AF_INET) ? sizeof(sockaddr_in) : sizeof(sockaddr_in6);
         
diff --git a/libraries/shared/src/NodeList.cpp b/libraries/shared/src/NodeList.cpp
index 4f05280fbd..c650190a4a 100644
--- a/libraries/shared/src/NodeList.cpp
+++ b/libraries/shared/src/NodeList.cpp
@@ -32,7 +32,7 @@ const char SOLO_NODE_TYPES[2] = {
 
 const char DEFAULT_DOMAIN_HOSTNAME[MAX_HOSTNAME_BYTES] = "root.highfidelity.io";
 const char DEFAULT_DOMAIN_IP[INET_ADDRSTRLEN] = "";    //  IP Address will be re-set by lookup on startup
-const int DEFAULT_DOMAINSERVER_PORT = 39999;
+const int DEFAULT_DOMAINSERVER_PORT = 40102;
 
 bool silentNodeThreadStopFlag = false;
 bool pingUnknownNodeThreadStopFlag = false;