updated network protocol so that individual resource chunks can be > 4GB

metadata
Wenzel Jakob 2015-04-22 03:33:40 +02:00
parent 3d2e67c3a5
commit 47d8d43d18
1 changed files with 4 additions and 4 deletions

View File

@ -168,7 +168,7 @@ void RemoteWorker::run() {
resStream->getPos() / 1024); resStream->getPos() / 1024);
m_memStream->writeShort(StreamBackend::ENewResource); m_memStream->writeShort(StreamBackend::ENewResource);
m_memStream->writeInt(resID); m_memStream->writeInt(resID);
m_memStream->writeUInt((unsigned int) resStream->getPos()); m_memStream->writeSize(resStream->getPos());
m_memStream->write(resStream->getData(), resStream->getPos()); m_memStream->write(resStream->getData(), resStream->getPos());
} }
@ -183,7 +183,7 @@ void RemoteWorker::run() {
resStream->getPos() / 1024); resStream->getPos() / 1024);
m_memStream->writeShort(StreamBackend::ENewMultiResource); m_memStream->writeShort(StreamBackend::ENewMultiResource);
m_memStream->writeInt(resID); m_memStream->writeInt(resID);
m_memStream->writeUInt((unsigned int) resStream->getPos()); m_memStream->writeSize(resStream->getPos());
m_memStream->write(resStream->getData(), resStream->getPos()); m_memStream->write(resStream->getData(), resStream->getPos());
} }
@ -390,7 +390,7 @@ void StreamBackend::run() {
break; break;
case ENewResource: { case ENewResource: {
int id = m_stream->readInt(); int id = m_stream->readInt();
size_t size = m_stream->readUInt(); size_t size = m_stream->readSize();
ref<InstanceManager> manager = new InstanceManager(); ref<InstanceManager> manager = new InstanceManager();
ref<MemoryStream> mstream = new MemoryStream(size); ref<MemoryStream> mstream = new MemoryStream(size);
mstream->setByteOrder(Stream::ENetworkByteOrder); mstream->setByteOrder(Stream::ENetworkByteOrder);
@ -402,7 +402,7 @@ void StreamBackend::run() {
break; break;
case ENewMultiResource: { case ENewMultiResource: {
int id = m_stream->readInt(); int id = m_stream->readInt();
size_t size = m_stream->readUInt(); size_t size = m_stream->readSize();
ref<InstanceManager> manager = new InstanceManager(); ref<InstanceManager> manager = new InstanceManager();
ref<MemoryStream> mstream = new MemoryStream(size); ref<MemoryStream> mstream = new MemoryStream(size);
mstream->setByteOrder(Stream::ENetworkByteOrder); mstream->setByteOrder(Stream::ENetworkByteOrder);