From 45d84add0557120f32c4bf4d9be1e04c066bb700 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Mon, 5 Aug 2013 10:37:23 -0700 Subject: [PATCH] cleanup from code review comments --- assignment-server/src/main.cpp | 1 - libraries/shared/src/Node.cpp | 2 -- libraries/shared/src/NodeList.cpp | 1 - libraries/shared/src/NodeTypes.h | 1 - libraries/shared/src/PacketHeaders.h | 2 ++ 5 files changed, 2 insertions(+), 5 deletions(-) diff --git a/assignment-server/src/main.cpp b/assignment-server/src/main.cpp index 90f91a6c10..09c29b1582 100644 --- a/assignment-server/src/main.cpp +++ b/assignment-server/src/main.cpp @@ -14,7 +14,6 @@ #include #include -const int ASSIGNMENT_SERVER_LISTEN_PORT = 7007; const int MAX_PACKET_SIZE_BYTES = 1400; struct Assignment {}; diff --git a/libraries/shared/src/Node.cpp b/libraries/shared/src/Node.cpp index c91626d99d..7aebb0c022 100644 --- a/libraries/shared/src/Node.cpp +++ b/libraries/shared/src/Node.cpp @@ -94,8 +94,6 @@ const char* Node::getTypeName() const { return NODE_TYPE_NAME_AUDIO_INJECTOR; case NODE_TYPE_ANIMATION_SERVER: return NODE_TYPE_NAME_ANIMATION_SERVER; - case NODE_TYPE_UNASSIGNED: - return NODE_TYPE_NAME_UNASSIGNED; default: return NODE_TYPE_NAME_UNKNOWN; } diff --git a/libraries/shared/src/NodeList.cpp b/libraries/shared/src/NodeList.cpp index 0a7da717c9..2dfd537d93 100644 --- a/libraries/shared/src/NodeList.cpp +++ b/libraries/shared/src/NodeList.cpp @@ -368,7 +368,6 @@ int NodeList::processDomainServerList(unsigned char* packetData, size_t dataByte void NodeList::sendAssignmentRequest() { const char ASSIGNMENT_SERVER_HOSTNAME[] = "assignment.highfidelity.io"; - const unsigned short ASSIGNMENT_SERVER_PORT = 7007; static sockaddr_in assignmentServerSocket = socketForHostname(ASSIGNMENT_SERVER_HOSTNAME); assignmentServerSocket.sin_port = htons(ASSIGNMENT_SERVER_PORT); diff --git a/libraries/shared/src/NodeTypes.h b/libraries/shared/src/NodeTypes.h index a9deebf333..aa4ae51ec5 100644 --- a/libraries/shared/src/NodeTypes.h +++ b/libraries/shared/src/NodeTypes.h @@ -24,6 +24,5 @@ const NODE_TYPE NODE_TYPE_AUDIO_MIXER = 'M'; const NODE_TYPE NODE_TYPE_AVATAR_MIXER = 'W'; const NODE_TYPE NODE_TYPE_AUDIO_INJECTOR = 'A'; const NODE_TYPE NODE_TYPE_ANIMATION_SERVER = 'a'; -const NODE_TYPE NODE_TYPE_UNASSIGNED = 1; #endif diff --git a/libraries/shared/src/PacketHeaders.h b/libraries/shared/src/PacketHeaders.h index 24d755652c..2b021db82c 100644 --- a/libraries/shared/src/PacketHeaders.h +++ b/libraries/shared/src/PacketHeaders.h @@ -54,4 +54,6 @@ const int MAX_PACKET_HEADER_BYTES = sizeof(PACKET_TYPE) + sizeof(PACKET_VERSION) #define ADD_SCENE_COMMAND "add scene" #define TEST_COMMAND "a message" +const int ASSIGNMENT_SERVER_PORT = 7007; + #endif