Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2024-12-28 09:58:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

force 16-letter devids

Browse source
This commit is contained in:
Eric House 2020-05-31 23:42:44 -07:00
parent 27e784e784
commit 43ce9f390a
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
xwords4/common/comtypes.h
View file

@ -249,9 +249,9 @@ typedef struct _PlayerDicts {
typedef uint64_t MQTTDevID;
#if __WORDSIZE == 64
# define MQTTDevID_FMT "%lX"
# define MQTTDevID_FMT "%016lX"
#elif __WORDSIZE == 32
# define MQTTDevID_FMT "%llX"
# define MQTTDevID_FMT "%016llX"
#endif
# define MQTTTopic_FMT "xw4/device/" MQTTDevID_FMT

2
xwords4/linux/mqttcon.c
View file

@ -52,6 +52,7 @@ loadClientID( LaunchParams* params, MQTTConStorage* storage )
dvc_getMQTTDevID( params->dutil, NULL_XWE, &storage->clientID );
formatMQTTDevID( &storage->clientID, storage->clientIDStr,
VSIZE(storage->clientIDStr) );
XP_ASSERT( 16 == strlen(storage->clientIDStr) );
formatMQTTTopic( &storage->clientID, storage->topic, VSIZE(storage->topic) );
}
@ -238,6 +239,7 @@ mqttc_invite( LaunchParams* params, NetLaunchInfo* nli, const MQTTDevID* invitee
MQTTConStorage* storage = getStorage( params );
gchar buf[32];
XP_LOGFF( "need to send to %s", formatMQTTDevID(invitee, buf, sizeof(buf) ) );
XP_ASSERT( 16 == strlen(buf) );
XWStreamCtxt* stream = mem_stream_make_raw( MPPARM(params->mpool)
params->vtMgr );