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

re-factor sending code so essentially same message (without cookieID

Browse source 
that implies a connection) is sent and received by no-conn code.  Use
flags to determine if comms can support no-conn sending without making
up the message only to have it fail to send.
This commit is contained in:
Andy2 2011-08-16 19:36:23 -07:00
parent 2dcfb2193c
commit 7ab8c6eca4
3 changed files with 106 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
xwords4/android/XWords4/jni/Android.mk
View file

@ -16,6 +16,7 @@ local_DEFINES += \
-DXWFEATURE_RELAY \ -DXWFEATURE_RELAY \
-DXWFEATURE_TURNCHANGENOTIFY \ -DXWFEATURE_TURNCHANGENOTIFY \
-DXWFEATURE_CHAT \ -DXWFEATURE_CHAT \
-DCOMMS_XPORT_FLAGSPROC \
-DKEY_SUPPORT \ -DKEY_SUPPORT \
-DXWFEATURE_CROSSHAIRS \ -DXWFEATURE_CROSSHAIRS \
-DPOINTER_SUPPORT \ -DPOINTER_SUPPORT \

135
xwords4/common/comms.c
View file

@ -90,6 +90,7 @@ struct CommsCtxt {
AddressRecord* recs; /* return addresses */ AddressRecord* recs; /* return addresses */
TransportProcs procs; TransportProcs procs;
XP_U32 xportFlags;
#ifdef COMMS_HEARTBEAT #ifdef COMMS_HEARTBEAT
XP_U32 lastMsgRcd; XP_U32 lastMsgRcd;
#endif #endif
@ -175,7 +176,7 @@ static XP_Bool relayConnect( CommsCtxt* comms );
static void relayDisconnect( CommsCtxt* comms ); static void relayDisconnect( CommsCtxt* comms );
static XP_Bool send_via_relay( CommsCtxt* comms, XWRELAY_Cmd cmd, static XP_Bool send_via_relay( CommsCtxt* comms, XWRELAY_Cmd cmd,
XWHostID destID, void* data, int dlen ); XWHostID destID, void* data, int dlen );
static XP_Bool sendNoConn( const CommsCtxt* comms, static XP_Bool sendNoConn( CommsCtxt* comms,
const MsgQueueElem* elem, XWHostID destID ); const MsgQueueElem* elem, XWHostID destID );
static XWHostID getDestID( CommsCtxt* comms, XP_PlayerAddr channelNo ); static XWHostID getDestID( CommsCtxt* comms, XP_PlayerAddr channelNo );
static void set_reset_timer( CommsCtxt* comms ); static void set_reset_timer( CommsCtxt* comms );
@ -294,6 +295,11 @@ comms_make( MPFORMAL XW_UtilCtxt* util, XP_Bool isServer,
result->isServer = isServer; result->isServer = isServer;
if ( !!procs ) { if ( !!procs ) {
XP_MEMCPY( &result->procs, procs, sizeof(result->procs) ); XP_MEMCPY( &result->procs, procs, sizeof(result->procs) );
#ifdef COMMS_XPORT_FLAGSPROC
result->xportFlags = (*result->procs.getFlags)(result->procs.closure);
#else
result->xportFlags = result.procs.flags;
#endif
} }
result->util = util; result->util = util;
@ -1210,7 +1216,9 @@ relayCmdToStr( XWRELAY_Cmd cmd )
CASESTR( XWRELAY_HEARTBEAT ); CASESTR( XWRELAY_HEARTBEAT );
#endif #endif
CASESTR( XWRELAY_MSG_FROMRELAY ); CASESTR( XWRELAY_MSG_FROMRELAY );
CASESTR( XWRELAY_MSG_FROMRELAY_NOCONN );
CASESTR( XWRELAY_MSG_TORELAY ); CASESTR( XWRELAY_MSG_TORELAY );
CASESTR( XWRELAY_MSG_TORELAY_NOCONN );
CASESTR( XWRELAY_MSG_STATUS ); CASESTR( XWRELAY_MSG_STATUS );
default: default:
XP_LOGF( "%s: unknown cmd: %d", __func__, cmd ); XP_LOGF( "%s: unknown cmd: %d", __func__, cmd );
@ -1274,7 +1282,7 @@ relayPreProcess( CommsCtxt* comms, XWStreamCtxt* stream, XWHostID* senderID )
{ {
XP_Bool consumed = XP_TRUE; XP_Bool consumed = XP_TRUE;
XWHostID destID, srcID; XWHostID destID, srcID;
CookieID cookieID; CookieID cookieID = comms->r.cookieID;
XWREASON relayErr; XWREASON relayErr;
/* nothing for us to do here if not using relay */ /* nothing for us to do here if not using relay */
@ -1337,6 +1345,7 @@ relayPreProcess( CommsCtxt* comms, XWStreamCtxt* stream, XWHostID* senderID )
break; break;
case XWRELAY_MSG_FROMRELAY: case XWRELAY_MSG_FROMRELAY:
cookieID = stream_getU16( stream ); cookieID = stream_getU16( stream );
case XWRELAY_MSG_FROMRELAY_NOCONN:
srcID = stream_getU8( stream ); srcID = stream_getU8( stream );
destID = stream_getU8( stream ); destID = stream_getU8( stream );
XP_LOGF( "%s: cookieID: %d; srcID: %x; destID: %x", XP_LOGF( "%s: cookieID: %d; srcID: %x; destID: %x",
@ -2023,93 +2032,107 @@ getDestID( CommsCtxt* comms, XP_PlayerAddr channelNo )
return id; return id;
} /* getDestID */ } /* getDestID */
static XP_Bool static XWStreamCtxt*
send_via_relay( CommsCtxt* comms, XWRELAY_Cmd cmd, XWHostID destID, msg_to_stream( CommsCtxt* comms, XWRELAY_Cmd cmd, XWHostID destID,
void* data, int dlen ) void* data, int datalen )
{ {
XP_Bool success = XP_FALSE; XWStreamCtxt* stream;
XP_U16 len = 0; stream = mem_stream_make( MPPARM(comms->mpool)
CommsAddrRec addr;
XWStreamCtxt* tmpStream;
XP_U8* buf;
comms_getAddr( comms, &addr );
tmpStream = mem_stream_make( MPPARM(comms->mpool)
util_getVTManager(comms->util), util_getVTManager(comms->util),
NULL, 0, NULL, 0,
(MemStreamCloseCallback)NULL ); (MemStreamCloseCallback)NULL );
if ( tmpStream != NULL ) { if ( stream != NULL ) {
stream_open( tmpStream ); CommsAddrRec addr;
stream_putU8( tmpStream, cmd ); stream_open( stream );
stream_putU8( stream, cmd );
comms_getAddr( comms, &addr );
switch ( cmd ) { switch ( cmd ) {
case XWRELAY_MSG_TORELAY: case XWRELAY_MSG_TORELAY:
XP_ASSERT( 0 != comms->r.cookieID ); XP_ASSERT( 0 != comms->r.cookieID );
stream_putU16( tmpStream, comms->r.cookieID ); stream_putU16( stream, comms->r.cookieID );
stream_putU8( tmpStream, comms->r.myHostID ); case XWRELAY_MSG_TORELAY_NOCONN:
stream_putU8( tmpStream, destID ); stream_putU8( stream, comms->r.myHostID );
if ( data != NULL && dlen > 0 ) { stream_putU8( stream, destID );
stream_putBytes( tmpStream, data, dlen ); XP_LOGF( "%s: wrote ids %d, %d", __func__,
comms->r.myHostID, destID );
if ( data != NULL && datalen > 0 ) {
stream_putBytes( stream, data, datalen );
} }
break; break;
case XWRELAY_GAME_CONNECT: case XWRELAY_GAME_CONNECT:
stream_putU8( tmpStream, XWRELAY_PROTO_VERSION ); stream_putU8( stream, XWRELAY_PROTO_VERSION );
stringToStream( tmpStream, addr.u.ip_relay.invite ); stringToStream( stream, addr.u.ip_relay.invite );
stream_putU8( tmpStream, addr.u.ip_relay.seeksPublicRoom ); stream_putU8( stream, addr.u.ip_relay.seeksPublicRoom );
stream_putU8( tmpStream, addr.u.ip_relay.advertiseRoom ); stream_putU8( stream, addr.u.ip_relay.advertiseRoom );
/* XP_ASSERT( cmd == XWRELAY_GAME_RECONNECT */ /* XP_ASSERT( cmd == XWRELAY_GAME_RECONNECT */
/* || comms->r.myHostID == HOST_ID_NONE */ /* || comms->r.myHostID == HOST_ID_NONE */
/* || comms->r.myHostID == HOST_ID_SERVER ); */ /* || comms->r.myHostID == HOST_ID_SERVER ); */
XP_LOGF( "%s: writing nPlayersHere: %d; nPlayersTotal: %d", XP_LOGF( "%s: writing nPlayersHere: %d; nPlayersTotal: %d",
__func__, comms->r.nPlayersHere, __func__, comms->r.nPlayersHere,
comms->r.nPlayersTotal ); comms->r.nPlayersTotal );
stream_putU8( tmpStream, comms->r.nPlayersHere ); stream_putU8( stream, comms->r.nPlayersHere );
stream_putU8( tmpStream, comms->r.nPlayersTotal ); stream_putU8( stream, comms->r.nPlayersTotal );
stream_putU16( tmpStream, comms_getChannelSeed(comms) ); stream_putU16( stream, comms_getChannelSeed(comms) );
stream_putU8( tmpStream, comms->util->gameInfo->dictLang ); stream_putU8( stream, comms->util->gameInfo->dictLang );
set_relay_state( comms, COMMS_RELAYSTATE_CONNECT_PENDING ); set_relay_state( comms, COMMS_RELAYSTATE_CONNECT_PENDING );
break; break;
case XWRELAY_GAME_RECONNECT: case XWRELAY_GAME_RECONNECT:
stream_putU8( tmpStream, XWRELAY_PROTO_VERSION ); stream_putU8( stream, XWRELAY_PROTO_VERSION );
stringToStream( tmpStream, addr.u.ip_relay.invite ); stringToStream( stream, addr.u.ip_relay.invite );
stream_putU8( tmpStream, addr.u.ip_relay.seeksPublicRoom ); stream_putU8( stream, addr.u.ip_relay.seeksPublicRoom );
stream_putU8( tmpStream, addr.u.ip_relay.advertiseRoom ); stream_putU8( stream, addr.u.ip_relay.advertiseRoom );
stream_putU8( tmpStream, comms->r.myHostID ); stream_putU8( stream, comms->r.myHostID );
XP_ASSERT( cmd == XWRELAY_GAME_RECONNECT XP_ASSERT( cmd == XWRELAY_GAME_RECONNECT
|| comms->r.myHostID == HOST_ID_NONE || comms->r.myHostID == HOST_ID_NONE
|| comms->r.myHostID == HOST_ID_SERVER ); || comms->r.myHostID == HOST_ID_SERVER );
XP_LOGF( "%s: writing nPlayersHere: %d; nPlayersTotal: %d", XP_LOGF( "%s: writing nPlayersHere: %d; nPlayersTotal: %d",
__func__, comms->r.nPlayersHere, __func__, comms->r.nPlayersHere,
comms->r.nPlayersTotal ); comms->r.nPlayersTotal );
stream_putU8( tmpStream, comms->r.nPlayersHere ); stream_putU8( stream, comms->r.nPlayersHere );
stream_putU8( tmpStream, comms->r.nPlayersTotal ); stream_putU8( stream, comms->r.nPlayersTotal );
stream_putU16( tmpStream, comms_getChannelSeed(comms) ); stream_putU16( stream, comms_getChannelSeed(comms) );
stream_putU8( tmpStream, comms->util->gameInfo->dictLang ); stream_putU8( stream, comms->util->gameInfo->dictLang );
stringToStream( tmpStream, comms->r.connName ); stringToStream( stream, comms->r.connName );
set_relay_state( comms, COMMS_RELAYSTATE_CONNECT_PENDING ); set_relay_state( comms, COMMS_RELAYSTATE_CONNECT_PENDING );
break; break;
case XWRELAY_ACK: case XWRELAY_ACK:
stream_putU8( tmpStream, destID ); stream_putU8( stream, destID );
break; break;
case XWRELAY_GAME_DISCONNECT: case XWRELAY_GAME_DISCONNECT:
stream_putU16( tmpStream, comms->r.cookieID ); stream_putU16( stream, comms->r.cookieID );
stream_putU8( tmpStream, comms->r.myHostID ); stream_putU8( stream, comms->r.myHostID );
break; break;
#if defined XWFEATURE_RELAY && defined RELAY_HEARTBEAT #if defined XWFEATURE_RELAY && defined RELAY_HEARTBEAT
case XWRELAY_HEARTBEAT: case XWRELAY_HEARTBEAT:
/* Add these for grins. Server can assert they match the IP /* Add these for grins. Server can assert they match the IP
address it expects 'em on. */ address it expects 'em on. */
stream_putU16( tmpStream, comms->r.cookieID ); stream_putU16( stream, comms->r.cookieID );
stream_putU8( tmpStream, comms->r.myHostID ); stream_putU8( stream, comms->r.myHostID );
break; break;
#endif #endif
default: default:
XP_ASSERT(0); XP_ASSERT(0);
} }
}
return stream;
} /* format_message */
static XP_Bool
send_via_relay( CommsCtxt* comms, XWRELAY_Cmd cmd, XWHostID destID,
void* data, int dlen )
{
XP_Bool success = XP_FALSE;
XWStreamCtxt* tmpStream = msg_to_stream( comms, cmd, destID, data, dlen );
if ( tmpStream != NULL ) {
XP_U16 len = 0;
XP_U8* buf;
len = stream_getSize( tmpStream ); len = stream_getSize( tmpStream );
buf = XP_MALLOC( comms->mpool, len ); buf = XP_MALLOC( comms->mpool, len );
@ -2119,6 +2142,9 @@ send_via_relay( CommsCtxt* comms, XWRELAY_Cmd cmd, XWHostID destID,
stream_destroy( tmpStream ); stream_destroy( tmpStream );
if ( buf != NULL ) { if ( buf != NULL ) {
XP_U16 result; XP_U16 result;
CommsAddrRec addr;
comms_getAddr( comms, &addr );
XP_LOGF( "%s: passing %d bytes to sendproc", __func__, len ); XP_LOGF( "%s: passing %d bytes to sendproc", __func__, len );
result = (*comms->procs.send)( buf, len, &addr, result = (*comms->procs.send)( buf, len, &addr,
comms->procs.closure ); comms->procs.closure );
@ -2133,7 +2159,7 @@ send_via_relay( CommsCtxt* comms, XWRELAY_Cmd cmd, XWHostID destID,
} /* send_via_relay */ } /* send_via_relay */
static XP_Bool static XP_Bool
sendNoConn( const CommsCtxt* comms, const MsgQueueElem* elem, XWHostID destID ) sendNoConn( CommsCtxt* comms, const MsgQueueElem* elem, XWHostID destID )
{ {
LOG_FUNC(); LOG_FUNC();
XP_Bool success = XP_FALSE; XP_Bool success = XP_FALSE;
@ -2141,9 +2167,24 @@ sendNoConn( const CommsCtxt* comms, const MsgQueueElem* elem, XWHostID destID )
XP_UCHAR relayID[64]; XP_UCHAR relayID[64];
XP_U16 len = sizeof(relayID); XP_U16 len = sizeof(relayID);
success = NULL != comms->procs.sendNoConn success = NULL != comms->procs.sendNoConn
&& formatRelayID( comms, destID, relayID, &len ) && (0 != (comms->xportFlags & COMMS_XPORT_FLAGS_HASNOCONN))
&& (*comms->procs.sendNoConn)( elem->msg, elem->len, relayID, && formatRelayID( comms, destID, relayID, &len );
if ( success ) {
XWStreamCtxt* stream =
msg_to_stream( comms, XWRELAY_MSG_TORELAY_NOCONN,
destID, elem->msg, elem->len );
if ( NULL != stream ) {
XP_U16 len = stream_getSize( stream );
XP_U8* buf = XP_MALLOC( comms->mpool, len );
if ( buf != NULL ) {
stream_getBytes( stream, buf, len );
success = (*comms->procs.sendNoConn)( buf, len, relayID,
comms->procs.closure ); comms->procs.closure );
XP_FREE( comms->mpool, buf );
}
stream_destroy( stream );
}
}
LOG_RETURNF( "%d", success ); LOG_RETURNF( "%d", success );
return success; return success;

14
xwords4/common/comms.h
View file

@ -128,7 +128,21 @@ typedef XP_Bool (*RelayNoConnProc)( const XP_U8* buf, XP_U16 len,
const XP_UCHAR* relayID, void* closure ); const XP_UCHAR* relayID, void* closure );
#endif #endif
typedef enum {
COMMS_XPORT_FLAGS_NONE = 0
,COMMS_XPORT_FLAGS_HASNOCONN = 1
} CommsTransportFlags;
#ifdef COMMS_XPORT_FLAGSPROC
typedef XP_U32 (*FlagsProc)( void* closure );
#endif
typedef struct _TransportProcs { typedef struct _TransportProcs {
# ifdef COMMS_XPORT_FLAGSPROC
FlagsProc getFlags;
#else
XP_U32 flags;
#endif
TransportSend send; TransportSend send;
#ifdef COMMS_HEARTBEAT #ifdef COMMS_HEARTBEAT
TransportReset reset; TransportReset reset;