Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-02 06:20:14 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix crash when old client connects to new host by making host use the

Browse source 
right version test in deciding what to send.
This commit is contained in:
Eric House 2012-10-27 08:52:54 -07:00
parent 4ea8569abc
commit e7d5be06e9
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
xwords4/common/server.c
View file

@ -1384,6 +1384,9 @@ server_sendInitialMessage( ServerCtxt* server )
XP_U16 nPlayers = server->vol.gi->nPlayers; XP_U16 nPlayers = server->vol.gi->nPlayers;
CurGameInfo localGI; CurGameInfo localGI;
XP_U32 gameID = server->vol.gi->gameID; XP_U32 gameID = server->vol.gi->gameID;
#ifdef STREAM_VERS_BIGBOARD
XP_U8 streamVersion = server->nv.streamVersion;
#endif
XP_ASSERT( server->nv.nDevices > 1 ); XP_ASSERT( server->nv.nDevices > 1 );
for ( deviceIndex = 1; deviceIndex < server->nv.nDevices; for ( deviceIndex = 1; deviceIndex < server->nv.nDevices;
@ -1397,8 +1400,8 @@ server_sendInitialMessage( ServerCtxt* server )
writeProto( server, stream, XWPROTO_CLIENT_SETUP ); writeProto( server, stream, XWPROTO_CLIENT_SETUP );
#ifdef STREAM_VERS_BIGBOARD #ifdef STREAM_VERS_BIGBOARD
XP_ASSERT( 0 < server->nv.streamVersion ); XP_ASSERT( 0 < streamVersion );
stream_putU8( stream, server->nv.streamVersion ); stream_putU8( stream, streamVersion );
#else #else
stream_putU8( stream, CUR_STREAM_VERS ); stream_putU8( stream, CUR_STREAM_VERS );
#endif #endif
@ -1411,7 +1414,7 @@ server_sendInitialMessage( ServerCtxt* server )
dict_writeToStream( dict, stream ); dict_writeToStream( dict, stream );
#ifdef STREAM_VERS_BIGBOARD #ifdef STREAM_VERS_BIGBOARD
if ( STREAM_VERS_DICTNAME <= addr->streamVersion ) { if ( STREAM_VERS_DICTNAME <= streamVersion ) {
stringToStream( stream, dict_getShortName(dict) ); stringToStream( stream, dict_getShortName(dict) );
stringToStream( stream, dict_getMd5Sum(dict) ); stringToStream( stream, dict_getMd5Sum(dict) );
} }