diff options
| author | Steve Huston <shuston@riverace.com> | 2001-09-14 22:30:57 +0000 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 2001-09-14 22:30:57 +0000 |
| commit | c1757facd9c76c7aae65fe3735b95b63f7e6b947 (patch) | |
| tree | f3271f4bdac113d96cd4e29d448ca0e4306ccddc | |
| parent | 8eaa6678291e4593d4afcaec8631af1cab4fd262 (diff) | |
| download | ATCD-c1757facd9c76c7aae65fe3735b95b63f7e6b947.tar.gz | |
ChangeLogTag:(IPv6 changes) Fri Sep 14 18:25:39 2001 Steve Huston <shuston@riverace.com>
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-02a | 3 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 3 | ||||
| -rw-r--r-- | ace/INET_Addr.cpp | 15 |
4 files changed, 15 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog index ad817093c6e..d9cf51f5962 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,9 @@ the hosts not providing getipnodebyname (uses gethostbyname2 instead) and getipnodebyaddr (no substitute). + * ace/INET_Addr.cpp (get_ip_address): Fixed a "fall off the end" + warning for the IPv6 case. + (IPv6 changes) Fri Sep 14 17:36:21 2001 Steve Huston <shuston@riverace.com> * ace/SOCK.cpp (get_local_addr): After fetching the address, be diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index ad817093c6e..d9cf51f5962 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -4,6 +4,9 @@ the hosts not providing getipnodebyname (uses gethostbyname2 instead) and getipnodebyaddr (no substitute). + * ace/INET_Addr.cpp (get_ip_address): Fixed a "fall off the end" + warning for the IPv6 case. + (IPv6 changes) Fri Sep 14 17:36:21 2001 Steve Huston <shuston@riverace.com> * ace/SOCK.cpp (get_local_addr): After fetching the address, be diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index ad817093c6e..d9cf51f5962 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -4,6 +4,9 @@ the hosts not providing getipnodebyname (uses gethostbyname2 instead) and getipnodebyaddr (no substitute). + * ace/INET_Addr.cpp (get_ip_address): Fixed a "fall off the end" + warning for the IPv6 case. + (IPv6 changes) Fri Sep 14 17:36:21 2001 Steve Huston <shuston@riverace.com> * ace/SOCK.cpp (get_local_addr): After fetching the address, be diff --git a/ace/INET_Addr.cpp b/ace/INET_Addr.cpp index ff21887b7ba..624cb127e68 100644 --- a/ace/INET_Addr.cpp +++ b/ace/INET_Addr.cpp @@ -843,15 +843,12 @@ ACE_INET_Addr::get_ip_address (void) const ACE_OS_String::memcpy (&addr, thisaddrptr, sizeof (addr)); return ACE_NTOHL (addr); } - else - { - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("ACE_INET_Addr::get_ip_address: address is a IPv6 address not IPv4\n"))); - errno = EAFNOSUPPORT; - return 0; - } + + ACE_ERROR ((LM_ERROR, + ACE_LIB_TEXT ("ACE_INET_Addr::get_ip_address: address is a IPv6 address not IPv4\n"))); + errno = EAFNOSUPPORT; + return 0; } -#else - return ntohl (ACE_UINT32 (this->inet_addr4_.sin_addr.s_addr)); #endif /* ACE_HAS_IPV6 */ + return ntohl (ACE_UINT32 (this->inet_addr_.in4_.sin_addr.s_addr)); } |