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

changes for includes-messageID-please-ack protocol addition

Browse source
This commit is contained in:
Eric House 2013-01-23 07:43:58 -08:00
parent ce7cdab3f0
commit 12f70154a0
7 changed files with 112 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
xwords4/linux/gtkboard.c
View file

@ -539,6 +539,7 @@ createOrLoadObjects( GtkGameGlobals* globals )
#ifndef XWFEATURE_STANDALONE_ONLY #ifndef XWFEATURE_STANDALONE_ONLY
/* This may trigger network activity */ /* This may trigger network activity */
if ( !!cGlobals->game.comms ) { if ( !!cGlobals->game.comms ) {
XP_ASSERT( COMMS_CONN_RELAY == addr.conType );
comms_setAddr( cGlobals->game.comms, &addr ); comms_setAddr( cGlobals->game.comms, &addr );
} }
#endif #endif
@ -2622,13 +2623,15 @@ makeNewGame( GtkGameGlobals* globals )
cGlobals->dict = cGlobals->dict =
linux_dictionary_make( MEMPOOL cGlobals->params, linux_dictionary_make( MEMPOOL cGlobals->params,
gi->dictName, XP_TRUE ); gi->dictName, XP_TRUE );
gi->dictLang = dict_getLangCode( cGlobals->dict );
} }
LOG_RETURNF( "%d", success ); LOG_RETURNF( "%d", success );
return success; return success;
} }
void void
gameGotBuf( GtkGameGlobals* globals, XP_Bool hasDraw, XP_U8* buf, XP_U16 len ) gameGotBuf( GtkGameGlobals* globals, XP_Bool hasDraw, const XP_U8* buf,
XP_U16 len )
{ {
XP_LOGF( "%s(hasDraw=%d)", __func__, hasDraw ); XP_LOGF( "%s(hasDraw=%d)", __func__, hasDraw );
XP_Bool redraw = XP_FALSE; XP_Bool redraw = XP_FALSE;

2
xwords4/linux/gtkboard.h
View file

@ -170,7 +170,7 @@ void initGlobals( GtkGameGlobals* globals, LaunchParams* params );
void freeGlobals( GtkGameGlobals* globals ); void freeGlobals( GtkGameGlobals* globals );
XP_Bool makeNewGame( GtkGameGlobals* globals ); XP_Bool makeNewGame( GtkGameGlobals* globals );
void gameGotBuf( GtkGameGlobals* globals, XP_Bool haveDraw, void gameGotBuf( GtkGameGlobals* globals, XP_Bool haveDraw,
XP_U8* buf, XP_U16 len ); const XP_U8* buf, XP_U16 len );
XP_Bool loadGameNoDraw( GtkGameGlobals* globals, LaunchParams* params, XP_Bool loadGameNoDraw( GtkGameGlobals* globals, LaunchParams* params,
sqlite3* pDb, sqlite3_int64 rowid ); sqlite3* pDb, sqlite3_int64 rowid );
void destroy_board_window( GtkWidget* widget, GtkGameGlobals* globals ); void destroy_board_window( GtkWidget* widget, GtkGameGlobals* globals );

2
xwords4/linux/gtkmain.c
View file

@ -385,7 +385,7 @@ socketChanged( void* closure, int newSock, int XP_UNUSED(oldSock),
} }
static void static void
gtkGotBuf( void* closure, XP_U8* buf, XP_U16 len ) gtkGotBuf( void* closure, const XP_U8* buf, XP_U16 len )
{ {
LOG_FUNC(); LOG_FUNC();
GtkAppGlobals* apg = (GtkAppGlobals*)closure; GtkAppGlobals* apg = (GtkAppGlobals*)closure;

2
xwords4/linux/linuxmain.c
View file

@ -1065,7 +1065,7 @@ linux_relay_receive( CommonGlobals* cGlobals, unsigned char* buf, int bufSize )
information specific to our platform's comms layer (return address, say) information specific to our platform's comms layer (return address, say)
*/ */
XWStreamCtxt* XWStreamCtxt*
stream_from_msgbuf( CommonGlobals* globals, unsigned char* bufPtr, stream_from_msgbuf( CommonGlobals* globals, const unsigned char* bufPtr,
XP_U16 nBytes ) XP_U16 nBytes )
{ {
XWStreamCtxt* result; XWStreamCtxt* result;

2
xwords4/linux/linuxmain.h
View file

@ -55,7 +55,7 @@ XP_Bool linuxFireTimer( CommonGlobals* cGlobals, XWTimerReason why );
XWStreamCtxt* stream_from_msgbuf( CommonGlobals* cGlobals, XWStreamCtxt* stream_from_msgbuf( CommonGlobals* cGlobals,
unsigned char* bufPtr, XP_U16 nBytes ); const unsigned char* bufPtr, XP_U16 nBytes );
XP_UCHAR* strFromStream( XWStreamCtxt* stream ); XP_UCHAR* strFromStream( XWStreamCtxt* stream );
void catGameHistory( CommonGlobals* cGlobals ); void catGameHistory( CommonGlobals* cGlobals );

156
xwords4/linux/relaycon.c
View file

@ -19,6 +19,7 @@
#include <netdb.h> #include <netdb.h>
#include <errno.h> #include <errno.h>
#include <stdbool.h>
#include "relaycon.h" #include "relaycon.h"
#include "comtypes.h" #include "comtypes.h"
@ -30,13 +31,20 @@ typedef struct _RelayConStorage {
struct sockaddr_in saddr; struct sockaddr_in saddr;
} RelayConStorage; } RelayConStorage;
typedef struct _MsgHeader {
XWRelayReg cmd;
uint32_t packetID;
} MsgHeader;
static RelayConStorage* getStorage( LaunchParams* params ); static RelayConStorage* getStorage( LaunchParams* params );
static XP_U32 hostNameToIP( const XP_UCHAR* name ); static XP_U32 hostNameToIP( const XP_UCHAR* name );
static void relaycon_receive( void* closure, int socket ); static void relaycon_receive( void* closure, int socket );
static ssize_t sendIt( RelayConStorage* storage, const XP_U8* msgbuf, XP_U16 len ); static ssize_t sendIt( RelayConStorage* storage, const XP_U8* msgbuf, XP_U16 len );
static size_t addStrWithLength( XP_U8* buf, XP_U8* end, const XP_UCHAR* str ); static size_t addStrWithLength( XP_U8* buf, XP_U8* end, const XP_UCHAR* str );
static void getNetString( XP_U8** ptr, XP_U16 len, XP_UCHAR* buf ); static void getNetString( const XP_U8** ptr, XP_U16 len, XP_UCHAR* buf );
static XP_U16 getNetShort( XP_U8** ptr ); static XP_U16 getNetShort( const XP_U8** ptr );
static int writeHeader( XP_U8* dest, XWRelayReg cmd );
static bool readHeader( const XP_U8** buf, MsgHeader* header );
void void
relaycon_init( LaunchParams* params, const RelayConnProcs* procs, relaycon_init( LaunchParams* params, const RelayConnProcs* procs,
@ -68,8 +76,7 @@ relaycon_reg( LaunchParams* params, const XP_UCHAR* devID, DevIDType typ )
XP_ASSERT( !!devID ); XP_ASSERT( !!devID );
XP_U16 idLen = XP_STRLEN( devID ); XP_U16 idLen = XP_STRLEN( devID );
XP_U16 lenNBO = XP_HTONS( idLen ); XP_U16 lenNBO = XP_HTONS( idLen );
tmpbuf[indx++] = XWPDEV_PROTO_VERSION; indx += writeHeader( tmpbuf, XWPDEV_REG );
tmpbuf[indx++] = XWPDEV_REG;
tmpbuf[indx++] = typ; tmpbuf[indx++] = typ;
XP_MEMCPY( &tmpbuf[indx], &lenNBO, sizeof(lenNBO) ); XP_MEMCPY( &tmpbuf[indx], &lenNBO, sizeof(lenNBO) );
indx += sizeof(lenNBO); indx += sizeof(lenNBO);
@ -86,13 +93,15 @@ relaycon_send( LaunchParams* params, const XP_U8* buf, XP_U16 buflen,
ssize_t nSent = -1; ssize_t nSent = -1;
RelayConStorage* storage = getStorage( params ); RelayConStorage* storage = getStorage( params );
XP_U8 tmpbuf[1 + 1 + sizeof(gameToken) + buflen]; XP_U8 tmpbuf[1 + 4 + 1 + sizeof(gameToken) + buflen];
tmpbuf[0] = XWPDEV_PROTO_VERSION; int indx = 0;
tmpbuf[1] = XWPDEV_MSG; indx += writeHeader( tmpbuf, XWPDEV_MSG );
XP_U32 inNBO = htonl(gameToken); XP_U32 inNBO = htonl(gameToken);
XP_MEMCPY( &tmpbuf[2], &inNBO, sizeof(inNBO) ); XP_MEMCPY( &tmpbuf[indx], &inNBO, sizeof(inNBO) );
XP_MEMCPY( &tmpbuf[1 + 1 + sizeof(gameToken)], buf, buflen ); indx += sizeof(inNBO);
nSent = sendIt( storage, tmpbuf, sizeof(tmpbuf) ); XP_MEMCPY( &tmpbuf[indx], buf, buflen );
indx += buflen;
nSent = sendIt( storage, tmpbuf, indx );
if ( nSent > buflen ) { if ( nSent > buflen ) {
nSent = buflen; nSent = buflen;
} }
@ -110,11 +119,10 @@ relaycon_sendnoconn( LaunchParams* params, const XP_U8* buf, XP_U16 buflen,
RelayConStorage* storage = getStorage( params ); RelayConStorage* storage = getStorage( params );
XP_U16 idLen = XP_STRLEN( relayID ); XP_U16 idLen = XP_STRLEN( relayID );
XP_U8 tmpbuf[1 + 1 + XP_U8 tmpbuf[1 + 4 + 1 +
1 + idLen + 1 + idLen +
sizeof(gameToken) + buflen]; sizeof(gameToken) + buflen];
tmpbuf[indx++] = XWPDEV_PROTO_VERSION; indx += writeHeader( tmpbuf, XWPDEV_MSGNOCONN );
tmpbuf[indx++] = XWPDEV_MSGNOCONN;
gameToken = htonl( gameToken ); gameToken = htonl( gameToken );
XP_MEMCPY( &tmpbuf[indx], &gameToken, sizeof(gameToken) ); XP_MEMCPY( &tmpbuf[indx], &gameToken, sizeof(gameToken) );
indx += sizeof(gameToken); indx += sizeof(gameToken);
@ -138,13 +146,25 @@ relaycon_requestMsgs( LaunchParams* params, const XP_UCHAR* devID )
XP_U8 tmpbuf[128]; XP_U8 tmpbuf[128];
int indx = 0; int indx = 0;
tmpbuf[indx++] = XWPDEV_PROTO_VERSION; indx += writeHeader( tmpbuf, XWPDEV_RQSTMSGS );
tmpbuf[indx++] = XWPDEV_RQSTMSGS;
indx += addStrWithLength( &tmpbuf[indx], tmpbuf + sizeof(tmpbuf), devID ); indx += addStrWithLength( &tmpbuf[indx], tmpbuf + sizeof(tmpbuf), devID );
sendIt( storage, tmpbuf, indx ); sendIt( storage, tmpbuf, indx );
} }
static void
sendAckIf( RelayConStorage* storage, const MsgHeader* header )
{
if ( header->cmd != XWPDEV_ACK ) {
XP_U8 tmpbuf[16];
int indx = writeHeader( tmpbuf, XWPDEV_ACK );
uint32_t msgID = htonl( header->packetID );
memcpy( &tmpbuf[indx], &msgID, sizeof(msgID) );
indx += sizeof(msgID);
sendIt( storage, tmpbuf, indx );
}
}
static void static void
relaycon_receive( void* closure, int socket ) relaycon_receive( void* closure, int socket )
{ {
@ -161,43 +181,45 @@ relaycon_receive( void* closure, int socket )
(struct sockaddr*)&from, &fromlen ); (struct sockaddr*)&from, &fromlen );
XP_LOGF( "%s: read %d bytes", __func__, nRead ); XP_LOGF( "%s: read %d bytes", __func__, nRead );
if ( 0 <= nRead ) { if ( 0 <= nRead ) {
XP_U8* ptr = buf; const XP_U8* ptr = buf;
const XP_U8* end = buf + nRead; const XP_U8* end = buf + nRead;
XP_ASSERT( XWPDEV_PROTO_VERSION == *ptr++ ); MsgHeader header;
XWRelayReg cmd = *ptr++; if ( readHeader( &ptr, &header ) ) {
switch( cmd ) { sendAckIf( storage, &header );
case XWPDEV_REGRSP: { switch( header.cmd ) {
XP_U16 len = getNetShort( &ptr ); case XWPDEV_REGRSP: {
XP_UCHAR devID[len+1]; XP_U16 len = getNetShort( &ptr );
getNetString( &ptr, len, devID ); XP_UCHAR devID[len+1];
(*storage->procs.devIDChanged)( storage->procsClosure, devID ); getNetString( &ptr, len, devID );
} (*storage->procs.devIDChanged)( storage->procsClosure, devID );
break; }
case XWPDEV_MSG: break;
(*storage->procs.msgReceived)( storage->procsClosure, case XWPDEV_MSG:
ptr, end - ptr ); (*storage->procs.msgReceived)( storage->procsClosure,
break; ptr, end - ptr );
case XWPDEV_BADREG: break;
(*storage->procs.devIDChanged)( storage->procsClosure, NULL ); case XWPDEV_BADREG:
break; (*storage->procs.devIDChanged)( storage->procsClosure, NULL );
case XWPDEV_HAVEMSGS: { break;
XP_U32 gameToken; case XWPDEV_HAVEMSGS: {
XP_MEMCPY( &gameToken, ptr, sizeof(gameToken) ); XP_U32 gameToken;
ptr += sizeof( gameToken ); XP_MEMCPY( &gameToken, ptr, sizeof(gameToken) );
(*storage->procs.msgNoticeReceived)( storage->procsClosure, ptr += sizeof( gameToken );
ntohl(gameToken) ); (*storage->procs.msgNoticeReceived)( storage->procsClosure,
break; ntohl(gameToken) );
} break;
case XWPDEV_ALERT: { }
XP_U16 len = getNetShort( &ptr ); case XWPDEV_ALERT: {
XP_UCHAR buf[len+1]; XP_U16 len = getNetShort( &ptr );
getNetString( &ptr, len, buf ); XP_UCHAR buf[len+1];
(*storage->procs.msgErrorMsg)( storage->procsClosure, buf ); getNetString( &ptr, len, buf );
break; (*storage->procs.msgErrorMsg)( storage->procsClosure, buf );
} break;
default: }
XP_LOGF( "%s: Unexpected cmd %d", __func__, cmd ); default:
XP_ASSERT( 0 ); XP_LOGF( "%s: Unexpected cmd %d", __func__, header.cmd );
XP_ASSERT( 0 );
}
} }
} else { } else {
XP_LOGF( "%s: error reading udp socket: %d (%s)", __func__, XP_LOGF( "%s: error reading udp socket: %d (%s)", __func__,
@ -264,7 +286,7 @@ addStrWithLength( XP_U8* buf, XP_U8* end, const XP_UCHAR* str )
} }
static XP_U16 static XP_U16
getNetShort( XP_U8** ptr ) getNetShort( const XP_U8** ptr )
{ {
XP_U16 result; XP_U16 result;
memcpy( &result, *ptr, sizeof(result) ); memcpy( &result, *ptr, sizeof(result) );
@ -273,9 +295,37 @@ getNetShort( XP_U8** ptr )
} }
static void static void
getNetString( XP_U8** ptr, XP_U16 len, XP_UCHAR* buf ) getNetString( const XP_U8** ptr, XP_U16 len, XP_UCHAR* buf )
{ {
memcpy( buf, *ptr, len ); memcpy( buf, *ptr, len );
*ptr += len; *ptr += len;
buf[len] = '\0'; buf[len] = '\0';
} }
static int
writeHeader( XP_U8* dest, XWRelayReg cmd )
{
int indx = 0;
dest[indx++] = XWPDEV_PROTO_VERSION;
uint32_t packetNum = htonl(0);
memcpy( &dest[indx], &packetNum, sizeof(packetNum) );
indx += sizeof(packetNum);
dest[indx++] = cmd;
return indx;
}
static bool
readHeader( const XP_U8** buf, MsgHeader* header )
{
const XP_U8* ptr = *buf;
bool ok = XWPDEV_PROTO_VERSION == *ptr++;
assert( ok );
uint32_t packetID;
memcpy( &packetID, ptr, sizeof(packetID) );
ptr += sizeof(packetID);
header->packetID = ntohl( packetID );
XP_LOGF( "%s: got packet %d", __func__, header->packetID );
header->cmd = *ptr++;
*buf = ptr;
return ok;
}

2
xwords4/linux/relaycon.h
View file

@ -23,7 +23,7 @@
#include "main.h" #include "main.h"
typedef struct _Procs { typedef struct _Procs {
void (*msgReceived)( void* closure, XP_U8* buf, XP_U16 len ); void (*msgReceived)( void* closure, const XP_U8* buf, XP_U16 len );
void (*msgNoticeReceived)( void* closure, XP_U32 gameToken ); void (*msgNoticeReceived)( void* closure, XP_U32 gameToken );
void (*devIDChanged)( void* closure, const XP_UCHAR* devID ); void (*devIDChanged)( void* closure, const XP_UCHAR* devID );
void (*msgErrorMsg)( void* closure, const XP_UCHAR* msg ); void (*msgErrorMsg)( void* closure, const XP_UCHAR* msg );