From e3d842dff7b12a4b7af93fd96fe3107372f76265 Mon Sep 17 00:00:00 2001 From: Leonardo Murillo Date: Fri, 22 Mar 2013 11:43:16 -0600 Subject: [PATCH] Packing agent ID on domain broadcast packet --- domain/src/main.cpp | 4 +--- shared/src/AgentList.h | 5 +++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/domain/src/main.cpp b/domain/src/main.cpp index 05fb088329..d80864eaa0 100644 --- a/domain/src/main.cpp +++ b/domain/src/main.cpp @@ -50,9 +50,7 @@ AgentList agentList(DOMAIN_LISTEN_PORT); unsigned char * addAgentToBroadcastPacket(unsigned char *currentPosition, Agent *agentToAdd) { *currentPosition++ = agentToAdd->getType(); - // FIX THIS - NOT ONE BYTE - currentPosition += agentToAdd->getAgentId(); - // --- + currentPosition += packAgentId(currentPosition, agentToAdd->getAgentId()); currentPosition += packSocket(currentPosition, agentToAdd->getPublicSocket()); currentPosition += packSocket(currentPosition, agentToAdd->getLocalSocket()); diff --git a/shared/src/AgentList.h b/shared/src/AgentList.h index 9d6e9991dc..e376f29af7 100644 --- a/shared/src/AgentList.h +++ b/shared/src/AgentList.h @@ -38,8 +38,6 @@ class AgentList { int updateList(unsigned char *packetData, size_t dataBytes); bool addOrUpdateAgent(sockaddr *publicSocket, sockaddr *localSocket, char agentType, uint16_t agentId); - int unpackAgentId(unsigned char *packedData, uint16_t *agentId); - int packAgentId(unsigned char *packStore, uint16_t agentId); void processAgentData(sockaddr *senderAddress, void *packetData, size_t dataBytes); void updateAgentWithData(sockaddr *senderAddress, void *packetData, size_t dataBytes); void broadcastToAgents(char *broadcastData, size_t dataBytes); @@ -56,4 +54,7 @@ class AgentList { void handlePingReply(sockaddr *agentAddress); }; +int unpackAgentId(unsigned char *packedData, uint16_t *agentId); +int packAgentId(unsigned char *packStore, uint16_t agentId); + #endif /* defined(__hifi__AgentList__) */