Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-15 15:41:24 +01:00
Code Issues Projects Releases Packages Wiki Activity

toward changing APIs to allow combined messages for mqtt

Browse source
This commit is contained in:
Eric House 2023-03-17 19:21:57 -07:00
parent f5f8ae9908
commit 6ec0e64657
15 changed files with 127 additions and 77 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
xwords4/common/comms.c
View file

@ -1655,6 +1655,7 @@ comms_invite( CommsCtxt* comms, XWEnv xwe, const NetLaunchInfo* nli,
elem = addToQueue( comms, xwe, elem, XP_TRUE );
if ( !!elem ) {
XP_ASSERT( !elem->next );
XP_LOGFF( "added invite on channel %d", elem->channelNo & CHANNEL_MASK );
/* Let's let platform code decide whether to call sendMsg() . On
Android creating a game with an invitation in its queue is always
@ -2134,17 +2135,22 @@ sendMsg( const CommsCtxt* comms, XWEnv xwe, MsgQueueElem* elem,
}
#endif
} else {
XP_ASSERT( !!comms->procs.sendMsg );
XP_ASSERT( !!comms->procs.sendMsgs );
XP_U32 gameid = gameID( comms );
logAddrComms( comms, &addr, __func__ );
XP_UCHAR msgNo[16];
formatMsgNo( comms, elem, msgNo, sizeof(msgNo) );
XP_ASSERT( 0 != elem->createdStamp );
nSent = (*comms->procs.sendMsg)( xwe, elem->msg, elem->len,
comms->streamVersion, msgNo,
elem->createdStamp, &addr,
typ, gameid,
comms->procs.closure );
SendMsgsPacket packet = {
.msgNo = msgNo,
.createdStamp = elem->createdStamp,
.buf = elem->msg,
.len = elem->len,
};
nSent = (*comms->procs.sendMsgs)( xwe, 1, &packet,
comms->streamVersion, &addr,
typ, gameid,
comms->procs.closure );
checkForPrev( comms, elem, typ );
}
break;

13
xwords4/common/comms.h
View file

@ -79,11 +79,12 @@ typedef XP_S16 (*TransportSendInvt)( XWEnv xwe, const NetLaunchInfo* nli,
XP_U32 createdStamp, const CommsAddrRec* addr,
CommsConnType conType, void* closure );
#endif
typedef XP_S16 (*TransportSendMsg)( XWEnv xwe, const XP_U8* buf, XP_U16 len,
XP_U16 streamVersion, const XP_UCHAR* msgNo,
XP_U32 createdStamp, const CommsAddrRec* addr,
CommsConnType conType, XP_U32 gameID,
void* closure );
typedef XP_S16 (*TransportSendMsgs)( XWEnv xwe, XP_U16 count, SendMsgsPacket msgs[],
XP_U16 streamVersion,
const CommsAddrRec* addr,
CommsConnType conType, XP_U32 gameID,
void* closure );
#ifdef COMMS_HEARTBEAT
typedef void (*TransportReset)( XWEnv xwe, void* closure );
@ -125,7 +126,7 @@ typedef struct _TransportProcs {
#else
XP_U32 flags;
#endif
TransportSendMsg sendMsg;
TransportSendMsgs sendMsgs;
#ifdef XWFEATURE_COMMS_INVITE
TransportSendInvt sendInvt;
#endif

7
xwords4/common/comtypes.h
View file

@ -161,6 +161,13 @@ typedef XP_U8 XWPhoniesChoice;
typedef XP_U8 XP_LangCode;
typedef struct _SendMsgsPacket {
const XP_UCHAR* msgNo;
XP_U32 createdStamp;
const XP_U8* buf;
XP_U16 len;
} SendMsgsPacket;
/* I'm going to try putting all forward "class" decls in the same file */
typedef struct BoardCtxt BoardCtxt;
typedef struct CommMgrCtxt CommMgrCtxt;

37
xwords4/common/device.c
View file

@ -337,17 +337,16 @@ dvc_makeMQTTNukeInvite( XW_DUtilCtxt* dutil, XWEnv xwe,
#endif
}
/* Ship with == 1, but increase to test */
#define MULTI_MSG_COUNT 1
void
XP_S16
dvc_makeMQTTMessages( XW_DUtilCtxt* dutil, XWEnv xwe,
MsgAndTopicProc proc, void* closure,
XP_U16 nBufs, SendMsgsPacket bufs[],
const MQTTDevID* addressee,
XP_U32 gameID, const XP_U8* buf, XP_U16 len,
XP_U16 streamVersion )
XP_U32 gameID, XP_U16 streamVersion )
{
XP_LOGFF( "(len: %d; streamVersion: %X)", len, streamVersion );
XP_S16 nSent0 = 0;
XP_S16 nSent1 = 0;
XP_LOGFF( "(nBufs: %d; streamVersion: %X)", nBufs, streamVersion );
XP_UCHAR devTopic[64]; /* used by two below */
formatMQTTDevTopic( addressee, devTopic, VSIZE(devTopic) );
@ -357,11 +356,14 @@ dvc_makeMQTTMessages( XW_DUtilCtxt* dutil, XWEnv xwe,
it's > 0 but < STREAM_VERS_NORELAY, no point sending PROTO_3 */
if ( 0 == streamVersion || STREAM_VERS_NORELAY > streamVersion ) {
XWStreamCtxt* stream = mkStream( dutil );
addHeaderGameIDAndCmd( dutil, xwe, CMD_MSG, gameID, stream );
stream_putBytes( stream, buf, len );
callProc( proc, closure, devTopic, stream );
stream_destroy( stream );
for ( int ii = 0; ii < nBufs; ++ii ) {
XWStreamCtxt* stream = mkStream( dutil );
addHeaderGameIDAndCmd( dutil, xwe, CMD_MSG, gameID, stream );
stream_putBytes( stream, bufs[ii].buf, bufs[ii].len );
callProc( proc, closure, devTopic, stream );
stream_destroy( stream );
nSent0 += bufs[ii].len;
}
}
if ( 0 == streamVersion || STREAM_VERS_NORELAY <= streamVersion ) {
@ -370,12 +372,16 @@ dvc_makeMQTTMessages( XW_DUtilCtxt* dutil, XWEnv xwe,
/* For now, we ship one message per packet. But the receiving code
should be ready */
stream_putU8( stream, MULTI_MSG_COUNT );
for ( int ii = 0; ii < MULTI_MSG_COUNT; ++ii ) {
stream_putU8( stream, nBufs );
for ( int ii = 0; ii < nBufs; ++ii ) {
XP_U32 len = bufs[ii].len;
stream_putU32VL( stream, len );
stream_putBytes( stream, buf, len );
stream_putBytes( stream, bufs[ii].buf, len );
nSent1 += len;
}
XP_ASSERT( nSent0 == nSent1 || nSent0 == 0 || nSent1 == 0 );
XP_UCHAR gameTopic[64];
size_t siz = XP_SNPRINTF( gameTopic, VSIZE(gameTopic),
"%s/%X", devTopic, gameID );
@ -385,6 +391,7 @@ dvc_makeMQTTMessages( XW_DUtilCtxt* dutil, XWEnv xwe,
callProc( proc, closure, gameTopic, stream );
stream_destroy( stream );
}
return XP_MAX( nSent0, nSent1 );
}
void

11
xwords4/common/device.h
View file

@ -46,11 +46,12 @@ void dvc_makeMQTTNukeInvite( XW_DUtilCtxt* dutil, XWEnv xwe,
MsgAndTopicProc proc, void* closure,
const NetLaunchInfo* nli );
void dvc_makeMQTTMessages( XW_DUtilCtxt* dutil, XWEnv xwe,
MsgAndTopicProc proc, void* closure,
const MQTTDevID* addressee,
XP_U32 gameID, const XP_U8* buf, XP_U16 len,
XP_U16 streamVersion );
XP_S16 dvc_makeMQTTMessages( XW_DUtilCtxt* dutil, XWEnv xwe,
MsgAndTopicProc proc, void* closure,
XP_U16 nBufs, SendMsgsPacket bufs[],
const MQTTDevID* addressee, XP_U32 gameID,
XP_U16 streamVersion );
void dvc_makeMQTTNoSuchGames( XW_DUtilCtxt* dutil, XWEnv xwe,
MsgAndTopicProc proc, void* closure,
const MQTTDevID* addressee,

2
xwords4/linux/cursesboard.c
View file

@ -365,7 +365,7 @@ static void
initTProcsCurses( CommonGlobals* cGlobals )
{
cGlobals->procs.closure = cGlobals;
cGlobals->procs.sendMsg = linux_send;
cGlobals->procs.sendMsgs = linux_send;
#ifdef XWFEATURE_COMMS_INVITE
cGlobals->procs.sendInvt = linux_send_invt;
#endif

2
xwords4/linux/gtkboard.c
View file

@ -485,7 +485,7 @@ setTransportProcs( TransportProcs* procs, GtkGameGlobals* globals )
{
XP_ASSERT( !procs->closure );
procs->closure = globals;
procs->sendMsg = linux_send;
procs->sendMsgs = linux_send;
#ifdef XWFEATURE_COMMS_INVITE
procs->sendInvt = linux_send_invt;
#endif

29
xwords4/linux/linuxbt.c
View file

@ -416,10 +416,10 @@ linux_bt_close( CommonGlobals* globals )
}
} /* linux_bt_close */
XP_S16
linux_bt_send( const XP_U8* buf, XP_U16 buflen,
const CommsAddrRec* addrP,
CommonGlobals* globals )
static XP_S16
linux_bt_send_impl( const XP_U8* buf, XP_U16 buflen,
const CommsAddrRec* addrP,
CommonGlobals* globals )
{
XP_S16 nSent = -1;
LinBtStuff* btStuff;
@ -460,7 +460,26 @@ linux_bt_send( const XP_U8* buf, XP_U16 buflen,
}
LOG_RETURNF( "%d", nSent );
return nSent;
} /* linux_bt_send */
} /* linux_bt_send_impl */
XP_S16
linux_bt_send( XP_U16 count, SendMsgsPacket msgs[],
const CommsAddrRec* addrRec, CommonGlobals* globals )
{
XP_S16 result = 0;
for ( int ii = 0; ii < count; ++ii ) {
const SendMsgsPacket* packet = &msgs[ii];
XP_S16 tmp = linux_bt_send_impl( packet->buf, packet->len,
addrRec, globals );
if ( tmp > 0 ) {
result += tmp;
} else {
result = -1;
break;
}
}
return result;
}
#if defined BT_USE_RFCOMM
static void

2
xwords4/linux/linuxbt.h
View file

@ -28,7 +28,7 @@ void linux_bt_open( CommonGlobals* globals, XP_Bool amMaster );
void linux_bt_reset( CommonGlobals* globals );
void linux_bt_close( CommonGlobals* globals );
XP_S16 linux_bt_send( const XP_U8* buf, XP_U16 buflen,
XP_S16 linux_bt_send( XP_U16 count, SendMsgsPacket msgs[],
const CommsAddrRec* addrRec,
CommonGlobals* globals );
XP_S16 linux_bt_receive( int sock, XP_U8* buf, XP_U16 buflen );

25
xwords4/linux/linuxmain.c
View file

@ -1441,22 +1441,14 @@ linux_reset( XWEnv xwe, void* closure )
#endif
XP_S16
linux_send( XWEnv XP_UNUSED(xwe), const XP_U8* buf, XP_U16 buflen,
XP_U16 streamVersion, const XP_UCHAR* msgNo,
XP_U32 XP_UNUSED(createdStamp),
const CommsAddrRec* addrRec, CommsConnType conType,
XP_U32 gameID, void* closure )
linux_send( XWEnv XP_UNUSED(xwe), XP_U16 count, SendMsgsPacket msgs[],
XP_U16 streamVersion, const CommsAddrRec* addrRec,
CommsConnType conType, XP_U32 gameID, void* closure )
{
XP_LOGFF( "(streamVersion: %X, len: %d)", streamVersion, buflen );
XP_LOGFF( "(streamVersion: %X)", streamVersion );
XP_S16 nSent = -1;
CommonGlobals* cGlobals = (CommonGlobals*)closure;
/* if ( !!addrRec ) { */
/* conType = addr_getType( addrRec ); */
/* } else { */
/* conType = addr_getType( &cGlobals->params->addr ); */
/* } */
switch ( conType ) {
#ifdef XWFEATURE_RELAY
case COMMS_CONN_RELAY:
@ -1474,7 +1466,7 @@ linux_send( XWEnv XP_UNUSED(xwe), const XP_U8* buf, XP_U16 buflen,
case COMMS_CONN_BT: {
XP_Bool isServer = game_getIsServer( &cGlobals->game );
linux_bt_open( cGlobals, isServer );
nSent = linux_bt_send( buf, buflen, addrRec, cGlobals );
nSent = linux_bt_send( count, msgs, addrRec, cGlobals );
}
break;
#endif
@ -1499,15 +1491,14 @@ linux_send( XWEnv XP_UNUSED(xwe), const XP_U8* buf, XP_U16 buflen,
// use serverphone if I'm a client, else hope one's provided (this is
// a reply)
nSent = linux_sms_send( cGlobals->params, buf, buflen, msgNo,
addrRec->u.sms.phone, addrRec->u.sms.port,
gameID );
nSent = linux_sms_send( cGlobals->params, count, msgs, addrRec->u.sms.phone,
addrRec->u.sms.port, gameID );
}
break;
#endif
case COMMS_CONN_MQTT:
nSent = mqttc_send( cGlobals->params, gameID, buf, buflen,
nSent = mqttc_send( cGlobals->params, gameID, count, msgs,
streamVersion, &addrRec->u.mqtt.devID );
break;

8
xwords4/linux/linuxmain.h
View file

@ -38,11 +38,9 @@ typedef struct LinuxBMStruct {
} LinuxBMStruct;
int initListenerSocket( int port );
XP_S16 linux_send( XWEnv xwe, const XP_U8* buf, XP_U16 buflen,
XP_U16 streamVersion, const XP_UCHAR* msgNo,
XP_U32 createdStamp, const CommsAddrRec* addrRec,
CommsConnType conType, XP_U32 gameID,
void* closure );
XP_S16 linux_send( XWEnv xwe, XP_U16 count, SendMsgsPacket msgs[],
XP_U16 streamVersion, const CommsAddrRec* addrRec,
CommsConnType conType, XP_U32 gameID, void* closure );
XP_S16 linux_send_invt( XWEnv xwe, const NetLaunchInfo* nli,
XP_U32 createdStamp, const CommsAddrRec* addr,
CommsConnType conType, void* closure );

27
xwords4/linux/linuxsms.c
View file

@ -324,10 +324,10 @@ linux_sms_invite( LaunchParams* params, const NetLaunchInfo* nli,
stream_destroy( stream );
}
XP_S16
linux_sms_send( LaunchParams* params, const XP_U8* buf,
XP_U16 buflen, const XP_UCHAR* msgNo, const XP_UCHAR* phone,
XP_U16 port, XP_U32 gameID )
static XP_S16
linux_sms_send_impl( LaunchParams* params, const XP_U8* buf,
XP_U16 buflen, const XP_UCHAR* msgNo, const XP_UCHAR* phone,
XP_U16 port, XP_U32 gameID )
{
XP_S16 nSent = -1;
LinSMSData* storage = getStorage( params );
@ -344,6 +344,25 @@ linux_sms_send( LaunchParams* params, const XP_U8* buf,
return nSent;
}
XP_S16
linux_sms_send( LaunchParams* params, XP_U16 count, SendMsgsPacket msgs[],
const XP_UCHAR* phone, XP_U16 port, XP_U32 gameID )
{
XP_S16 result = 0;
for ( int ii = 0; ii < count; ++ii ) {
const SendMsgsPacket* packet = &msgs[ii];
XP_S16 tmp = linux_sms_send_impl( params, packet->buf,
packet->len, packet->msgNo, phone, port, gameID );
if ( tmp > 0 ) {
result += tmp;
} else {
result = -1;
break;
}
}
return result;
}
typedef struct _RetryClosure {
LaunchParams* params;
SMS_CMD cmd;

4
xwords4/linux/linuxsms.h
View file

@ -38,8 +38,8 @@ typedef struct _SMSProcs {
void linux_sms_init( LaunchParams* params, const gchar* phone,
XP_U16 port, const SMSProcs* procs, void* procClosure );
XP_S16 linux_sms_send( LaunchParams* params, const XP_U8* buf, XP_U16 buflen,
const XP_UCHAR* msgNo, const XP_UCHAR* phone, XP_U16 port,
XP_S16 linux_sms_send( LaunchParams* params, XP_U16 count, SendMsgsPacket msgs[],
const XP_UCHAR* phone, XP_U16 port,
XP_U32 gameID );
void linux_sms_invite( LaunchParams* params, const NetLaunchInfo* nli,
const gchar* phone, int port );

14
xwords4/linux/mqttcon.c
View file

@ -293,15 +293,15 @@ mqttc_invite( LaunchParams* params, const NetLaunchInfo* nli,
XP_S16
mqttc_send( LaunchParams* params, XP_U32 gameID,
const XP_U8* buf, XP_U16 len, XP_U16 streamVersion,
const MQTTDevID* addressee )
XP_U16 nMsgs, SendMsgsPacket msgs[],
XP_U16 streamVersion, const MQTTDevID* addressee )
{
MQTTConStorage* storage = getStorage( params );
dvc_makeMQTTMessages( params->dutil, NULL_XWE,
msgAndTopicProc, storage,
addressee, gameID, buf, len, streamVersion );
return len;
XP_S16 nSent = dvc_makeMQTTMessages( params->dutil, NULL_XWE,
msgAndTopicProc, storage,
nMsgs, msgs, addressee,
gameID, streamVersion );
return nSent;
}
void

5
xwords4/linux/mqttcon.h
View file

@ -1,6 +1,7 @@
/* -*- compile-command: "make MEMDEBUG=TRUE -j3"; -*- */
/*
* Copyright 2020 by Eric House (xwords@eehouse.org). All rights reserved.
* Copyright 2020 - 2023 by Eric House (xwords@eehouse.org). All rights
* reserved.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@ -32,7 +33,7 @@ void mqttc_invite( LaunchParams* params, const NetLaunchInfo* nli,
const MQTTDevID* mqttInvitee );
void mqttc_onInviteHandled( LaunchParams* params, const NetLaunchInfo* nli );
XP_S16 mqttc_send( LaunchParams* params, XP_U32 gameID,
const XP_U8* buf, XP_U16 len, XP_U16 streamVersion,
XP_U16 count, SendMsgsPacket msgs[], XP_U16 streamVersion,
const MQTTDevID* addressee );
void mqttc_notifyGameGone( LaunchParams* params, const MQTTDevID* addressee, XP_U32 gameID );