mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-05-07 00:25:16 -04:00
removed possible data race on boolean value (Not critical)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5161 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
dc2d6c975e
commit
02a7548de4
1 changed files with 33 additions and 26 deletions
|
@ -202,6 +202,8 @@ bool ExtAddrFinder::hasValidIP(struct in_addr *addr)
|
||||||
std::cerr << "ExtAddrFinder: Getting ip." << std::endl ;
|
std::cerr << "ExtAddrFinder: Getting ip." << std::endl ;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
{
|
||||||
|
RsStackMutex mut(_addrMtx) ;
|
||||||
if(*_found)
|
if(*_found)
|
||||||
{
|
{
|
||||||
#ifdef EXTADDRSEARCH_DEBUG
|
#ifdef EXTADDRSEARCH_DEBUG
|
||||||
|
@ -209,9 +211,13 @@ bool ExtAddrFinder::hasValidIP(struct in_addr *addr)
|
||||||
#endif
|
#endif
|
||||||
*addr = *_addr;
|
*addr = *_addr;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
time_t delta;
|
||||||
|
{
|
||||||
|
RsStackMutex mut(_addrMtx) ;
|
||||||
//timeout the current ip
|
//timeout the current ip
|
||||||
time_t delta = time(NULL) - *mFoundTS;
|
delta = time(NULL) - *mFoundTS;
|
||||||
|
}
|
||||||
if((uint32_t)delta > MAX_IP_STORE) {//launch a research
|
if((uint32_t)delta > MAX_IP_STORE) {//launch a research
|
||||||
if( _addrMtx.trylock())
|
if( _addrMtx.trylock())
|
||||||
{
|
{
|
||||||
|
@ -235,6 +241,7 @@ bool ExtAddrFinder::hasValidIP(struct in_addr *addr)
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
RsStackMutex mut(_addrMtx) ;
|
||||||
return *_found ;
|
return *_found ;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue