libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-09 19:32:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SCUMM HE: Replace binary packet with JSON

Browse Source
This commit is contained in:
Eugene Sandulenko 2019-10-27 21:46:30 +00:00
parent a43381cf99
commit e2c7434aa8
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
engines/scumm/he/moonbase/net_main.cpp
View File

@ -333,27 +333,26 @@ void Net::remoteStartScript(int typeOfSend, int sendTypeParam, int priority, int
}
int Net::remoteSendData(int typeOfSend, int sendTypeParam, int type, byte *data, int len, int defaultRes) {
byte *buf = (byte *)malloc(MAX_PACKET_SIZE + DATA_HEADER_SIZE);
Common::MemoryWriteStream pack(buf, MAX_PACKET_SIZE + DATA_HEADER_SIZE);
// Since I am lazy, instead of constructing the JSON object manually
// I'd rather parse it
Common::String res = Common::String::format(
"{\"sessionid\":%d, \"userid\":%d, \"to\":%d, \"toparam\": %d, "
"\"type\":%d, \"timestamp\": %d, \"data\": [", _sessionid, _myUserId,
typeOfSend, sendTypeParam, type, g_system->getMillis());
pack.writeUint32LE(_sessionid);
pack.writeUint32LE(_myUserId);
pack.writeUint32LE(typeOfSend);
pack.writeUint32LE(sendTypeParam);
pack.writeUint32LE(type);
pack.writeUint32LE(len);
pack.writeUint32LE(g_system->getMillis());
pack.write(data, len);
for (int i = 0; i < len - 1; i++)
res += Common::String::format("%d, ", data[i]);
debug("Package to send, to: %d (%d), %d(%x) bytes", typeOfSend, sendTypeParam, len + DATA_HEADER_SIZE, len);
res += Common::String::format("%d] }", data[len - 1]);
Common::hexdump(buf, len + DATA_HEADER_SIZE);
debug("Package to send: %s", res.c_str());
Networking::PostRequest rq(_serverprefix + "/packet",
new Common::Callback<Net, Common::JSONValue *>(this, &Net::remoteSendDataCallback),
new Common::Callback<Net, Networking::ErrorResponse>(this, &Net::remoteSendDataErrorCallback));
rq.setPostData(buf, len + DATA_HEADER_SIZE);
rq.setPostData((byte *)res.c_str(), res.size());
rq.setContentType("application/json");
rq.start();