diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2004-09-15 03:49:14 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2004-09-15 03:49:14 +0000 |
| commit | 72b565d6528fd64f6e11226fa353f81e98317944 (patch) | |
| tree | add0497d5c41014e900156a6efdbb9484e92a92a | |
| parent | 59e0aaef033d97e8820da07ef5dde1a7d7ef7ac4 (diff) | |
| download | ATCD-72b565d6528fd64f6e11226fa353f81e98317944.tar.gz | |
ChangeLogTag:Tue Sep 14 22:44:39 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu>
| -rw-r--r-- | ChangeLog | 15 | ||||
| -rw-r--r-- | THANKS | 2 | ||||
| -rw-r--r-- | ace/INET_Addr.cpp | 7 |
3 files changed, 16 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog index 11bb89d1c2c..ee2b601c5a0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +Tue Sep 14 22:44:39 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu> + + * ace/Inet_Addr.cpp: + + Fix for the problem reported by Charlie Duke, which is that + ACE_INET_Addr::string_to_addr cannot accept an address string + produced by ACE_INET_Addr::addr_to_string method. The output of + addr_to_string method is of the form "[ipv4]:port" while the + string_to_addr accepts "ipv4:port" i.e. cannot handle "[]". + + The fix for this is not to include "[]" in + string_to_addr. Thanks to Charlie Duke <cduke at fvc dot com>. + + * THANKS: Updated Charlie's email address. + Tue Sep 14 15:02:05 2004 Dale Wilson <wilson_d@ociweb.com> * NEWS: @@ -870,7 +870,7 @@ Pierre Oberson <oberson at nagra-kudelski dot ch> Chris Uzdavinis <chris at atdesk dot com> Ishay Green <ishaygreen at hotmail dot com> Andrey Nechypurenko <andreynech at yahoo dot com> -Charlie Duke <cduke at cuseeme dot com> +Charlie Duke <cduke at fvc dot com> Jonathan Luellen <jluellen at scires dot com> Andrew Psaltis <apsaltis at mho dot net> Erik Jones <ej at pcslink dot com> diff --git a/ace/INET_Addr.cpp b/ace/INET_Addr.cpp index ac100d46117..a80a2fd06a9 100644 --- a/ace/INET_Addr.cpp +++ b/ace/INET_Addr.cpp @@ -40,9 +40,6 @@ ACE_INET_Addr::addr_to_string (ACE_TCHAR s[], ACE_OS::strlen (this->get_host_addr ())) + ACE_OS::strlen ("65536") // Assume the max port number. + sizeof (':') -#if defined ACE_HAS_IPV6 - + ACE_OS::strlen ("[]") -#endif + sizeof ('\0'); // For trailing '\0'. if (size < total_len) @@ -50,11 +47,7 @@ ACE_INET_Addr::addr_to_string (ACE_TCHAR s[], else { ACE_OS::sprintf (s, -#if defined ACE_HAS_IPV6 - ACE_LIB_TEXT ("[%s]:%d"), -#else ACE_LIB_TEXT ("%s:%d"), -#endif ACE_TEXT_CHAR_TO_TCHAR (ipaddr_format == 0 ? this->get_host_name () : this->get_host_addr ()), |