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

clear any server bits that happen to have been set in older games.

Browse source
This commit is contained in:
Eric House 2015-02-10 07:05:34 -08:00
parent cf4431402b
commit 72a1d8b7d4
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
xwords4/common/comms.c
View file

@ -645,7 +645,7 @@ comms_makeFromStream( MPFORMAL XWStreamCtxt* stream, XW_UtilCtxt* util,
if ( version < STREAM_VERS_CHANNELSEED ) { if ( version < STREAM_VERS_CHANNELSEED ) {
comms->channelSeed = 0; comms->channelSeed = 0;
} else { } else {
comms->channelSeed = stream_getU16( stream ); comms->channelSeed = stream_getU16( stream ) & ~(1 << SERVER_OFFSET);
CNO_FMT( cbuf, comms->channelSeed ); CNO_FMT( cbuf, comms->channelSeed );
XP_LOGF( "%s: loaded seed: %s", __func__, cbuf ); XP_LOGF( "%s: loaded seed: %s", __func__, cbuf );
} }
@ -674,7 +674,7 @@ comms_makeFromStream( MPFORMAL XWStreamCtxt* stream, XW_UtilCtxt* util,
if ( version >= STREAM_VERS_BLUETOOTH2 ) { if ( version >= STREAM_VERS_BLUETOOTH2 ) {
rec->lastMsgAckd = stream_getU16( stream ); rec->lastMsgAckd = stream_getU16( stream );
} }
rec->channelNo = stream_getU16( stream ); rec->channelNo = stream_getU16( stream ) & ~(1 << SERVER_OFFSET);
if ( addr_hasType( &rec->addr, COMMS_CONN_RELAY ) ) { if ( addr_hasType( &rec->addr, COMMS_CONN_RELAY ) ) {
rec->rr.hostID = stream_getU8( stream ); rec->rr.hostID = stream_getU8( stream );
} }
@ -2141,6 +2141,7 @@ comms_checkIncomingStream( CommsCtxt* comms, XWStreamCtxt* stream,
/* channelNo comparison invalid */ /* channelNo comparison invalid */
} else if ( 0 == channelNo || 0 == channelSeed ) { } else if ( 0 == channelNo || 0 == channelSeed ) {
XP_LOGF( TAGFMT() "one of channelNos still 0", TAGPRMS ); XP_LOGF( TAGFMT() "one of channelNos still 0", TAGPRMS );
XP_ASSERT(0);
} else if ( channelNo != channelSeed ) { } else if ( channelNo != channelSeed ) {
XP_LOGF( TAGFMT() "channelNos test fails", TAGPRMS ); XP_LOGF( TAGFMT() "channelNos test fails", TAGPRMS );
messageValid = XP_FALSE; messageValid = XP_FALSE;