Skip to content

Improved support on Windows platforms with differing IPv4/IPv6 support #954

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 3 commits into
base: master
Choose a base branch
from
Open

Improved support on Windows platforms with differing IPv4/IPv6 support #954

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4f48ced
Improved support on Windows platforms with differing IPv4/IPv6 suppor…
wkbrd Jun 15, 2019
778724c
Merge branch 'master' into INET_Addr_Windows_Improvements
jwillemsen Feb 1, 2025
cd43908
Merge branch 'master' into INET_Addr_Windows_Improvements
jwillemsen Feb 3, 2025
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
30 changes: 22 additions & 8 deletions ACE/ace/INET_Addr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,11 @@ ACE_INET_Addr::set (u_short port_number,

addrinfo hints;
ACE_OS::memset (&hints, 0, sizeof hints);
#if defined (ACE_WIN32)
hints.ai_family = AF_UNSPEC;
#else
hints.ai_family = address_family;
#endif
// The ai_flags used to contain AI_ADDRCONFIG as well but that prevented
// lookups from completing if there is no, or only a loopback, IPv6
// interface configured. See Bugzilla 4211 for more info.
Expand Down Expand Up @@ -426,17 +430,27 @@ ACE_INET_Addr::set (u_short port_number,

this->set_type (res->ai_family);

for (addrinfo *curr = res; curr; curr = curr->ai_next)
// Perform two passes, first pass is for same address family, second pass is for other families
for (int i=0; i<2; i++)
{
ip46 addr;
ACE_OS::memcpy (&addr, curr->ai_addr, curr->ai_addrlen);
for (addrinfo *curr = res; curr; curr = curr->ai_next)
{
ip46 addr;
if((curr->ai_family == address_family && i == 0) || (curr->ai_family != address_family && i == 1))
{
if(curr->ai_family == address_family)
this->set_type (curr->ai_family); //if the initial family is wrong, but a later one is correct

ACE_OS::memcpy (&addr, curr->ai_addr, curr->ai_addrlen);
#ifdef ACE_HAS_IPV6
if (curr->ai_family == AF_INET6)
addr.in6_.sin6_port = encode ? ACE_NTOHS (port_number) : port_number;
else
if (curr->ai_family == AF_INET6)
addr.in6_.sin6_port = encode ? ACE_NTOHS (port_number) : port_number;
else
#endif
addr.in4_.sin_port = encode ? ACE_NTOHS (port_number) : port_number;
this->inet_addrs_.push_back (addr);
addr.in4_.sin_port = encode ? ACE_NTOHS (port_number) : port_number;
this->inet_addrs_.push_back (addr);
}
}
}

ACE_OS::freeaddrinfo (res);
Expand Down
Loading