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

reset cookieID for a new game

Browse source
This commit is contained in:
ehouse 2005-09-04 20:30:47 +00:00
parent c6e9a747b8
commit b99675640a
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
common/comms.c
View file

@ -87,7 +87,7 @@ struct CommsCtxt {
XWHostID myHostID; /* 0 if unset, 1 if acting as server, random for XWHostID myHostID; /* 0 if unset, 1 if acting as server, random for
client */ client */
CommsRelaystate relayState; /* not saved: starts at UNCONNECTED */ CommsRelaystate relayState; /* not saved: starts at UNCONNECTED */
XP_U32 cookieID; /* standin for cookie; set by relay */ CookieID cookieID; /* standin for cookie; set by relay */
/* heartbeat: for periodic pings if relay thinks the network the device is /* heartbeat: for periodic pings if relay thinks the network the device is
on requires them. Not saved since only valid when connected, and we on requires them. Not saved since only valid when connected, and we
@ -192,6 +192,9 @@ comms_reset( CommsCtxt* comms, XP_Bool isServer )
comms->nextChannelNo = 0; comms->nextChannelNo = 0;
comms->connID = CONN_ID_NONE; comms->connID = CONN_ID_NONE;
#ifdef BEYOND_IR
comms->cookieID = COOKIE_ID_NONE;
#endif
} /* comms_reset */ } /* comms_reset */
void void
@ -430,7 +433,7 @@ comms_getAddr( CommsCtxt* comms, CommsAddrRec* addr )
void void
comms_setAddr( CommsCtxt* comms, const CommsAddrRec* addr ) comms_setAddr( CommsCtxt* comms, const CommsAddrRec* addr )
{ {
XP_ASSERT( comms ); XP_ASSERT( comms != NULL );
#ifdef BEYOND_IR #ifdef BEYOND_IR
util_addrChange( comms->util, &comms->addr, addr ); util_addrChange( comms->util, &comms->addr, addr );
#endif #endif
@ -1084,7 +1087,8 @@ relayConnect( CommsCtxt* comms )
if ( !comms->connecting ) { if ( !comms->connecting ) {
comms->connecting = XP_TRUE; comms->connecting = XP_TRUE;
send_via_relay( comms, send_via_relay( comms,
comms->cookieID == 0? XWRELAY_CONNECT:XWRELAY_RECONNECT, comms->cookieID == COOKIE_ID_NONE ?
XWRELAY_CONNECT:XWRELAY_RECONNECT,
comms->myHostID, NULL, 0 ); comms->myHostID, NULL, 0 );
comms->connecting = XP_FALSE; comms->connecting = XP_FALSE;
} }