Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2024-12-28 09:58:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

change name for clarity

Browse source
This commit is contained in:
Eric House 2022-09-03 19:14:40 -07:00
parent 4996d3fe89
commit 381b014b8b
8 changed files with 79 additions and 77 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

90
xwords4/common/comms.c
View file

@ -148,7 +148,7 @@ struct CommsCtxt {
/* The following fields, down to isServer, are only used if
XWFEATURE_RELAY is defined, but I'm leaving them in here so apps built
both ways can open each other's saved games files.*/
CommsAddrRec addr;
CommsAddrRec selfAddr;
/* Stuff for relays */
struct {
@ -613,7 +613,7 @@ comms_transportFailed( CommsCtxt* comms,
{
XP_LOGFF( "(%s)", ConnType2Str(failed) );
XP_ASSERT( !!comms );
if ( COMMS_CONN_RELAY == failed && addr_hasType( &comms->addr, COMMS_CONN_RELAY )
if ( COMMS_CONN_RELAY == failed && addr_hasType( &comms->selfAddr, COMMS_CONN_RELAY )
&& comms->rr.relayState != COMMS_RELAYSTATE_DENIED ) {
relayDisconnect( comms, xwe );
#ifdef XWFEATURE_RELAY
@ -627,11 +627,11 @@ void
comms_destroy( CommsCtxt* comms, XWEnv xwe )
{
/* did I call comms_stop()? */
XP_ASSERT( ! addr_hasType( &comms->addr, COMMS_CONN_RELAY )
XP_ASSERT( ! addr_hasType( &comms->selfAddr, COMMS_CONN_RELAY )
|| COMMS_RELAYSTATE_UNCONNECTED == comms->rr.relayState );
CommsAddrRec aNew = {0};
util_addrChange( comms->util, xwe, &comms->addr, &aNew );
util_addrChange( comms->util, xwe, &comms->selfAddr, &aNew );
cleanupInternal( comms );
cleanupAddrRecs( comms );
@ -791,7 +791,7 @@ comms_makeFromStream( MPFORMAL XWEnv xwe, XWStreamCtxt* stream,
XP_USE( nPlayersHere );
XP_USE( nPlayersTotal );
#endif
XP_MEMCPY( &comms->addr, &addr, sizeof(comms->addr) );
XP_MEMCPY( &comms->selfAddr, &addr, sizeof(comms->selfAddr) );
logAddr( comms, xwe, &addr, __func__ );
comms->flags = flags;
@ -878,7 +878,7 @@ comms_makeFromStream( MPFORMAL XWEnv xwe, XWStreamCtxt* stream,
if ( STREAM_VERS_DISABLEDS <= version ) {
for ( CommsConnType typ = (CommsConnType)0; typ < VSIZE(comms->disableds); ++typ ) {
if ( typ < COMMS_CONN_NFC || addr_hasType( &comms->addr, typ ) ) {
if ( typ < COMMS_CONN_NFC || addr_hasType( &comms->selfAddr, typ ) ) {
for ( int ii = 0; ii < VSIZE(comms->disableds[0]); ++ii ) {
comms->disableds[typ][ii] = 0 != stream_getBits( stream, 1 );
}
@ -887,9 +887,9 @@ comms_makeFromStream( MPFORMAL XWEnv xwe, XWStreamCtxt* stream,
}
notifyQueueChanged( comms, xwe );
if ( addr_hasType( &comms->addr, COMMS_CONN_RELAY )
if ( addr_hasType( &comms->selfAddr, COMMS_CONN_RELAY )
&& removeRelayIf( comms, xwe ) ) {
addr_rmType( &comms->addr, COMMS_CONN_RELAY );
addr_rmType( &comms->selfAddr, COMMS_CONN_RELAY );
}
return comms;
@ -899,7 +899,7 @@ comms_makeFromStream( MPFORMAL XWEnv xwe, XWStreamCtxt* stream,
static void
setDoHeartbeat( CommsCtxt* comms )
{
CommsConnType conType = comms->addr.conType;
CommsConnType conType = comms->selfAddr.conType;
comms->doHeartbeat = XP_FALSE
|| COMMS_CONN_IP_DIRECT == conType
|| COMMS_CONN_BT == conType
@ -932,7 +932,7 @@ comms_stop( CommsCtxt* comms
)
{
LOG_FUNC();
if ( addr_hasType( &comms->addr, COMMS_CONN_RELAY ) ) {
if ( addr_hasType( &comms->selfAddr, COMMS_CONN_RELAY ) ) {
relayDisconnect( comms, xwe );
}
}
@ -944,9 +944,9 @@ sendConnect( CommsCtxt* comms, XWEnv xwe
#endif
)
{
// CommsAddrRec addr = comms->addr;
// CommsAddrRec addr = comms->selfAddr;
CommsConnType typ;
for ( XP_U32 st = 0; addr_iter( &comms->addr, &typ, &st ); ) {
for ( XP_U32 st = 0; addr_iter( &comms->selfAddr, &typ, &st ); ) {
// addr._conTypes = typ;
switch( typ ) {
#ifdef XWFEATURE_RELAY
@ -1053,8 +1053,8 @@ comms_writeToStream( CommsCtxt* comms, XWEnv XP_UNUSED_DBG(xwe),
stream_setVersion( stream, CUR_STREAM_VERS );
stream_putU8( stream, comms->flags );
logAddr( comms, xwe, &comms->addr, __func__ );
addrToStream( stream, &comms->addr );
logAddr( comms, xwe, &comms->selfAddr, __func__ );
addrToStream( stream, &comms->selfAddr );
stream_putBits( stream, 4, comms->rr.nPlayersHere );
stream_putBits( stream, 4, comms->rr.nPlayersTotal );
@ -1064,7 +1064,7 @@ comms_writeToStream( CommsCtxt* comms, XWEnv XP_UNUSED_DBG(xwe),
stream_putU16( stream, channelSeed );
stream_putU16( stream, comms->resendBackoff );
stream_putU32( stream, comms->nextResend );
if ( addr_hasType( &comms->addr, COMMS_CONN_RELAY ) ) {
if ( addr_hasType( &comms->selfAddr, COMMS_CONN_RELAY ) ) {
stream_putU8( stream, comms->rr.myHostID );
XP_LOGFF( "stored myHostID: %d", comms->rr.myHostID );
stringToStream( stream, comms->rr.connName );
@ -1110,7 +1110,7 @@ comms_writeToStream( CommsCtxt* comms, XWEnv XP_UNUSED_DBG(xwe),
/* This writes 2 bytes instead of 1 if it were smarter. Not worth the work
* to fix. */
for ( CommsConnType typ = (CommsConnType)0; typ < VSIZE(comms->disableds); ++typ ) {
if ( typ < COMMS_CONN_NFC || addr_hasType( &comms->addr, typ ) ) {
if ( typ < COMMS_CONN_NFC || addr_hasType( &comms->selfAddr, typ ) ) {
for ( int ii = 0; ii < VSIZE(comms->disableds[0]); ++ii ) {
stream_putBits( stream, 1, comms->disableds[typ][ii] ? 1 : 0 );
}
@ -1147,10 +1147,10 @@ comms_saveSucceeded( CommsCtxt* comms, XWEnv xwe, XP_U16 saveToken )
}
void
comms_getAddr( const CommsCtxt* comms, CommsAddrRec* addr )
comms_getSelfAddr( const CommsCtxt* comms, CommsAddrRec* addr )
{
XP_ASSERT( !!comms );
XP_MEMCPY( addr, &comms->addr, sizeof(*addr) );
XP_MEMCPY( addr, &comms->selfAddr, sizeof(*addr) );
} /* comms_getAddr */
void
@ -1160,14 +1160,14 @@ comms_augmentHostAddr( CommsCtxt* comms, XWEnv xwe, const CommsAddrRec* addr )
XP_ASSERT( comms != NULL );
XP_Bool addingRelay = addr_hasType( addr, COMMS_CONN_RELAY )
&& ! addr_hasType( &comms->addr, COMMS_CONN_RELAY );
&& ! addr_hasType( &comms->selfAddr, COMMS_CONN_RELAY );
CommsAddrRec tmp = comms->addr;
CommsAddrRec tmp = comms->selfAddr;
augmentAddrIntrnl( comms, &tmp, addr, XP_TRUE );
util_addrChange( comms->util, xwe, &comms->addr, &tmp );
comms->addr = tmp;
util_addrChange( comms->util, xwe, &comms->selfAddr, &tmp );
comms->selfAddr = tmp;
logAddr( comms, xwe, &comms->addr, "after" );
logAddr( comms, xwe, &comms->selfAddr, "after" );
#ifdef COMMS_HEARTBEAT
setDoHeartbeat( comms );
@ -1294,7 +1294,7 @@ comms_getConTypes( const CommsCtxt* comms )
{
CommsConnType typ;
if ( !!comms ) {
typ = comms->addr._conTypes;
typ = comms->selfAddr._conTypes;
} else {
typ = COMMS_CONN_NONE;
XP_LOGFF( "returning COMMS_CONN_NONE for null comms" );
@ -1305,8 +1305,8 @@ comms_getConTypes( const CommsCtxt* comms )
void
comms_dropHostAddr( CommsCtxt* comms, CommsConnType typ )
{
addr_rmType( &comms->addr, typ );
ASSERT_ADDR_OK( &comms->addr );
addr_rmType( &comms->selfAddr, typ );
ASSERT_ADDR_OK( &comms->selfAddr );
}
XP_Bool
@ -1669,7 +1669,7 @@ sendMsg( CommsCtxt* comms, XWEnv xwe, MsgQueueElem* elem, const CommsConnType fi
XP_ASSERT(0);
} else {
CommsAddrRec addr = *addrP;
if ( addr_hasType( &comms->addr, COMMS_CONN_NFC ) ) {
if ( addr_hasType( &comms->selfAddr, COMMS_CONN_NFC ) ) {
addr_addType( &addr, COMMS_CONN_NFC );
}
@ -1993,7 +1993,7 @@ got_connect_cmd( CommsCtxt* comms, XWEnv xwe, XWStreamCtxt* stream,
if ( CONN_ID_NONE == comms->connID ) {
if ( !!comms->procs.rconnd ) {
(*comms->procs.rconnd)( xwe, comms->procs.closure,
comms->addr.u.ip_relay.invite, reconnected,
comms->selfAddr.u.ip_relay.invite, reconnected,
comms->rr.myHostID, XP_FALSE, nSought - nHere );
XP_LOGFF( "have %d of %d players", nHere, nSought );
}
@ -2069,7 +2069,7 @@ relayPreProcess( CommsCtxt* comms, XWEnv xwe, XWStreamCtxt* stream, XWHostID* se
/* } */
if ( XWRELAY_ALLHERE == cmd ) { /* initial connect? */
(*comms->procs.rconnd)( xwe, comms->procs.closure,
comms->addr.u.ip_relay.invite, XP_FALSE,
comms->selfAddr.u.ip_relay.invite, XP_FALSE,
comms->rr.myHostID, XP_TRUE, 0 );
}
set_relay_state( comms, xwe, COMMS_RELAYSTATE_ALLCONNECTED );
@ -2618,13 +2618,13 @@ comms_checkIncomingStream( CommsCtxt* comms, XWEnv xwe, XWStreamCtxt* stream,
if ( comms_getAddrDisabled( comms, addrType, XP_FALSE ) ) {
XP_LOGFF( "dropping message because %s disabled",
ConnType2Str( addrType ) );
/* } else if (0 == (comms->addr._conTypes & retAddr->_conTypes)) { */
/* } else if (0 == (comms->selfAddr._conTypes & retAddr->_conTypes)) { */
/* /\* we don't expect messages with that address type; drop it *\/ */
/* XP_LOGF( "%s: not expecting %s messages", __func__, */
/* ConnType2Str( addrType ) ); */
} else {
#ifdef DEBUG
if (0 == (comms->addr._conTypes & retAddr->_conTypes)) {
if (0 == (comms->selfAddr._conTypes & retAddr->_conTypes)) {
XP_LOGFF( "not expecting %s messages (but proceeding)",
ConnType2Str( addrType ) );
}
@ -2638,7 +2638,7 @@ comms_checkIncomingStream( CommsCtxt* comms, XWEnv xwe, XWStreamCtxt* stream,
XP_U16 initialLen = stream_getSize( stream );
#endif
const CommsAddrRec* useAddr = !!retAddr ? retAddr : &comms->addr;
const CommsAddrRec* useAddr = !!retAddr ? retAddr : &comms->selfAddr;
if ( !preProcess(
#ifdef XWFEATURE_RELAY
comms, xwe , stream, &usingRelay, &senderID,
@ -2786,7 +2786,7 @@ comms_isConnected( const CommsCtxt* const comms )
{
XP_Bool result = XP_FALSE;
CommsConnType typ;
for ( XP_U32 st = 0; !result && addr_iter( &comms->addr, &typ, &st ); ) {
for ( XP_U32 st = 0; !result && addr_iter( &comms->selfAddr, &typ, &st ); ) {
XP_Bool expected = XP_FALSE;
switch ( typ ) {
case COMMS_CONN_RELAY:
@ -2920,7 +2920,7 @@ p_comms_timerFired( void* closure, XWEnv xwe, XWTimerReason XP_UNUSED_DBG(why) )
comms->hbTimerPending = XP_FALSE;
if (0 ) {
#if defined XWFEATURE_RELAY && defined RELAY_HEARTBEAT
} else if ( (comms->addr.conType == COMMS_CONN_RELAY )
} else if ( (comms->selfAddr.conType == COMMS_CONN_RELAY )
&& (comms->rr.heartbeat != HEARTBEAT_NONE) ) {
(void)send_via_relay( comms, xwe, XWRELAY_HEARTBEAT, HOST_ID_NONE,
NULL, 0, NULL );
@ -2947,7 +2947,7 @@ setHeartbeatTimer( CommsCtxt* comms )
} else {
XP_U16 when = 0;
#ifdef XWFEATURE_RELAY
if ( comms->addr.conType == COMMS_CONN_RELAY ) {
if ( comms->selfAddr.conType == COMMS_CONN_RELAY ) {
when = comms->rr.heartbeat;
}
#endif
@ -3084,8 +3084,8 @@ rememberChannelAddress( CommsCtxt* comms, XWEnv xwe, XP_PlayerAddr channelNo,
XP_LOGFF( "storing addr with _conTypes %x",
addr->_conTypes );
XP_MEMSET( &rec->addr, 0, sizeof(rec->addr) );
rec->addr._conTypes = comms->addr._conTypes;
// addr_setTypes( &recs->addr, addr_getTypes( &comms->addr ) );
rec->addr._conTypes = comms->selfAddr._conTypes;
// addr_setTypes( &recs->addr, addr_getTypes( &comms->selfAddr ) );
}
}
return rec;
@ -3186,7 +3186,7 @@ augmentChannelAddr( CommsCtxt* comms, AddressRecord* const rec,
#ifdef DEBUG
CommsConnType typ;
for ( XP_U32 st = 0; addr_iter( addr, &typ, &st ); ) {
if ( !addr_hasType( &comms->addr, typ ) ) {
if ( !addr_hasType( &comms->selfAddr, typ ) ) {
XP_LOGFF( "main addr missing type %s", ConnType2Str(typ) );
}
}
@ -3213,11 +3213,11 @@ augmentAddrIntrnl( CommsCtxt* comms, CommsAddrRec* destAddr,
address don't make sense to copy, however.
NO -- not any more. I have the addresses my user gives me
*/
if ( !!comms && ! addr_hasType( &comms->addr, typ ) ) {
/* we just added it, so can't be comms->addr */
XP_ASSERT( destAddr != &comms->addr );
XP_LOGFF( "NOT adding %s to comms->addr", ConnType2Str(typ) );
// addr_addType( &comms->addr, typ );
if ( !!comms && ! addr_hasType( &comms->selfAddr, typ ) ) {
/* we just added it, so can't be comms->selfAddr */
XP_ASSERT( destAddr != &comms->selfAddr );
XP_LOGFF( "NOT adding %s to comms->selfAddr", ConnType2Str(typ) );
// addr_addType( &comms->selfAddr, typ );
}
}
@ -3631,7 +3631,7 @@ relayConnect( CommsCtxt* comms, XWEnv xwe )
{
LOG_FUNC();
XP_Bool success = XP_TRUE;
if ( addr_hasType( &comms->addr, COMMS_CONN_RELAY ) ) {
if ( addr_hasType( &comms->selfAddr, COMMS_CONN_RELAY ) ) {
if ( 0 ) {
#ifdef RELAY_VIA_HTTP
} else if ( comms->rr.connName[0] ) {
@ -3698,7 +3698,7 @@ static void
relayDisconnect( CommsCtxt* comms, XWEnv xwe )
{
LOG_FUNC();
if ( addr_hasType( &comms->addr, COMMS_CONN_RELAY ) ) {
if ( addr_hasType( &comms->selfAddr, COMMS_CONN_RELAY ) ) {
if ( comms->rr.relayState > COMMS_RELAYSTATE_CONNECT_PENDING ) {
(void)send_via_relay( comms, xwe, XWRELAY_GAME_DISCONNECT, HOST_ID_NONE,
NULL, 0, NULL );

3
xwords4/common/comms.h
View file

@ -167,7 +167,8 @@ void comms_destroy( CommsCtxt* comms, XWEnv xwe );
void comms_setConnID( CommsCtxt* comms, XP_U32 connID );
void comms_getAddr( const CommsCtxt* comms, CommsAddrRec* addr );
void comms_getSelfAddr( const CommsCtxt* comms, CommsAddrRec* selfAddr );
void comms_getHostAddr( const CommsCtxt* comms, CommsAddrRec* hostAddr );
void comms_augmentHostAddr( CommsCtxt* comms, XWEnv xwe, const CommsAddrRec* addr );
void comms_addMQTTDevID( CommsCtxt* comms, XP_PlayerAddr channelNo,
const MQTTDevID* devID );

2
xwords4/common/server.c
View file

@ -505,7 +505,7 @@ informMissing( const ServerCtxt* server, XWEnv xwe )
addrP = NULL;
} else {
addrP = &addr;
comms_getAddr( comms, addrP );
comms_getSelfAddr( comms, addrP );
}
XP_U16 nDevs = 0;

21
xwords4/linux/cursesboard.c
View file

@ -1235,15 +1235,15 @@ handleInvite( void* closure, int XP_UNUSED(key) )
CursesBoardGlobals* bGlobals = (CursesBoardGlobals*)closure;
CommonGlobals* cGlobals = &bGlobals->cGlobals;
LaunchParams* params = cGlobals->params;
CommsAddrRec addr = {0};
CommsAddrRec selfAddr;
CommsCtxt* comms = cGlobals->game.comms;
XP_ASSERT( comms );
comms_getAddr( comms, &addr );
comms_getSelfAddr( comms, &selfAddr );
gint forceChannel = 1;
const XP_U16 nPlayers = params->connInfo.inviteeCounts[forceChannel-1];
NetLaunchInfo nli = {0};
nli_init( &nli, cGlobals->gi, &addr, nPlayers, forceChannel );
nli_init( &nli, cGlobals->gi, &selfAddr, nPlayers, forceChannel );
if ( SERVER_ISSERVER != cGlobals->gi->serverRole ) {
ca_inform( bGlobals->boardWin, "Only hosts can invite" );
@ -1251,20 +1251,21 @@ handleInvite( void* closure, int XP_UNUSED(key) )
/* Invite first based on an invitee provided. Otherwise, fall back to
doing a send-to-self. Let the recipient code reject a duplicate if
the user so desires. */
} else if ( inviteList( cGlobals, &addr, params->connInfo.sms.inviteePhones, COMMS_CONN_SMS ) ) {
} else if ( inviteList( cGlobals, &selfAddr, params->connInfo.sms.inviteePhones,
COMMS_CONN_SMS ) ) {
/* do nothing */
#ifdef XWFEATURE_RELAY
} else if ( inviteList( cGlobals, &addr, params->connInfo.relay.inviteeRelayIDs, COMMS_CONN_RELAY ) ) {
} else if ( inviteList( cGlobals, &selfAddr, params->connInfo.relay.inviteeRelayIDs, COMMS_CONN_RELAY ) ) {
/* do nothing */
#endif
} else if ( inviteList( cGlobals, &addr, params->connInfo.mqtt.inviteeDevIDs, COMMS_CONN_MQTT ) ) {
} else if ( inviteList( cGlobals, &selfAddr, params->connInfo.mqtt.inviteeDevIDs, COMMS_CONN_MQTT ) ) {
/* do nothing */
/* Try sending to self, using the phone number or relayID of this device */
} else if ( addr_hasType( &addr, COMMS_CONN_SMS ) ) {
linux_sms_invite( params, &nli, addr.u.sms.phone, addr.u.sms.port );
} else if ( addr_hasType( &addr, COMMS_CONN_MQTT ) ) {
} else if ( addr_hasType( &selfAddr, COMMS_CONN_SMS ) ) {
linux_sms_invite( params, &nli, selfAddr.u.sms.phone, selfAddr.u.sms.port );
} else if ( addr_hasType( &selfAddr, COMMS_CONN_MQTT ) ) {
mqttc_invite( params, &nli, mqttc_getDevID( params ) );
} else if ( addr_hasType( &addr, COMMS_CONN_RELAY ) ) {
} else if ( addr_hasType( &selfAddr, COMMS_CONN_RELAY ) ) {
XP_U32 relayID = linux_getDevIDRelay( params );
if ( 0 != relayID ) {
relaycon_invite( params, relayID, NULL, &nli );

6
xwords4/linux/gamesdb.c
View file

@ -339,7 +339,6 @@ gdb_summarize( CommonGlobals* cGlobals )
XP_U16 nTotal = gi->nPlayers;
XP_U32 gameID = gi->gameID;
XP_ASSERT( 0 != gameID );
CommsAddrRec addr = {0};
// gchar* connvia = "local";
gchar connvia[128] = {0};
@ -364,9 +363,10 @@ gdb_summarize( CommonGlobals* cGlobals )
if ( !!game->comms ) {
nMissing = server_getMissingPlayers( game->server );
comms_getAddr( game->comms, &addr );
CommsAddrRec selfAddr;
comms_getSelfAddr( game->comms, &selfAddr );
CommsConnType typ;
for ( XP_U32 st = 0; addr_iter( &addr, &typ, &st ); ) {
for ( XP_U32 st = 0; addr_iter( &selfAddr, &typ, &st ); ) {
if ( !!connvia[0] ) {
strcat( connvia, "+" );
}

14
xwords4/linux/gtkboard.c
View file

@ -524,10 +524,10 @@ addDropChecks( GtkGameGlobals* globals )
{
CommsCtxt* comms = globals->cGlobals.game.comms;
if ( !!comms ) {
CommsAddrRec addr;
comms_getAddr( comms, &addr );
CommsAddrRec selfAddr;
comms_getSelfAddr( comms, &selfAddr );
CommsConnType typ;
for ( XP_U32 st = 0; addr_iter( &addr, &typ, &st ); ) {
for ( XP_U32 st = 0; addr_iter( &selfAddr, &typ, &st ); ) {
DropTypeData* datum = &globals->dropData[typ];
datum->typ = typ;
datum->comms = comms;
@ -897,13 +897,13 @@ new_game( GtkWidget* XP_UNUSED(widget), GtkGameGlobals* globals )
static void
game_info( GtkWidget* XP_UNUSED(widget), GtkGameGlobals* globals )
{
CommsAddrRec addr;
comms_getAddr( globals->cGlobals.game.comms, &addr );
CommsAddrRec selfAddr;
comms_getSelfAddr( globals->cGlobals.game.comms, &selfAddr );
/* Anything to do if OK is clicked? Changed names etc. already saved. Try
server_do in case one's become a robot. */
CurGameInfo* gi = globals->cGlobals.gi;
if ( gtkNewGameDialog( globals, gi, &addr, XP_FALSE, XP_FALSE ) ) {
if ( gtkNewGameDialog( globals, gi, &selfAddr, XP_FALSE, XP_FALSE ) ) {
if ( server_do( globals->cGlobals.game.server, NULL_XWE ) ) {
board_draw( globals->cGlobals.game.board, NULL_XWE );
}
@ -1454,7 +1454,7 @@ send_invites( CommonGlobals* cGlobals, XP_U16 nPlayers,
CommsAddrRec myAddr = {0};
CommsCtxt* comms = cGlobals->game.comms;
XP_ASSERT( comms );
comms_getAddr( comms, &myAddr );
comms_getSelfAddr( comms, &myAddr );
gint forceChannel = 1; /* 1 is what Android does. Limits to two-device games */

16
xwords4/linux/linuxbt.c
View file

@ -373,9 +373,13 @@ linux_bt_open( CommonGlobals* globals, XP_Bool amMaster )
lbt_listenerSetup( globals );
} else {
if ( btStuff->socket < 0 ) {
CommsAddrRec addr;
comms_getAddr( globals->game.comms, &addr );
lbt_connectSocket( btStuff, &addr );
XP_ASSERT(0);
/* Check whether selfAddr or hostAddr is right? Am I a client
connecting? Doesn't matter while BT's broken on linux for
me. */
CommsAddrRec selfAddr;
comms_getSelfAddr( globals->game.comms, &selfAddr );
lbt_connectSocket( btStuff, &selfAddr );
}
}
}
@ -428,11 +432,7 @@ linux_bt_send( const XP_U8* buf, XP_U16 buflen,
btStuff = globals->btStuff;
if ( !!btStuff ) {
CommsAddrRec addr;
if ( !addrP ) {
comms_getAddr( globals->game.comms, &addr );
addrP = &addr;
}
XP_ASSERT( !!addrP );
if ( btStuff->socket < 0 && !btStuff->amMaster ) {
lbt_connectSocket( btStuff, addrP );

4
xwords4/linux/linuxmain.c
View file

@ -1454,7 +1454,7 @@ linux_send( XWEnv XP_UNUSED(xwe), const XP_U8* buf, XP_U16 buflen,
#if defined XWFEATURE_IP_DIRECT || defined XWFEATURE_DIRECTIP
case COMMS_CONN_IP_DIRECT: {
CommsAddrRec addr;
comms_getAddr( cGlobals->game.comms, &addr );
comms_getSelfAddr( cGlobals->game.comms, &addr );
XP_LOGF( "%s: given %d bytes to send via IP_DIRECT -- which isn't implemented",
__func__, buflen );
// linux_udp_open( cGlobals, &addr );
@ -1466,7 +1466,7 @@ linux_send( XWEnv XP_UNUSED(xwe), const XP_U8* buf, XP_U16 buflen,
case COMMS_CONN_SMS: {
CommsAddrRec addr;
if ( !addrRec ) {
comms_getAddr( cGlobals->game.comms, &addr );
comms_getSelfAddr( cGlobals->game.comms, &addr );
addrRec = &addr;
}