RomkaZVO/xash3d-fwgs
1
0
Fork 0
mirror of https://github.com/FWGS/xash3d-fwgs.git synced 2026-08-05 03:24:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

engine: common: account for header size when sending first file fragment (which contains filename + compressor on goldsrc)

Browse Source
This commit is contained in:
Alibek Omarov
2026-06-05 08:42:46 +05:00
parent 33e47ef5a9
commit 4cd6d25ee6
1 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
engine/common/net_chan.c
View File

@@ -1009,6 +1009,17 @@ int Netchan_CreateFileFragments( netchan_t *chan, const char *filename )
Mem_Free( uncompressed ); Mem_Free( uncompressed );
} }
// filename string + null terminator; for gs_netchan also compressor string + null + uint32 original size
int header_size = Q_strlen( filename ) + 1;
if( chan->gs_netchan )
header_size += Q_strlen( compressor ) + 1 + 4;
if( unlikely( chunksize < 0 || chunksize < header_size + 1 ))
{
Con_Printf( S_ERROR "%s: could not fit header for \"%s\" (%d bytes) into chunk of length %d\n", NET_AdrToString( chan->remote_address ), filename, header_size, chunksize );
return 0;
}
fragbufwaiting_t *wait = (fragbufwaiting_t *)Mem_Calloc( net_mempool, sizeof( fragbufwaiting_t )); fragbufwaiting_t *wait = (fragbufwaiting_t *)Mem_Calloc( net_mempool, sizeof( fragbufwaiting_t ));
int remaining = filesize; int remaining = filesize;
int pos = 0; int pos = 0;
@@ -1017,6 +1028,9 @@ int Netchan_CreateFileFragments( netchan_t *chan, const char *filename )
{ {
int send = Q_min( remaining, chunksize ); int send = Q_min( remaining, chunksize );
if( firstfragment )
send = Q_min( header_size + remaining, chunksize );
buf = Netchan_AllocFragbuf( send ); buf = Netchan_AllocFragbuf( send );
buf->bufferid = bufferid++; buf->bufferid = bufferid++;
@@ -1025,7 +1039,7 @@ int Netchan_CreateFileFragments( netchan_t *chan, const char *filename )
if( firstfragment ) if( firstfragment )
{ {
// Write filename // write filename
MSG_WriteString( &buf->frag_message, filename ); MSG_WriteString( &buf->frag_message, filename );
// write compressor name and uncompressed size // write compressor name and uncompressed size
@@ -1035,9 +1049,11 @@ int Netchan_CreateFileFragments( netchan_t *chan, const char *filename )
MSG_WriteLong( &buf->frag_message, (uint)originalSize ); MSG_WriteLong( &buf->frag_message, (uint)originalSize );
} }
// Send a bit less on first package if( unlikely( MSG_GetNumBytesWritten( &buf->frag_message ) != header_size ))
send -= MSG_GetNumBytesWritten( &buf->frag_message ); Con_Printf( S_ERROR "%s: header size mismatch for \"%s\" (%d vs %d)\n", NET_AdrToString( chan->remote_address ), filename, header_size, MSG_GetNumBytesWritten( &buf->frag_message ));
// send a bit less on first package
send -= MSG_GetNumBytesWritten( &buf->frag_message );
firstfragment = false; firstfragment = false;
} }