From 280fc3bfe1912e300686721171dc6f429bfbb426 Mon Sep 17 00:00:00 2001 From: Eric House Date: Tue, 18 Jul 2023 21:35:17 -0700 Subject: [PATCH] fix failure to correctly pass devids into linux client --- xwords4/linux/linuxmain.c | 1 + xwords4/linux/scripts/discon_ok2.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/xwords4/linux/linuxmain.c b/xwords4/linux/linuxmain.c index 1ef974593..5beb24bdc 100644 --- a/xwords4/linux/linuxmain.c +++ b/xwords4/linux/linuxmain.c @@ -2869,6 +2869,7 @@ main( int argc, char** argv ) mainParams.connInfo.mqtt.port = atoi(optarg); break; case CMD_INVITEE_MQTTDEVID: + XP_ASSERT( 16 == strlen(optarg) ); mainParams.connInfo.mqtt.inviteeDevIDs = g_slist_append( mainParams.connInfo.mqtt.inviteeDevIDs, optarg ); types_addType( &mainParams.conTypes, COMMS_CONN_MQTT ); diff --git a/xwords4/linux/scripts/discon_ok2.py b/xwords4/linux/scripts/discon_ok2.py index f7b0d4f46..6ce49422f 100755 --- a/xwords4/linux/scripts/discon_ok2.py +++ b/xwords4/linux/scripts/discon_ok2.py @@ -207,7 +207,7 @@ class Device(): if self.inviteeMQTTDevIDs: args += [ '--force-invite' ] for idid in self.inviteeMQTTDevIDs: - asHexStr = '{:16X}'.format(idid) + asHexStr = '{:016X}'.format(idid) args += ['--invitee-mqtt-devid', asHexStr] self.proc = subprocess.Popen(args, stdout = subprocess.DEVNULL,