From d3348f4de2dfbc863373208bc07a30d31a7a7b1b Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Wed, 13 Feb 2013 12:50:26 -0800
Subject: [PATCH] make changes suggested in PR #9

---
 space/CMakeLists.txt              |  2 +-
 space/src/{space.cpp => main.cpp} | 24 ++++++++++--------------
 2 files changed, 11 insertions(+), 15 deletions(-)
 rename space/src/{space.cpp => main.cpp} (93%)

diff --git a/space/CMakeLists.txt b/space/CMakeLists.txt
index 4ad405d64c..fd33179c76 100644
--- a/space/CMakeLists.txt
+++ b/space/CMakeLists.txt
@@ -2,6 +2,6 @@ cmake_minimum_required(VERSION 2.8)
 
 project(space)
 
-file(GLOB DOMAIN_SRCS src/*.cpp src/*.h)
+file(GLOB SPACE_SRCS src/*.cpp src/*.h)
 
 add_executable(space ${DOMAIN_SRCS})
diff --git a/space/src/space.cpp b/space/src/main.cpp
similarity index 93%
rename from space/src/space.cpp
rename to space/src/main.cpp
index 9c5119a2ce..9710385263 100644
--- a/space/src/space.cpp
+++ b/space/src/main.cpp
@@ -1,6 +1,6 @@
 //
-//  spaceserver.cpp
-//  interface
+//  main.cpp
+//  space
 //
 //  Created by Leonardo Murillo on 2/6/13.
 //  Copyright (c) 2013 HighFidelity, Inc. All rights reserved.
@@ -29,10 +29,8 @@ const int CHILDREN_PER_NODE = 8;
 const char *CONFIG_FILE = "/etc/below92/spaceserver.data.txt";
 const int UDP_PORT = 55551;
 std::vector< std::vector<std::string> > configData;
-sockaddr_in address, dest_address;
-socklen_t destLength = sizeof(dest_address);
-const int BUFFER_LENGTH_BYTES = 1024;
-const int BUFFER_LENGTH_SAMPLES = BUFFER_LENGTH_BYTES / sizeof(int16_t);
+sockaddr_in address, destAddress;
+socklen_t destLength = sizeof(destAddress);
 
 std::string EMPTY_STRING = "";
 
@@ -92,7 +90,7 @@ int network_init()
     return handle;
 }
 
-treeNode *FindOrCreateNode(unsigned long lengthInBits,
+treeNode *findOrCreateNode(unsigned long lengthInBits,
                            unsigned char *addressBytes,
                            std::string *hostname,
                            std::string *nickname,
@@ -118,8 +116,6 @@ treeNode *FindOrCreateNode(unsigned long lengthInBits,
             octet = octetA | octetB;
         }
         
-        printBinaryValue(octet);
-        
         if (currentNode->child[octet] == NULL) {
             currentNode->child[octet] = new treeNode;
         } else if (!currentNode->child[octet]->hostname->empty()) {
@@ -137,7 +133,7 @@ treeNode *FindOrCreateNode(unsigned long lengthInBits,
     return currentNode;
 };
 
-bool LoadSpaceData(void) {
+bool loadSpaceData(void) {
     std::ifstream configFile(CONFIG_FILE);
     std::string line;
     
@@ -202,7 +198,7 @@ bool LoadSpaceData(void) {
             ++j;
         }
         
-        FindOrCreateNode(bitsInAddress, addressBytes, thisHostname, thisNickname, 0);
+        findOrCreateNode(bitsInAddress, addressBytes, thisHostname, thisNickname, 0);
     }
     return true;
 }
@@ -222,7 +218,7 @@ int main (int argc, const char *argv[]) {
     rootNode.hostname = &ROOT_HOSTNAME;
     rootNode.nickname = &ROOT_NICKNAME;
     
-    LoadSpaceData();
+    loadSpaceData();
     
     std::cout << "[DEBUG] Listening for Datagrams" << std::endl;
     
@@ -230,8 +226,8 @@ int main (int argc, const char *argv[]) {
         received_bytes = recvfrom(handle, (unsigned char*)packet_data, BUFFER_LENGTH_BYTES, 0, (sockaddr*)&dest_address, &destLength);
         if (received_bytes > 0) {
             unsigned long lengthInBits;
-            // I assume this will be asted to long properly...
             lengthInBits = packet_data[0] * 3;
+            
             unsigned char addressData[sizeof(packet_data)-1];
             for (int i = 0; i < sizeof(packet_data)-1; ++i) {
                 addressData[i] = packet_data[i+1];
@@ -242,7 +238,7 @@ int main (int argc, const char *argv[]) {
             int domain_id = 0;
             long sentBytes;
             
-            treeNode thisNode = *FindOrCreateNode(lengthInBits, addressData, &thisHostname, &thisNickname, domain_id);
+            treeNode thisNode = *findOrCreateNode(lengthInBits, addressData, &thisHostname, &thisNickname, domain_id);
             
             if (thisNode.hostname->empty()) {
                 hostnameHolder = *LAST_KNOWN_HOSTNAME;