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

don't remember tcp-based addresses. Fixes problem when a device

Browse source 
switches from tcp- to udp-based connection.
This commit is contained in:
Eric House 2013-08-07 21:04:05 -07:00
parent 91c82d9874
commit bac947d780
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
xwords4/relay/cref.cpp
View file

@ -916,12 +916,13 @@ CookieRef::increasePlayerCounts( CRefEvent* evt, bool reconn, HostID* hidp,
assert( m_nPlayersHere <= m_nPlayersSought ); assert( m_nPlayersHere <= m_nPlayersSought );
} }
if ( !!devIDp ) { const AddrInfo* addr = &evt->addr;
if ( !!devIDp && !addr->isTCP() ) {
DevIDType devIDType = evt->u.con.devID->m_devIDType; DevIDType devIDType = evt->u.con.devID->m_devIDType;
// does client support devID // does client support devID
if ( ID_TYPE_NONE != devIDType ) { if ( ID_TYPE_NONE != devIDType ) {
devID = DBMgr::Get()->RegisterDevice( evt->u.con.devID ); devID = DBMgr::Get()->RegisterDevice( evt->u.con.devID );
DevMgr::Get()->Remember( devID, &evt->addr ); DevMgr::Get()->Remember( devID, addr );
} }
*devIDp = devID; *devIDp = devID;
} }
@ -929,7 +930,7 @@ CookieRef::increasePlayerCounts( CRefEvent* evt, bool reconn, HostID* hidp,
evt->u.con.srcID = evt->u.con.srcID =
DBMgr::Get()->AddDevice( ConnName(), evt->u.con.srcID, DBMgr::Get()->AddDevice( ConnName(), evt->u.con.srcID,
evt->u.con.clientVersion, nPlayersH, seed, evt->u.con.clientVersion, nPlayersH, seed,
&evt->addr, devID, reconn ); addr, devID, reconn );
HostID hostid = evt->u.con.srcID; HostID hostid = evt->u.con.srcID;
if ( NULL != hidp ) { if ( NULL != hidp ) {
@ -944,9 +945,9 @@ CookieRef::increasePlayerCounts( CRefEvent* evt, bool reconn, HostID* hidp,
{ {
RWWriteLock rwl( &m_socketsRWLock ); RWWriteLock rwl( &m_socketsRWLock );
HostRec hr( hostid, &evt->addr, nPlayersH, seed, !reconn ); HostRec hr( hostid, addr, nPlayersH, seed, !reconn );
logf( XW_LOGINFO, "%s: adding socket rec with ts %lx", __func__, logf( XW_LOGINFO, "%s: adding socket rec with ts %lx", __func__,
evt->addr.created() ); addr->created() );
m_sockets.push_back( hr ); m_sockets.push_back( hr );
} }