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

add comms_getInitialAddr; protect against recursive sends

Browse source
This commit is contained in:
ehouse 2005-04-03 02:49:04 +00:00
parent 3d27d0d882
commit ad6de22306
1 changed files with 22 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
xwords4/common/comms.c
View file

@ -93,6 +93,7 @@ struct CommsCtxt {
reconnect for every game and after restarting. */ reconnect for every game and after restarting. */
XP_U16 heartbeat; XP_U16 heartbeat;
XP_Bool isServer; XP_Bool isServer;
XP_Bool connecting;
#ifdef DEBUG #ifdef DEBUG
XP_U16 nUniqueBytes; XP_U16 nUniqueBytes;
#endif #endif
@ -135,17 +136,6 @@ comms_make( MPFORMAL XW_UtilCtxt* util, XP_Bool isServer,
result->sendClosure = closure; result->sendClosure = closure;
result->util = util; result->util = util;
#ifdef BEYOND_IR
/* default values; default is still IR where there's a choice */
result->addr.conType = COMMS_CONN_RELAY;
result->addr.u.ip_relay.ipAddr = 0L; /* force 'em to set it */
result->addr.u.ip_relay.port = 10999;
{
char* name = "aphraea.org"; /* Don't ship with this!!! PENDING */
XP_MEMCPY( result->addr.u.ip_relay.hostName, name, XP_STRLEN(name) );
}
#endif
if ( isServer ) { if ( isServer ) {
hostID = HOST_ID_SERVER; hostID = HOST_ID_SERVER;
} else { } else {
@ -423,9 +413,24 @@ comms_writeToStream( CommsCtxt* comms, XWStreamCtxt* stream )
void void
comms_getAddr( CommsCtxt* comms, CommsAddrRec* addr ) comms_getAddr( CommsCtxt* comms, CommsAddrRec* addr )
{ {
XP_ASSERT( !!comms );
XP_MEMCPY( addr, &comms->addr, sizeof(*addr) ); XP_MEMCPY( addr, &comms->addr, sizeof(*addr) );
} /* comms_getAddr */ } /* comms_getAddr */
void
comms_getInitialAddr( CommsAddrRec* addr )
{
/* default values; default is still IR where there's a choice */
addr->conType = COMMS_CONN_RELAY;
addr->u.ip_relay.ipAddr = 0L; /* force 'em to set it */
addr->u.ip_relay.port = 10999;
{
char* name = "eehouse.org";
XP_MEMCPY( addr->u.ip_relay.hostName, name, XP_STRLEN(name)+1 );
}
addr->u.ip_relay.cookie[0] = '\0';
}
void void
comms_setAddr( CommsCtxt* comms, CommsAddrRec* addr ) comms_setAddr( CommsCtxt* comms, CommsAddrRec* addr )
{ {
@ -919,7 +924,7 @@ comms_send_relay( CommsCtxt* comms, XWRELAY_Cmd cmd, XWHostID destID,
void* data, int dlen ) void* data, int dlen )
{ {
XP_U16 result = 0; XP_U16 result = 0;
XP_U16 len; XP_U16 len = 0;
CommsAddrRec addr; CommsAddrRec addr;
XWStreamCtxt* tmpStream; XWStreamCtxt* tmpStream;
XP_U8* buf; XP_U8* buf;
@ -975,8 +980,11 @@ static void
comms_relayConnect( CommsCtxt* comms ) comms_relayConnect( CommsCtxt* comms )
{ {
XP_LOGF( "comms_relayConnect called" ); XP_LOGF( "comms_relayConnect called" );
if ( !comms->connecting ) {
comms_send_relay( comms, XWRELAY_CONNECT, HOST_ID_NONE, NULL, 0 ); comms->connecting = XP_TRUE;
comms_send_relay( comms, XWRELAY_CONNECT, HOST_ID_NONE, NULL, 0 );
comms->connecting = XP_FALSE;
}
} /* comms_relayConnect */ } /* comms_relayConnect */
EXTERN_C_END EXTERN_C_END