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

fix NFC

Browse source 
A change in how sendMsg() figured out what address types to use dropped
NFC, breaking sending on Android. Fix.
This commit is contained in:
Eric House 2020-03-24 15:58:06 -07:00
parent 2451b0c53c
commit 8bd623d91a
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
xwords4/common/comms.c
View file

@ -1471,6 +1471,9 @@ sendMsg( CommsCtxt* comms, MsgQueueElem* elem, const CommsConnType filter )
logAddr( comms, &addr, "default case" ); logAddr( comms, &addr, "default case" );
} else { } else {
addr = *addrP; addr = *addrP;
if ( addr_hasType( &comms->addr, COMMS_CONN_NFC ) ) {
addr_addType( &addr, COMMS_CONN_NFC );
}
} }
CommsConnType typ; CommsConnType typ;
@ -1498,7 +1501,7 @@ sendMsg( CommsCtxt* comms, MsgQueueElem* elem, const CommsConnType filter )
XP_UCHAR msgNo[16]; XP_UCHAR msgNo[16];
formatMsgNo( comms, elem, msgNo, sizeof(msgNo) ); formatMsgNo( comms, elem, msgNo, sizeof(msgNo) );
if ( send_via_relay( comms, XWRELAY_MSG_TORELAY, destID, if ( send_via_relay( comms, XWRELAY_MSG_TORELAY, destID,
elem->msg, elem->len, msgNo ) ){ elem->msg, elem->len, msgNo ) ) {
nSent = elem->len; nSent = elem->len;
} }
} else { } else {
@ -2826,7 +2829,7 @@ logAddrs( const CommsCtxt* comms, const char* caller )
#endif #endif
static void static void
augmentChannelAddr( AddressRecord * const rec, const CommsAddrRec* addr, augmentChannelAddr( AddressRecord* const rec, const CommsAddrRec* addr,
XWHostID hostID ) XWHostID hostID )
{ {
augmentAddr( &rec->addr, addr ); augmentAddr( &rec->addr, addr );