History

store username and not UUID for MyAvatar

Stephen Birarda committed 13 years ago

Commit f36fd471 parent 98f435c5 files · +41 −36Browse files

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

Unified · Split

interface/src/DataServerClient.cpp+24−21
@@ -13,7 +13,7 @@ · 12 unmodified lines
1313
1414 #include "DataServerClient.h"
1515
16−QUuid DataServerClient::_clientUUID;
16+QString DataServerClient::_clientUsername;
1717 std::vector<unsigned char*> DataServerClient::_unconfirmedPackets;
1818
1919 const char DATA_SERVER_HOSTNAME[] = "127.0.0.1";
@@ -21,16 +21,15 @@ const unsigned short DATA_SERVER_PORT = 3282; · 1 unmodified line
2121 const sockaddr_in DATA_SERVER_SOCKET = socketForHostnameAndHostOrderPort(DATA_SERVER_HOSTNAME, DATA_SERVER_PORT);
2222
2323 void DataServerClient::putValueForKey(const char* key, const char* value) {
24− if (!_clientUUID.isNull()) {
24+ if (!_clientUsername.isEmpty()) {
2525 unsigned char* putPacket = new unsigned char[MAX_PACKET_SIZE];
2626
2727 // setup the header for this packet
2828 int numPacketBytes = populateTypeAndVersion(putPacket, PACKET_TYPE_DATA_SERVER_PUT);
2929
3030 // pack the client UUID
31− QString uuidString = uuidStringWithoutCurlyBraces(_clientUUID);
32− memcpy(putPacket + numPacketBytes, uuidString.toLocal8Bit().constData(), uuidString.toLocal8Bit().size());
33− numPacketBytes += uuidString.toLocal8Bit().size();
31+ memcpy(putPacket + numPacketBytes, _clientUsername.toLocal8Bit().constData(), _clientUsername.toLocal8Bit().size());
32+ numPacketBytes += _clientUsername.toLocal8Bit().size();
3433
3534 // pack the key, null terminated
3635 strcpy((char*) putPacket + numPacketBytes, key);
@@ -52,26 +51,30 @@ void DataServerClient::putValueForKey(const char* key, const char* value) { · 15 unmodified lines
5251
5352 void DataServerClient::getValueForKeyAndUUID(const char* key, QUuid &uuid) {
5453 if (!uuid.isNull()) {
55− unsigned char getPacket[MAX_PACKET_SIZE];
56−
57− // setup the header for this packet
58− int numPacketBytes = populateTypeAndVersion(getPacket, PACKET_TYPE_DATA_SERVER_GET);
59−
60− // pack the UUID we're asking for data for
6154 QString uuidString = uuidStringWithoutCurlyBraces(uuid);
62− memcpy(getPacket + numPacketBytes, uuidString.toLocal8Bit().constData(), uuidString.toLocal8Bit().size());
63− numPacketBytes += uuidString.toLocal8Bit().size();
64−
65− // pack the key, null terminated
66− strcpy((char*) getPacket + numPacketBytes, key);
67− numPacketBytes += strlen(key);
68− getPacket[numPacketBytes++] = '\0';
69−
70− // send the get to the data server
71− NodeList::getInstance()->getNodeSocket()->send((sockaddr*) &DATA_SERVER_SOCKET, getPacket, numPacketBytes);
55+ getValueforKeyAndUserString(key, uuidString);
7256 }
7357 }
7458
59+void DataServerClient::getValueforKeyAndUserString(const char* key, QString& userString) {
60+ unsigned char getPacket[MAX_PACKET_SIZE];
61+
62+ // setup the header for this packet
63+ int numPacketBytes = populateTypeAndVersion(getPacket, PACKET_TYPE_DATA_SERVER_GET);
64+
65+ // pack the user string (could be username or UUID string)
66+ memcpy(getPacket + numPacketBytes, userString.toLocal8Bit().constData(), userString.toLocal8Bit().size());
67+ numPacketBytes += userString.toLocal8Bit().size();
68+
69+ // pack the key, null terminated
70+ strcpy((char*) getPacket + numPacketBytes, key);
71+ numPacketBytes += strlen(key);
72+ getPacket[numPacketBytes++] = '\0';
73+
74+ // send the get to the data server
75+ NodeList::getInstance()->getNodeSocket()->send((sockaddr*) &DATA_SERVER_SOCKET, getPacket, numPacketBytes);
76+}
77+
7578 void DataServerClient::processConfirmFromDataServer(unsigned char* packetData, int numPacketBytes) {
7679
7780 for (std::vector<unsigned char*>::iterator unconfirmedPacket = _unconfirmedPackets.begin();