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

make comms_getChannelSeed non-static so jni can call it

Browse source
This commit is contained in:
Andy2 2010-11-08 17:22:38 -08:00
parent d893632e1b
commit 22f7a42c1d
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
xwords4/common/comms.c
View file

@ -896,8 +896,8 @@ makeElemWithID( CommsCtxt* comms, MsgID msgID, AddressRecord* rec,
return newMsgElem; return newMsgElem;
} /* makeElemWithID */ } /* makeElemWithID */
static XP_U16 XP_U16
getChannelSeed( CommsCtxt* comms ) comms_getChannelSeed( CommsCtxt* comms )
{ {
while ( comms->channelSeed == 0 ) { while ( comms->channelSeed == 0 ) {
comms->channelSeed = XP_RANDOM(); comms->channelSeed = XP_RANDOM();
@ -919,7 +919,7 @@ comms_send( CommsCtxt* comms, XWStreamCtxt* stream )
XP_S16 result = -1; XP_S16 result = -1;
if ( 0 == channelNo ) { if ( 0 == channelNo ) {
channelNo = getChannelSeed(comms) & ~CHANNEL_MASK; channelNo = comms_getChannelSeed(comms) & ~CHANNEL_MASK;
} }
XP_DEBUGF( "%s: assigning msgID=" XP_LD " on chnl %x", __func__, XP_DEBUGF( "%s: assigning msgID=" XP_LD " on chnl %x", __func__,
@ -1983,7 +1983,7 @@ send_via_relay( CommsCtxt* comms, XWRELAY_Cmd cmd, XWHostID destID,
comms->r.nPlayersTotal ); comms->r.nPlayersTotal );
stream_putU8( tmpStream, comms->r.nPlayersHere ); stream_putU8( tmpStream, comms->r.nPlayersHere );
stream_putU8( tmpStream, comms->r.nPlayersTotal ); stream_putU8( tmpStream, comms->r.nPlayersTotal );
stream_putU16( tmpStream, getChannelSeed(comms) ); stream_putU16( tmpStream, comms_getChannelSeed(comms) );
stream_putU8( tmpStream, comms->util->gameInfo->dictLang ); stream_putU8( tmpStream, comms->util->gameInfo->dictLang );
set_relay_state( comms, COMMS_RELAYSTATE_CONNECT_PENDING ); set_relay_state( comms, COMMS_RELAYSTATE_CONNECT_PENDING );
break; break;
@ -2002,7 +2002,7 @@ send_via_relay( CommsCtxt* comms, XWRELAY_Cmd cmd, XWHostID destID,
comms->r.nPlayersTotal ); comms->r.nPlayersTotal );
stream_putU8( tmpStream, comms->r.nPlayersHere ); stream_putU8( tmpStream, comms->r.nPlayersHere );
stream_putU8( tmpStream, comms->r.nPlayersTotal ); stream_putU8( tmpStream, comms->r.nPlayersTotal );
stream_putU16( tmpStream, getChannelSeed(comms) ); stream_putU16( tmpStream, comms_getChannelSeed(comms) );
stream_putU8( tmpStream, comms->util->gameInfo->dictLang ); stream_putU8( tmpStream, comms->util->gameInfo->dictLang );
stringToStream( tmpStream, comms->r.connName ); stringToStream( tmpStream, comms->r.connName );
set_relay_state( comms, COMMS_RELAYSTATE_CONNECT_PENDING ); set_relay_state( comms, COMMS_RELAYSTATE_CONNECT_PENDING );

1
xwords4/common/comms.h
View file

@ -180,6 +180,7 @@ void comms_writeToStream( const CommsCtxt* comms, XWStreamCtxt* stream );
XP_S16 comms_send( CommsCtxt* comms, XWStreamCtxt* stream ); XP_S16 comms_send( CommsCtxt* comms, XWStreamCtxt* stream );
XP_S16 comms_resendAll( CommsCtxt* comms ); XP_S16 comms_resendAll( CommsCtxt* comms );
XP_U16 comms_getChannelSeed( CommsCtxt* comms );
XP_Bool comms_checkIncomingStream( CommsCtxt* comms, XWStreamCtxt* stream, XP_Bool comms_checkIncomingStream( CommsCtxt* comms, XWStreamCtxt* stream,