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

Fix DNS resolution for hostnames that has also AAAA record

Browse Source 
rsGetHostByName doesn't support IPv6 addresses.
Before this commit when
an hostname had both AAAA and A record rsGetHostByName retrurned success
but with 0.0.0.0 invalid address. As rsGetHostByName is not capable of
handling IPv6 (fixing it would require API change and a bunch of
refactors around) just avoid to receive IPv6 addresses on resolition, so
the correct IPv4 address is returned if present, otherwise fail
gracefully (A record not found).
This commit is contained in:
Gioacchino Mazzurco 2018-11-08 13:14:29 +01:00
parent dfe7ebaa08
commit c4cbcf78f3
No known key found for this signature in database
GPG Key ID: A1FBCA3872E87051
1 changed files with 18 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,6 +31,8 @@
#include <netdb.h> #include <netdb.h>
#endif #endif
#include <cstring>
/* enforce LITTLE_ENDIAN on Windows */ /* enforce LITTLE_ENDIAN on Windows */
#ifdef WINDOWS_SYS #ifdef WINDOWS_SYS
#define BYTE_ORDER 1234 #define BYTE_ORDER 1234
@ -76,53 +78,23 @@ 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; addrinfo hint; memset(&hint, 0, sizeof(hint));
int res = getaddrinfo(hostname.c_str(),NULL,NULL,&info) ; hint.ai_family = AF_INET;
addrinfo* info = nullptr;
int res = getaddrinfo(hostname.c_str(), nullptr, &hint, &info);
bool ok = true; bool ok = true;
if(res > 0 || info == NULL || info->ai_addr == NULL) if(res > 0 || !info || !info->ai_addr)
{ {
std::cerr << "(EE) getaddrinfo returned error " << res << " on string \"" << hostname << "\"" << std::endl; std::cerr << __PRETTY_FUNCTION__ << "(EE) getaddrinfo returned error "
<< res << " on string \"" << hostname << "\"" << std::endl;
returned_addr.s_addr = 0; returned_addr.s_addr = 0;
ok = false; ok = false;
} }
else else
returned_addr.s_addr = ((sockaddr_in*)info->ai_addr)->sin_addr.s_addr; returned_addr.s_addr = ((sockaddr_in*)info->ai_addr)->sin_addr.s_addr;
if(info) if(info) freeaddrinfo(info);
freeaddrinfo(info) ;
#ifdef DEPRECATED_TO_REMOVE
#if defined(WINDOWS_SYS) || defined(__APPLE__) || defined(__HAIKU__)
hostent *result = gethostbyname(hostname.c_str()) ;
#else
RsTemporaryMemory mem(8192) ;
if(!mem)
{
std::cerr << __PRETTY_FUNCTION__ << ": Cannot allocate memory!" << std::endl;
return false; // Do something.
}
int error = 0;
struct hostent pHost;
struct hostent *result;
if(gethostbyname_r(hostname.c_str(), &pHost, (char*)(unsigned char*)mem, mem.size(), &result, &error) != 0)
{
std::cerr << __PRETTY_FUNCTION__ << ": cannot call gethostname_r. Internal error reported. Check buffer size." << std::endl;
return false ;
}
#endif
if(!result)
{
std::cerr << __PRETTY_FUNCTION__ << ": gethostname returned null result." << std::endl;
return false ;
}
// Use contents of result.
returned_addr.s_addr = *(unsigned long*) (result->h_addr);
#endif
return ok; return ok;
} }