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

fix failure to correctly pass devids into linux client

Browse source
This commit is contained in:
Eric House 2023-07-18 21:35:17 -07:00
parent 76c0ce3a2e
commit 280fc3bfe1
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
xwords4/linux/linuxmain.c
View file

@ -2869,6 +2869,7 @@ main( int argc, char** argv )
mainParams.connInfo.mqtt.port = atoi(optarg); mainParams.connInfo.mqtt.port = atoi(optarg);
break; break;
case CMD_INVITEE_MQTTDEVID: case CMD_INVITEE_MQTTDEVID:
XP_ASSERT( 16 == strlen(optarg) );
mainParams.connInfo.mqtt.inviteeDevIDs = mainParams.connInfo.mqtt.inviteeDevIDs =
g_slist_append( mainParams.connInfo.mqtt.inviteeDevIDs, optarg ); g_slist_append( mainParams.connInfo.mqtt.inviteeDevIDs, optarg );
types_addType( &mainParams.conTypes, COMMS_CONN_MQTT ); types_addType( &mainParams.conTypes, COMMS_CONN_MQTT );

2
xwords4/linux/scripts/discon_ok2.py
View file

@ -207,7 +207,7 @@ class Device():
if self.inviteeMQTTDevIDs: if self.inviteeMQTTDevIDs:
args += [ '--force-invite' ] args += [ '--force-invite' ]
for idid in self.inviteeMQTTDevIDs: for idid in self.inviteeMQTTDevIDs:
asHexStr = '{:16X}'.format(idid) asHexStr = '{:016X}'.format(idid)
args += ['--invitee-mqtt-devid', asHexStr] args += ['--invitee-mqtt-devid', asHexStr]
self.proc = subprocess.Popen(args, stdout = subprocess.DEVNULL, self.proc = subprocess.Popen(args, stdout = subprocess.DEVNULL,