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

in comms, send ack on receipt of duplicate msg

Browse source
This commit is contained in:
Eric House 2021-03-11 21:02:48 -08:00
parent e30a02ee7c
commit f947382f4c
1 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
xwords4/common/comms.c
View file

@ -1714,32 +1714,35 @@ comms_getPending( CommsCtxt* comms, XWEnv xwe, PendingMsgProc proc, void* closur
} }
#ifdef XWFEATURE_COMMSACK #ifdef XWFEATURE_COMMSACK
void static void
comms_ackAny( CommsCtxt* comms, XWEnv xwe ) ackAnyImpl( CommsCtxt* comms, XWEnv xwe, XP_Bool force )
{ {
if ( CONN_ID_NONE == comms->connID ) { if ( CONN_ID_NONE == comms->connID ) {
XP_LOGF( "%s: doing nothing because connID still unset", __func__ ); XP_LOGFF( "doing nothing because connID still unset" );
} else { } else {
#ifdef DEBUG
XP_U16 nSent = 0; XP_U16 nSent = 0;
#endif
AddressRecord* rec; AddressRecord* rec;
for ( rec = comms->recs; !!rec; rec = rec->next ) { for ( rec = comms->recs; !!rec; rec = rec->next ) {
if ( rec->lastMsgAckd < rec->lastMsgRcd ) { if ( force || rec->lastMsgAckd < rec->lastMsgRcd ) {
#ifdef DEBUG
++nSent; ++nSent;
#endif
CNO_FMT( cbuf, rec->channelNo ); CNO_FMT( cbuf, rec->channelNo );
XP_LOGF( "%s: %s; %d < %d: rec needs ack", __func__, XP_LOGFF( "%s; %d < %d (or force: %s): rec getting ack",
cbuf, rec->lastMsgAckd, rec->lastMsgRcd ); cbuf, rec->lastMsgAckd, rec->lastMsgRcd,
boolToStr(force) );
sendEmptyMsg( comms, xwe, rec ); sendEmptyMsg( comms, xwe, rec );
} }
} }
#ifdef DEBUG
XP_LOGF( "%s: sent for %d channels", __func__, nSent ); XP_LOGF( "%s: sent for %d channels", __func__, nSent );
#endif
} }
} }
void
comms_ackAny( CommsCtxt* comms, XWEnv xwe )
{
ackAnyImpl( comms, xwe, XP_FALSE );
}
#else
# define ackAnyImpl( comms, xwe, force )
#endif #endif
#ifdef XWFEATURE_RELAY #ifdef XWFEATURE_RELAY
@ -2364,6 +2367,7 @@ validateChannelMessage( CommsCtxt* comms, XWEnv xwe, const CommsAddrRec* addr,
} else if ( msgID != rec->lastMsgRcd + 1 ) { } else if ( msgID != rec->lastMsgRcd + 1 ) {
XP_LOGF( TAGFMT() "expected %d, got %d", TAGPRMS, XP_LOGF( TAGFMT() "expected %d, got %d", TAGPRMS,
rec->lastMsgRcd + 1, msgID ); rec->lastMsgRcd + 1, msgID );
ackAnyImpl( comms, xwe, XP_TRUE );
rec = NULL; rec = NULL;
} }
} else { } else {