From 784fa5882a9e48828f3ed4c2cb08cec9ec0814bf Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Mon, 6 May 2013 13:36:58 -0700 Subject: [PATCH 1/3] closing of serial interface should be conditional on __APPLE__ --- interface/src/SerialInterface.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/interface/src/SerialInterface.cpp b/interface/src/SerialInterface.cpp index c7d539935f..cca18f76cc 100644 --- a/interface/src/SerialInterface.cpp +++ b/interface/src/SerialInterface.cpp @@ -34,7 +34,9 @@ const int GRAVITY_SAMPLES = 200; // Use the first samples to const bool USING_INVENSENSE_MPU9150 = 1; SerialInterface::~SerialInterface() { +#ifdef __APPLE__ close(_serialDescriptor); +#endif } void SerialInterface::pair() { From f9edfd3b83f3dc7530659ec4ea42683fb0b84b53 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Mon, 6 May 2013 13:43:21 -0700 Subject: [PATCH 2/3] don't incorrectly push the broadcast packet pointer --- domain-server/src/main.cpp | 4 ++-- libraries/shared/src/AgentList.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/domain-server/src/main.cpp b/domain-server/src/main.cpp index 705bc317b2..553484dfc7 100644 --- a/domain-server/src/main.cpp +++ b/domain-server/src/main.cpp @@ -100,7 +100,7 @@ int main(int argc, const char * argv[]) std::map newestSoloAgents; agentType = packetData[1]; - unpackSocket(&packetData[2], (sockaddr*) &agentLocalAddress); + unpackSocket(packetData + 2, (sockaddr*) &agentLocalAddress); // check the agent public address // if it matches our local address we're on the same box @@ -125,7 +125,7 @@ int main(int argc, const char * argv[]) refreshedAgent->setWakeMicrostamp(usecTimestampNow()); } - currentBufferPos = broadcastPacket + 2; + currentBufferPos = broadcastPacket + 1; startPointer = currentBufferPos; for (AgentList::iterator agent = agentList->begin(); agent != agentList->end(); agent++) { diff --git a/libraries/shared/src/AgentList.cpp b/libraries/shared/src/AgentList.cpp index 51a14d8cb1..f77ab12407 100644 --- a/libraries/shared/src/AgentList.cpp +++ b/libraries/shared/src/AgentList.cpp @@ -31,7 +31,7 @@ const char SOLO_AGENT_TYPES[3] = { }; char DOMAIN_HOSTNAME[] = "highfidelity.below92.com"; -char DOMAIN_IP[100] = ""; // IP Address will be re-set by lookup on startup +char DOMAIN_IP[100] = "192.168.1.47"; // IP Address will be re-set by lookup on startup const int DOMAINSERVER_PORT = 40102; bool silentAgentThreadStopFlag = false; From a4c525e308a67a6c04f87039495ebed1be391e8b Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Mon, 6 May 2013 13:44:40 -0700 Subject: [PATCH 3/3] don't commit birarda's local IP to AgentList --- libraries/shared/src/AgentList.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/shared/src/AgentList.cpp b/libraries/shared/src/AgentList.cpp index f77ab12407..51a14d8cb1 100644 --- a/libraries/shared/src/AgentList.cpp +++ b/libraries/shared/src/AgentList.cpp @@ -31,7 +31,7 @@ const char SOLO_AGENT_TYPES[3] = { }; char DOMAIN_HOSTNAME[] = "highfidelity.below92.com"; -char DOMAIN_IP[100] = "192.168.1.47"; // IP Address will be re-set by lookup on startup +char DOMAIN_IP[100] = ""; // IP Address will be re-set by lookup on startup const int DOMAINSERVER_PORT = 40102; bool silentAgentThreadStopFlag = false;