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

Merge pull request #1743 from birarda/dataserver

Browse source 
fix for data-server crashes
This commit is contained in:
ZappoMan 2014-01-29 16:22:07 -08:00
commit 44d60614bc
2 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -24,7 +24,8 @@ const unsigned short REDIS_PORT = 6379;
DataServer::DataServer(int argc, char* argv[]) : DataServer::DataServer(int argc, char* argv[]) :
QCoreApplication(argc, argv), QCoreApplication(argc, argv),
_socket(), _socket(),
_redis(NULL) _redis(NULL),
_uuid(QUuid::createUuid())
{ {
_socket.bind(QHostAddress::Any, DATA_SERVER_LISTEN_PORT); _socket.bind(QHostAddress::Any, DATA_SERVER_LISTEN_PORT);
@ -59,7 +60,8 @@ void DataServer::readPendingDatagrams() {
while (_socket.hasPendingDatagrams()) { while (_socket.hasPendingDatagrams()) {
receivedPacket.resize(_socket.pendingDatagramSize()); receivedPacket.resize(_socket.pendingDatagramSize());
_socket.readDatagram(receivedPacket.data(), _socket.pendingDatagramSize()); _socket.readDatagram(receivedPacket.data(), _socket.pendingDatagramSize(),
senderSockAddr.getAddressPointer(), senderSockAddr.getPortPointer());
PacketType requestType = packetTypeForPacket(receivedPacket); PacketType requestType = packetTypeForPacket(receivedPacket);
@ -119,26 +121,28 @@ 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 a reply packet with the sequence number // which is a reply packet with the sequence number
QByteArray replyPacket = byteArrayWithPopluatedHeader(PacketTypeDataServerConfirm); QByteArray replyPacket = byteArrayWithPopluatedHeader(PacketTypeDataServerConfirm, _uuid);
replyPacket.append(sequenceNumber); replyPacket.append(sequenceNumber);
_socket.writeDatagram(replyPacket, _socket.writeDatagram(replyPacket, senderSockAddr.getAddress(), senderSockAddr.getPort());
senderSockAddr.getAddress(), senderSockAddr.getPort());
} }
freeReplyObject(reply); freeReplyObject(reply);
} else { } else {
// setup a send packet with the returned data // setup a send packet with the returned data
// leverage the packetData sent by overwriting and appending // leverage the packetData sent by overwriting and appending
QByteArray sendPacket = byteArrayWithPopluatedHeader(PacketTypeDataServerSend); QByteArray sendPacket = byteArrayWithPopluatedHeader(PacketTypeDataServerSend, _uuid);
sendPacket.append(sequenceNumber);
if (!receivedPacket.mid(numReceivedHeaderBytes).startsWith("uuid")) { if (!receivedPacket.mid(numReceivedHeaderBytes + sizeof(sequenceNumber)).startsWith("uuid")) {
const char MULTI_KEY_VALUE_SEPARATOR = '|'; const char MULTI_KEY_VALUE_SEPARATOR = '|';
// pull the key that specifies the data the user is putting/getting, null terminate it // pull the key that specifies the data the user is putting/getting, null terminate it
QString keyListString(receivedPacket.mid(numReceivedHeaderBytes)); QString keyListString;
packetStream >> keyListString;
QStringList keyList = keyListString.split(MULTI_KEY_VALUE_SEPARATOR); QStringList keyList = keyListString.split(MULTI_KEY_VALUE_SEPARATOR);
foreach (const QString& dataKey, keyList) { foreach (const QString& dataKey, keyList) {

2
data-server/src/DataServer.h
View file

@ -10,6 +10,7 @@
#define __hifi__DataServer__ #define __hifi__DataServer__
#include <QtCore/QCoreApplication> #include <QtCore/QCoreApplication>
#include <QtCore/QUuid>
#include <QtNetwork/QUdpSocket> #include <QtNetwork/QUdpSocket>
#include <hiredis.h> #include <hiredis.h>
@ -22,6 +23,7 @@ public:
private: private:
QUdpSocket _socket; QUdpSocket _socket;
redisContext* _redis; redisContext* _redis;
QUuid _uuid;
private slots: private slots:
void readPendingDatagrams(); void readPendingDatagrams();
}; };