diff options
| -rw-r--r-- | ACE/ChangeLog | 7 | ||||
| -rw-r--r-- | ACE/ace/MEM_Connector.cpp | 26 | ||||
| -rw-r--r-- | ACE/ace/SOCK_Dgram_Mcast.cpp | 6 | ||||
| -rw-r--r-- | ACE/ace/Service_Manager.cpp | 8 |
4 files changed, 21 insertions, 26 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index eb94f98ebd3..4bc01166d67 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,10 @@ +Tue Apr 29 07:23:10 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/MEM_Connector.cpp: + * ace/Service_Manager.cpp: + * ace/SOCK_Dgram_Mcast.cpp: + Reverted accidental commits from Doug + Tue Apr 29 06:32:10 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> * bin/MakeProjectCreator/modules/VXTestProjectCreator.pm: diff --git a/ACE/ace/MEM_Connector.cpp b/ACE/ace/MEM_Connector.cpp index bfab7ba8d3b..5be1f3985a8 100644 --- a/ACE/ace/MEM_Connector.cpp +++ b/ACE/ace/MEM_Connector.cpp @@ -2,7 +2,6 @@ // $Id$ #include "ace/MEM_Connector.h" -#include "ace/OS_NS_netdb.h" ACE_RCSID(ace, MEM_Connector, "$Id$") @@ -70,22 +69,15 @@ ACE_MEM_Connector::connect (ACE_MEM_Stream &new_stream, ACE_TRACE ("ACE_MEM_Connector::connect"); if (!this->address_.same_host (remote_sap)) - { - 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); - } + 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); else this->address_.set_port_number (remote_sap.get_port_number ()); diff --git a/ACE/ace/SOCK_Dgram_Mcast.cpp b/ACE/ace/SOCK_Dgram_Mcast.cpp index 41bd3dd9d83..baa49f521e5 100644 --- a/ACE/ace/SOCK_Dgram_Mcast.cpp +++ b/ACE/ace/SOCK_Dgram_Mcast.cpp @@ -363,11 +363,10 @@ 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 (hostaddr, INET6_ADDRSTRLEN))) == 0) + (if_addrs[if_cnt].get_host_addr ())) == 0) ++nr_subscribed; } } @@ -723,10 +722,9 @@ 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 (hostaddr, INET6_ADDRSTRLEN))) == 0) + (if_addrs[if_cnt].get_host_addr ())) == 0) ++nr_unsubscribed; } } diff --git a/ACE/ace/Service_Manager.cpp b/ACE/ace/Service_Manager.cpp index 05f53c7be3c..67b527fa79a 100644 --- a/ACE/ace/Service_Manager.cpp +++ b/ACE/ace/Service_Manager.cpp @@ -11,7 +11,6 @@ #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, @@ -302,11 +301,10 @@ 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 (hoststr), + ACE_TEXT ("accepted from host %C at port %d\n"), + sa.get_host_name (), sa.get_port_number ())); } |