Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-18 22:26:30 +01:00
Code Issues Projects Releases Packages Wiki Activity

Write relayID conditionally so we can drop it later

Browse source
This commit is contained in:
Eric House 2019-12-30 17:52:28 -08:00
parent 864648c5b9
commit 1eb3c7e2e0
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
xwords4/common/nli.c
View file

@ -89,7 +89,9 @@ nli_saveToStream( const NetLaunchInfo* nli, XWStreamCtxt* stream )
if ( types_hasType( nli->_conTypes, COMMS_CONN_RELAY ) ) { if ( types_hasType( nli->_conTypes, COMMS_CONN_RELAY ) ) {
stringToStream( stream, nli->room ); stringToStream( stream, nli->room );
stringToStream( stream, nli->inviteID ); stringToStream( stream, nli->inviteID );
stream_putU32( stream, nli->devID ); if ( 0 == NLI_VERSION ) {
stream_putU32( stream, nli->devID );
}
} }
if ( types_hasType( nli->_conTypes, COMMS_CONN_BT ) ) { if ( types_hasType( nli->_conTypes, COMMS_CONN_BT ) ) {
stringToStream( stream, nli->btName ); stringToStream( stream, nli->btName );
@ -128,7 +130,9 @@ nli_makeFromStream( NetLaunchInfo* nli, XWStreamCtxt* stream )
if ( types_hasType( nli->_conTypes, COMMS_CONN_RELAY ) ) { if ( types_hasType( nli->_conTypes, COMMS_CONN_RELAY ) ) {
stringFromStreamHere( stream, nli->room, sizeof(nli->room) ); stringFromStreamHere( stream, nli->room, sizeof(nli->room) );
stringFromStreamHere( stream, nli->inviteID, sizeof(nli->inviteID) ); stringFromStreamHere( stream, nli->inviteID, sizeof(nli->inviteID) );
nli->devID = stream_getU32( stream ); if ( version == 0 ) {
nli->devID = stream_getU32( stream );
}
} }
if ( types_hasType( nli->_conTypes, COMMS_CONN_BT ) ) { if ( types_hasType( nli->_conTypes, COMMS_CONN_BT ) ) {
stringFromStreamHere( stream, nli->btName, sizeof(nli->btName) ); stringFromStreamHere( stream, nli->btName, sizeof(nli->btName) );