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

send invites as invites, not messages

Browse source 
Fixes sending of invitations on Android
This commit is contained in:
Eric House 2023-03-27 14:29:49 -07:00
parent 50ac11970e
commit d0a53ab3ff
1 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
xwords4/common/comms.c
View file

@ -1,6 +1,6 @@
/* -*- compile-command: "cd ../linux && make MEMDEBUG=TRUE -j3"; -*- */ /* -*- compile-command: "cd ../linux && make MEMDEBUG=TRUE -j3"; -*- */
/* /*
* Copyright 2001 - 2022 by Eric House (xwords@eehouse.org). All rights * Copyright 2001 - 2023 by Eric House (xwords@eehouse.org). All rights
* reserved. * reserved.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
@ -1825,7 +1825,7 @@ printQueue( const CommsCtxt* comms )
} }
static void static void
_assertQueueOk( const CommsCtxt* comms, const char* func ) _assertQueueOk( const CommsCtxt* comms, const char* XP_UNUSED(func) )
{ {
XP_U16 count = 0; XP_U16 count = 0;
@ -2203,14 +2203,25 @@ comms_resendAll( CommsCtxt* comms, XWEnv xwe, CommsConnType filter, XP_Bool forc
} else { } else {
XP_U32 gameid = gameID( comms ); XP_U32 gameid = gameID( comms );
for ( AddressRecord* rec = comms->recs; !!rec; rec = rec->next ) { for ( AddressRecord* rec = comms->recs; !!rec; rec = rec->next ) {
const SendMsgsPacket* const head = &rec->_msgQueueHead->smp; const MsgQueueElem* const elem = rec->_msgQueueHead;
const SendMsgsPacket* const head = &elem->smp;
if ( !!head ) { if ( !!head ) {
CommsConnType typ; CommsConnType typ;
for ( XP_U32 st = 0; addr_iter( &rec->addr, &typ, &st ); ) { for ( XP_U32 st = 0; addr_iter( &rec->addr, &typ, &st ); ) {
if ( COMMS_CONN_NONE == filter || typ == filter ) { if ( COMMS_CONN_NONE == filter || typ == filter ) {
count += (*comms->procs.sendMsgs)( xwe, head, comms->streamVersion, if ( IS_INVITE(elem) ) {
&rec->addr, typ, gameid, NetLaunchInfo* nli = (NetLaunchInfo*)head->buf;
comms->procs.closure ); (void)(*comms->procs.sendInvt)( xwe, nli,
head->createdStamp,
&rec->addr, typ,
comms->procs.closure );
++count;
XP_ASSERT( !head->next );
} else {
count += (*comms->procs.sendMsgs)( xwe, head, comms->streamVersion,
&rec->addr, typ, gameid,
comms->procs.closure );
}
} }
} }
} }