Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 02:03:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

More agent IDing around the code

Browse source
This commit is contained in:
Leonardo Murillo 2013-03-22 13:34:35 -06:00
parent f604b574c5
commit dc92f0be42
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
domain/src/main.cpp
View file

@ -73,6 +73,7 @@ int main(int argc, const char * argv[])
int packetBytesWithoutLeadingChar; int packetBytesWithoutLeadingChar;
sockaddr_in agentPublicAddress, agentLocalAddress; sockaddr_in agentPublicAddress, agentLocalAddress;
uint16_t agentId = 0;
agentLocalAddress.sin_family = AF_INET; agentLocalAddress.sin_family = AF_INET;
agentList.startSilentAgentRemovalThread(); agentList.startSilentAgentRemovalThread();
@ -82,9 +83,10 @@ int main(int argc, const char * argv[])
std::map<char, Agent *> newestSoloAgents; std::map<char, Agent *> newestSoloAgents;
agentType = packetData[0]; 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; currentBufferPos = broadcastPacket + 1;
startPointer = currentBufferPos; startPointer = currentBufferPos;

2
shared/src/AgentList.cpp
View file

@ -140,8 +140,6 @@ int AgentList::updateList(unsigned char *packetData, size_t dataBytes) {
readPtr += unpackSocket(readPtr, (sockaddr *)&agentPublicSocket); readPtr += unpackSocket(readPtr, (sockaddr *)&agentPublicSocket);
readPtr += unpackSocket(readPtr, (sockaddr *)&agentLocalSocket); readPtr += unpackSocket(readPtr, (sockaddr *)&agentLocalSocket);
//syncClientAgentList(agentId, (sockaddr *)&agentPublicSocket, (sockaddr *)&agentLocalSocket, agentType);
addOrUpdateAgent((sockaddr *)&agentPublicSocket, (sockaddr *)&agentLocalSocket, agentType, agentId); addOrUpdateAgent((sockaddr *)&agentPublicSocket, (sockaddr *)&agentLocalSocket, agentType, agentId);
} }