diff options
| author | Steve Huston <shuston@riverace.com> | 2018-03-13 17:03:33 -0400 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 2018-03-13 17:03:33 -0400 |
| commit | 99f855f9f3ab5102ce07424fd2968f8e330462a6 (patch) | |
| tree | fd549081049157511aca24a1bb0e9b35290989e2 | |
| parent | ba891f62e7f7d1d5255cbff26bf31f19d299a028 (diff) | |
| download | ATCD-99f855f9f3ab5102ce07424fd2968f8e330462a6.tar.gz | |
Fix IPv4 case
| -rw-r--r-- | ACE/ace/SOCK_Dgram.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/ACE/ace/SOCK_Dgram.cpp b/ACE/ace/SOCK_Dgram.cpp index 3726fb24398..60f148441f1 100644 --- a/ACE/ace/SOCK_Dgram.cpp +++ b/ACE/ace/SOCK_Dgram.cpp @@ -121,22 +121,23 @@ ACE_SOCK_Dgram::shared_open (const ACE_Addr &local, { ACE_TRACE ("ACE_SOCK_Dgram::shared_open"); bool error = false; -#if !defined (ACE_HAS_IPV6) || (!defined (IPPROTO_IPV6) || !defined (IPV6_V6ONLY)) +#if !defined (ACE_HAS_IPV6) ACE_UNUSED_ARG (ipv6_only); -#endif /* !defined (ACE_HAS_IPV6) || (!defined (IPPROTO_IPV6) || !defined (IPV6_V6ONLY)) */ +#endif /* !defined (ACE_HAS_IPV6) */ if (local == ACE_Addr::sap_any) { -#if defined (ACE_HAS_IPV6) && defined (IPPROTO_IPV6) && defined (IPV6_V6ONLY) +#if defined (ACE_HAS_IPV6) int setting = !!ipv6_only; - if (-1 == ACE_OS::setsockopt (this->get_handle (), + if (protocol_family == PF_INET6 && + -1 == ACE_OS::setsockopt (this->get_handle (), IPPROTO_IPV6, IPV6_V6ONLY, (char *)&setting, sizeof (setting))) error = true; else -#endif /* ACE_HAS_IPV6 && IPPROTO_IPV6 && IPV6_V6ONLY */ +#endif /* ACE_HAS_IPV6 */ if (protocol_family == PF_INET #if defined (ACE_HAS_IPV6) |