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

include phone in known players test

Browse source
This commit is contained in:
Eric House 2024-09-10 05:32:48 -07:00
parent 04017ff7c6
commit 31d0547a60
2 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
xwords4/linux/cursesmain.c
View file

@ -1543,9 +1543,14 @@ getKPsWrapper( void* closure )
if ( kplr_getAddr( dutil, NULL_XWE, players[ii],
&addr, NULL ) ) {
XP_UCHAR buf[17];
formatMQTTDevID( &addr.u.mqtt.devID, buf, VSIZE(buf) );
cJSON_AddStringToObject( entry, "devID", buf );
if ( addr_hasType( &addr, COMMS_CONN_MQTT ) ) {
XP_UCHAR buf[17];
formatMQTTDevID( &addr.u.mqtt.devID, buf, VSIZE(buf) );
cJSON_AddStringToObject( entry, "devID", buf );
}
if ( addr_hasType( &addr, COMMS_CONN_SMS ) ) {
cJSON_AddStringToObject( entry, "phone", addr.u.sms.phone );
}
}
cJSON_AddItemToArray( result, entry );

20
xwords4/linux/scripts/netGamesTest.py
View file

@ -328,15 +328,17 @@ class Device():
def checkKPs(self, kps):
if kps:
for kp in kps:
devID = kp.get('devID')
if not devID in Device._kps: Device._kps[devID] = set()
names = Device._kps[devID]
name = kp.get('name')
if name not in names and len(names):
print('adding {} to {} for {}' \
.format(name, names, Device._kps.get(devID)))
names.add(name)
addr = Device._kps.get(name)
if not addr:
addr = {}
Device._kps[name] = addr
for key in ['devID', 'phone']:
val = kp.get(key)
if val:
if not key in addr: addr[key] = val
else: assert addr[key] == val
def _pickGid(self):
result = None
@ -797,8 +799,6 @@ def countCores(args):
def printKPs():
kps = Device._kps
for names in kps.values():
assert 1 == len(names)
print('Known players: {}'.format(kps))
def printStats():