Showing the changes to interface/src/DatagramProcessor.cpp (1 of 164 files). Show all
Unified · Split
| @@ -26,52 +26,53 @@ void DatagramProcessor::processDatagrams() { · 25 unmodified lines | |||
| 26 | "DatagramProcessor::processDatagrams()"); | 26 | "DatagramProcessor::processDatagrams()"); |
| 27 | 27 | ||
| 28 | HifiSockAddr senderSockAddr; | 28 | HifiSockAddr senderSockAddr; |
| 29 | ssize_t bytesReceived; | ||
| 30 | 29 | ||
| 31 | static unsigned char incomingPacket[MAX_PACKET_SIZE]; | 30 | static QByteArray incomingPacket; |
| 32 | 31 | ||
| 33 | Application* application = Application::getInstance(); | 32 | Application* application = Application::getInstance(); |
| 33 | NodeList* nodeList = NodeList::getInstance(); | ||
| 34 | 34 | ||
| 35 | while (NodeList::getInstance()->getNodeSocket().hasPendingDatagrams() && | 35 | while (NodeList::getInstance()->getNodeSocket().hasPendingDatagrams()) { |
| 36 | (bytesReceived = NodeList::getInstance()->getNodeSocket().readDatagram((char*) incomingPacket, | 36 | incomingPacket.resize(nodeList->getNodeSocket().pendingDatagramSize()); |
| 37 | MAX_PACKET_SIZE, | 37 | nodeList->getNodeSocket().readDatagram(incomingPacket.data(), incomingPacket.size(), |
| 38 | senderSockAddr.getAddressPointer(), | 38 | senderSockAddr.getAddressPointer(), senderSockAddr.getPortPointer()); |
| 39 | senderSockAddr.getPortPointer()))) { | ||
| 40 | 39 | ||
| 41 | _packetCount++; | 40 | _packetCount++; |
| 42 | _byteCount += bytesReceived; | 41 | _byteCount += incomingPacket.size(); |
| 43 | 42 | ||
| 44 | if (packetVersionMatch(incomingPacket, senderSockAddr)) { | 43 | if (packetVersionMatch(incomingPacket)) { |
| 45 | // only process this packet if we have a match on the packet version | 44 | // only process this packet if we have a match on the packet version |
| 46 | switch (incomingPacket[0]) { | 45 | switch (packetTypeForPacket(incomingPacket)) { |
| 47 | case PACKET_TYPE_TRANSMITTER_DATA_V2: | 46 | case PacketTypeTransmitterData: |
| 48 | // V2 = IOS transmitter app | 47 | // V2 = IOS transmitter app |
| 49 | application->_myTransmitter.processIncomingData(incomingPacket, bytesReceived); | 48 | application->_myTransmitter.processIncomingData(reinterpret_cast<unsigned char*>(incomingPacket.data()), |
| 49 | incomingPacket.size()); | ||
| 50 | 50 | ||
| 51 | break; | 51 | break; |
| 52 | case PACKET_TYPE_MIXED_AUDIO: | 52 | case PacketTypeMixedAudio: |
| 53 | QMetaObject::invokeMethod(&application->_audio, "addReceivedAudioToBuffer", Qt::QueuedConnection, | 53 | QMetaObject::invokeMethod(&application->_audio, "addReceivedAudioToBuffer", Qt::QueuedConnection, |
| 54 | Q_ARG(QByteArray, QByteArray((char*) incomingPacket, bytesReceived))); | 54 | Q_ARG(QByteArray, incomingPacket)); |
| 55 | break; | 55 | break; |
| 56 | 56 | ||
| 57 | case PACKET_TYPE_PARTICLE_ADD_RESPONSE: | 57 | case PacketTypeParticleAddResponse: |
| 58 | // this will keep creatorTokenIDs to IDs mapped correctly | 58 | // this will keep creatorTokenIDs to IDs mapped correctly |
| 59 | Particle::handleAddParticleResponse(incomingPacket, bytesReceived); | 59 | Particle::handleAddParticleResponse(incomingPacket); |
| 60 | application->getParticles()->getTree()->handleAddParticleResponse(incomingPacket); | ||
| 60 | break; | 61 | break; |
| 61 | 62 | ||
| 62 | case PACKET_TYPE_PARTICLE_DATA: | 63 | case PacketTypeParticleData: |
| 63 | case PACKET_TYPE_PARTICLE_ERASE: | 64 | case PacketTypeParticleErase: |
| 64 | case PACKET_TYPE_VOXEL_DATA: | 65 | case PacketTypeVoxelData: |
| 65 | case PACKET_TYPE_VOXEL_ERASE: | 66 | case PacketTypeVoxelErase: |
| 66 | case PACKET_TYPE_OCTREE_STATS: | 67 | case PacketTypeOctreeStats: |
| 67 | case PACKET_TYPE_ENVIRONMENT_DATA: { | 68 | case PacketTypeEnvironmentData: { |
| 68 | PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings), | 69 | PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings), |
| 69 | "Application::networkReceive()... _voxelProcessor.queueReceivedPacket()"); | 70 | "Application::networkReceive()... _voxelProcessor.queueReceivedPacket()"); |
| 70 | 71 | ||
| 71 | bool wantExtraDebugging = application->getLogger()->extraDebugging(); | 72 | bool wantExtraDebugging = application->getLogger()->extraDebugging(); |
| 72 | if (wantExtraDebugging && incomingPacket[0] == PACKET_TYPE_VOXEL_DATA) { | 73 | if (wantExtraDebugging && packetTypeForPacket(incomingPacket) == PacketTypeVoxelData) { |
| 73 | int numBytesPacketHeader = numBytesForPacketHeader(incomingPacket); | 74 | int numBytesPacketHeader = numBytesForPacketHeader(incomingPacket); |
| 74 | unsigned char* dataAt = incomingPacket + numBytesPacketHeader; | 75 | unsigned char* dataAt = reinterpret_cast<unsigned char*>(incomingPacket.data()) + numBytesPacketHeader; |
| 75 | dataAt += sizeof(VOXEL_PACKET_FLAGS); | 76 | dataAt += sizeof(VOXEL_PACKET_FLAGS); |
| 76 | VOXEL_PACKET_SEQUENCE sequence = (*(VOXEL_PACKET_SEQUENCE*)dataAt); | 77 | VOXEL_PACKET_SEQUENCE sequence = (*(VOXEL_PACKET_SEQUENCE*)dataAt); |
| 77 | dataAt += sizeof(VOXEL_PACKET_SEQUENCE); | 78 | dataAt += sizeof(VOXEL_PACKET_SEQUENCE); |
| @@ -80,50 +81,47 @@ void DatagramProcessor::processDatagrams() { · 2 unmodified lines | |||
| 80 | VOXEL_PACKET_SENT_TIME arrivedAt = usecTimestampNow(); | 81 | VOXEL_PACKET_SENT_TIME arrivedAt = usecTimestampNow(); |
| 81 | int flightTime = arrivedAt - sentAt; | 82 | int flightTime = arrivedAt - sentAt; |
| 82 | 83 | ||
| 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); |
| 84 | } | 85 | } |
| 85 | 86 | ||
| 86 | // add this packet to our list of voxel packets and process them on the voxel processing | 87 | // 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); |
| 88 | break; | 89 | break; |
| 89 | } | 90 | } |
| 90 | case PACKET_TYPE_METAVOXEL_DATA: | 91 | case PacketTypeMetavoxelData: |
| 91 | application->_metavoxels.processData(QByteArray((const char*) incomingPacket, bytesReceived), | 92 | application->_metavoxels.processData(incomingPacket, senderSockAddr); |
| 92 | senderSockAddr); | ||
| 93 | break; | 93 | break; |
| 94 | case PACKET_TYPE_BULK_AVATAR_DATA: | 94 | case PacketTypeBulkAvatarData: |
| 95 | case PACKET_TYPE_KILL_AVATAR: { | 95 | case PacketTypeKillAvatar: { |
| 96 | // update having heard from the avatar-mixer and record the bytes received | 96 | // update having heard from the avatar-mixer and record the bytes received |
| 97 | SharedNodePointer avatarMixer = NodeList::getInstance()->nodeWithAddress(senderSockAddr); | 97 | SharedNodePointer avatarMixer = NodeList::getInstance()->nodeWithAddress(senderSockAddr); |
| 98 | 98 | ||
| 99 | if (avatarMixer) { | 99 | if (avatarMixer) { |
| 100 | avatarMixer->setLastHeardMicrostamp(usecTimestampNow()); | 100 | avatarMixer->setLastHeardMicrostamp(usecTimestampNow()); |
| 101 | avatarMixer->recordBytesReceived(bytesReceived); | 101 | avatarMixer->recordBytesReceived(incomingPacket.size()); |
| 102 | 102 | ||
| 103 | QByteArray datagram(reinterpret_cast<char*>(incomingPacket), bytesReceived); | 103 | if (packetTypeForPacket(incomingPacket) == PacketTypeBulkAvatarData) { |
| 104 | |||
| 105 | if (incomingPacket[0] == PACKET_TYPE_BULK_AVATAR_DATA) { | ||
| 106 | QMetaObject::invokeMethod(&application->getAvatarManager(), "processAvatarMixerDatagram", | 104 | QMetaObject::invokeMethod(&application->getAvatarManager(), "processAvatarMixerDatagram", |
| 107 | Q_ARG(const QByteArray&, datagram), | 105 | Q_ARG(const QByteArray&, incomingPacket), |
| 108 | Q_ARG(const QWeakPointer<Node>&, avatarMixer)); | 106 | Q_ARG(const QWeakPointer<Node>&, avatarMixer)); |
| 109 | } else { | 107 | } else { |
| 110 | // this is an avatar kill, pass it to the application AvatarManager | 108 | // this is an avatar kill, pass it to the application AvatarManager |
| 111 | QMetaObject::invokeMethod(&application->getAvatarManager(), "processKillAvatar", | 109 | QMetaObject::invokeMethod(&application->getAvatarManager(), "processKillAvatar", |
| 112 | Q_ARG(const QByteArray&, datagram)); | 110 | Q_ARG(const QByteArray&, incomingPacket)); |
| 113 | } | 111 | } |
| 114 | } | 112 | } |
| 115 | 113 | ||
| 116 | application->_bandwidthMeter.inputStream(BandwidthMeter::AVATARS).updateValue(bytesReceived); | 114 | application->_bandwidthMeter.inputStream(BandwidthMeter::AVATARS).updateValue(incomingPacket.size()); |
| 117 | break; | 115 | break; |
| 118 | } | 116 | } |
| 119 | case PACKET_TYPE_DATA_SERVER_GET: | 117 | case PacketTypeDataServerGet: |
| 120 | case PACKET_TYPE_DATA_SERVER_PUT: | 118 | case PacketTypeDataServerPut: |
| 121 | case PACKET_TYPE_DATA_SERVER_SEND: | 119 | case PacketTypeDataServerSend: |
| 122 | case PACKET_TYPE_DATA_SERVER_CONFIRM: | 120 | case PacketTypeDataServerConfirm: |
| 123 | DataServerClient::processMessageFromDataServer(incomingPacket, bytesReceived); | 121 | DataServerClient::processMessageFromDataServer(incomingPacket); |
| 124 | break; | 122 | break; |
| 125 | default: | 123 | default: |
| 126 | NodeList::getInstance()->processNodeData(senderSockAddr, incomingPacket, bytesReceived); | 124 | NodeList::getInstance()->processNodeData(senderSockAddr, incomingPacket); |
| 127 | break; | 125 | break; |
| 128 | } | 126 | } |
| 129 | } | 127 | } |