Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix for UDP relay deadlock... not tested

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7393 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2014-06-01 01:16:34 +00:00
parent 3cf9d9b955
commit c87efec81b
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libretroshare/src/pqi/pqissl.cc
View File

@ -569,11 +569,11 @@ int pqissl::Delay_Connection()
{ {
waiting = WAITING_DELAY; waiting = WAITING_DELAY;
/* set delay */ /* we cannot just jump to Initiate_Connection,
if (mConnectDelay == 0) * but must switch to WAITING_DELAY for at least one cycle.
{ * to avoid deadlock between threads....
return Initiate_Connection(); * ie. so the connection stuff is called from tick(), rather than connect()
} */
/* set Connection TS. /* set Connection TS.
*/ */
@ -597,8 +597,7 @@ int pqissl::Delay_Connection()
rslog(RSL_DEBUG_BASIC, pqisslzone, out); rslog(RSL_DEBUG_BASIC, pqisslzone, out);
} }
#endif #endif
if (time(NULL) >= mConnectTS)
if (time(NULL) > mConnectTS)
{ {
return Initiate_Connection(); return Initiate_Connection();
} }