Skip to content

Choose correct local address for targeted IP family #85

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Choose correct local address for targeted IP family #85

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
1 change: 0 additions & 1 deletion src/config.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ class Config {
, max_reusable_write_objects_(CASS_DEFAULT_MAX_REUSABLE_WRITE_OBJECTS)
, prepare_on_all_hosts_(CASS_DEFAULT_PREPARE_ON_ALL_HOSTS)
, prepare_on_up_or_add_host_(CASS_DEFAULT_PREPARE_ON_UP_OR_ADD_HOST)
, local_address_(CASS_DEFAULT_LOCAL_ADDRESS, CASS_DEFAULT_LOCAL_ADDRESS_PORT)
, no_compact_(CASS_DEFAULT_NO_COMPACT)
, is_client_id_set_(false)
, host_listener_(new DefaultHostListener())
Expand Down
2 changes: 0 additions & 2 deletions src/constants.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,6 @@
#define CASS_DEFAULT_NUM_CONNECTIONS_PER_HOST 1
#define CASS_DEFAULT_PREPARE_ON_ALL_HOSTS true
#define CASS_DEFAULT_PREPARE_ON_UP_OR_ADD_HOST true
#define CASS_DEFAULT_LOCAL_ADDRESS "0.0.0.0"
#define CASS_DEFAULT_LOCAL_ADDRESS_PORT 0
#define CASS_DEFAULT_PORT 9042
#define CASS_DEFAULT_QUEUE_SIZE_IO 8192
#define CASS_DEFAULT_CONSTANT_RECONNECT_WAIT_TIME_MS 2000u
Expand Down
30 changes: 29 additions & 1 deletion src/socket_connector.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,7 @@ void SocketConnector::internal_connect(uv_loop_t* loop) {
// This needs to be done after setting the socket to properly cleanup.
const Address& local_address = settings_.local_address;
if (local_address.is_valid()) {
// use configured local address
Address::SocketStorage storage;
LOG_DEBUG("Binding socket. local_address=%s, remote=%s",
local_address.to_string(true).c_str(), socket_->address().to_string(true).c_str());
Expand All @@ -187,7 +188,34 @@ void SocketConnector::internal_connect(uv_loop_t* loop) {
return;
}
} else {
LOG_WARN("Cannot bind to an invalid `local_address` %s:%d", local_address.to_string().c_str(), local_address.port());
// determine local address matching resolved addresses family
if (resolved_address_.family() == Address::IPv4) {
Address::SocketStorage storage;
storage.addr_in()->sin_family = AF_INET;
storage.addr_in()->sin_addr.s_addr = INADDR_ANY;
storage.addr_in()->sin_port = local_address.port();
int rc = uv_tcp_bind(socket->handle(), storage.addr(), 0);
if (rc != 0) {
on_error(SOCKET_ERROR_BIND, "Unable to bind local address: " + String(uv_strerror(rc)));

return;
}
} else if (resolved_address_.family() == Address::IPv6) {
Address::SocketStorage storage;
storage.addr_in6()->sin6_family = AF_INET6;
storage.addr_in6()->sin6_addr = in6addr_any;
storage.addr_in6()->sin6_port = local_address.port();
storage.addr_in6()->sin6_flowinfo = 0;
storage.addr_in6()->sin6_scope_id = 0;
int rc = uv_tcp_bind(socket->handle(), storage.addr(), 0);
if (rc != 0) {
on_error(SOCKET_ERROR_BIND, "Unable to bind local address: " + String(uv_strerror(rc)));

return;
}
} else {
LOG_WARN("Cannot bind to local address for unknown family (%d) of resolved address %s.", resolved_address_.family(), resolved_address_.to_string().c_str());
}
}

if (settings_.ssl_context) {
Expand Down