diff options
| author | Phil Mesnier <mesnier_p@ociweb.com> | 2006-09-20 21:39:55 +0000 |
|---|---|---|
| committer | Phil Mesnier <mesnier_p@ociweb.com> | 2006-09-20 21:39:55 +0000 |
| commit | 55a5c60a07f5c0f1c6c998fbaa5dd0905d6cbdcf (patch) | |
| tree | 754d85ff2d961e2e9b53d2dc1161aea6854f753f | |
| parent | d9fa726dde12379a630ddb503027c21d2d55eea3 (diff) | |
| download | ATCD-55a5c60a07f5c0f1c6c998fbaa5dd0905d6cbdcf.tar.gz | |
Wed Sep 20 21:37:58 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com>
| -rw-r--r-- | TAO/ChangeLog | 7 | ||||
| -rw-r--r-- | TAO/tao/IIOP_Acceptor.cpp | 26 |
2 files changed, 21 insertions, 12 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 6804e418e97..814749c9ed8 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,10 @@ +Wed Sep 20 21:37:58 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> + + * tao/IIOP_Acceptor.cpp: + + Fix for non-IPV6 builds. This relates back to the test for an + explicitly supplied any addr. + Wed Sep 20 21:02:14 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> * tao/IIOP_Acceptor.cpp: diff --git a/TAO/tao/IIOP_Acceptor.cpp b/TAO/tao/IIOP_Acceptor.cpp index f701b438222..c1a78f3e02c 100644 --- a/TAO/tao/IIOP_Acceptor.cpp +++ b/TAO/tao/IIOP_Acceptor.cpp @@ -703,19 +703,21 @@ TAO_IIOP_Acceptor::parse_address (const char *address, tmp_host[len] = '\0'; } } - else if (!host_defaulted) - { - if (port_separator_loc != 0) - { - // Extract out just the host part of the address. - size_t const len = port_separator_loc - address; - ACE_OS::memcpy (tmp_host, address, len); - tmp_host[len] = '\0'; - } - else - ACE_OS::strcpy (tmp_host, address); - } + else #endif /* ACE_HAS_IPV6 */ + if (!host_defaulted) + { + if (port_separator_loc != 0) + { + // Extract out just the host part of the address. + size_t const len = port_separator_loc - address; + ACE_OS::memcpy (tmp_host, address, len); + tmp_host[len] = '\0'; + } + else + ACE_OS::strcpy (tmp_host, address); + } + if (!ipv6_in_host && !host_defaulted) { if (addr.set((unsigned short)0,tmp_host) != 0) |