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

fix problem where client held on to its first message forever, sending

Browse source 
it each time resendAll was called on connect etc.
This commit is contained in:
Eric House 2010-06-04 22:23:46 -07:00
parent ca968d8294
commit c7a0271830
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
xwords4/common/comms.c
View file

@ -961,16 +961,16 @@ removeFromQueue( CommsCtxt* comms, XP_PlayerAddr channelNo, MsgID msgID )
XP_Bool knownGood = XP_FALSE; XP_Bool knownGood = XP_FALSE;
next = elem->next; next = elem->next;
/* remove the 0-channel message if we've established a channel /* If I'm the server and there's more than one guest I have
number. Only clients should have any 0-channel messages in the multiple channels to worry about. Not so for the guest. So
queue, and receiving something from the server is an implicit while the guest's messages are labeled with two versions of the
ACK -- IFF it isn't left over from the last game. */ channelNo, the 0th message having the two low bits clear and
all subsequent messages having at least one set, that's not an
if ( (elem->channelNo == 0) && (channelNo != 0) ) { issue here: the client needn't test channelNo. */
XP_ASSERT( !comms->isServer ); if ( comms->isServer ) {
XP_ASSERT( elem->msgID == 0 ); knownGood = elem->channelNo != channelNo;
} else if ( elem->channelNo != channelNo ) { } else {
knownGood = XP_TRUE; knownGood = XP_FALSE;
} }
if ( !knownGood && (elem->msgID <= msgID) ) { if ( !knownGood && (elem->msgID <= msgID) ) {