Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-19 17:03:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

stubbing of mechanism to confirm packets sent to data server

Browse source
This commit is contained in:
Stephen Birarda 2013-10-07 10:45:54 -07:00
parent 4cc9f29c83
commit 13232a4c0b
3 changed files with 25 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
interface/src/DataServerClient.cpp
View file

@ -17,7 +17,7 @@ const unsigned short DATA_SERVER_PORT = 3282;
const sockaddr_in DATA_SERVER_SOCKET = socketForHostnameAndHostOrderPort(DATA_SERVER_HOSTNAME, DATA_SERVER_PORT);
void DataServerClient::putValueForKey(const char* key, const char* value) {
unsigned char putPacket[MAX_PACKET_SIZE];
unsigned char* putPacket = new unsigned char[MAX_PACKET_SIZE];
// setup the header for this packet
int numPacketBytes = populateTypeAndVersion(putPacket, PACKET_TYPE_DATA_SERVER_PUT);
@ -37,6 +37,9 @@ void DataServerClient::putValueForKey(const char* key, const char* value) {
numPacketBytes += strlen(value);
putPacket[numPacketBytes++] = '\0';
// add the putPacket to our vector of unconfirmed packets, will be deleted once put is confirmed
_unconfirmedPackets.push_back(putPacket);
// send this put request to the data server
NodeList::getInstance()->getNodeSocket()->send((sockaddr*) &DATA_SERVER_SOCKET, putPacket, numPacketBytes);
}
@ -63,6 +66,22 @@ void DataServerClient::getValueForKeyAndUUID(const char* key, QUuid &uuid) {
void DataServerClient::processConfirmFromDataServer(unsigned char* packetData, int numPacketBytes) {
for (std::vector<unsigned char*>::iterator unconfirmedPacket = _unconfirmedPackets.begin();
unconfirmedPacket != _unconfirmedPackets.end();
++unconfirmedPacket) {
if (memcmp(*unconfirmedPacket + sizeof(PACKET_TYPE),
packetData + sizeof(PACKET_TYPE),
numPacketBytes - sizeof(PACKET_TYPE)) == 0) {
// this is a match - remove the confirmed packet from the vector so it isn't sent back out
_unconfirmedPackets.erase(unconfirmedPacket);
// we've matched the packet - bail out
break;
} else {
// no match, just push the iterator
unconfirmedPacket++;
}
}
}
void DataServerClient::processGetFromDataServer(unsigned char* packetData, int numPacketBytes) {

3
interface/src/DataServerClient.h
View file

@ -9,6 +9,8 @@
#ifndef __hifi__DataServerClient__
#define __hifi__DataServerClient__
#include <vector>
#include <QtCore/QUuid>
class DataServerClient {
@ -23,6 +25,7 @@ public:
static QUuid& getClientUUID() { return _clientUUID; }
private:
static QUuid _clientUUID;
static std::vector<unsigned char*> _unconfirmedPackets;
};
#endif /* defined(__hifi__DataServerClient__) */

2
libraries/shared/src/PacketHeaders.h
View file

@ -43,6 +43,8 @@ const PACKET_TYPE PACKET_TYPE_VOXEL_JURISDICTION = 'J';
const PACKET_TYPE PACKET_TYPE_VOXEL_JURISDICTION_REQUEST = 'j';
const PACKET_TYPE PACKET_TYPE_DATA_SERVER_PUT = 'p';
const PACKET_TYPE PACKET_TYPE_DATA_SERVER_GET = 'g';
const PACKET_TYPE PACKET_TYPE_DATA_SERVER_SEND = 'u';
const PACKET_TYPE PACKET_TYPE_DATA_SERVER_CONFIRM = 'c';
typedef char PACKET_VERSION;