From 5062ae89652e853849b64f9688cc8ed68e7494c3 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Mon, 8 Jul 2013 11:37:39 -0700 Subject: [PATCH] rename PACKET_HEADER to PACKET_TYPE, fix DS packet versioning --- animation-server/src/main.cpp | 16 ++--- audio-mixer/src/AvatarAudioRingBuffer.cpp | 2 +- audio-mixer/src/InjectedAudioRingBuffer.cpp | 2 +- audio-mixer/src/PositionalAudioRingBuffer.cpp | 2 +- audio-mixer/src/main.cpp | 14 ++--- avatar-mixer/src/main.cpp | 13 ++-- domain-server/src/main.cpp | 15 +++-- eve/src/main.cpp | 6 +- injector/src/main.cpp | 5 +- interface/src/Application.cpp | 62 +++++++++---------- interface/src/Application.h | 2 +- interface/src/Audio.cpp | 10 +-- interface/src/VoxelSystem.cpp | 6 +- libraries/audio/src/AudioInjector.cpp | 6 +- libraries/audio/src/AudioRingBuffer.cpp | 2 +- libraries/avatars/src/AvatarData.cpp | 2 +- libraries/shared/src/NodeList.cpp | 29 +++++---- libraries/shared/src/PacketHeaders.cpp | 12 +++- libraries/shared/src/PacketHeaders.h | 47 +++++++------- libraries/voxels/src/VoxelTree.cpp | 2 +- voxel-server/src/VoxelNodeData.cpp | 2 +- voxel-server/src/main.cpp | 28 ++++----- 22 files changed, 148 insertions(+), 137 deletions(-) diff --git a/animation-server/src/main.cpp b/animation-server/src/main.cpp index 8a3d70d83d..876512e13a 100644 --- a/animation-server/src/main.cpp +++ b/animation-server/src/main.cpp @@ -46,11 +46,11 @@ bool wantLocalDomain = false; unsigned long packetsSent = 0; unsigned long bytesSent = 0; -static void sendVoxelEditMessage(PACKET_HEADER header, VoxelDetail& detail) { +static void sendVoxelEditMessage(PACKET_TYPE type, VoxelDetail& detail) { unsigned char* bufferOut; int sizeOut; - if (createVoxelEditMessage(header, 0, 1, &detail, bufferOut, sizeOut)){ + if (createVoxelEditMessage(type, 0, 1, &detail, bufferOut, sizeOut)){ ::packetsSent++; ::bytesSent += sizeOut; @@ -159,7 +159,7 @@ static void renderMovingBug() { } // send the "erase message" first... - PACKET_HEADER message = PACKET_HEADER_ERASE_VOXEL; + PACKET_TYPE message = PACKET_TYPE_ERASE_VOXEL; if (createVoxelEditMessage(message, 0, VOXELS_PER_BUG, (VoxelDetail*)&details, bufferOut, sizeOut)){ ::packetsSent++; @@ -229,7 +229,7 @@ static void renderMovingBug() { } // send the "create message" ... - message = PACKET_HEADER_SET_VOXEL_DESTRUCTIVE; + message = PACKET_TYPE_SET_VOXEL_DESTRUCTIVE; if (createVoxelEditMessage(message, 0, VOXELS_PER_BUG, (VoxelDetail*)&details, bufferOut, sizeOut)){ ::packetsSent++; @@ -274,7 +274,7 @@ static void sendVoxelBlinkMessage() { detail.green = 0 * ::intensity; detail.blue = 0 * ::intensity; - PACKET_HEADER message = PACKET_HEADER_SET_VOXEL_DESTRUCTIVE; + PACKET_TYPE message = PACKET_TYPE_SET_VOXEL_DESTRUCTIVE; sendVoxelEditMessage(message, detail); } @@ -291,7 +291,7 @@ unsigned char onColor[3] = { 0, 255, 255 }; const float STRING_OF_LIGHTS_SIZE = 0.125f / TREE_SCALE; // approximately 1/8th meter static void sendBlinkingStringOfLights() { - PACKET_HEADER message = PACKET_HEADER_SET_VOXEL_DESTRUCTIVE; // we're a bully! + PACKET_TYPE message = PACKET_TYPE_SET_VOXEL_DESTRUCTIVE; // we're a bully! float lightScale = STRING_OF_LIGHTS_SIZE; static VoxelDetail details[LIGHTS_PER_SEGMENT]; unsigned char* bufferOut; @@ -421,7 +421,7 @@ const int PACKETS_PER_DANCE_FLOOR = DANCE_FLOOR_VOXELS_PER_PACKET / (DANCE_FLOOR int danceFloorColors[DANCE_FLOOR_WIDTH][DANCE_FLOOR_LENGTH]; void sendDanceFloor() { - PACKET_HEADER message = PACKET_HEADER_SET_VOXEL_DESTRUCTIVE; // we're a bully! + PACKET_TYPE message = PACKET_TYPE_SET_VOXEL_DESTRUCTIVE; // we're a bully! float lightScale = DANCE_FLOOR_LIGHT_SIZE; static VoxelDetail details[DANCE_FLOOR_VOXELS_PER_PACKET]; unsigned char* bufferOut; @@ -548,7 +548,7 @@ bool billboardMessage[BILLBOARD_HEIGHT][BILLBOARD_WIDTH] = { }; static void sendBillboard() { - PACKET_HEADER message = PACKET_HEADER_SET_VOXEL_DESTRUCTIVE; // we're a bully! + PACKET_TYPE message = PACKET_TYPE_SET_VOXEL_DESTRUCTIVE; // we're a bully! float lightScale = BILLBOARD_LIGHT_SIZE; static VoxelDetail details[VOXELS_PER_PACKET]; unsigned char* bufferOut; diff --git a/audio-mixer/src/AvatarAudioRingBuffer.cpp b/audio-mixer/src/AvatarAudioRingBuffer.cpp index c3e0e2cbe9..42092cff3a 100644 --- a/audio-mixer/src/AvatarAudioRingBuffer.cpp +++ b/audio-mixer/src/AvatarAudioRingBuffer.cpp @@ -24,6 +24,6 @@ AvatarAudioRingBuffer::~AvatarAudioRingBuffer() { } int AvatarAudioRingBuffer::parseData(unsigned char* sourceBuffer, int numBytes) { - _shouldLoopbackForNode = (sourceBuffer[0] == PACKET_HEADER_MICROPHONE_AUDIO_WITH_ECHO); + _shouldLoopbackForNode = (sourceBuffer[0] == PACKET_TYPE_MICROPHONE_AUDIO_WITH_ECHO); return PositionalAudioRingBuffer::parseData(sourceBuffer, numBytes); } \ No newline at end of file diff --git a/audio-mixer/src/InjectedAudioRingBuffer.cpp b/audio-mixer/src/InjectedAudioRingBuffer.cpp index 426bbf361d..3309e79efc 100644 --- a/audio-mixer/src/InjectedAudioRingBuffer.cpp +++ b/audio-mixer/src/InjectedAudioRingBuffer.cpp @@ -21,7 +21,7 @@ InjectedAudioRingBuffer::InjectedAudioRingBuffer() : } int InjectedAudioRingBuffer::parseData(unsigned char* sourceBuffer, int numBytes) { - unsigned char* currentBuffer = sourceBuffer + sizeof(PACKET_HEADER_INJECT_AUDIO); + unsigned char* currentBuffer = sourceBuffer + sizeof(PACKET_TYPE_INJECT_AUDIO); // pull stream identifier from the packet memcpy(&_streamIdentifier, currentBuffer, sizeof(_streamIdentifier)); diff --git a/audio-mixer/src/PositionalAudioRingBuffer.cpp b/audio-mixer/src/PositionalAudioRingBuffer.cpp index 87c51e2cf8..b8cd32bbf6 100644 --- a/audio-mixer/src/PositionalAudioRingBuffer.cpp +++ b/audio-mixer/src/PositionalAudioRingBuffer.cpp @@ -22,7 +22,7 @@ PositionalAudioRingBuffer::PositionalAudioRingBuffer() : } int PositionalAudioRingBuffer::parseData(unsigned char* sourceBuffer, int numBytes) { - unsigned char* currentBuffer = sourceBuffer + sizeof(PACKET_HEADER); + unsigned char* currentBuffer = sourceBuffer + sizeof(PACKET_TYPE); currentBuffer += parsePositionalData(currentBuffer, numBytes - (currentBuffer - sourceBuffer)); currentBuffer += parseAudioSamples(currentBuffer, numBytes - (currentBuffer - sourceBuffer)); diff --git a/audio-mixer/src/main.cpp b/audio-mixer/src/main.cpp index 26f4bb23f8..62ac66a3f4 100644 --- a/audio-mixer/src/main.cpp +++ b/audio-mixer/src/main.cpp @@ -103,8 +103,8 @@ int main(int argc, const char* argv[]) { int nextFrame = 0; timeval startTime; - unsigned char clientPacket[BUFFER_LENGTH_BYTES_STEREO + sizeof(PACKET_HEADER_MIXED_AUDIO)]; - clientPacket[0] = PACKET_HEADER_MIXED_AUDIO; + unsigned char clientPacket[BUFFER_LENGTH_BYTES_STEREO + sizeof(PACKET_TYPE_MIXED_AUDIO)]; + clientPacket[0] = PACKET_TYPE_MIXED_AUDIO; int16_t clientSamples[BUFFER_LENGTH_SAMPLES_PER_CHANNEL * 2] = {}; @@ -325,7 +325,7 @@ int main(int argc, const char* argv[]) { } } - memcpy(clientPacket + sizeof(PACKET_HEADER_MIXED_AUDIO), clientSamples, sizeof(clientSamples)); + memcpy(clientPacket + sizeof(PACKET_TYPE_MIXED_AUDIO), clientSamples, sizeof(clientSamples)); nodeList->getNodeSocket()->send(node->getPublicSocket(), clientPacket, sizeof(clientPacket)); } } @@ -346,8 +346,8 @@ int main(int argc, const char* argv[]) { // pull any new audio data from nodes off of the network stack while (nodeList->getNodeSocket()->receive(nodeAddress, packetData, &receivedBytes)) { - if (packetData[0] == PACKET_HEADER_MICROPHONE_AUDIO_NO_ECHO || - packetData[0] == PACKET_HEADER_MICROPHONE_AUDIO_WITH_ECHO) { + if (packetData[0] == PACKET_TYPE_MICROPHONE_AUDIO_NO_ECHO || + packetData[0] == PACKET_TYPE_MICROPHONE_AUDIO_WITH_ECHO) { Node* avatarNode = nodeList->addOrUpdateNode(nodeAddress, nodeAddress, NODE_TYPE_AGENT, @@ -363,7 +363,7 @@ int main(int argc, const char* argv[]) { // kill off this node - temporary solution to mixer crash on mac sleep avatarNode->setAlive(false); } - } else if (packetData[0] == PACKET_HEADER_INJECT_AUDIO) { + } else if (packetData[0] == PACKET_TYPE_INJECT_AUDIO) { Node* matchingInjector = NULL; for (NodeList::iterator node = nodeList->begin(); node != nodeList->end(); node++) { @@ -391,7 +391,7 @@ int main(int argc, const char* argv[]) { // give the new audio data to the matching injector node nodeList->updateNodeWithData(matchingInjector, packetData, receivedBytes); - } else if (packetData[0] == PACKET_HEADER_PING) { + } else if (packetData[0] == PACKET_TYPE_PING) { // If the packet is a ping, let processNodeData handle it. nodeList->processNodeData(nodeAddress, packetData, receivedBytes); diff --git a/avatar-mixer/src/main.cpp b/avatar-mixer/src/main.cpp index ce7b428795..f55218e7c6 100644 --- a/avatar-mixer/src/main.cpp +++ b/avatar-mixer/src/main.cpp @@ -73,8 +73,7 @@ int main(int argc, const char* argv[]) { ssize_t receivedBytes = 0; unsigned char *broadcastPacket = new unsigned char[MAX_PACKET_SIZE]; - *broadcastPacket = PACKET_HEADER_BULK_AVATAR_DATA; - *(broadcastPacket + 1) = version(*broadcastPacket); + int numHeaderBytes = populateTypeAndVersion(broadcastPacket, PACKET_TYPE_BULK_AVATAR_DATA); unsigned char* currentBufferPosition = NULL; @@ -95,7 +94,7 @@ int main(int argc, const char* argv[]) { if (nodeList->getNodeSocket()->receive(nodeAddress, packetData, &receivedBytes)) { switch (packetData[0]) { - case PACKET_HEADER_HEAD_DATA: + case PACKET_TYPE_HEAD_DATA: // grab the node ID from the packet unpackNodeId(packetData + 1, &nodeID); @@ -104,8 +103,8 @@ int main(int argc, const char* argv[]) { // parse positional data from an node nodeList->updateNodeWithData(avatarNode, packetData, receivedBytes); - case PACKET_HEADER_INJECT_AUDIO: - currentBufferPosition = broadcastPacket + sizeof(PACKET_HEADER) + sizeof(PACKET_VERSION); + case PACKET_TYPE_INJECT_AUDIO: + currentBufferPosition = broadcastPacket + numHeaderBytes; // send back a packet with other active node data to this node for (NodeList::iterator node = nodeList->begin(); node != nodeList->end(); node++) { @@ -117,7 +116,7 @@ int main(int argc, const char* argv[]) { nodeList->getNodeSocket()->send(nodeAddress, broadcastPacket, currentBufferPosition - broadcastPacket); break; - case PACKET_HEADER_AVATAR_VOXEL_URL: + case PACKET_TYPE_AVATAR_VOXEL_URL: // grab the node ID from the packet unpackNodeId(packetData + 1, &nodeID); @@ -128,7 +127,7 @@ int main(int argc, const char* argv[]) { } } break; - case PACKET_HEADER_DOMAIN: + case PACKET_TYPE_DOMAIN: // ignore the DS packet, for now nodes are added only when they communicate directly with us break; default: diff --git a/domain-server/src/main.cpp b/domain-server/src/main.cpp index 471f66b462..1911fb7dd4 100644 --- a/domain-server/src/main.cpp +++ b/domain-server/src/main.cpp @@ -70,8 +70,7 @@ int main(int argc, const char * argv[]) char nodeType = '\0'; unsigned char broadcastPacket[MAX_PACKET_SIZE]; - broadcastPacket[0] = PACKET_HEADER_DOMAIN; - broadcastPacket[1] = packetVersion(broadcastPacket[0]); + int numHeaderBytes = populateTypeAndVersion(broadcastPacket, PACKET_TYPE_DOMAIN); unsigned char* currentBufferPos; unsigned char* startPointer; @@ -87,13 +86,13 @@ int main(int argc, const char * argv[]) while (true) { if (nodeList->getNodeSocket()->receive((sockaddr *)&nodePublicAddress, packetData, &receivedBytes) && - (packetData[0] == PACKET_HEADER_DOMAIN_REPORT_FOR_DUTY || packetData[0] == PACKET_HEADER_DOMAIN_LIST_REQUEST) && - packetVersion(packetData[0]) == packetData[1]) { + (packetData[0] == PACKET_TYPE_DOMAIN_REPORT_FOR_DUTY || packetData[0] == PACKET_TYPE_DOMAIN_LIST_REQUEST) && + versionForPacketType(packetData[0]) == packetData[1]) { // this is an RFD or domain list request packet, and there is a version match std::map newestSoloNodes; nodeType = packetData[1]; - int numBytesSocket = unpackSocket(packetData + sizeof(PACKET_HEADER) + sizeof(PACKET_VERSION) + sizeof(NODE_TYPE), + int numBytesSocket = unpackSocket(packetData + numHeaderBytes + sizeof(NODE_TYPE), (sockaddr*) &nodeLocalAddress); sockaddr* destinationSocket = (sockaddr*) &nodePublicAddress; @@ -119,10 +118,10 @@ int main(int argc, const char * argv[]) nodeList->increaseNodeID(); } - currentBufferPos = broadcastPacket + sizeof(PACKET_HEADER) + sizeof(PACKET_VERSION); + currentBufferPos = broadcastPacket + sizeof(PACKET_TYPE) + sizeof(PACKET_VERSION); startPointer = currentBufferPos; - unsigned char* nodeTypesOfInterest = packetData + sizeof(PACKET_HEADER) + sizeof(PACKET_VERSION) + sizeof(NODE_TYPE) + unsigned char* nodeTypesOfInterest = packetData + sizeof(PACKET_TYPE) + sizeof(PACKET_VERSION) + sizeof(NODE_TYPE) + numBytesSocket + sizeof(unsigned char); int numInterestTypes = *(nodeTypesOfInterest - 1); @@ -165,7 +164,7 @@ int main(int argc, const char * argv[]) long long timeNow = usecTimestampNow(); newNode->setLastHeardMicrostamp(timeNow); - if (packetData[0] == PACKET_HEADER_DOMAIN_REPORT_FOR_DUTY + if (packetData[0] == PACKET_TYPE_DOMAIN_REPORT_FOR_DUTY && memchr(SOLO_NODE_TYPES, nodeType, sizeof(SOLO_NODE_TYPES))) { newNode->setWakeMicrostamp(timeNow); } diff --git a/eve/src/main.cpp b/eve/src/main.cpp index 8a03dc453b..827bd67bc6 100644 --- a/eve/src/main.cpp +++ b/eve/src/main.cpp @@ -51,7 +51,7 @@ void *receiveNodeData(void *args) { while (!::stopReceiveNodeDataThread) { if (nodeList->getNodeSocket()->receive(&senderAddress, incomingPacket, &bytesReceived)) { switch (incomingPacket[0]) { - case PACKET_HEADER_BULK_AVATAR_DATA: + case PACKET_TYPE_BULK_AVATAR_DATA: // this is the positional data for other nodes // pass that off to the nodeList processBulkNodeData method nodeList->processBulkNodeData(&senderAddress, incomingPacket, bytesReceived); @@ -125,7 +125,7 @@ int main(int argc, const char* argv[]) { nodeList->linkedDataCreateCallback = createAvatarDataForNode; unsigned char broadcastPacket[MAX_PACKET_SIZE]; - broadcastPacket[0] = PACKET_HEADER_HEAD_DATA; + broadcastPacket[0] = PACKET_TYPE_HEAD_DATA; timeval thisSend; long long numMicrosecondsSleep = 0; @@ -153,7 +153,7 @@ int main(int argc, const char* argv[]) { // make sure we actually have an avatar mixer with an active socket if (nodeList->getOwnerID() != UNKNOWN_NODE_ID && avatarMixer && avatarMixer->getActiveSocket() != NULL) { - unsigned char* packetPosition = broadcastPacket + sizeof(PACKET_HEADER); + unsigned char* packetPosition = broadcastPacket + sizeof(PACKET_TYPE); packetPosition += packNodeId(packetPosition, nodeList->getOwnerID()); // use the getBroadcastData method in the AvatarData class to populate the broadcastPacket buffer diff --git a/injector/src/main.cpp b/injector/src/main.cpp index e8cb345471..68c0938ab0 100644 --- a/injector/src/main.cpp +++ b/injector/src/main.cpp @@ -144,7 +144,7 @@ int main(int argc, char* argv[]) { nodeList->linkedDataCreateCallback = createAvatarDataForNode; timeval lastSend = {}; - unsigned char broadcastPacket = PACKET_HEADER_INJECT_AUDIO; + unsigned char broadcastPacket = PACKET_TYPE_INJECT_AUDIO; timeval lastDomainServerCheckIn = {}; @@ -170,8 +170,7 @@ int main(int argc, char* argv[]) { while (nodeList->getNodeSocket()->receive(&senderAddress, incomingPacket, &bytesReceived)) { switch (incomingPacket[0]) { - case PACKET_HEADER_BULK_AVATAR_DATA: - // this is the positional data for other nodes + case PACKET_TYPE_BULK_AVATAR_DATA: // this is the positional data for other nodes // pass that off to the nodeList processBulkNodeData method nodeList->processBulkNodeData(&senderAddress, incomingPacket, bytesReceived); break; diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index ba65117509..fb76e0adea 100755 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -892,11 +892,11 @@ void Application::sendPingPackets() { char nodeTypesOfInterest[] = {NODE_TYPE_VOXEL_SERVER, NODE_TYPE_AUDIO_MIXER, NODE_TYPE_AVATAR_MIXER}; long long currentTime = usecTimestampNow(); - unsigned char pingPacket[1 + sizeof(currentTime)]; - pingPacket[0] = PACKET_HEADER_PING; + unsigned char pingPacket[MAX_PACKET_HEADER_BYTES + sizeof(currentTime)]; + int numHeaderBytes = populateTypeAndVersion(pingPacket, PACKET_TYPE_PING); memcpy(&pingPacket[1], ¤tTime, sizeof(currentTime)); - getInstance()->controlledBroadcastToNodes(pingPacket, 1 + sizeof(currentTime), + getInstance()->controlledBroadcastToNodes(pingPacket, numHeaderBytes + sizeof(currentTime), nodeTypesOfInterest, sizeof(nodeTypesOfInterest)); } @@ -994,7 +994,7 @@ void Application::sendAvatarVoxelURLMessage(const QUrl& url) { return; // we don't yet know who we are } QByteArray message; - message.append(PACKET_HEADER_AVATAR_VOXEL_URL); + message.append(PACKET_TYPE_AVATAR_VOXEL_URL); message.append((const char*)&ownerID, sizeof(ownerID)); message.append(url.toEncoded()); @@ -1226,11 +1226,11 @@ void Application::updateVoxelModeActions() { } } -void Application::sendVoxelEditMessage(PACKET_HEADER header, VoxelDetail& detail) { +void Application::sendVoxelEditMessage(PACKET_TYPE type, VoxelDetail& detail) { unsigned char* bufferOut; int sizeOut; - if (createVoxelEditMessage(header, 0, 1, &detail, bufferOut, sizeOut)){ + if (createVoxelEditMessage(type, 0, 1, &detail, bufferOut, sizeOut)){ Application::controlledBroadcastToNodes(bufferOut, sizeOut, & NODE_TYPE_VOXEL_SERVER, 1); delete[] bufferOut; } @@ -1313,7 +1313,7 @@ bool Application::sendVoxelsOperation(VoxelNode* node, void* extraData) { // if we have room don't have room in the buffer, then send the previously generated message first if (args->bufferInUse + codeAndColorLength > MAXIMUM_EDIT_VOXEL_MESSAGE_SIZE) { controlledBroadcastToNodes(args->messageBuffer, args->bufferInUse, & NODE_TYPE_VOXEL_SERVER, 1); - args->bufferInUse = sizeof(PACKET_HEADER_SET_VOXEL_DESTRUCTIVE) + sizeof(unsigned short int); // reset + args->bufferInUse = sizeof(PACKET_TYPE_SET_VOXEL_DESTRUCTIVE) + sizeof(unsigned short int); // reset } // copy this node's code color details into our buffer. @@ -1376,10 +1376,10 @@ void Application::importVoxels() { // the server as an set voxel message, this will also rebase the voxels to the new location unsigned char* calculatedOctCode = NULL; SendVoxelsOperationArgs args; - args.messageBuffer[0] = PACKET_HEADER_SET_VOXEL_DESTRUCTIVE; - unsigned short int* sequenceAt = (unsigned short int*)&args.messageBuffer[sizeof(PACKET_HEADER_SET_VOXEL_DESTRUCTIVE)]; + args.messageBuffer[0] = PACKET_TYPE_SET_VOXEL_DESTRUCTIVE; + unsigned short int* sequenceAt = (unsigned short int*)&args.messageBuffer[sizeof(PACKET_TYPE_SET_VOXEL_DESTRUCTIVE)]; *sequenceAt = 0; - args.bufferInUse = sizeof(PACKET_HEADER_SET_VOXEL_DESTRUCTIVE) + sizeof(unsigned short int); // set to command + sequence + args.bufferInUse = sizeof(PACKET_TYPE_SET_VOXEL_DESTRUCTIVE) + sizeof(unsigned short int); // set to command + sequence // we only need the selected voxel to get the newBaseOctCode, which we can actually calculate from the // voxel size/position details. @@ -1392,7 +1392,7 @@ void Application::importVoxels() { importVoxels.recurseTreeWithOperation(sendVoxelsOperation, &args); // If we have voxels left in the packet, then send the packet - if (args.bufferInUse > (sizeof(PACKET_HEADER_SET_VOXEL_DESTRUCTIVE) + sizeof(unsigned short int))) { + if (args.bufferInUse > (sizeof(PACKET_TYPE_SET_VOXEL_DESTRUCTIVE) + sizeof(unsigned short int))) { controlledBroadcastToNodes(args.messageBuffer, args.bufferInUse, & NODE_TYPE_VOXEL_SERVER, 1); } @@ -1427,10 +1427,10 @@ void Application::pasteVoxels() { // Recurse the clipboard tree, where everything is root relative, and send all the colored voxels to // the server as an set voxel message, this will also rebase the voxels to the new location SendVoxelsOperationArgs args; - args.messageBuffer[0] = PACKET_HEADER_SET_VOXEL_DESTRUCTIVE; - unsigned short int* sequenceAt = (unsigned short int*)&args.messageBuffer[sizeof(PACKET_HEADER_SET_VOXEL_DESTRUCTIVE)]; + args.messageBuffer[0] = PACKET_TYPE_SET_VOXEL_DESTRUCTIVE; + unsigned short int* sequenceAt = (unsigned short int*)&args.messageBuffer[sizeof(PACKET_TYPE_SET_VOXEL_DESTRUCTIVE)]; *sequenceAt = 0; - args.bufferInUse = sizeof(PACKET_HEADER_SET_VOXEL_DESTRUCTIVE) + sizeof(unsigned short int); // set to command + sequence + args.bufferInUse = sizeof(PACKET_TYPE_SET_VOXEL_DESTRUCTIVE) + sizeof(unsigned short int); // set to command + sequence // we only need the selected voxel to get the newBaseOctCode, which we can actually calculate from the // voxel size/position details. If we don't have an actual selectedNode then use the mouseVoxel to create a @@ -1444,7 +1444,7 @@ void Application::pasteVoxels() { _clipboardTree.recurseTreeWithOperation(sendVoxelsOperation, &args); // If we have voxels left in the packet, then send the packet - if (args.bufferInUse > (sizeof(PACKET_HEADER_SET_VOXEL_DESTRUCTIVE) + sizeof(unsigned short int))) { + if (args.bufferInUse > (sizeof(PACKET_TYPE_SET_VOXEL_DESTRUCTIVE) + sizeof(unsigned short int))) { controlledBroadcastToNodes(args.messageBuffer, args.bufferInUse, & NODE_TYPE_VOXEL_SERVER, 1); } @@ -1989,7 +1989,7 @@ void Application::updateAvatar(float deltaTime) { unsigned char broadcastString[200]; unsigned char* endOfBroadcastStringWrite = broadcastString; - *(endOfBroadcastStringWrite++) = PACKET_HEADER_HEAD_DATA; + *(endOfBroadcastStringWrite++) = PACKET_TYPE_HEAD_DATA; endOfBroadcastStringWrite += packNodeId(endOfBroadcastStringWrite, nodeList->getOwnerID()); endOfBroadcastStringWrite += _myAvatar.getBroadcastData(endOfBroadcastStringWrite); @@ -2019,8 +2019,8 @@ void Application::updateAvatar(float deltaTime) { _paintingVoxel.y >= 0.0 && _paintingVoxel.y <= 1.0 && _paintingVoxel.z >= 0.0 && _paintingVoxel.z <= 1.0) { - PACKET_HEADER message = (_destructiveAddVoxel->isChecked() ? - PACKET_HEADER_SET_VOXEL_DESTRUCTIVE : PACKET_HEADER_SET_VOXEL); + PACKET_TYPE message = (_destructiveAddVoxel->isChecked() ? + PACKET_TYPE_SET_VOXEL_DESTRUCTIVE : PACKET_TYPE_SET_VOXEL); sendVoxelEditMessage(message, _paintingVoxel); } } @@ -2698,8 +2698,8 @@ void Application::shiftPaintingColor() { void Application::maybeEditVoxelUnderCursor() { if (_addVoxelMode->isChecked() || _colorVoxelMode->isChecked()) { if (_mouseVoxel.s != 0) { - PACKET_HEADER message = (_destructiveAddVoxel->isChecked() ? - PACKET_HEADER_SET_VOXEL_DESTRUCTIVE : PACKET_HEADER_SET_VOXEL); + PACKET_TYPE message = (_destructiveAddVoxel->isChecked() ? + PACKET_TYPE_SET_VOXEL_DESTRUCTIVE : PACKET_TYPE_SET_VOXEL); sendVoxelEditMessage(message, _mouseVoxel); // create the voxel locally so it appears immediately @@ -2772,7 +2772,7 @@ void Application::maybeEditVoxelUnderCursor() { void Application::deleteVoxelUnderCursor() { if (_mouseVoxel.s != 0) { // sending delete to the server is sufficient, server will send new version so we see updates soon enough - sendVoxelEditMessage(PACKET_HEADER_ERASE_VOXEL, _mouseVoxel); + sendVoxelEditMessage(PACKET_TYPE_ERASE_VOXEL, _mouseVoxel); AudioInjector* voxelInjector = AudioInjectionManager::injectorWithCapacity(5000); voxelInjector->setPosition(glm::vec3(_mouseVoxel.x, _mouseVoxel.y, _mouseVoxel.z)); // voxelInjector->setBearing(0); //straight down the z axis @@ -2881,33 +2881,33 @@ void* Application::networkReceive(void* args) { app->_packetCount++; app->_bytesCount += bytesReceived; - if (app->_incomingPacket[1] == packetVersion(app->_incomingPacket[0])) { + if (app->_incomingPacket[1] == versionForPacketType(app->_incomingPacket[0])) { // only process this packet if we have a match on the packet version switch (app->_incomingPacket[0]) { - case PACKET_HEADER_TRANSMITTER_DATA_V2: + case PACKET_TYPE_TRANSMITTER_DATA_V2: // V2 = IOS transmitter app app->_myTransmitter.processIncomingData(app->_incomingPacket, bytesReceived); break; - case PACKET_HEADER_MIXED_AUDIO: + case PACKET_TYPE_MIXED_AUDIO: app->_audio.addReceivedAudioToBuffer(app->_incomingPacket, bytesReceived); break; - case PACKET_HEADER_VOXEL_DATA: - case PACKET_HEADER_VOXEL_DATA_MONOCHROME: - case PACKET_HEADER_Z_COMMAND: - case PACKET_HEADER_ERASE_VOXEL: + case PACKET_TYPE_VOXEL_DATA: + case PACKET_TYPE_VOXEL_DATA_MONOCHROME: + case PACKET_TYPE_Z_COMMAND: + case PACKET_TYPE_ERASE_VOXEL: app->_voxels.parseData(app->_incomingPacket, bytesReceived); break; - case PACKET_HEADER_ENVIRONMENT_DATA: + case PACKET_TYPE_ENVIRONMENT_DATA: app->_environment.parseData(&senderAddress, app->_incomingPacket, bytesReceived); break; - case PACKET_HEADER_BULK_AVATAR_DATA: + case PACKET_TYPE_BULK_AVATAR_DATA: NodeList::getInstance()->processBulkNodeData(&senderAddress, app->_incomingPacket, bytesReceived); getInstance()->_bandwidthMeter.inputStream(BandwidthMeter::AVATARS).updateValue(bytesReceived); break; - case PACKET_HEADER_AVATAR_VOXEL_URL: + case PACKET_TYPE_AVATAR_VOXEL_URL: processAvatarVoxelURLMessage(app->_incomingPacket, bytesReceived); break; default: diff --git a/interface/src/Application.h b/interface/src/Application.h index 2b4bd27a3d..1b2bef6347 100644 --- a/interface/src/Application.h +++ b/interface/src/Application.h @@ -157,7 +157,7 @@ private: static void sendVoxelServerAddScene(); static bool sendVoxelsOperation(VoxelNode* node, void* extraData); - static void sendVoxelEditMessage(PACKET_HEADER header, VoxelDetail& detail); + static void sendVoxelEditMessage(PACKET_TYPE type, VoxelDetail& detail); static void sendAvatarVoxelURLMessage(const QUrl& url); static void processAvatarVoxelURLMessage(unsigned char *packetData, size_t dataBytes); static void sendPingPackets(); diff --git a/interface/src/Audio.cpp b/interface/src/Audio.cpp index dc303f8d4b..b381a3c178 100644 --- a/interface/src/Audio.cpp +++ b/interface/src/Audio.cpp @@ -99,15 +99,15 @@ inline void Audio::performIO(int16_t* inputLeft, int16_t* outputLeft, int16_t* o glm::vec3 headPosition = interfaceAvatar->getHeadJointPosition(); glm::quat headOrientation = interfaceAvatar->getHead().getOrientation(); - int leadingBytes = sizeof(PACKET_HEADER_MICROPHONE_AUDIO_NO_ECHO) + sizeof(headPosition) + sizeof(headOrientation); + int leadingBytes = sizeof(PACKET_TYPE_MICROPHONE_AUDIO_NO_ECHO) + sizeof(headPosition) + sizeof(headOrientation); // we need the amount of bytes in the buffer + 1 for type // + 12 for 3 floats for position + float for bearing + 1 attenuation byte unsigned char dataPacket[BUFFER_LENGTH_BYTES_PER_CHANNEL + leadingBytes]; dataPacket[0] = (Application::getInstance()->shouldEchoAudio()) - ? PACKET_HEADER_MICROPHONE_AUDIO_WITH_ECHO - : PACKET_HEADER_MICROPHONE_AUDIO_NO_ECHO; + ? PACKET_TYPE_MICROPHONE_AUDIO_WITH_ECHO + : PACKET_TYPE_MICROPHONE_AUDIO_NO_ECHO; unsigned char *currentPacketPtr = dataPacket + 1; // memcpy the three float positions @@ -446,10 +446,10 @@ void Audio::addReceivedAudioToBuffer(unsigned char* receivedData, int receivedBy //printf("Got audio packet %d\n", _packetsReceivedThisPlayback); - _ringBuffer.parseData((unsigned char*) receivedData, PACKET_LENGTH_BYTES + sizeof(PACKET_HEADER)); + _ringBuffer.parseData((unsigned char*) receivedData, PACKET_LENGTH_BYTES + sizeof(PACKET_TYPE)); Application::getInstance()->getBandwidthMeter()->inputStream(BandwidthMeter::AUDIO) - .updateValue(PACKET_LENGTH_BYTES + sizeof(PACKET_HEADER)); + .updateValue(PACKET_LENGTH_BYTES + sizeof(PACKET_TYPE)); _lastReceiveTime = currentReceiveTime; } diff --git a/interface/src/VoxelSystem.cpp b/interface/src/VoxelSystem.cpp index 97c3e4bcd5..8912762d6e 100644 --- a/interface/src/VoxelSystem.cpp +++ b/interface/src/VoxelSystem.cpp @@ -117,21 +117,21 @@ int VoxelSystem::parseData(unsigned char* sourceBuffer, int numBytes) { pthread_mutex_lock(&_treeLock); switch(command) { - case PACKET_HEADER_VOXEL_DATA: + case PACKET_TYPE_VOXEL_DATA: { PerformanceWarning warn(_renderWarningsOn, "readBitstreamToTree()"); // ask the VoxelTree to read the bitstream into the tree _tree->readBitstreamToTree(voxelData, numBytes - 1, WANT_COLOR, WANT_EXISTS_BITS); } break; - case PACKET_HEADER_VOXEL_DATA_MONOCHROME: + case PACKET_TYPE_VOXEL_DATA_MONOCHROME: { PerformanceWarning warn(_renderWarningsOn, "readBitstreamToTree()"); // ask the VoxelTree to read the MONOCHROME bitstream into the tree _tree->readBitstreamToTree(voxelData, numBytes - 1, NO_COLOR, WANT_EXISTS_BITS); } break; - case PACKET_HEADER_Z_COMMAND: + case PACKET_TYPE_Z_COMMAND: // the Z command is a special command that allows the sender to send high level semantic // requests, like erase all, or add sphere scene, different receivers may handle these diff --git a/libraries/audio/src/AudioInjector.cpp b/libraries/audio/src/AudioInjector.cpp index 16c381a036..44a8257e4a 100644 --- a/libraries/audio/src/AudioInjector.cpp +++ b/libraries/audio/src/AudioInjector.cpp @@ -70,7 +70,7 @@ void AudioInjector::injectAudio(UDPSocket* injectorSocket, sockaddr* destination timeval startTime; // calculate the number of bytes required for additional data - int leadingBytes = sizeof(PACKET_HEADER) + int leadingBytes = sizeof(PACKET_TYPE) + sizeof(_streamIdentifier) + sizeof(_position) + sizeof(_orientation) @@ -79,8 +79,8 @@ void AudioInjector::injectAudio(UDPSocket* injectorSocket, sockaddr* destination unsigned char dataPacket[(BUFFER_LENGTH_SAMPLES_PER_CHANNEL * sizeof(int16_t)) + leadingBytes]; - dataPacket[0] = PACKET_HEADER_INJECT_AUDIO; - unsigned char *currentPacketPtr = dataPacket + sizeof(PACKET_HEADER_INJECT_AUDIO); + dataPacket[0] = PACKET_TYPE_INJECT_AUDIO; + unsigned char *currentPacketPtr = dataPacket + sizeof(PACKET_TYPE_INJECT_AUDIO); // copy the identifier for this injector memcpy(currentPacketPtr, &_streamIdentifier, sizeof(_streamIdentifier)); diff --git a/libraries/audio/src/AudioRingBuffer.cpp b/libraries/audio/src/AudioRingBuffer.cpp index 79e94e625d..8e2e28e964 100644 --- a/libraries/audio/src/AudioRingBuffer.cpp +++ b/libraries/audio/src/AudioRingBuffer.cpp @@ -34,7 +34,7 @@ void AudioRingBuffer::reset() { } int AudioRingBuffer::parseData(unsigned char* sourceBuffer, int numBytes) { - return parseAudioSamples(sourceBuffer + sizeof(PACKET_HEADER_MIXED_AUDIO), numBytes - sizeof(PACKET_HEADER_MIXED_AUDIO)); + return parseAudioSamples(sourceBuffer + sizeof(PACKET_TYPE_MIXED_AUDIO), numBytes - sizeof(PACKET_TYPE_MIXED_AUDIO)); } int AudioRingBuffer::parseAudioSamples(unsigned char* sourceBuffer, int numBytes) { diff --git a/libraries/avatars/src/AvatarData.cpp b/libraries/avatars/src/AvatarData.cpp index 9779d0a1f5..64bde13d4a 100755 --- a/libraries/avatars/src/AvatarData.cpp +++ b/libraries/avatars/src/AvatarData.cpp @@ -169,7 +169,7 @@ int AvatarData::parseData(unsigned char* sourceBuffer, int numBytes) { } // increment to push past the packet header - sourceBuffer += sizeof(PACKET_HEADER_HEAD_DATA); + sourceBuffer += sizeof(PACKET_TYPE_HEAD_DATA); unsigned char* startPosition = sourceBuffer; diff --git a/libraries/shared/src/NodeList.cpp b/libraries/shared/src/NodeList.cpp index fad925541c..a934624bad 100644 --- a/libraries/shared/src/NodeList.cpp +++ b/libraries/shared/src/NodeList.cpp @@ -90,18 +90,18 @@ void NodeList::timePingReply(sockaddr *nodeAddress, unsigned char *packetData) { void NodeList::processNodeData(sockaddr *senderAddress, unsigned char *packetData, size_t dataBytes) { switch (((char *)packetData)[0]) { - case PACKET_HEADER_DOMAIN: { + case PACKET_TYPE_DOMAIN: { processDomainServerList(packetData, dataBytes); break; } - case PACKET_HEADER_PING: { + case PACKET_TYPE_PING: { char pingPacket[dataBytes]; memcpy(pingPacket, packetData, dataBytes); - pingPacket[0] = PACKET_HEADER_PING_REPLY; + pingPacket[0] = PACKET_TYPE_PING_REPLY; _nodeSocket.send(senderAddress, pingPacket, dataBytes); break; } - case PACKET_HEADER_PING_REPLY: { + case PACKET_TYPE_PING_REPLY: { timePingReply(senderAddress, packetData); break; } @@ -123,7 +123,7 @@ void NodeList::processBulkNodeData(sockaddr *senderAddress, unsigned char *packe unsigned char *currentPosition = startPosition + 1; unsigned char packetHolder[numTotalBytes]; - packetHolder[0] = PACKET_HEADER_HEAD_DATA; + packetHolder[0] = PACKET_TYPE_HEAD_DATA; uint16_t nodeID = -1; @@ -237,19 +237,22 @@ void NodeList::sendDomainServerCheckIn() { int numBytesNodesOfInterest = _nodeTypesOfInterest ? strlen((char*) _nodeTypesOfInterest) : 0; // check in packet has header, node type, port, IP, node types of interest, null termination - int numPacketBytes = sizeof(PACKET_HEADER) + sizeof(PACKET_VERSION) + sizeof(NODE_TYPE) + sizeof(uint16_t) + + int numPacketBytes = sizeof(PACKET_TYPE) + sizeof(PACKET_VERSION) + sizeof(NODE_TYPE) + sizeof(uint16_t) + (sizeof(char) * 4) + numBytesNodesOfInterest + sizeof(unsigned char); checkInPacket = new unsigned char[numPacketBytes]; unsigned char* packetPosition = checkInPacket; - *(packetPosition++) = (memchr(SOLO_NODE_TYPES, _ownerType, sizeof(SOLO_NODE_TYPES))) - ? PACKET_HEADER_DOMAIN_REPORT_FOR_DUTY - : PACKET_HEADER_DOMAIN_LIST_REQUEST; - *(packetPosition++) = packetVersion(*(packetPosition - 1)); + PACKET_TYPE nodePacketType = (memchr(SOLO_NODE_TYPES, _ownerType, sizeof(SOLO_NODE_TYPES))) + ? PACKET_TYPE_DOMAIN_REPORT_FOR_DUTY + : PACKET_TYPE_DOMAIN_LIST_REQUEST; + + int numHeaderBytes = populateTypeAndVersion(packetPosition, nodePacketType); + packetPosition += numHeaderBytes; + *(packetPosition++) = _ownerType; - packetPosition += packSocket(checkInPacket + sizeof(PACKET_HEADER) + sizeof(PACKET_VERSION) + sizeof(NODE_TYPE), + packetPosition += packSocket(checkInPacket + numHeaderBytes + sizeof(NODE_TYPE), getLocalAddress(), htons(_nodeSocket.getListeningPort())); @@ -418,8 +421,8 @@ void *pingUnknownNodes(void *args) { if (!node->getActiveSocket() && node->getPublicSocket() && node->getLocalSocket()) { // ping both of the sockets for the node so we can figure out // which socket we can use - nodeList->getNodeSocket()->send(node->getPublicSocket(), &PACKET_HEADER_PING, 1); - nodeList->getNodeSocket()->send(node->getLocalSocket(), &PACKET_HEADER_PING, 1); + nodeList->getNodeSocket()->send(node->getPublicSocket(), &PACKET_TYPE_PING, 1); + nodeList->getNodeSocket()->send(node->getLocalSocket(), &PACKET_TYPE_PING, 1); } } diff --git a/libraries/shared/src/PacketHeaders.cpp b/libraries/shared/src/PacketHeaders.cpp index fff453abdc..f892afc124 100644 --- a/libraries/shared/src/PacketHeaders.cpp +++ b/libraries/shared/src/PacketHeaders.cpp @@ -8,10 +8,18 @@ #include "PacketHeaders.h" -PACKET_VERSION packetVersion(PACKET_HEADER header) { - switch (header) { +PACKET_VERSION versionForPacketType(PACKET_TYPE type) { + switch (type) { default: return 0; break; } +} + +int populateTypeAndVersion(unsigned char* destination, PACKET_TYPE type) { + destination[0] = type; + destination[1] = versionForPacketType(type); + + // return the number of bytes written for pointer pushing + return 2; } \ No newline at end of file diff --git a/libraries/shared/src/PacketHeaders.h b/libraries/shared/src/PacketHeaders.h index 7f69e09668..ec7f717721 100644 --- a/libraries/shared/src/PacketHeaders.h +++ b/libraries/shared/src/PacketHeaders.h @@ -12,30 +12,33 @@ #ifndef hifi_PacketHeaders_h #define hifi_PacketHeaders_h -typedef char PACKET_HEADER; -const PACKET_HEADER PACKET_HEADER_DOMAIN = 'D'; -const PACKET_HEADER PACKET_HEADER_PING = 'P'; -const PACKET_HEADER PACKET_HEADER_PING_REPLY = 'R'; -const PACKET_HEADER PACKET_HEADER_HEAD_DATA = 'H'; -const PACKET_HEADER PACKET_HEADER_Z_COMMAND = 'Z'; -const PACKET_HEADER PACKET_HEADER_INJECT_AUDIO = 'I'; -const PACKET_HEADER PACKET_HEADER_MIXED_AUDIO = 'A'; -const PACKET_HEADER PACKET_HEADER_MICROPHONE_AUDIO_NO_ECHO = 'M'; -const PACKET_HEADER PACKET_HEADER_MICROPHONE_AUDIO_WITH_ECHO = 'm'; -const PACKET_HEADER PACKET_HEADER_SET_VOXEL = 'S'; -const PACKET_HEADER PACKET_HEADER_SET_VOXEL_DESTRUCTIVE = 'O'; -const PACKET_HEADER PACKET_HEADER_ERASE_VOXEL = 'E'; -const PACKET_HEADER PACKET_HEADER_VOXEL_DATA = 'V'; -const PACKET_HEADER PACKET_HEADER_VOXEL_DATA_MONOCHROME = 'v'; -const PACKET_HEADER PACKET_HEADER_BULK_AVATAR_DATA = 'X'; -const PACKET_HEADER PACKET_HEADER_AVATAR_VOXEL_URL = 'U'; -const PACKET_HEADER PACKET_HEADER_TRANSMITTER_DATA_V2 = 'T'; -const PACKET_HEADER PACKET_HEADER_ENVIRONMENT_DATA = 'e'; -const PACKET_HEADER PACKET_HEADER_DOMAIN_LIST_REQUEST = 'L'; -const PACKET_HEADER PACKET_HEADER_DOMAIN_REPORT_FOR_DUTY = 'C'; +typedef char PACKET_TYPE; +const PACKET_TYPE PACKET_TYPE_DOMAIN = 'D'; +const PACKET_TYPE PACKET_TYPE_PING = 'P'; +const PACKET_TYPE PACKET_TYPE_PING_REPLY = 'R'; +const PACKET_TYPE PACKET_TYPE_HEAD_DATA = 'H'; +const PACKET_TYPE PACKET_TYPE_Z_COMMAND = 'Z'; +const PACKET_TYPE PACKET_TYPE_INJECT_AUDIO = 'I'; +const PACKET_TYPE PACKET_TYPE_MIXED_AUDIO = 'A'; +const PACKET_TYPE PACKET_TYPE_MICROPHONE_AUDIO_NO_ECHO = 'M'; +const PACKET_TYPE PACKET_TYPE_MICROPHONE_AUDIO_WITH_ECHO = 'm'; +const PACKET_TYPE PACKET_TYPE_SET_VOXEL = 'S'; +const PACKET_TYPE PACKET_TYPE_SET_VOXEL_DESTRUCTIVE = 'O'; +const PACKET_TYPE PACKET_TYPE_ERASE_VOXEL = 'E'; +const PACKET_TYPE PACKET_TYPE_VOXEL_DATA = 'V'; +const PACKET_TYPE PACKET_TYPE_VOXEL_DATA_MONOCHROME = 'v'; +const PACKET_TYPE PACKET_TYPE_BULK_AVATAR_DATA = 'X'; +const PACKET_TYPE PACKET_TYPE_AVATAR_VOXEL_URL = 'U'; +const PACKET_TYPE PACKET_TYPE_TRANSMITTER_DATA_V2 = 'T'; +const PACKET_TYPE PACKET_TYPE_ENVIRONMENT_DATA = 'e'; +const PACKET_TYPE PACKET_TYPE_DOMAIN_LIST_REQUEST = 'L'; +const PACKET_TYPE PACKET_TYPE_DOMAIN_REPORT_FOR_DUTY = 'C'; typedef char PACKET_VERSION; -PACKET_VERSION packetVersion(PACKET_HEADER header); +PACKET_VERSION versionForPacketType(PACKET_TYPE header); +int populateTypeAndVersion(unsigned char* destination, PACKET_TYPE header); + +const int MAX_PACKET_HEADER_BYTES = sizeof(PACKET_TYPE) + sizeof(PACKET_VERSION); // These are supported Z-Command #define ERASE_ALL_COMMAND "erase all" diff --git a/libraries/voxels/src/VoxelTree.cpp b/libraries/voxels/src/VoxelTree.cpp index b16425370e..21e406400d 100644 --- a/libraries/voxels/src/VoxelTree.cpp +++ b/libraries/voxels/src/VoxelTree.cpp @@ -535,7 +535,7 @@ void VoxelTree::readCodeColorBufferToTreeRecursion(VoxelNode* node, void* extraD void VoxelTree::processRemoveVoxelBitstream(unsigned char * bitstream, int bufferSizeBytes) { //unsigned short int itemNumber = (*((unsigned short int*)&bitstream[sizeof(PACKET_HEADER)])); - int atByte = sizeof(short int) + sizeof(PACKET_HEADER); + int atByte = sizeof(short int) + sizeof(PACKET_TYPE); unsigned char* voxelCode = (unsigned char*)&bitstream[atByte]; while (atByte < bufferSizeBytes) { int codeLength = numberOfThreeBitSectionsInCode(voxelCode); diff --git a/voxel-server/src/VoxelNodeData.cpp b/voxel-server/src/VoxelNodeData.cpp index f2cce906cf..2b4b405c48 100644 --- a/voxel-server/src/VoxelNodeData.cpp +++ b/voxel-server/src/VoxelNodeData.cpp @@ -27,7 +27,7 @@ VoxelNodeData::VoxelNodeData(Node* owningNode) : void VoxelNodeData::resetVoxelPacket() { - _voxelPacket[0] = getWantColor() ? PACKET_HEADER_VOXEL_DATA : PACKET_HEADER_VOXEL_DATA_MONOCHROME; + _voxelPacket[0] = getWantColor() ? PACKET_TYPE_VOXEL_DATA : PACKET_TYPE_VOXEL_DATA_MONOCHROME; _voxelPacketAt = &_voxelPacket[1]; _voxelPacketAvailableBytes = MAX_VOXEL_PACKET_SIZE - 1; _voxelPacketWaiting = false; diff --git a/voxel-server/src/main.cpp b/voxel-server/src/main.cpp index 64a4565b6c..7a5fe4f816 100644 --- a/voxel-server/src/main.cpp +++ b/voxel-server/src/main.cpp @@ -201,7 +201,7 @@ void resInVoxelDistributor(NodeList* nodeList, // send the environment packets if (shouldSendEnvironments) { int envPacketLength = 1; - *tempOutputBuffer = PACKET_HEADER_ENVIRONMENT_DATA; + *tempOutputBuffer = PACKET_TYPE_ENVIRONMENT_DATA; for (int i = 0; i < sizeof(environmentData) / sizeof(environmentData[0]); i++) { envPacketLength += environmentData[i].getBroadcastData(tempOutputBuffer + envPacketLength); } @@ -387,7 +387,7 @@ void deepestLevelVoxelDistributor(NodeList* nodeList, // send the environment packet if (shouldSendEnvironments) { int envPacketLength = 1; - *tempOutputBuffer = PACKET_HEADER_ENVIRONMENT_DATA; + *tempOutputBuffer = PACKET_TYPE_ENVIRONMENT_DATA; for (int i = 0; i < sizeof(environmentData) / sizeof(environmentData[0]); i++) { envPacketLength += environmentData[i].getBroadcastData(tempOutputBuffer + envPacketLength); } @@ -637,18 +637,18 @@ int main(int argc, const char * argv[]) { persistVoxelsWhenDirty(); if (nodeList->getNodeSocket()->receive(&nodePublicAddress, packetData, &receivedBytes)) { - if (packetData[0] == PACKET_HEADER_SET_VOXEL || packetData[0] == PACKET_HEADER_SET_VOXEL_DESTRUCTIVE) { - bool destructive = (packetData[0] == PACKET_HEADER_SET_VOXEL_DESTRUCTIVE); + if (packetData[0] == PACKET_TYPE_SET_VOXEL || packetData[0] == PACKET_TYPE_SET_VOXEL_DESTRUCTIVE) { + bool destructive = (packetData[0] == PACKET_TYPE_SET_VOXEL_DESTRUCTIVE); PerformanceWarning warn(::shouldShowAnimationDebug, - destructive ? "PACKET_HEADER_SET_VOXEL_DESTRUCTIVE" : "PACKET_HEADER_SET_VOXEL", + destructive ? "PACKET_TYPE_SET_VOXEL_DESTRUCTIVE" : "PACKET_TYPE_SET_VOXEL", ::shouldShowAnimationDebug); unsigned short int itemNumber = (*((unsigned short int*)&packetData[1])); if (::shouldShowAnimationDebug) { printf("got %s - command from client receivedBytes=%ld itemNumber=%d\n", - destructive ? "PACKET_HEADER_SET_VOXEL_DESTRUCTIVE" : "PACKET_HEADER_SET_VOXEL", + destructive ? "PACKET_TYPE_SET_VOXEL_DESTRUCTIVE" : "PACKET_TYPE_SET_VOXEL", receivedBytes,itemNumber); } - int atByte = sizeof(PACKET_HEADER) + sizeof(itemNumber); + int atByte = sizeof(PACKET_TYPE) + sizeof(itemNumber); unsigned char* voxelData = (unsigned char*)&packetData[atByte]; while (atByte < receivedBytes) { unsigned char octets = (unsigned char)*voxelData; @@ -691,20 +691,20 @@ int main(int argc, const char * argv[]) { atByte += voxelDataSize; } } - if (packetData[0] == PACKET_HEADER_ERASE_VOXEL) { + if (packetData[0] == PACKET_TYPE_ERASE_VOXEL) { // Send these bits off to the VoxelTree class to process them pthread_mutex_lock(&::treeLock); serverTree.processRemoveVoxelBitstream((unsigned char*)packetData, receivedBytes); pthread_mutex_unlock(&::treeLock); } - if (packetData[0] == PACKET_HEADER_Z_COMMAND) { + if (packetData[0] == PACKET_TYPE_Z_COMMAND) { // the Z command is a special command that allows the sender to send the voxel server high level semantic // requests, like erase all, or add sphere scene char* command = (char*) &packetData[1]; // start of the command int commandLength = strlen(command); // commands are null terminated strings - int totalLength = sizeof(PACKET_HEADER_Z_COMMAND) + commandLength + 1; // 1 for null termination + int totalLength = sizeof(PACKET_TYPE_Z_COMMAND) + commandLength + 1; // 1 for null termination printf("got Z message len(%ld)= %s\n", receivedBytes, command); bool rebroadcast = true; // by default rebroadcast @@ -731,11 +731,11 @@ int main(int argc, const char * argv[]) { nodeList->broadcastToNodes(packetData, receivedBytes, &NODE_TYPE_AGENT, 1); } } - // If we got a PACKET_HEADER_HEAD_DATA, then we're talking to an NODE_TYPE_AVATAR, and we + // If we got a PACKET_TYPE_HEAD_DATA, then we're talking to an NODE_TYPE_AVATAR, and we // need to make sure we have it in our nodeList. - if (packetData[0] == PACKET_HEADER_HEAD_DATA) { + if (packetData[0] == PACKET_TYPE_HEAD_DATA) { uint16_t nodeID = 0; - unpackNodeId(packetData + sizeof(PACKET_HEADER_HEAD_DATA), &nodeID); + unpackNodeId(packetData + sizeof(PACKET_TYPE_HEAD_DATA), &nodeID); Node* node = nodeList->addOrUpdateNode(&nodePublicAddress, &nodePublicAddress, NODE_TYPE_AGENT, @@ -744,7 +744,7 @@ int main(int argc, const char * argv[]) { nodeList->updateNodeWithData(node, packetData, receivedBytes); } // If the packet is a ping, let processNodeData handle it. - if (packetData[0] == PACKET_HEADER_PING) { + if (packetData[0] == PACKET_TYPE_PING) { nodeList->processNodeData(&nodePublicAddress, packetData, receivedBytes); } }