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

fix stuff test script found

Browse source
This commit is contained in:
Eric House 2023-12-19 16:31:17 -08:00
parent 3e6edd3ec4
commit f0ca490b3c
2 changed files with 23 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
xwords4/common/server.c
View file

@ -965,20 +965,30 @@ readGuestAddrs( ServerCtxt* server, XWStreamCtxt* stream )
server->nv.rematch.addrs = XP_MALLOC( server->mpool, len );
stream_getBytes( stream, server->nv.rematch.addrs, len );
XP_LOGFF( "loaded %d bytes of rematch.addrs", len );
}
#ifdef DEBUG
XWStreamCtxt* tmpStream = mkServerStream( server );
stream_setVersion( tmpStream, stream_getVersion( stream ) );
stream_putBytes( tmpStream, server->nv.rematch.addrs,
server->nv.rematch.addrsLen );
while ( 0 < stream_getSize(tmpStream) ) {
CommsAddrRec addr = {0};
addrFromStream( &addr, tmpStream );
XP_LOGFF( "got an address" );
logAddr( server->vol.dutil, &addr, __func__ );
}
stream_destroy( tmpStream );
XWStreamCtxt* tmpStream = mkServerStream( server );
stream_setVersion( tmpStream, version );
stream_putBytes( tmpStream, server->nv.rematch.addrs,
server->nv.rematch.addrsLen );
if ( STREAM_VERS_REMATCHORDER <= version ) {
RematchInfo ri;
ri_fromStream( &ri, tmpStream, server );
for ( int ii = 0; ii < ri.nAddrs; ++ii ) {
XP_LOGFF( "got an address" );
logAddr( server->vol.dutil, &ri.addrs[ii], __func__ );
}
} else {
while ( 0 < stream_getSize(tmpStream) ) {
CommsAddrRec addr = {0};
addrFromStream( &addr, tmpStream );
XP_LOGFF( "got an address" );
logAddr( server->vol.dutil, &addr, __func__ );
}
}
stream_destroy( tmpStream );
#endif
}
}
LOG_RETURN_VOID();
}

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

@ -5,7 +5,7 @@ import argparse, datetime, json, os, random, shutil, signal, \
g_NAMES = ['Brynn', 'Ariela', 'Kati', 'Eric']
# These must correspond to what the linux app is looking for in roFromStr()
g_ROS = ['same', 'low_score_first', 'high_score_first', 'juggle', 'by_name',]
g_ROS = ['same', 'low_score_first', 'high_score_first', 'juggle',]
gDone = False
gGamesMade = 0
g_LOGFILE = None