mirrors/dragonflydb-dragonfly
1
0
Fork 0
mirror of https://github.com/dragonflydb/dragonfly.git synced 2024-12-14 11:58:02 +00:00
Code Activity

chore: Use c-ares for resolving hosts in ProtocolClient (#2719)

Browse source 
We already have a Fiber-aware DNS resolver in Helio, so it's trivial to
change and use.

I tested this end-to-end and it really resolves DNS addresses, not just
localhost.

Fixes #947
This commit is contained in:
Shahar Mike 2024-03-12 14:39:22 +02:00 committed by GitHub
parent d6107e55c5
commit 8a5ed442d1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 4 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
src/server/protocol_client.cc
View file

@ -28,6 +28,7 @@ extern "C" {
#include "server/main_service.h"
#include "server/rdb_load.h"
#include "strings/human_readable.h"
#include "util/fibers/dns_resolve.h"
#ifdef DFLY_USE_SSL
#include "util/tls/tls_socket.h"
@ -92,51 +93,6 @@ static ProtocolClient::SSL_CTX* CreateSslClientCntx() {
}
#endif
int ResolveDns(std::string_view host, char* dest) {
struct addrinfo hints, *servinfo;
memset(&hints, 0, sizeof(hints));
hints.ai_family = AF_UNSPEC;
hints.ai_socktype = SOCK_STREAM;
hints.ai_protocol = IPPROTO_TCP;
hints.ai_flags = AI_ALL;
int res = getaddrinfo(host.data(), NULL, &hints, &servinfo);
if (res != 0)
return res;
static_assert(INET_ADDRSTRLEN < INET6_ADDRSTRLEN);
// If possible, we want to use an IPv4 address.
char ipv4_addr[INET6_ADDRSTRLEN];
bool found_ipv4 = false;
char ipv6_addr[INET6_ADDRSTRLEN];
bool found_ipv6 = false;
for (addrinfo* p = servinfo; p != NULL; p = p->ai_next) {
CHECK(p->ai_family == AF_INET || p->ai_family == AF_INET6);
if (p->ai_family == AF_INET && !found_ipv4) {
struct sockaddr_in* ipv4 = (struct sockaddr_in*)p->ai_addr;
CHECK(nullptr !=
inet_ntop(p->ai_family, (void*)&ipv4->sin_addr, ipv4_addr, INET6_ADDRSTRLEN));
found_ipv4 = true;
break;
} else if (!found_ipv6) {
struct sockaddr_in6* ipv6 = (struct sockaddr_in6*)p->ai_addr;
CHECK(nullptr !=
inet_ntop(p->ai_family, (void*)&ipv6->sin6_addr, ipv6_addr, INET6_ADDRSTRLEN));
found_ipv6 = true;
}
}
CHECK(found_ipv4 || found_ipv6);
memcpy(dest, found_ipv4 ? ipv4_addr : ipv6_addr, INET6_ADDRSTRLEN);
freeaddrinfo(servinfo);
return 0;
}
error_code Recv(FiberSocketBase* input, base::IoBuf* dest) {
auto buf = dest->AppendBuffer();
io::Result<size_t> exp_size = input->Recv(buf);
@ -214,9 +170,9 @@ ProtocolClient::~ProtocolClient() {
error_code ProtocolClient::ResolveHostDns() {
char ip_addr[INET6_ADDRSTRLEN];
int resolve_res = ResolveDns(server_context_.host, ip_addr);
if (resolve_res != 0) {
LOG(ERROR) << "Dns error " << gai_strerror(resolve_res) << ", host: " << server_context_.host;
auto ec = util::fb2::DnsResolve(server_context_.host, 0, ip_addr, ProactorBase::me());
if (ec) {
LOG(ERROR) << "Dns error " << ec << ", host: " << server_context_.host;
return make_error_code(errc::host_unreachable);
}