From fea3ca82298c75889e3088a8ba1ec4442ae51d40 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Mon, 7 Oct 2013 10:58:26 -0700 Subject: [PATCH] pack string representation of UUID for data server communication --- interface/src/DataServerClient.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/interface/src/DataServerClient.cpp b/interface/src/DataServerClient.cpp index 00bc4d4077..250557242e 100644 --- a/interface/src/DataServerClient.cpp +++ b/interface/src/DataServerClient.cpp @@ -9,6 +9,7 @@ #include #include #include +#include #include "DataServerClient.h" @@ -26,9 +27,9 @@ void DataServerClient::putValueForKey(const char* key, const char* value) { int numPacketBytes = populateTypeAndVersion(putPacket, PACKET_TYPE_DATA_SERVER_PUT); // pack the client UUID - QByteArray rfcUUID = _clientUUID.toRfc4122(); - memcpy(putPacket + numPacketBytes, rfcUUID.constData(), rfcUUID.size()); - numPacketBytes += rfcUUID.size(); + QString uuidString = uuidStringWithoutCurlyBraces(_clientUUID); + memcpy(putPacket + numPacketBytes, uuidString.toLocal8Bit().constData(), uuidString.toLocal8Bit().size()); + numPacketBytes += uuidString.toLocal8Bit().size(); // pack the key, null terminated strcpy((char*) putPacket + numPacketBytes, key); @@ -54,9 +55,9 @@ void DataServerClient::getValueForKeyAndUUID(const char* key, QUuid &uuid) { int numPacketBytes = populateTypeAndVersion(getPacket, PACKET_TYPE_DATA_SERVER_GET); // pack the UUID we're asking for data for - QByteArray rfcUUID = uuid.toRfc4122(); - memcpy(getPacket + numPacketBytes, rfcUUID, rfcUUID.size()); - numPacketBytes += rfcUUID.size(); + QString uuidString = uuidStringWithoutCurlyBraces(uuid); + memcpy(getPacket + numPacketBytes, uuidString.toLocal8Bit().constData(), uuidString.toLocal8Bit().size()); + numPacketBytes += uuidString.toLocal8Bit().size(); // pack the key, null terminated strcpy((char*) getPacket + numPacketBytes, key);