diff options
| -rw-r--r-- | ACE/ChangeLog | 5 | ||||
| -rw-r--r-- | ACE/ace/MEM_Connector.cpp | 28 | ||||
| -rw-r--r-- | ACE/ace/SOCK_Dgram_Mcast.cpp | 6 | ||||
| -rw-r--r-- | ACE/ace/Service_Manager.cpp | 6 | ||||
| -rw-r--r-- | ACE/ace/Vector_T.inl | 2 |
5 files changed, 32 insertions, 15 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 539e1fcba9b..b69ba773a96 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,8 @@ +Mon Apr 28 12:21:55 UTC 2008 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> + + * ace/Vector_T.inl (ACE_Vector): Zapped the "this->" in "this->max_size()". + Thanks to Karl-Heinz <wind at itq dot de> for reporting this. + Mon Apr 28 12:13:54 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> * include/makeinclude/platform_sunos5_common.GNU: diff --git a/ACE/ace/MEM_Connector.cpp b/ACE/ace/MEM_Connector.cpp index c66641404bd..bfab7ba8d3b 100644 --- a/ACE/ace/MEM_Connector.cpp +++ b/ACE/ace/MEM_Connector.cpp @@ -2,6 +2,7 @@ // $Id$ #include "ace/MEM_Connector.h" +#include "ace/OS_NS_netdb.h" ACE_RCSID(ace, MEM_Connector, "$Id$") @@ -69,15 +70,22 @@ ACE_MEM_Connector::connect (ACE_MEM_Stream &new_stream, ACE_TRACE ("ACE_MEM_Connector::connect"); if (!this->address_.same_host (remote_sap)) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("(%P|%t) MEM_Connector can't connect ") - ACE_TEXT ("to %s:%d which is not a local endpoint ") - ACE_TEXT ("(local address is %s:%d)\n"), - ACE_TEXT_CHAR_TO_TCHAR (remote_sap.get_host_name ()), - remote_sap.get_port_number (), - ACE_TEXT_CHAR_TO_TCHAR (this->address_.get_host_name ()), - this->address_.get_port_number ()), - -1); + { + char remote_hoststr[MAXHOSTNAMELEN+1] = "<unknown>"; + remote_sap.get_host_name (remote_hoststr, MAXHOSTNAMELEN+1); + char local_hoststr[MAXHOSTNAMELEN+1] = "<unknown>"; + this->address_.get_host_name (local_hoststr, MAXHOSTNAMELEN+1); + + ACE_ERROR_RETURN ((LM_ERROR, + ACE_TEXT ("(%P|%t) MEM_Connector can't connect") + ACE_TEXT ("to %s:%d which is not a local endpoint ") + ACE_TEXT ("(local address is %s:%d)\n"), + ACE_TEXT_CHAR_TO_TCHAR (remote_hoststr), + remote_sap.get_port_number (), + ACE_TEXT_CHAR_TO_TCHAR (local_hoststr), + this->address_.get_port_number ()), + -1); + } else this->address_.set_port_number (remote_sap.get_port_number ()); @@ -111,7 +119,7 @@ ACE_MEM_Connector::connect (ACE_MEM_Stream &new_stream, ACE_TEXT ("ACE_MEM_Connector::connect error receiving strategy\n")), -1); - // If either side don't support MT, we will not use it. + // If either side don't support MT, we will not use it. #if defined (ACE_WIN32) || !defined (_ACE_USE_SV_SEM) if (! (this->preferred_strategy_ == ACE_MEM_IO::MT && server_strategy == ACE_MEM_IO::MT)) diff --git a/ACE/ace/SOCK_Dgram_Mcast.cpp b/ACE/ace/SOCK_Dgram_Mcast.cpp index baa49f521e5..41bd3dd9d83 100644 --- a/ACE/ace/SOCK_Dgram_Mcast.cpp +++ b/ACE/ace/SOCK_Dgram_Mcast.cpp @@ -363,10 +363,11 @@ ACE_SOCK_Dgram_Mcast::subscribe_ifs (const ACE_INET_Addr &mcast_addr, // Convert to 0-based for indexing, next loop check. if (if_addrs[if_cnt].get_type () != AF_INET || if_addrs[if_cnt].is_loopback ()) continue; + char hostaddr[INET6_ADDRSTRLEN]; if (this->join (mcast_addr, reuse_addr, ACE_TEXT_CHAR_TO_TCHAR - (if_addrs[if_cnt].get_host_addr ())) == 0) + (if_addrs[if_cnt].get_host_addr (hostaddr, INET6_ADDRSTRLEN))) == 0) ++nr_subscribed; } } @@ -722,9 +723,10 @@ ACE_SOCK_Dgram_Mcast::unsubscribe_ifs (const ACE_INET_Addr &mcast_addr, // Convert to 0-based for indexing, next loop check if (if_addrs[if_cnt].get_type () != AF_INET || if_addrs[if_cnt].is_loopback ()) continue; + char hostaddr[INET6_ADDRSTRLEN]; if (this->leave (mcast_addr, ACE_TEXT_CHAR_TO_TCHAR - (if_addrs[if_cnt].get_host_addr ())) == 0) + (if_addrs[if_cnt].get_host_addr (hostaddr, INET6_ADDRSTRLEN))) == 0) ++nr_unsubscribed; } } diff --git a/ACE/ace/Service_Manager.cpp b/ACE/ace/Service_Manager.cpp index 979187be847..05f53c7be3c 100644 --- a/ACE/ace/Service_Manager.cpp +++ b/ACE/ace/Service_Manager.cpp @@ -11,6 +11,7 @@ #include "ace/WFMO_Reactor.h" #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_string.h" +#include "ace/OS_NS_netdb.h" ACE_RCSID (ace, Service_Manager, @@ -301,10 +302,11 @@ ACE_Service_Manager::handle_input (ACE_HANDLE) ACE_INET_Addr sa; if (this->client_stream_.get_remote_addr (sa) == -1) return -1; - + char hoststr[MAXHOSTNAMELEN+1] = "<unknow>"; + sa.get_host_name (hoststr, MAXHOSTNAMELEN+1); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("accepted from host %s at port %d\n"), - ACE_TEXT_CHAR_TO_TCHAR (sa.get_host_name ()), + ACE_TEXT_CHAR_TO_TCHAR (hoststr), sa.get_port_number ())); } diff --git a/ACE/ace/Vector_T.inl b/ACE/ace/Vector_T.inl index 8dea22cd361..9c552efea5f 100644 --- a/ACE/ace/Vector_T.inl +++ b/ACE/ace/Vector_T.inl @@ -11,7 +11,7 @@ ACE_Vector<T, DEFAULT_SIZE>::ACE_Vector (const size_t init_size, ACE_Allocator* alloc) : ACE_Array<T> (init_size == 0 ? DEFAULT_SIZE : init_size, alloc), length_ (0), - curr_max_size_ (this->max_size ()) + curr_max_size_ (max_size ()) { } |