diff options
| author | Huang-Ming Huang <huangming.huang@gmail.com> | 2017-04-17 13:28:32 -0500 |
|---|---|---|
| committer | Huang-Ming Huang <huangming.huang@gmail.com> | 2017-04-17 13:28:32 -0500 |
| commit | 98c20bb9fbf0b474f1addc519e43168a50dc9fa8 (patch) | |
| tree | 1c5196de0f50fbd38d7e902c94e77606987191b9 | |
| parent | 44c422e3d406b095f5299e0b5a1c684a0e547b5c (diff) | |
| download | ATCD-98c20bb9fbf0b474f1addc519e43168a50dc9fa8.tar.gz | |
Fix PR #400 incorrect revert
| -rw-r--r-- | ACE/ace/INET_Addr.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/ACE/ace/INET_Addr.cpp b/ACE/ace/INET_Addr.cpp index ccc26bf20ec..6dfd75ce171 100644 --- a/ACE/ace/INET_Addr.cpp +++ b/ACE/ace/INET_Addr.cpp @@ -366,9 +366,12 @@ ACE_INET_Addr::set (u_short port_number, this->reset_i (); ACE_OS::memset (&this->inet_addr_, 0, sizeof this->inet_addr_); +#if defined ACE_HAS_IPV6 && defined ACE_USES_IPV4_IPV6_MIGRATION + if (address_family == AF_UNSPEC && !ACE::ipv6_enabled ()) + address_family = AF_INET; +#endif /* ACE_HAS_IPV6 && ACE_USES_IPV4_IPV6_MIGRATION */ + #ifdef ACE_HAS_IPV6 - if (address_family == AF_UNSPEC && ACE::ipv6_enabled ()) - address_family = AF_INET6; if (address_family != AF_INET && ACE_OS::inet_pton (AF_INET6, host_name, |