From 7220643fe9b72b1df3de72816a1d6f27a9de4082 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Wed, 18 Sep 2013 12:04:09 -0700
Subject: [PATCH] default AC to point to DS on localhost and default port

---
 assignment-client/src/main.cpp       |  2 +-
 libraries/shared/src/NodeList.cpp    | 10 +++++-----
 libraries/shared/src/NodeList.h      |  2 +-
 libraries/shared/src/PacketHeaders.h |  2 --
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/assignment-client/src/main.cpp b/assignment-client/src/main.cpp
index 1d2f7c2bb7..479e12eec7 100644
--- a/assignment-client/src/main.cpp
+++ b/assignment-client/src/main.cpp
@@ -199,7 +199,7 @@ int main(int argc, const char* argv[]) {
     if (customAssignmentServerHostname) {
         const char* customAssignmentServerPortString = getCmdOption(argc, argv, CUSTOM_ASSIGNMENT_SERVER_PORT_OPTION);
         unsigned short assignmentServerPort = customAssignmentServerPortString
-            ? atoi(customAssignmentServerPortString) : ASSIGNMENT_SERVER_PORT;
+            ? atoi(customAssignmentServerPortString) : DEFAULT_DOMAINSERVER_PORT;
         
         ::customAssignmentSocket = socketForHostnameAndHostOrderPort(customAssignmentServerHostname, assignmentServerPort);
     }
diff --git a/libraries/shared/src/NodeList.cpp b/libraries/shared/src/NodeList.cpp
index d5a8bf99a2..6af17c2dcf 100644
--- a/libraries/shared/src/NodeList.cpp
+++ b/libraries/shared/src/NodeList.cpp
@@ -33,7 +33,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 = 40102;
+const unsigned short DEFAULT_DOMAINSERVER_PORT = 40102;
 
 bool silentNodeThreadStopFlag = false;
 bool pingUnknownNodeThreadStopFlag = false;
@@ -382,9 +382,9 @@ int NodeList::processDomainServerList(unsigned char* packetData, size_t dataByte
     return readNodes;
 }
 
-const char GLOBAL_ASSIGNMENT_SERVER_HOSTNAME[] = "assignment.highfidelity.io";
-const sockaddr_in GLOBAL_ASSIGNMENT_SOCKET = socketForHostnameAndHostOrderPort(GLOBAL_ASSIGNMENT_SERVER_HOSTNAME,
-                                                                               ASSIGNMENT_SERVER_PORT);
+const char LOCAL_ASSIGNMENT_SERVER_HOSTNAME[] = "localhost";
+const sockaddr_in DEFAULT_LOCAL_ASSIGNMENT_SOCKET = socketForHostnameAndHostOrderPort(LOCAL_ASSIGNMENT_SERVER_HOSTNAME,
+                                                                              DEFAULT_DOMAINSERVER_PORT);
 void NodeList::sendAssignment(Assignment& assignment) {
     unsigned char assignmentPacket[MAX_PACKET_SIZE];
     
@@ -396,7 +396,7 @@ void NodeList::sendAssignment(Assignment& assignment) {
     int numAssignmentBytes = assignment.packToBuffer(assignmentPacket + numHeaderBytes);
     
     sockaddr* assignmentServerSocket = (_assignmentServerSocket == NULL)
-        ? (sockaddr*) &GLOBAL_ASSIGNMENT_SOCKET
+        ? (sockaddr*) &DEFAULT_LOCAL_ASSIGNMENT_SOCKET
         : _assignmentServerSocket;
     
     _nodeSocket.send(assignmentServerSocket, assignmentPacket, numHeaderBytes + numAssignmentBytes);
diff --git a/libraries/shared/src/NodeList.h b/libraries/shared/src/NodeList.h
index 7233e7af69..0834a278dc 100644
--- a/libraries/shared/src/NodeList.h
+++ b/libraries/shared/src/NodeList.h
@@ -38,7 +38,7 @@ const int MAX_HOSTNAME_BYTES = 256;
 
 extern const char DEFAULT_DOMAIN_HOSTNAME[MAX_HOSTNAME_BYTES];
 extern const char DEFAULT_DOMAIN_IP[INET_ADDRSTRLEN];    //  IP Address will be re-set by lookup on startup
-extern const int DEFAULT_DOMAINSERVER_PORT;
+extern const unsigned short DEFAULT_DOMAINSERVER_PORT;
 
 const int UNKNOWN_NODE_ID = 0;
 
diff --git a/libraries/shared/src/PacketHeaders.h b/libraries/shared/src/PacketHeaders.h
index 2aaabc4aa8..10ddbf56ad 100644
--- a/libraries/shared/src/PacketHeaders.h
+++ b/libraries/shared/src/PacketHeaders.h
@@ -58,6 +58,4 @@ const int MAX_PACKET_HEADER_BYTES = sizeof(PACKET_TYPE) + sizeof(PACKET_VERSION)
 #define ADD_SCENE_COMMAND "add scene"
 #define TEST_COMMAND      "a message"
 
-const unsigned short ASSIGNMENT_SERVER_PORT = 7007;
-
 #endif