From dc92f0be4233221f962472c67c2fd99113586afd Mon Sep 17 00:00:00 2001 From: Leonardo Murillo Date: Fri, 22 Mar 2013 13:34:35 -0600 Subject: [PATCH] More agent IDing around the code --- domain/src/main.cpp | 6 ++++-- shared/src/AgentList.cpp | 2 -- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/domain/src/main.cpp b/domain/src/main.cpp index d80864eaa0..bd49ca0ee9 100644 --- a/domain/src/main.cpp +++ b/domain/src/main.cpp @@ -73,6 +73,7 @@ int main(int argc, const char * argv[]) int packetBytesWithoutLeadingChar; sockaddr_in agentPublicAddress, agentLocalAddress; + uint16_t agentId = 0; agentLocalAddress.sin_family = AF_INET; agentList.startSilentAgentRemovalThread(); @@ -82,9 +83,10 @@ int main(int argc, const char * argv[]) std::map newestSoloAgents; agentType = packetData[0]; - unpackSocket(&packetData[1], (sockaddr *)&agentLocalAddress); + unpackAgentId(&packetData[1], (uint16_t *)&agentId); + unpackSocket(&packetData[2], (sockaddr *)&agentLocalAddress); - agentList.addOrUpdateAgent((sockaddr *)&agentPublicAddress, (sockaddr *)&agentLocalAddress, agentType); + agentList.addOrUpdateAgent((sockaddr *)&agentPublicAddress, (sockaddr *)&agentLocalAddress, agentType, agentId); currentBufferPos = broadcastPacket + 1; startPointer = currentBufferPos; diff --git a/shared/src/AgentList.cpp b/shared/src/AgentList.cpp index 7d71f1da2c..eab053e5d0 100644 --- a/shared/src/AgentList.cpp +++ b/shared/src/AgentList.cpp @@ -140,8 +140,6 @@ int AgentList::updateList(unsigned char *packetData, size_t dataBytes) { readPtr += unpackSocket(readPtr, (sockaddr *)&agentPublicSocket); readPtr += unpackSocket(readPtr, (sockaddr *)&agentLocalSocket); - //syncClientAgentList(agentId, (sockaddr *)&agentPublicSocket, (sockaddr *)&agentLocalSocket, agentType); - addOrUpdateAgent((sockaddr *)&agentPublicSocket, (sockaddr *)&agentLocalSocket, agentType, agentId); }