third-party-mirrors/hans
1
0
Fork 0
mirror of https://github.com/norohind/hans.git synced 2025-04-21 16:37:36 +03:00
Code Issues Projects Releases Wiki Activity

Fix server name resolution

Browse Source 
When resolving the name of a server, the result was always assumed to
be an IPv4 address, even if an IPv6 address was actually returned.

Use `getaddrinfo` instead of `gethostbyname` and specify that we are
only interested in IPv4 addresses.
This commit is contained in:
Friedrich Schöller 2017-05-11 00:43:58 +02:00
parent f0eb5a46ac
commit 0801a67257
1 changed files with 17 additions and 10 deletions

27
src/main.cpp

@ -36,6 +36,10 @@
#include <sys/socket.h>
#include <signal.h>
#ifndef AI_V4MAPPED // Not supported on OpenBSD 6.0
#define AI_V4MAPPED 0
#endif
static Worker *worker = NULL;
static void sig_term_handler(int)
@ -208,19 +212,22 @@ int main(int argc, char *argv[])
}
else
{
uint32_t serverIp = inet_addr(serverName);
if (serverIp == INADDR_NONE)
{
struct hostent* he = gethostbyname(serverName);
if (!he)
{
syslog(LOG_ERR, "gethostbyname: %s", hstrerror(h_errno));
return 1;
}
struct addrinfo hints = {0};
struct addrinfo *res = NULL;
serverIp = *(uint32_t *)he->h_addr;
hints.ai_family = AF_INET;
hints.ai_flags = AI_V4MAPPED | AI_ADDRCONFIG;
int err = getaddrinfo(serverName, NULL, &hints, &res);
if (err)
{
syslog(LOG_ERR, "getaddrinfo: %s", gai_strerror(err));
return 1;
}
sockaddr_in *sockaddr = reinterpret_cast<sockaddr_in *>(res->ai_addr);
uint32_t serverIp = sockaddr->sin_addr.s_addr;
worker = new Client(mtu, device, ntohl(serverIp), maxPolls, password, uid, gid, changeEchoId, changeEchoSeq, clientIp);
}