From 0aa49ef5c2d1ccab20888c3257678acb986cbd67 Mon Sep 17 00:00:00 2001 From: mk1 Date: Fri, 20 Jul 2001 13:13:05 +0000 Subject: ChangeLogTag: Fri Jul 20 08:10:00 2001 Michael Kircher --- TAO/tao/Strategies/DIOP_Acceptor.cpp | 7 +----- TAO/tao/Strategies/DIOP_Connection_Handler.cpp | 3 +-- TAO/tao/Strategies/DIOP_Connector.cpp | 13 +++------- TAO/tao/Strategies/DIOP_Transport.cpp | 34 +++----------------------- 4 files changed, 9 insertions(+), 48 deletions(-) (limited to 'TAO/tao/Strategies') diff --git a/TAO/tao/Strategies/DIOP_Acceptor.cpp b/TAO/tao/Strategies/DIOP_Acceptor.cpp index 0cb8f29f33d..d0febad299a 100644 --- a/TAO/tao/Strategies/DIOP_Acceptor.cpp +++ b/TAO/tao/Strategies/DIOP_Acceptor.cpp @@ -381,8 +381,7 @@ TAO_DIOP_Acceptor::open_default (TAO_ORB_Core *orb_core, // address. ACE_INET_Addr addr; - // @@ Michael: The following needs to be verified. - if (addr.set (ACE_DEFAULT_SERVER_PORT, // old: ACE_static_cast(u_short, 0), + if (addr.set (ACE_DEFAULT_SERVER_PORT, ACE_static_cast(ACE_UINT32, INADDR_ANY), 1) != 0) return -1; @@ -393,8 +392,6 @@ TAO_DIOP_Acceptor::open_default (TAO_ORB_Core *orb_core, int TAO_DIOP_Acceptor::open_i (const ACE_INET_Addr& addr) { - // @@ Michael: UDP changes --------------- - ACE_NEW_RETURN (this->connection_handler_, TAO_DIOP_Connection_Handler (this->orb_core_, this->lite_flag_, @@ -410,8 +407,6 @@ TAO_DIOP_Acceptor::open_i (const ACE_INET_Addr& addr) this->orb_core_->reactor ()->register_handler (this->connection_handler_, ACE_Event_Handler::READ_MASK); } - // ------------------------------------ - // Set the port for each addr. If there is more than one network // interface then the endpoint created on each interface will be on diff --git a/TAO/tao/Strategies/DIOP_Connection_Handler.cpp b/TAO/tao/Strategies/DIOP_Connection_Handler.cpp index 4b4891c1348..ec2f9243681 100644 --- a/TAO/tao/Strategies/DIOP_Connection_Handler.cpp +++ b/TAO/tao/Strategies/DIOP_Connection_Handler.cpp @@ -386,8 +386,7 @@ TAO_DIOP_Connection_Handler::handle_input (ACE_HANDLE) resume_handle.set_flag (TAO_Resume_Handle::TAO_HANDLE_LEAVE_SUSPENDED); } // @@ Michael: - // We always return 0, as we do not have any - // send errors. + // We always return 0, as we do not have any send errors. return 0; } diff --git a/TAO/tao/Strategies/DIOP_Connector.cpp b/TAO/tao/Strategies/DIOP_Connector.cpp index 52095095184..71e3774d97d 100644 --- a/TAO/tao/Strategies/DIOP_Connector.cpp +++ b/TAO/tao/Strategies/DIOP_Connector.cpp @@ -70,7 +70,7 @@ TAO_DIOP_Connector::open (TAO_ORB_Core *orb_core) { this->orb_core (orb_core); - // @@ Michael: We do not use traditional connection management. + // @@ Michael: We do not use regular connection management. return 0; } @@ -78,8 +78,6 @@ TAO_DIOP_Connector::open (TAO_ORB_Core *orb_core) int TAO_DIOP_Connector::close (void) { - // @@ Michael: UDP Addition ------------------------------------ - // The list of service handlers cleans itself?? SvcHandlerIterator iter (svc_handler_table_); @@ -89,9 +87,8 @@ TAO_DIOP_Connector::close (void) delete (*iter).int_id_; iter++; } - // ----------------------------------------------------------------- - // @@ Michael: We do not use traditional connection management. + // @@ Michael: We do not use regular connection management. return 0; } @@ -135,8 +132,6 @@ TAO_DIOP_Connector::connect (TAO_GIOP_Invocation *invocation, TAO_DIOP_Connection_Handler *svc_handler = 0; - // @@ Michael -- UDP Additions ---------------------------- - if (svc_handler_table_.find (remote_address, svc_handler) == -1) { TAO_DIOP_Connection_Handler *svc_handler_i = 0; @@ -162,9 +157,7 @@ TAO_DIOP_Connector::connect (TAO_GIOP_Invocation *invocation, svc_handler->get_handle ())); } - // --------------------------------------------------------- - - // @@ Michael: We do not use traditional connection management. + // @@ Michael: We do not use regular connection management. transport = TAO_Transport::_duplicate (svc_handler->transport ()); diff --git a/TAO/tao/Strategies/DIOP_Transport.cpp b/TAO/tao/Strategies/DIOP_Transport.cpp index 1e74bc6f5f1..8ed6aa9b4a6 100644 --- a/TAO/tao/Strategies/DIOP_Transport.cpp +++ b/TAO/tao/Strategies/DIOP_Transport.cpp @@ -38,20 +38,10 @@ TAO_DIOP_Transport::TAO_DIOP_Transport (TAO_DIOP_Connection_Handler *handler, { // @@ Michael: Set the input CDR size to ACE_MAX_DGRAM_SIZE so that // we read the whole UDP packet on a single read. - /* if (flag) - { - // Use the lite version of the protocol - ACE_NEW (this->messaging_object_, - TAO_GIOP_Message_Lite (orb_core, - ACE_MAX_DGRAM_SIZE)); - } - else*/ - { - // Use the normal GIOP object - ACE_NEW (this->messaging_object_, - TAO_GIOP_Message_Base (orb_core, - ACE_MAX_DGRAM_SIZE)); - } + + ACE_NEW (this->messaging_object_, + TAO_GIOP_Message_Base (orb_core, + ACE_MAX_DGRAM_SIZE)); } TAO_DIOP_Transport::~TAO_DIOP_Transport (void) @@ -233,22 +223,6 @@ TAO_DIOP_Transport::register_handler_i (void) // disturbs the general DIOP assumptions of not being // interested in any network failures, we ignore ICMP messages. return 0; - /* - // @@ It seems like this method should go away, the right reactor is - // picked at object creation time. - ACE_Reactor *r = this->orb_core_->reactor (); - - if (r == this->connection_handler_->reactor ()) - return 0; - - // Set the flag in the Connection Handler - this->connection_handler_->is_registered (1); - - - // Register the handler with the reactor - return r->register_handler (this->connection_handler_, - ACE_Event_Handler::READ_MASK); - */ } -- cgit v1.2.1