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

Merge pull request #24 from birarda/master

Browse source 
fix unmatched packet header, remove logging
This commit is contained in:
Leonardo Murillo 2013-04-11 11:21:22 -07:00
commit 3c5ab776ed
4 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
avatar/src/main.cpp
View file

@ -83,7 +83,7 @@ int main(int argc, char* argv[])
ssize_t receivedBytes = 0;
unsigned char *broadcastPacket = new unsigned char[MAX_PACKET_SIZE];
*broadcastPacket = PACKET_HEADER_AVATAR_SERVER;
*broadcastPacket = PACKET_HEADER_BULK_AVATAR_DATA;
unsigned char* currentBufferPosition = NULL;
int agentIndex = 0;

2
interface/src/main.cpp
View file

@ -1211,7 +1211,7 @@ void *networkReceive(void *args)
case PACKET_HEADER_ERASE_VOXEL:
voxels.parseData(incomingPacket, bytesReceived);
break;
case PACKET_HEADER_HEAD_DATA:
case PACKET_HEADER_BULK_AVATAR_DATA:
agentList.processBulkAgentData(&senderAddress, incomingPacket, bytesReceived, sizeof(float) * 11);
break;
default:

2
shared/src/AgentList.cpp
View file

@ -262,11 +262,9 @@ void AgentList::handlePingReply(sockaddr *agentAddress) {
// prioritize the private address so that we prune erroneous local matches
if (socketMatch(agent->getPublicSocket(), agentAddress)) {
agent->activatePublicSocket();
std::cout << "Activated public socket for agent " << &*agent << "\n";
break;
} else if (socketMatch(agent->getLocalSocket(), agentAddress)) {
agent->activateLocalSocket();
std::cout << "Activated local socket for agent " << &*agent << "\n";
break;
}
}

2
shared/src/PacketHeaders.h
View file

@ -21,7 +21,7 @@ const char PACKET_HEADER_INJECT_AUDIO = 'I';
const char PACKET_HEADER_SET_VOXEL = 'S';
const char PACKET_HEADER_ERASE_VOXEL = 'E';
const char PACKET_HEADER_VOXEL_DATA = 'V';
const char PACKET_HEADER_AVATAR_SERVER = 'X';
const char PACKET_HEADER_BULK_AVATAR_DATA = 'X';
const char PACKET_HEADER_TRANSMITTER_DATA = 't';
#endif