Skip to content

Fix build on latest c-ares #331

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

Merged
merged 2 commits into from
Apr 3, 2024
Merged

Fix build on latest c-ares #331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
560a7e4
Fix build on latest c-ares
marty1885 Apr 3, 2024
53a8cd4
Disable botan build on MacOs
marty1885 Apr 3, 2024
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
4 changes: 3 additions & 1 deletion .github/workflows/macos-clang.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@ jobs:
link: [ 'STATIC', 'SHARED' ]
# Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
build-type: ['Debug', 'Release']
tls-provider: ['', 'openssl', 'botan']
# Botan needs std::ranges but clang on macOS doesn't support it yet
#tls-provider: ['', 'openssl', 'botan']
tls-provider: ['', 'openssl']

steps:
- name: Install dependencies
Expand Down
48 changes: 33 additions & 15 deletions trantor/net/inner/AresResolver.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,17 @@ bool Resolver::isCAresUsed()
AresResolver::LibraryInitializer::LibraryInitializer()
{
ares_library_init(ARES_LIB_INIT_ALL);

hints_ = new ares_addrinfo_hints;
hints_->ai_flags = 0;
hints_->ai_family = AF_INET;
hints_->ai_socktype = 0;
hints_->ai_protocol = 0;
}
AresResolver::LibraryInitializer::~LibraryInitializer()
{
ares_library_cleanup();
delete hints_;
}

AresResolver::LibraryInitializer AresResolver::libraryInitializer_;
Expand Down Expand Up @@ -124,11 +131,12 @@ void AresResolver::resolveInLoop(const std::string& hostname,
#endif
init();
QueryData* queryData = new QueryData(this, cb, hostname);
ares_gethostbyname(ctx_,
hostname.c_str(),
AF_INET,
&AresResolver::ares_hostcallback_,
queryData);
ares_getaddrinfo(ctx_,
hostname.c_str(),
NULL,
libraryInitializer_.hints_,
&AresResolver::ares_hostcallback_,
queryData);
struct timeval tv;
struct timeval* tvp = ares_timeout(ctx_, NULL, &tv);
double timeout = getSeconds(tvp);
Expand Down Expand Up @@ -166,23 +174,33 @@ void AresResolver::onTimer()
}

void AresResolver::onQueryResult(int status,
struct hostent* result,
struct ares_addrinfo* result,
const std::string& hostname,
const ResolverResultsCallback& callback)
{
LOG_TRACE << "onQueryResult " << status;
auto inets_ptr = std::make_shared<std::vector<trantor::InetAddress>>();
if (result)
{
auto pptr = (struct in_addr**)result->h_addr_list;
for (; *pptr != nullptr; pptr++)
auto pptr = (struct ares_addrinfo_node*)result->nodes;
for (; pptr != NULL; pptr = pptr->ai_next)
{
struct sockaddr_in addr;
memset(&addr, 0, sizeof addr);
addr.sin_family = AF_INET;
addr.sin_port = 0;
addr.sin_addr = *reinterpret_cast<in_addr*>(*pptr);
inets_ptr->emplace_back(trantor::InetAddress{addr});
trantor::InetAddress inet;
if (pptr->ai_family == AF_INET)
{
struct sockaddr_in* addr4 = (struct sockaddr_in*)pptr->ai_addr;
inets_ptr->emplace_back(trantor::InetAddress{*addr4});
}
else if (pptr->ai_family == AF_INET6)
{
struct sockaddr_in6* addr6 =
(struct sockaddr_in6*)pptr->ai_addr;
inets_ptr->emplace_back(trantor::InetAddress{*addr6});
}
else
{
// TODO: Handle unknown family?
}
}
}
if (inets_ptr->empty())
Expand Down Expand Up @@ -237,7 +255,7 @@ void AresResolver::onSockStateChange(int sockfd, bool read, bool write)
void AresResolver::ares_hostcallback_(void* data,
int status,
int timeouts,
struct hostent* hostent)
struct ares_addrinfo* hostent)
{
(void)timeouts;
QueryData* query = static_cast<QueryData*>(data);
Expand Down
8 changes: 5 additions & 3 deletions trantor/net/inner/AresResolver.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,9 @@

extern "C"
{
struct hostent;
struct ares_addrinfo;
struct ares_channeldata;
struct ares_addrinfo_hints;
using ares_channel = struct ares_channeldata*;
}
namespace trantor
Expand Down Expand Up @@ -157,7 +158,7 @@ class AresResolver : public Resolver,
void onRead(int sockfd);
void onTimer();
void onQueryResult(int status,
struct hostent* result,
struct ares_addrinfo* result,
const std::string& hostname,
const ResolverResultsCallback& callback);
void onSockCreate(int sockfd, int type);
Expand All @@ -166,7 +167,7 @@ class AresResolver : public Resolver,
static void ares_hostcallback_(void* data,
int status,
int timeouts,
struct hostent* hostent);
struct ares_addrinfo* hostent);
#ifdef _WIN32
static int ares_sock_createcallback_(SOCKET sockfd, int type, void* data);
#else
Expand All @@ -184,6 +185,7 @@ class AresResolver : public Resolver,
{
LibraryInitializer();
~LibraryInitializer();
ares_addrinfo_hints* hints_;
};
static LibraryInitializer libraryInitializer_;
};
Expand Down