History

Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels

Andrzej Kapolka committed 12 years ago

Commit e99b7ea2 parents 4c70af5 4ff400f164 files · +3393 −2435Browse files

Showing the changes to interface/src/DatagramProcessor.cpp (1 of 164 files). Show all

Unified · Split

interface/src/DatagramProcessor.cpp+43−45
@@ -26,52 +26,53 @@ void DatagramProcessor::processDatagrams() { · 25 unmodified lines
2626 "DatagramProcessor::processDatagrams()");
2727
2828 HifiSockAddr senderSockAddr;
29− ssize_t bytesReceived;
3029
31− static unsigned char incomingPacket[MAX_PACKET_SIZE];
30+ static QByteArray incomingPacket;
3231
3332 Application* application = Application::getInstance();
33+ NodeList* nodeList = NodeList::getInstance();
3434
35− while (NodeList::getInstance()->getNodeSocket().hasPendingDatagrams() &&
36− (bytesReceived = NodeList::getInstance()->getNodeSocket().readDatagram((char*) incomingPacket,
37− MAX_PACKET_SIZE,
38− senderSockAddr.getAddressPointer(),
39− senderSockAddr.getPortPointer()))) {
35+ while (NodeList::getInstance()->getNodeSocket().hasPendingDatagrams()) {
36+ incomingPacket.resize(nodeList->getNodeSocket().pendingDatagramSize());
37+ nodeList->getNodeSocket().readDatagram(incomingPacket.data(), incomingPacket.size(),
38+ senderSockAddr.getAddressPointer(), senderSockAddr.getPortPointer());
4039
4140 _packetCount++;
42− _byteCount += bytesReceived;
41+ _byteCount += incomingPacket.size();
4342
44− if (packetVersionMatch(incomingPacket, senderSockAddr)) {
43+ if (packetVersionMatch(incomingPacket)) {
4544 // only process this packet if we have a match on the packet version
46− switch (incomingPacket[0]) {
47− case PACKET_TYPE_TRANSMITTER_DATA_V2:
45+ switch (packetTypeForPacket(incomingPacket)) {
46+ case PacketTypeTransmitterData:
4847 // V2 = IOS transmitter app
49− application->_myTransmitter.processIncomingData(incomingPacket, bytesReceived);
48+ application->_myTransmitter.processIncomingData(reinterpret_cast<unsigned char*>(incomingPacket.data()),
49+ incomingPacket.size());
5050
5151 break;
52− case PACKET_TYPE_MIXED_AUDIO:
52+ case PacketTypeMixedAudio:
5353 QMetaObject::invokeMethod(&application->_audio, "addReceivedAudioToBuffer", Qt::QueuedConnection,
54− Q_ARG(QByteArray, QByteArray((char*) incomingPacket, bytesReceived)));
54+ Q_ARG(QByteArray, incomingPacket));
5555 break;
5656
57− case PACKET_TYPE_PARTICLE_ADD_RESPONSE:
57+ case PacketTypeParticleAddResponse:
5858 // this will keep creatorTokenIDs to IDs mapped correctly
59− Particle::handleAddParticleResponse(incomingPacket, bytesReceived);
59+ Particle::handleAddParticleResponse(incomingPacket);
60+ application->getParticles()->getTree()->handleAddParticleResponse(incomingPacket);
6061 break;
6162
62− case PACKET_TYPE_PARTICLE_DATA:
63− case PACKET_TYPE_PARTICLE_ERASE:
64− case PACKET_TYPE_VOXEL_DATA:
65− case PACKET_TYPE_VOXEL_ERASE:
66− case PACKET_TYPE_OCTREE_STATS:
67− case PACKET_TYPE_ENVIRONMENT_DATA: {
63+ case PacketTypeParticleData:
64+ case PacketTypeParticleErase:
65+ case PacketTypeVoxelData:
66+ case PacketTypeVoxelErase:
67+ case PacketTypeOctreeStats:
68+ case PacketTypeEnvironmentData: {
6869 PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings),
6970 "Application::networkReceive()... _voxelProcessor.queueReceivedPacket()");
7071
7172 bool wantExtraDebugging = application->getLogger()->extraDebugging();
72− if (wantExtraDebugging && incomingPacket[0] == PACKET_TYPE_VOXEL_DATA) {
73+ if (wantExtraDebugging && packetTypeForPacket(incomingPacket) == PacketTypeVoxelData) {
7374 int numBytesPacketHeader = numBytesForPacketHeader(incomingPacket);
74− unsigned char* dataAt = incomingPacket + numBytesPacketHeader;
75+ unsigned char* dataAt = reinterpret_cast<unsigned char*>(incomingPacket.data()) + numBytesPacketHeader;
7576 dataAt += sizeof(VOXEL_PACKET_FLAGS);
7677 VOXEL_PACKET_SEQUENCE sequence = (*(VOXEL_PACKET_SEQUENCE*)dataAt);
7778 dataAt += sizeof(VOXEL_PACKET_SEQUENCE);
@@ -80,50 +81,47 @@ void DatagramProcessor::processDatagrams() { · 2 unmodified lines
8081 VOXEL_PACKET_SENT_TIME arrivedAt = usecTimestampNow();
8182 int flightTime = arrivedAt - sentAt;
8283
83− printf("got PACKET_TYPE_VOXEL_DATA, sequence:%d flightTime:%d\n", sequence, flightTime);
84+ printf("got PacketType_VOXEL_DATA, sequence:%d flightTime:%d\n", sequence, flightTime);
8485 }
8586
8687 // add this packet to our list of voxel packets and process them on the voxel processing
87− application->_voxelProcessor.queueReceivedPacket(senderSockAddr, incomingPacket, bytesReceived);
88+ application->_voxelProcessor.queueReceivedPacket(senderSockAddr, incomingPacket);
8889 break;
8990 }
90− case PACKET_TYPE_METAVOXEL_DATA:
91− application->_metavoxels.processData(QByteArray((const char*) incomingPacket, bytesReceived),
92− senderSockAddr);
91+ case PacketTypeMetavoxelData:
92+ application->_metavoxels.processData(incomingPacket, senderSockAddr);
9393 break;
94− case PACKET_TYPE_BULK_AVATAR_DATA:
95− case PACKET_TYPE_KILL_AVATAR: {
94+ case PacketTypeBulkAvatarData:
95+ case PacketTypeKillAvatar: {
9696 // update having heard from the avatar-mixer and record the bytes received
9797 SharedNodePointer avatarMixer = NodeList::getInstance()->nodeWithAddress(senderSockAddr);
9898
9999 if (avatarMixer) {
100100 avatarMixer->setLastHeardMicrostamp(usecTimestampNow());
101− avatarMixer->recordBytesReceived(bytesReceived);
101+ avatarMixer->recordBytesReceived(incomingPacket.size());
102102
103− QByteArray datagram(reinterpret_cast<char*>(incomingPacket), bytesReceived);
104−
105− if (incomingPacket[0] == PACKET_TYPE_BULK_AVATAR_DATA) {
103+ if (packetTypeForPacket(incomingPacket) == PacketTypeBulkAvatarData) {
106104 QMetaObject::invokeMethod(&application->getAvatarManager(), "processAvatarMixerDatagram",
107− Q_ARG(const QByteArray&, datagram),
105+ Q_ARG(const QByteArray&, incomingPacket),
108106 Q_ARG(const QWeakPointer<Node>&, avatarMixer));
109107 } else {
110108 // this is an avatar kill, pass it to the application AvatarManager
111109 QMetaObject::invokeMethod(&application->getAvatarManager(), "processKillAvatar",
112− Q_ARG(const QByteArray&, datagram));
110+ Q_ARG(const QByteArray&, incomingPacket));
113111 }
114112 }
115113
116− application->_bandwidthMeter.inputStream(BandwidthMeter::AVATARS).updateValue(bytesReceived);
114+ application->_bandwidthMeter.inputStream(BandwidthMeter::AVATARS).updateValue(incomingPacket.size());
117115 break;
118− }
119− case PACKET_TYPE_DATA_SERVER_GET:
120− case PACKET_TYPE_DATA_SERVER_PUT:
121− case PACKET_TYPE_DATA_SERVER_SEND:
122− case PACKET_TYPE_DATA_SERVER_CONFIRM:
123− DataServerClient::processMessageFromDataServer(incomingPacket, bytesReceived);
116+ }
117+ case PacketTypeDataServerGet:
118+ case PacketTypeDataServerPut:
119+ case PacketTypeDataServerSend:
120+ case PacketTypeDataServerConfirm:
121+ DataServerClient::processMessageFromDataServer(incomingPacket);
124122 break;
125123 default:
126− NodeList::getInstance()->processNodeData(senderSockAddr, incomingPacket, bytesReceived);
124+ NodeList::getInstance()->processNodeData(senderSockAddr, incomingPacket);
127125 break;
128126 }
129127 }

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t