Skip to content

Fix: Only using a single resolved IP when connecting with hostname #488

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 1 commit into from
Nov 13, 2020
Merged

Fix: Only using a single resolved IP when connecting with hostname #488

Show file tree
Hide file tree
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
9 changes: 9 additions & 0 deletions src/resolver.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,15 @@ class Resolver : public RefCounted<Resolver> {

inc_ref(); // For the event loop

// If no hints are provided then use a default filter.
struct addrinfo default_hints;
if (hints == NULL) {
hints = &default_hints;
memset(hints, 0, sizeof(struct addrinfo));
hints->ai_family = AF_UNSPEC;
hints->ai_socktype = SOCK_STREAM;
}

if (timeout > 0) {
timer_.start(loop, timeout, bind_callback(&Resolver::on_timeout, this));
}
Expand Down
7 changes: 4 additions & 3 deletions src/socket_connector.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,9 +286,10 @@ void SocketConnector::on_resolve(Resolver* resolver) {
const AddressVec& addresses(resolver->addresses());
LOG_DEBUG("Resolved the addresses %s for hostname %s", to_string(addresses).c_str(),
hostname_.c_str());
resolved_address_ = Address(
addresses[resolved_address_offset_.fetch_add(MEMORY_ORDER_RELAXED) % addresses.size()],
address_.server_name()); // Keep the server name for debugging

size_t offset = resolved_address_offset_.fetch_add(1, MEMORY_ORDER_RELAXED);
resolved_address_ = Address(addresses[offset % addresses.size()],
address_.server_name()); // Keep the server name for debugging
internal_connect(resolver->loop());
} else if (is_canceled() || resolver->is_canceled()) {
finish();
Expand Down