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

transmit sms phone in nli (and hard-code port=1)

Browse source 
This fixes on gtk version being able to invite to an SMS game using
relayID. I don't know why not transmitting port is ok; maybe android
doesn't use the port or gets it some other way, e.g. it's hard-coded for
each variant.
This commit is contained in:
Eric House 2020-01-09 21:24:38 -08:00
parent cdbf574c0e
commit 9406297c03
2 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
xwords4/common/nli.c
View file

@ -42,9 +42,21 @@ nli_init( NetLaunchInfo* nli, const CurGameInfo* gi, const CommsAddrRec* addr,
nli->nPlayersH = nPlayers; nli->nPlayersH = nPlayers;
nli->forceChannel = forceChannel; nli->forceChannel = forceChannel;
if ( addr_hasType( addr, COMMS_CONN_RELAY ) ) { CommsConnType typ;
types_addType( &nli->_conTypes, COMMS_CONN_RELAY ); for ( XP_U32 st = 0; addr_iter( addr, &typ, &st ); ) {
XP_STRCAT( nli->room, addr->u.ip_relay.invite ); types_addType( &nli->_conTypes, typ );
switch ( typ ) {
case COMMS_CONN_RELAY:
XP_STRCAT( nli->room, addr->u.ip_relay.invite );
break;
case COMMS_CONN_SMS:
XP_STRCAT( nli->phone, addr->u.sms.phone );
// nli->port = addr->u.sms.port; <-- I wish
break;
default:
XP_ASSERT(0);
break;
}
} }
} }
@ -159,9 +171,8 @@ nli_makeFromStream( NetLaunchInfo* nli, XWStreamCtxt* stream )
void void
nli_makeAddrRec( const NetLaunchInfo* nli, CommsAddrRec* addr ) nli_makeAddrRec( const NetLaunchInfo* nli, CommsAddrRec* addr )
{ {
XP_U32 state = 0;
CommsConnType type; CommsConnType type;
while ( types_iter( nli->_conTypes, &type, &state ) ) { for ( XP_U32 state = 0; types_iter( nli->_conTypes, &type, &state ); ) {
addr_addType( addr, type ); addr_addType( addr, type );
switch( type ) { switch( type ) {
case COMMS_CONN_RELAY: case COMMS_CONN_RELAY:
@ -176,6 +187,7 @@ nli_makeAddrRec( const NetLaunchInfo* nli, CommsAddrRec* addr )
break; break;
case COMMS_CONN_SMS: case COMMS_CONN_SMS:
XP_STRCAT( addr->u.sms.phone, nli->phone ); XP_STRCAT( addr->u.sms.phone, nli->phone );
addr->u.sms.port = 1; /* BAD, but 0 is worse */
break; break;
default: default:
XP_ASSERT(0); XP_ASSERT(0);

4
xwords4/linux/gtkboard.c
View file

@ -1580,10 +1580,10 @@ send_invites( CommonGlobals* cGlobals, XP_U16 nPlayers,
NetLaunchInfo nli = {0}; NetLaunchInfo nli = {0};
nli_init( &nli, cGlobals->gi, &addr, nPlayers, forceChannel ); nli_init( &nli, cGlobals->gi, &addr, nPlayers, forceChannel );
if ( 0 != relayDevID || !!relayID ) { if ( addr_hasType( &addr, COMMS_CONN_RELAY ) ) {
XP_UCHAR buf[32]; XP_UCHAR buf[32];
snprintf( buf, sizeof(buf), "%X", makeRandomInt() ); snprintf( buf, sizeof(buf), "%X", makeRandomInt() );
nli_setInviteID( &nli, buf ); nli_setInviteID( &nli, buf ); /* should not be relay only!!! */
} }
// nli_setDevID( &nli, linux_getDevIDRelay( cGlobals->params ) ); // nli_setDevID( &nli, linux_getDevIDRelay( cGlobals->params ) );