Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 23:03:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

add sequence number handling to the data-server

Browse source
This commit is contained in:
Stephen Birarda 2014-01-20 14:52:45 -08:00
parent 8930cf889b
commit 657589fa64
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
data-server/src/DataServer.cpp
View file

@ -64,6 +64,10 @@ void DataServer::readPendingDatagrams() {
packetVersionMatch(packetData)) { packetVersionMatch(packetData)) {
int readBytes = numBytesForPacketHeader(packetData); int readBytes = numBytesForPacketHeader(packetData);
// pull the sequence number used for this packet
quint16 sequenceNumber = *reinterpret_cast<quint16>(packetData + readBytes);
readBytes += sizeof(sequenceNumber);
// pull the UUID that we will need as part of the key // pull the UUID that we will need as part of the key
QString uuidString(reinterpret_cast<char*>(packetData + readBytes)); QString uuidString(reinterpret_cast<char*>(packetData + readBytes));
@ -80,7 +84,6 @@ void DataServer::readPendingDatagrams() {
redisReply* reply = (redisReply*) redisCommand(_redis, "GET user:%s", qPrintable(username)); redisReply* reply = (redisReply*) redisCommand(_redis, "GET user:%s", qPrintable(username));
if (reply->type == REDIS_REPLY_STRING) { if (reply->type == REDIS_REPLY_STRING) {
parsedUUID = QUuid(QString(reply->str)); parsedUUID = QUuid(QString(reply->str));
} }
@ -120,7 +123,6 @@ void DataServer::readPendingDatagrams() {
if (reply->type == REDIS_REPLY_STATUS && strcmp("OK", reply->str) == 0) { if (reply->type == REDIS_REPLY_STATUS && strcmp("OK", reply->str) == 0) {
// if redis stored the value successfully reply back with a confirm // if redis stored the value successfully reply back with a confirm
// which is the sent packet with the header replaced // which is the sent packet with the header replaced
packetData[0] = PACKET_TYPE_DATA_SERVER_CONFIRM; packetData[0] = PACKET_TYPE_DATA_SERVER_CONFIRM;
_socket.writeDatagram(reinterpret_cast<char*>(packetData), receivedBytes, _socket.writeDatagram(reinterpret_cast<char*>(packetData), receivedBytes,
@ -135,6 +137,9 @@ void DataServer::readPendingDatagrams() {
numSendPacketBytes += populateTypeAndVersion(packetData, PACKET_TYPE_DATA_SERVER_SEND); numSendPacketBytes += populateTypeAndVersion(packetData, PACKET_TYPE_DATA_SERVER_SEND);
memcpy(packetData + numSendPacketBytes, &sequenceNumber, sizeof(sequenceNumber));
numSendPacketBytes += sizeof(sequenceNumber);
const char MULTI_KEY_VALUE_SEPARATOR = '|'; const char MULTI_KEY_VALUE_SEPARATOR = '|';
if (strcmp((char*) packetData + readBytes, "uuid") != 0) { if (strcmp((char*) packetData + readBytes, "uuid") != 0) {