From ae59ce22b7583a17a4835cf703499f43ba801845 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Tue, 8 Oct 2013 12:22:02 -0700 Subject: [PATCH] send an empty key when making a UUID request --- interface/src/DataServerClient.cpp | 8 ++++++-- interface/src/DataServerClient.h | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/interface/src/DataServerClient.cpp b/interface/src/DataServerClient.cpp index 27fbb44d13..aea7e2d4c2 100644 --- a/interface/src/DataServerClient.cpp +++ b/interface/src/DataServerClient.cpp @@ -78,8 +78,12 @@ void DataServerClient::getValueForKeyAndUserString(const char* key, QString& use // pack the key, null terminated strcpy((char*) getPacket + numPacketBytes, key); - numPacketBytes += strlen(key); - getPacket[numPacketBytes++] = '\0'; + int numKeyBytes = strlen(key); + + if (numKeyBytes > 0) { + numPacketBytes += numKeyBytes; + getPacket[numPacketBytes++] = '\0'; + } // add the getPacket to our vector of uncofirmed packets, will be deleted once we get a response from the nameserver _unmatchedPackets.insert(std::pair(getPacket, numPacketBytes)); diff --git a/interface/src/DataServerClient.h b/interface/src/DataServerClient.h index 1a26cdb23d..fed956833d 100644 --- a/interface/src/DataServerClient.h +++ b/interface/src/DataServerClient.h @@ -32,7 +32,7 @@ private: namespace DataServerKey { const char FaceMeshURL[] = "mesh"; - const char UUID[] = "uuid"; + const char UUID[] = ""; } #endif /* defined(__hifi__DataServerClient__) */