Skip to content

feat: allow specify hostnames instead of hardcoded IPs #67

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
double-k-3033 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat: allow specify hostnames instead of hardcoded IPs #67

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 42 additions & 2 deletions src/node/general/tcp_util.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,14 @@
#include <cassert>
#include <cstring>
#include <stdexcept>
#ifdef _WIN32
#include <winsock2.h>
#include <ws2tcpip.h>
#else
#include <netdb.h>
#include <sys/socket.h>
#include <sys/types.h>
#endif

namespace {
std::optional<uint16_t> parse_port(const std::string_view& s)
Expand Down Expand Up @@ -113,11 +121,43 @@ EndpointAddress::EndpointAddress(Reader& r)
{
}

namespace {
std::optional<IPv4> resolve_hostname(const std::string& hostname)
{
struct addrinfo hints, *res;
memset(&hints, 0, sizeof(hints));
hints.ai_family = AF_INET; // IPv4 only
hints.ai_socktype = SOCK_STREAM;

int status = getaddrinfo(hostname.c_str(), nullptr, &hints, &res);
if (status != 0) {
return {};
}

std::optional<IPv4> result;
if (res != nullptr && res->ai_family == AF_INET) {
struct sockaddr_in* ipv4_addr = reinterpret_cast<struct sockaddr_in*>(res->ai_addr);
result = IPv4(*ipv4_addr);
}

freeaddrinfo(res);
return result;
}
}

std::optional<EndpointAddress> EndpointAddress::parse(const std::string_view& s)
{
size_t d1 = s.find(":");
auto ipv4str { s.substr(0, d1) };
auto ip = IPv4::parse(ipv4str);
auto hoststr { s.substr(0, d1) };

// First try to parse as IP address
auto ip = IPv4::parse(hoststr);

// If not a valid IP, try DNS resolution
if (!ip) {
ip = resolve_hostname(std::string(hoststr));
}

if (!ip)
return {};
if (d1 != std::string::npos) {
Expand Down