mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-27 22:49:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/remote' of openspace.itn.liu.se:/openspace into feature/remote

Browse Source 
fixed decoding of init messages to include data size
This commit is contained in:
Joakim Kilby
2015-07-01 14:17:23 +02:00
parent 762e70f14b
commit a89bce72cc
1 changed files with 29 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/network/parallelconnection.cpp
View File

@@ -275,22 +275,39 @@ namespace openspace {
int result;
uint16_t numScripts;
uint32_t datalen;
uint32_t id;
//create a buffer to hold the number of scripts in the initialization message
std::vector<char> buffer;
buffer.resize(sizeof(numScripts));
//read number of scripts in the initialization message
result = receiveData(_clientSocket, buffer, sizeof(numScripts), 0);
if (result <= 0){
//error
return;
}
//assign number of scripts
numScripts = *reinterpret_cast<uint16_t*>(buffer.data());
buffer.resize(sizeof(id));
//read recepient ID (mine)
result = receiveData(_clientSocket, buffer, sizeof(id), 0);
if (result <= 0){
//error
return;
}
id = *(reinterpret_cast<uint32_t*>(buffer.data()));
//read data length
result = receiveData(_clientSocket, buffer, sizeof(datalen), 0);
if (result <= 0){
//error
return;
}
datalen = *(reinterpret_cast<uint32_t*>(buffer.data()));
buffer.clear();
buffer.resize(sizeof(numScripts));
//read number of scripts
result = receiveData(_clientSocket, buffer, sizeof(numScripts), 0);
if (result <= 0){
//error
return;
}
numScripts = *(reinterpret_cast<uint16_t*>(buffer.data()));
//declare placeholder for all received scripts
std::vector<std::string> initScripts;
initScripts.reserve(numScripts);
@@ -334,7 +351,6 @@ namespace openspace {
//que script with the script engine
OsEng.scriptEngine()->queueScript(script);
}
}