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

require that timestamp be set

Browse source 
MQTT must create the same header for each message, so having it set
the current timestamp is bad. I actually think it belongs in the comms
header, not in each transport.
This commit is contained in:
Eric House 2022-12-29 21:23:15 -08:00
parent 2942c140ee
commit bba8e99098
1 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
xwords4/common/device.c
View file

@ -260,22 +260,19 @@ addHeaderGameIDAndCmd( XW_DUtilCtxt* dutil, XWEnv xwe, MQTTCmd cmd,
stream_putU32( stream, gameID ); stream_putU32( stream, gameID );
if ( PROTO_2 <= MQTT_USE_PROTO ) { if ( PROTO_2 <= MQTT_USE_PROTO ) {
if ( 0 == timestamp ) { XP_ASSERT(0 != timestamp);
timestamp = dutil_getCurSeconds( dutil, xwe );
XP_LOGFF( "replacing timestamp of 0" );
}
stream_putU32( stream, timestamp ); stream_putU32( stream, timestamp );
} }
stream_putU8( stream, cmd ); stream_putU8( stream, cmd );
} }
#ifdef MQTT_GAMEID_TOPICS #ifdef MQTT_GAMEID_TOPICS
static void static void
addProto3HeaderCmd( XW_DUtilCtxt* dutil, XWEnv xwe, MQTTCmd cmd, addProto3HeaderCmd( XW_DUtilCtxt* dutil, XWEnv xwe, MQTTCmd cmd,
XP_U32 timestamp, XWStreamCtxt* stream ) XP_U32 timestamp, XWStreamCtxt* stream )
{ {
XP_ASSERT( 0 != timestamp );
stream_putU8( stream, PROTO_3 ); stream_putU8( stream, PROTO_3 );
MQTTDevID myID; MQTTDevID myID;
@ -283,10 +280,6 @@ addProto3HeaderCmd( XW_DUtilCtxt* dutil, XWEnv xwe, MQTTCmd cmd,
myID = htobe64( myID ); myID = htobe64( myID );
stream_putBytes( stream, &myID, sizeof(myID) ); stream_putBytes( stream, &myID, sizeof(myID) );
if ( 0 == timestamp ) {
timestamp = dutil_getCurSeconds( dutil, xwe );
XP_LOGFF( "replacing timestamp of 0" );
}
stream_putU32( stream, timestamp ); stream_putU32( stream, timestamp );
stream_putU8( stream, cmd ); stream_putU8( stream, cmd );