Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-01-28 16:27:01 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

suppressed debug info, added lock

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3983 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2011-01-25 23:28:22 +00:00
parent 6d44694c7a
commit e57f8836e4
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libretroshare/src/util/dnsresolver.cc
View File

@ -54,21 +54,25 @@ void *solveDNSEntries(void *p)
break ; break ;
} }
} }
else
return NULL; // the thread has been deleted. Return.
} }
if(!next_call.empty()) if(!next_call.empty())
{ {
hostent *pHost = gethostbyname(next_call.c_str()); hostent *pHost = gethostbyname(next_call.c_str());
if(pHost)
{ {
RsStackMutex mut(dnsr->_rdnsMtx) ; RsStackMutex mut(dnsr->_rdnsMtx) ;
(*dnsr->_addr_map)[next_call].state = DNSResolver::DNS_HAVE ; if(pHost)
(*dnsr->_addr_map)[next_call].addr.s_addr = *(unsigned long*) (pHost->h_addr); {
(*dnsr->_addr_map)[next_call].state = DNSResolver::DNS_HAVE ;
(*dnsr->_addr_map)[next_call].addr.s_addr = *(unsigned long*) (pHost->h_addr);
}
else
(*dnsr->_addr_map)[next_call].state = DNSResolver::DNS_LOOKUP_ERROR ;
} }
else
(*dnsr->_addr_map)[next_call].state = DNSResolver::DNS_LOOKUP_ERROR ;
} }
} }
@ -98,6 +102,7 @@ void DNSResolver::reset()
*_thread_running = false ; *_thread_running = false ;
_addr_map->clear(); _addr_map->clear();
_addr_map = NULL ;
} }
bool DNSResolver::getIPAddressFromString(const std::string& server_name,struct in_addr& addr) bool DNSResolver::getIPAddressFromString(const std::string& server_name,struct in_addr& addr)
@ -135,10 +140,7 @@ bool DNSResolver::getIPAddressFromString(const std::string& server_name,struct i
} }
if(!running) if(!running)
{
std::cerr << "Launching reuqest!!"<< std::endl;
start_request(); start_request();
}
return false ; return false ;
} }