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

send cookieid as part of [RE]CONNECT_RESPONSE in addition to ALL_COND (where it's now redundant).

Browse source
This commit is contained in:
Eric House 2010-09-20 22:06:35 -07:00
parent 0df651027f
commit 047f41b516
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
xwords4/common/comms.c
View file

@ -1084,6 +1084,7 @@ sendMsg( CommsCtxt* comms, MsgQueueElem* elem )
static void
send_ack( CommsCtxt* comms )
{
LOG_FUNC();
send_via_relay( comms, XWRELAY_ACK, comms->r.myHostID, NULL, 0 );
}
@ -1157,6 +1158,7 @@ got_connect_cmd( CommsCtxt* comms, XWStreamCtxt* stream,
comms->r.nPlayersTotal, XP_FALSE );
}
comms->r.cookieID = stream_getU16( stream );
comms->r.heartbeat = stream_getU16( stream );
nSought = (XP_U16)stream_getU8( stream );
nHere = (XP_U16)stream_getU8( stream );
@ -1212,7 +1214,9 @@ relayPreProcess( CommsCtxt* comms, XWStreamCtxt* stream, XWHostID* senderID )
|| comms->r.myHostID == srcID );
comms->r.myHostID = srcID;
XP_LOGF( "set hostid: %x", comms->r.myHostID );
comms->r.cookieID = stream_getU16( stream );
cookieID = stream_getU16( stream );
XP_ASSERT( cookieID == comms->r.cookieID );
// comms->r.cookieID = stream_getU16( stream );
XP_LOGF( "set cookieID = %d", comms->r.cookieID );
#ifdef DEBUG
@ -1256,7 +1260,7 @@ relayPreProcess( CommsCtxt* comms, XWStreamCtxt* stream, XWHostID* senderID )
if ( COMMS_RELAYSTATE_ALLCONNECTED == comms->r.relayState ) {
consumed = cookieID != comms->r.cookieID;
} else {
XP_ASSERT( COMMS_RELAYSTATE_RECONNECTED == comms->r.relayState );
XP_ASSERT( COMMS_RELAYSTATE_RECONNECTED == comms->r.relayState ); /* this is firing */
}
}
if ( consumed ) {
@ -1905,6 +1909,7 @@ send_via_relay( CommsCtxt* comms, XWRELAY_Cmd cmd, XWHostID destID,
switch ( cmd ) {
case XWRELAY_MSG_TORELAY:
XP_ASSERT( 0 != comms->r.cookieID );
stream_putU16( tmpStream, comms->r.cookieID );
stream_putU8( tmpStream, comms->r.myHostID );
stream_putU8( tmpStream, destID );

4
xwords4/relay/cref.cpp
View file

@ -910,6 +910,7 @@ CookieRef::sendResponse( const CRefEvent* evt, bool initial )
/* Now send the response */
unsigned char buf[1 /* cmd */
+ sizeof(unsigned char) /* hostID */
+ sizeof(short) /* cookidID */
+ sizeof(short) /* heartbeat */
+ sizeof(unsigned char) /* total here */
+ sizeof(unsigned char) /* total expected */
@ -920,6 +921,7 @@ CookieRef::sendResponse( const CRefEvent* evt, bool initial )
*bufp++ = initial ? XWRELAY_CONNECT_RESP : XWRELAY_RECONNECT_RESP;
*bufp++ = evt->u.con.srcID;
putNetShort( &bufp, GetCookieID() );
putNetShort( &bufp, GetHeartbeat() );
*bufp++ = GetPlayersSought();
*bufp++ = GetPlayersHere();
@ -1225,7 +1227,7 @@ void
CookieRef::printSeeds( const char* caller )
{
int len = 0;
char buf[64];
char buf[64] = {0};
vector<HostRec>::iterator iter;
for ( iter = m_sockets.begin(); iter != m_sockets.end(); ++iter ) {
len += snprintf( &buf[len], sizeof(buf)-len, "%.4x/%d ",