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

replaced deprecated gethostbyname by getaddrinfo. Only linux was using the re-entrant version, possibly causing bugs on windows+apple

Browse Source
This commit is contained in:
csoler 2016-05-09 20:54:58 -04:00
parent f8e6937e87
commit 74bb3b6a8b
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libretroshare/src/util/rsnet.cc
View File

@ -78,6 +78,20 @@ void sockaddr_clear(struct sockaddr_in *addr)
bool rsGetHostByName(const std::string& hostname, in_addr& returned_addr) bool rsGetHostByName(const std::string& hostname, in_addr& returned_addr)
{ {
addrinfo *info = NULL;
int res = getaddrinfo(hostname.c_str(),NULL,NULL,&info) ;
if(res > 0)
{
std::cerr << "(EE) getaddrinfo returned error " << res << " on string \"" << hostname << "\"" << std::endl;
returned_addr.s_addr = 0 ;
}
else
returned_addr.s_addr = ((sockaddr_in*)info->ai_addr)->sin_addr.s_addr ;
freeaddrinfo(info) ;
#ifdef DEPRECATED_TO_REMOVE
#if defined(WINDOWS_SYS) || defined(__APPLE__) || defined(__HAIKU__) #if defined(WINDOWS_SYS) || defined(__APPLE__) || defined(__HAIKU__)
hostent *result = gethostbyname(hostname.c_str()) ; hostent *result = gethostbyname(hostname.c_str()) ;
#else #else
@ -107,6 +121,7 @@ bool rsGetHostByName(const std::string& hostname, in_addr& returned_addr)
// Use contents of result. // Use contents of result.
returned_addr.s_addr = *(unsigned long*) (result->h_addr); returned_addr.s_addr = *(unsigned long*) (result->h_addr);
#endif
return true ; return true ;
} }