diff options
92 files changed, 233 insertions, 2955 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 3d3456159e1..1dbe439dc89 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,106 @@ +Wed Jul 18 09:55:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> + + * orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp: + * orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.cpp: + * orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.h: + * orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.cpp: + * orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp: + * orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.h: + * orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp: + * orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.cpp: + * orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.h: + * orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp: + * orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.h: + * orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.cpp: + * orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.h: + * orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.cpp: + * orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h: + * orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp: + * orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h: + * orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.cpp: + * orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.h: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h: + * tao/Acceptor_Impl.cpp: + * tao/Acceptor_Impl.h: + * tao/Connector_Impl.cpp: + * tao/Connector_Impl.h: + * tao/GIOP_Message_Base.cpp: + * tao/GIOP_Message_Base.h: + * tao/GIOP_Message_Generator_Parser.cpp: + * tao/IIOP_Acceptor.cpp: + * tao/IIOP_Acceptor.h: + * tao/IIOP_Connection_Handler.cpp: + * tao/IIOP_Connection_Handler.h: + * tao/IIOP_Connector.cpp: + * tao/IIOP_Connector.h: + * tao/IIOP_Transport.cpp: + * tao/IIOP_Transport.h: + * tao/Makefile.am: + * tao/ORB_Core.cpp: + * tao/params.cpp: + * tao/params.h: + * tao/Strategies/COIOP_Acceptor.cpp: + * tao/Strategies/COIOP_Acceptor.h: + * tao/Strategies/COIOP_Connection_Handler.cpp: + * tao/Strategies/COIOP_Connection_Handler.h: + * tao/Strategies/COIOP_Connector.cpp: + * tao/Strategies/COIOP_Connector.h: + * tao/Strategies/COIOP_Transport.cpp: + * tao/Strategies/COIOP_Transport.h: + * tao/Strategies/DIOP_Acceptor.cpp: + * tao/Strategies/DIOP_Acceptor.h: + * tao/Strategies/DIOP_Connection_Handler.cpp: + * tao/Strategies/DIOP_Connection_Handler.h: + * tao/Strategies/DIOP_Connector.cpp: + * tao/Strategies/DIOP_Connector.h: + * tao/Strategies/DIOP_Transport.cpp: + * tao/Strategies/DIOP_Transport.h: + * tao/Strategies/SCIOP_Acceptor.cpp: + * tao/Strategies/SCIOP_Acceptor.h: + * tao/Strategies/SCIOP_Connector.cpp: + * tao/Strategies/SCIOP_Connector.h: + * tao/Strategies/SCIOP_Transport.cpp: + * tao/Strategies/SCIOP_Transport.h: + * tao/Strategies/SHMIOP_Acceptor.cpp: + * tao/Strategies/SHMIOP_Acceptor.h: + * tao/Strategies/SHMIOP_Connection_Handler.cpp: + * tao/Strategies/SHMIOP_Connection_Handler.h: + * tao/Strategies/SHMIOP_Connector.cpp: + * tao/Strategies/SHMIOP_Connector.h: + * tao/Strategies/SHMIOP_Transport.cpp: + * tao/Strategies/SHMIOP_Transport.h: + * tao/Strategies/UIOP_Acceptor.cpp: + * tao/Strategies/UIOP_Acceptor.h: + * tao/Strategies/UIOP_Connection_Handler.cpp: + * tao/Strategies/UIOP_Connection_Handler.h: + * tao/Strategies/UIOP_Connector.cpp: + * tao/Strategies/UIOP_Connector.h: + * tao/Strategies/UIOP_Transport.cpp: + * tao/Strategies/UIOP_Transport.h: + * tao/tao.mpc: + Removed GIOP_Messaging_Lite and the required flag + in all protocols. This was proposed some time ago + by Iliyan Jeliazkov and stored as bugzilla issue 2803. + The lite version had a lot of duplicated code but + there is a replacement (using cdr without alignment) + and isn't really used so far as we know. With the removal + of this we lower our footprint. + + * tao/Strategies/SCIOP_Lite_Factory.cpp: + * tao/Strategies/SCIOP_Lite_Factory.h: + * tao/Strategies/UIOP_Lite_Factory.cpp: + * tao/Strategies/UIOP_Lite_Factory.h: + * tao/IIOP_Lite_Factory.cpp: + * tao/IIOP_Lite_Factory.h: + * tao/GIOP_Message_Lite.cpp: + * tao/GIOP_Message_Lite.h: + Removed from the repository, no needed anymore + Wed Jul 18 05:07:13 UTC 2007 Abdullah Sowayan <abdullah.sowayan@lmco.com> * orbsvcs/orbsvcs/Scheduler_Factory.cpp: diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp index 888884ae81d..446b62f7522 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp @@ -480,7 +480,7 @@ TAO::HTIOP::Acceptor::open_i (const ACE::HTBP::Addr& addr, ACE_Reactor *reactor) { ACE_NEW_RETURN (this->creation_strategy_, - CREATION_STRATEGY (this->orb_core_,0), + CREATION_STRATEGY (this->orb_core_), -1); ACE_NEW_RETURN (this->concurrency_strategy_, diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.cpp index f990f16ce1b..0a0e452a2e7 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.cpp @@ -27,10 +27,8 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL //////////////////////////////////////////////////////////////////////////////// template <class SVC_HANDLER> -TAO::HTIOP::Creation_Strategy<SVC_HANDLER>::Creation_Strategy (TAO_ORB_Core *orb_core, - CORBA::Boolean flag) - : orb_core_ (orb_core), - lite_flag_ (flag) +TAO::HTIOP::Creation_Strategy<SVC_HANDLER>::Creation_Strategy (TAO_ORB_Core *orb_core) + : orb_core_ (orb_core) { } diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.h index 9bfc69280c4..e347fe8dd8e 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.h +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.h @@ -47,8 +47,7 @@ namespace TAO * state/info to the service handler upon creation. */ - Creation_Strategy (TAO_ORB_Core *orb_core, - CORBA::Boolean flag = 0); + Creation_Strategy (TAO_ORB_Core *orb_core); /// Create a SVC_HANDLER and set the ORB_Core pointer on it. int make_svc_handler (SVC_HANDLER *&sh); @@ -56,9 +55,6 @@ namespace TAO protected: /// Pointer to the ORB Core. TAO_ORB_Core *orb_core_; - - /// Should we use the Lite version for any protocol? - CORBA::Boolean lite_flag_; }; template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.cpp index de9b6a14cd2..4e0cb58398d 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.cpp @@ -155,8 +155,7 @@ TAO::HTIOP::Completion_Handler::make_svc_handler (TAO::HTIOP::Connection_Handler // Purge connections (if necessary) this->orb_core_->lane_resources ().transport_cache ().purge (); ACE_NEW_RETURN (sh, - TAO::HTIOP::Connection_Handler (this->orb_core_, - 0), + TAO::HTIOP::Connection_Handler (this->orb_core_), -1); } diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp index 245a8c38adb..0e8ea8f8e35 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp @@ -40,14 +40,13 @@ TAO::HTIOP::Connection_Handler::Connection_Handler (ACE_Thread_Manager *t) ACE_ASSERT (this->orb_core () != 0); } -TAO::HTIOP::Connection_Handler::Connection_Handler (TAO_ORB_Core *orb_core, - CORBA::Boolean flag) +TAO::HTIOP::Connection_Handler::Connection_Handler (TAO_ORB_Core *orb_core) : SVC_HANDLER (orb_core->thr_mgr (), 0, 0), TAO_Connection_Handler (orb_core) { TAO::HTIOP::Transport* specific_transport = 0; ACE_NEW(specific_transport, - TAO::HTIOP::Transport (this, orb_core, flag)); + TAO::HTIOP::Transport (this, orb_core)); this->transport (specific_transport); } diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.h index 0d7ce03cf39..4f2c4670883 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.h +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.h @@ -61,8 +61,7 @@ namespace TAO /// Constructor. <arg> parameter is used by the Acceptor to pass the /// protocol configuration properties for this connection. - Connection_Handler (TAO_ORB_Core *orb_core, - CORBA::Boolean flag); + Connection_Handler (TAO_ORB_Core *orb_core); /// Destructor. ~Connection_Handler (void); diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp index 96ff901bb8b..56f6c077d47 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp @@ -51,8 +51,7 @@ TAO::HTIOP::Connector::open (TAO_ORB_Core *orb_core) ACE_NEW_RETURN (this->connect_creation_strategy_, CONNECT_CREATION_STRATEGY (orb_core->thr_mgr (), - orb_core, - 0), + orb_core), -1); diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.cpp index 8c891ddaf38..103807e87ee 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.cpp @@ -15,8 +15,7 @@ Connect_Creation_Strategy (ACE_Thread_Manager* t, CORBA::Boolean flag) : ACE_Creation_Strategy <SVC_HANDLER> (t), orb_core_ (orb_core), - arg_ (arg), - lite_flag_ (flag) + arg_ (arg) { } @@ -27,7 +26,6 @@ TAO::HTIOP::Connect_Creation_Strategy<SVC_HANDLER>::make_svc_handler (SVC_HANDLE if (sh == 0) ACE_NEW_RETURN (sh, SVC_HANDLER (this->orb_core_, - this->lite_flag_, this->arg_), -1); @@ -53,8 +51,7 @@ TAO::HTIOP::Connect_Concurrency_Strategy<SVC_HANDLER>:: activate_svc_handler (SVC_HANDLER *sh, void *arg) { - return ACE_Concurrency_Strategy<SVC_HANDLER>::activate_svc_handler (sh, - arg); + return ACE_Concurrency_Strategy<SVC_HANDLER>::activate_svc_handler (sh, arg); } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.h index 5658b346919..640334dea07 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.h +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.h @@ -73,9 +73,6 @@ namespace TAO /// Some info/state to be passed to the service handler we create. void *arg_; - - /// Are we using GIOP lite? - CORBA::Boolean lite_flag_; }; diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp index 6325f6920dd..37a6041402b 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp @@ -18,7 +18,6 @@ #include "tao/ORB_Core.h" #include "tao/debug.h" #include "tao/GIOP_Message_Base.h" -#include "tao/GIOP_Message_Lite.h" #include "tao/Protocols_Hooks.h" #include "tao/Adapter.h" @@ -29,24 +28,13 @@ ACE_RCSID (HTIOP, TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO::HTIOP::Transport::Transport (TAO::HTIOP::Connection_Handler *h, - TAO_ORB_Core *orb_core, - CORBA::Boolean flag) + TAO_ORB_Core *orb_core) : TAO_Transport (OCI_TAG_HTIOP_PROFILE, orb_core), connection_handler_ (h), messaging_object_ (0) { - if (flag) - { - // Use the lite version of the protocol - ACE_NEW (this->messaging_object_, - TAO_GIOP_Message_Lite (orb_core)); - } - else - { - // Use the normal GIOP object - ACE_NEW (this->messaging_object_, - TAO_GIOP_Message_Base (orb_core, this)); - } + ACE_NEW (this->messaging_object_, + TAO_GIOP_Message_Base (orb_core, this)); } TAO::HTIOP::Transport::~Transport (void) @@ -77,7 +65,6 @@ TAO::HTIOP::Transport::send (iovec *iov, int iovcnt, size_t &bytes_transferred, const ACE_Time_Value *max_wait_time) { - ACE_UNUSED_ARG (max_wait_time); ssize_t retval = this->connection_handler_->peer ().sendv (iov, iovcnt, max_wait_time); if (retval > 0) diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.h index 6db9ca8dcfc..4015cda3b6f 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.h +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.h @@ -72,8 +72,7 @@ namespace TAO /// Constructor. Transport (Connection_Handler *handler, - TAO_ORB_Core *orb_core, - CORBA::Boolean flag); + TAO_ORB_Core *orb_core); /// Default destructor. ~Transport (void); diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.cpp index 89bea659c76..badd9295d96 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.cpp @@ -10,8 +10,8 @@ ACE_RCSID (SSLIOP, TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO::IIOP_SSL_Acceptor::IIOP_SSL_Acceptor (CORBA::Boolean flag) - : TAO_IIOP_Acceptor (flag), +TAO::IIOP_SSL_Acceptor::IIOP_SSL_Acceptor (void) + : TAO_IIOP_Acceptor (), base_acceptor_ (), creation_strategy_ (0), concurrency_strategy_ (0), diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.h b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.h index c984ccdf151..58e8c7523d0 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.h @@ -52,7 +52,7 @@ namespace TAO typedef TAO_Accept_Strategy<IIOP_SSL_Connection_Handler, ACE_SOCK_ACCEPTOR> TAO_IIOP_SSL_ACCEPT_STRATEGY; /// Constructor. - IIOP_SSL_Acceptor (CORBA::Boolean flag = false); + IIOP_SSL_Acceptor (void); /// Destructor. ~IIOP_SSL_Acceptor (void); diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.cpp index fb9a61ba32b..931390e9573 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.cpp @@ -66,9 +66,8 @@ TAO::IIOP_SSL_Connection_Handler::IIOP_SSL_Connection_Handler ( TAO::IIOP_SSL_Connection_Handler::IIOP_SSL_Connection_Handler ( - TAO_ORB_Core *orb_core, - CORBA::Boolean /* flag */) - : TAO_IIOP_Connection_Handler (orb_core, 0) + TAO_ORB_Core *orb_core) + : TAO_IIOP_Connection_Handler (orb_core) { // Delete the transport with TAO_IIOP_Connection_Handler. delete this->transport (); @@ -76,8 +75,7 @@ TAO::IIOP_SSL_Connection_Handler::IIOP_SSL_Connection_Handler ( IIOP_SSL_Transport* specific_transport = 0; ACE_NEW (specific_transport, IIOP_SSL_Transport (this, - orb_core, - 0)); + orb_core)); // store this pointer this->transport (specific_transport); diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h index 1bf1e5f50a0..20ebe586e3c 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h @@ -52,7 +52,7 @@ namespace TAO /// Constructor. IIOP_SSL_Connection_Handler (ACE_Thread_Manager* t = 0); - IIOP_SSL_Connection_Handler (TAO_ORB_Core *orb_core, CORBA::Boolean flag); + IIOP_SSL_Connection_Handler (TAO_ORB_Core *orb_core); /// Destructor. ~IIOP_SSL_Connection_Handler (void); diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp index ccb25c30a36..e0aa736b6de 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp @@ -19,8 +19,8 @@ ACE_RCSID (SSLIOP, TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO::IIOP_SSL_Connector::IIOP_SSL_Connector (CORBA::Boolean flag) - : TAO_IIOP_Connector (flag), +TAO::IIOP_SSL_Connector::IIOP_SSL_Connector (void) + : TAO_IIOP_Connector (), connect_strategy_ (), base_connector_ () { @@ -44,8 +44,7 @@ TAO::IIOP_SSL_Connector::open (TAO_ORB_Core *orb_core) ACE_NEW_RETURN (connect_creation_strategy, CONNECT_CREATION_STRATEGY (orb_core->thr_mgr (), - orb_core, - this->lite_flag_), + orb_core), -1); // Our activation strategy diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h index b051fa19cae..44dba5ecf25 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h @@ -45,7 +45,7 @@ namespace TAO public: /// Constructor. - IIOP_SSL_Connector (CORBA::Boolean flag = 0); + IIOP_SSL_Connector (void); /// Destructor. ~IIOP_SSL_Connector (void); diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.cpp index eceb03b8b86..a46b6a56790 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.cpp @@ -16,11 +16,8 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO::IIOP_SSL_Transport::IIOP_SSL_Transport ( IIOP_SSL_Connection_Handler *handler, - TAO_ORB_Core *orb_core, - CORBA::Boolean flag) - : TAO_IIOP_Transport (handler, - orb_core, - flag) + TAO_ORB_Core *orb_core) + : TAO_IIOP_Transport (handler, orb_core) { this->current_ = TAO::SSLIOP::Util::current (orb_core); diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.h b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.h index a6c1aa7ea0f..de3b22b5f0c 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.h @@ -59,8 +59,7 @@ namespace TAO public: /// Constructor. IIOP_SSL_Transport (IIOP_SSL_Connection_Handler *handler, - TAO_ORB_Core *orb_core, - CORBA::Boolean flag = 0); + TAO_ORB_Core *orb_core); /// Default destructor. ~IIOP_SSL_Transport (void); diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp index 2b974c46852..76c8b1ef88d 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp @@ -451,13 +451,8 @@ TAO::SSLIOP::Acceptor::ssliop_open_i (TAO_ORB_Core *orb_core, { this->orb_core_ = orb_core; - // Explicitly disable GIOPlite support since it introduces security - // holes. - static const int giop_lite = 0; - ACE_NEW_RETURN (this->creation_strategy_, - CREATION_STRATEGY (this->orb_core_, - giop_lite), + CREATION_STRATEGY (this->orb_core_), -1); ACE_NEW_RETURN (this->concurrency_strategy_, diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp index 9de5610dba1..3d06df6cbf0 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp @@ -40,9 +40,7 @@ TAO::SSLIOP::Connection_Handler::Connection_Handler ( ACE_ASSERT (0); } -TAO::SSLIOP::Connection_Handler::Connection_Handler ( - TAO_ORB_Core *orb_core, - CORBA::Boolean /* flag */) // SSLIOP does *not* support GIOPlite +TAO::SSLIOP::Connection_Handler::Connection_Handler (TAO_ORB_Core *orb_core) : SVC_HANDLER (orb_core->thr_mgr (), 0, 0), TAO_Connection_Handler (orb_core), current_ () @@ -51,7 +49,7 @@ TAO::SSLIOP::Connection_Handler::Connection_Handler ( TAO::SSLIOP::Transport* specific_transport = 0; ACE_NEW (specific_transport, - TAO::SSLIOP::Transport (this, orb_core, 0)); + TAO::SSLIOP::Transport (this, orb_core)); // store this pointer (indirectly increment ref count) this->transport (specific_transport); diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h index 3a518859b10..fa8e35deb57 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h @@ -57,8 +57,7 @@ namespace TAO Connection_Handler (ACE_Thread_Manager* t = 0); /// Constructor. - Connection_Handler (TAO_ORB_Core *orb_core, - CORBA::Boolean flag); + Connection_Handler (TAO_ORB_Core *orb_core); /// Destructor. ~Connection_Handler (void); diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp index c192d1b8066..b8f4854b3e1 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp @@ -53,9 +53,7 @@ TAO::SSLIOP::Connector::open (TAO_ORB_Core *orb_core) ACE_NEW_RETURN (connect_creation_strategy, CONNECT_CREATION_STRATEGY (orb_core->thr_mgr (), - orb_core, - 0 /* Forcibly disable TAO's GIOPlite feature. - It introduces a security hole. */), + orb_core), -1); // Our activation strategy diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp index 1ad4d0370c3..7197382521b 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp @@ -25,8 +25,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO::SSLIOP::Transport::Transport ( TAO::SSLIOP::Connection_Handler *handler, - TAO_ORB_Core *orb_core, - CORBA::Boolean /* flag */) + TAO_ORB_Core *orb_core) : TAO_Transport (IOP::TAG_INTERNET_IOP, orb_core), connection_handler_ (handler), messaging_object_ (0) diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h index fec7a5ee95f..e2756675674 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h @@ -65,8 +65,7 @@ namespace TAO /// Constructor. Transport (Connection_Handler *handler, - TAO_ORB_Core *orb_core, - CORBA::Boolean flag); + TAO_ORB_Core *orb_core); /// Default destructor. ~Transport (void); diff --git a/TAO/tao/Acceptor_Impl.cpp b/TAO/tao/Acceptor_Impl.cpp index a4791740fd4..64fcef87682 100644 --- a/TAO/tao/Acceptor_Impl.cpp +++ b/TAO/tao/Acceptor_Impl.cpp @@ -33,11 +33,9 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ////////////////////////////////////////////////////////////////////////////// template <class SVC_HANDLER> -TAO_Creation_Strategy<SVC_HANDLER>::TAO_Creation_Strategy (TAO_ORB_Core *orb_core, - CORBA::Boolean flag) +TAO_Creation_Strategy<SVC_HANDLER>::TAO_Creation_Strategy (TAO_ORB_Core *orb_core) : ACE_Creation_Strategy<SVC_HANDLER> (0, orb_core->reactor()), - orb_core_ (orb_core), - lite_flag_ (flag) + orb_core_ (orb_core) { } @@ -50,8 +48,7 @@ TAO_Creation_Strategy<SVC_HANDLER>::make_svc_handler (SVC_HANDLER *&sh) this->orb_core_->lane_resources ().transport_cache ().purge (); ACE_NEW_RETURN (sh, - SVC_HANDLER (this->orb_core_, - this->lite_flag_), + SVC_HANDLER (this->orb_core_), -1); } diff --git a/TAO/tao/Acceptor_Impl.h b/TAO/tao/Acceptor_Impl.h index 36311040936..5fc16834dce 100644 --- a/TAO/tao/Acceptor_Impl.h +++ b/TAO/tao/Acceptor_Impl.h @@ -41,8 +41,7 @@ public: /** * Constructor. */ - TAO_Creation_Strategy (TAO_ORB_Core *orb_core, - CORBA::Boolean flag = false); + TAO_Creation_Strategy (TAO_ORB_Core *orb_core); /// Create a SVC_HANDLER and set the ORB_Core pointer on it. int make_svc_handler (SVC_HANDLER *&sh); @@ -50,9 +49,6 @@ public: protected: /// Pointer to the ORB Core. TAO_ORB_Core *orb_core_; - - /// Should we use the Lite version for any protocol? - CORBA::Boolean lite_flag_; }; /** diff --git a/TAO/tao/Connector_Impl.cpp b/TAO/tao/Connector_Impl.cpp index 3e7c5742320..d8d203f00ac 100644 --- a/TAO/tao/Connector_Impl.cpp +++ b/TAO/tao/Connector_Impl.cpp @@ -14,11 +14,9 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template <class SVC_HANDLER> TAO_Connect_Creation_Strategy<SVC_HANDLER>:: TAO_Connect_Creation_Strategy (ACE_Thread_Manager* t, - TAO_ORB_Core *orb_core, - CORBA::Boolean flag) + TAO_ORB_Core *orb_core) : ACE_Creation_Strategy <SVC_HANDLER> (t), - orb_core_ (orb_core), - lite_flag_ (flag) + orb_core_ (orb_core) { } @@ -28,8 +26,7 @@ TAO_Connect_Creation_Strategy<SVC_HANDLER>::make_svc_handler (SVC_HANDLER *&sh) { if (sh == 0) ACE_NEW_RETURN (sh, - SVC_HANDLER (this->orb_core_, - this->lite_flag_), + SVC_HANDLER (this->orb_core_), -1); // We add to the #REFCOUNT# since the Connector needs this. See diff --git a/TAO/tao/Connector_Impl.h b/TAO/tao/Connector_Impl.h index f0fa11a2676..c40111ec7e4 100644 --- a/TAO/tao/Connector_Impl.h +++ b/TAO/tao/Connector_Impl.h @@ -50,8 +50,7 @@ public: /// Constructor. TAO_Connect_Creation_Strategy (ACE_Thread_Manager * = 0, - TAO_ORB_Core* orb_core = 0, - CORBA::Boolean flag = false); + TAO_ORB_Core* orb_core = 0); /// Makes TAO_*_Client_Connection_Handlers virtual int make_svc_handler (SVC_HANDLER *&sh); @@ -61,9 +60,6 @@ private: /// Pointer to the ORB_Core on which we are activated TAO_ORB_Core * const orb_core_; - - /// Are we using GIOP lite? - CORBA::Boolean const lite_flag_; }; @@ -90,14 +86,12 @@ public: /// Activates the Svc_Handler, and if the right wait strategy is in /// use, registers the handle with the reactor. - int activate_svc_handler (SVC_HANDLER *svc_handler, - void *arg); + int activate_svc_handler (SVC_HANDLER *svc_handler, void *arg); private: /// Pointer to the ORB Core. TAO_ORB_Core * const orb_core_; - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/GIOP_Message_Base.cpp b/TAO/tao/GIOP_Message_Base.cpp index 014e61a1cf0..a74dee7bcd4 100644 --- a/TAO/tao/GIOP_Message_Base.cpp +++ b/TAO/tao/GIOP_Message_Base.cpp @@ -1289,9 +1289,6 @@ TAO_GIOP_Message_Base::send_error (TAO_Transport *transport) 0, 0, 0, 0 }; - // @@ Q: How does this works with GIOP lite? - // A: It doesn't - this->dump_msg ("send_error", (const u_char *) error_message, TAO_GIOP_MESSAGE_HEADER_LEN); diff --git a/TAO/tao/GIOP_Message_Base.h b/TAO/tao/GIOP_Message_Base.h index 67f03e81a0e..9ba13f3f1f9 100644 --- a/TAO/tao/GIOP_Message_Base.h +++ b/TAO/tao/GIOP_Message_Base.h @@ -197,8 +197,7 @@ protected: /// Writes the GIOP header in to @a msg /// @note If the GIOP header happens to change in the future, we can /// push this method in to the generator_parser classes. - int write_protocol_header (TAO_GIOP_Message_Type t, - TAO_OutputCDR &msg); + int write_protocol_header (TAO_GIOP_Message_Type t, TAO_OutputCDR &msg); /// Make a GIOP_LOCATEREPLY and hand that over to the transport so /// that it can be sent over the connection. diff --git a/TAO/tao/GIOP_Message_Generator_Parser.cpp b/TAO/tao/GIOP_Message_Generator_Parser.cpp index bcef310c2e0..e50ddf43117 100644 --- a/TAO/tao/GIOP_Message_Generator_Parser.cpp +++ b/TAO/tao/GIOP_Message_Generator_Parser.cpp @@ -150,8 +150,7 @@ TAO_GIOP_Message_Generator_Parser::is_ready_for_bidirectional (void) const void TAO_GIOP_Message_Generator_Parser::marshal_reply_status ( TAO_OutputCDR &output, - TAO_Pluggable_Reply_Params_Base &reply - ) + TAO_Pluggable_Reply_Params_Base &reply) { switch (reply.reply_status_) { diff --git a/TAO/tao/GIOP_Message_Lite.cpp b/TAO/tao/GIOP_Message_Lite.cpp deleted file mode 100644 index e70a7fb4a7b..00000000000 --- a/TAO/tao/GIOP_Message_Lite.cpp +++ /dev/null @@ -1,1735 +0,0 @@ -//$Id$ - -#include "tao/GIOP_Message_Lite.h" -#include "tao/debug.h" -#include "tao/TAOC.h" -#include "tao/ORB_Core.h" -#include "tao/operation_details.h" -#include "tao/TAO_Server_Request.h" -#include "tao/GIOP_Message_Locate_Header.h" -#include "tao/LF_Strategy.h" -#include "tao/Transport.h" -#include "tao/Transport_Mux_Strategy.h" -#include "tao/Codeset_Manager.h" -#include "tao/SystemException.h" -#include "ace/Min_Max.h" - -ACE_RCSID (tao, - GIOP_Message_Lite, - "$Id$") - - -static const size_t TAO_GIOP_LITE_HEADER_LEN = 5; -static const size_t TAO_GIOP_LITE_MESSAGE_SIZE_OFFSET = 0; -static const size_t TAO_GIOP_LITE_MESSAGE_TYPE_OFFSET = 4; - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -TAO_GIOP_Message_Lite::TAO_GIOP_Message_Lite (TAO_ORB_Core *orb_core, - size_t /*input_cdr_size*/) - : orb_core_ (orb_core), - message_type_ (0), - message_size_ (0), - byte_order_ (TAO_ENCAP_BYTE_ORDER) -{ -} - - -TAO_GIOP_Message_Lite::~TAO_GIOP_Message_Lite (void) -{ -} - - -void -TAO_GIOP_Message_Lite::init (CORBA::Octet, - CORBA::Octet) -{ - return; -} - -TAO_OutputCDR & -TAO_GIOP_Message_Lite::out_stream (void) -{ - return this->cdr_; -} - -void -TAO_GIOP_Message_Lite::reset (void) -{ - this->message_type_ = 0; - this->message_size_ = 0; -} - - -int -TAO_GIOP_Message_Lite::generate_request_header ( - TAO_Operation_Details &op, - TAO_Target_Specification &spec, - TAO_OutputCDR &cdr - ) -{ - // Write the GIOPLite header first - if (!this->write_protocol_header (TAO_GIOP_REQUEST, - cdr)) - { - if (TAO_debug_level) - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("(%P|%t) Error in writing GIOP header \n"))); - - - return -1; - } - - // Now call the implementation for the rest of the header - if (!this->write_request_header (op, - spec, - cdr)) - { - if (TAO_debug_level) - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("(%P|%t) Error in writing request header \n"))); - - return -1; - } - - return 0; - -} - - -int -TAO_GIOP_Message_Lite::generate_locate_request_header ( - TAO_Operation_Details &op, - TAO_Target_Specification &spec, - TAO_OutputCDR &cdr - ) -{ - // Write the GIOPLite header first - if (!this->write_protocol_header (TAO_GIOP_LOCATEREQUEST, - cdr)) - { - if (TAO_debug_level) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("(%P|%t) Error in writing GIOPLite header \n"))); - } - - return -1; - } - - // Now call the implementation for the rest of the header - if (!this->write_locate_request_header (op.request_id (), - spec, - cdr)) - { - if (TAO_debug_level) - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("(%P|%t) Error in writing locate request header \n"))); - - return -1; - } - - return 0; -} - - -int -TAO_GIOP_Message_Lite::generate_reply_header ( - TAO_OutputCDR &cdr, - TAO_Pluggable_Reply_Params_Base ¶ms - ) -{ - // Write the GIOPLite header first - if (!this->write_protocol_header (TAO_GIOP_REPLY, - cdr)) - { - if (TAO_debug_level) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("(%P|%t) Error in writing GIOPLite header \n"))); - } - - return -1; - } - - // Now call the implementation for the rest of the header - if (!this->write_reply_header (cdr, - params)) - { - if (TAO_debug_level > 4) - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("(%P|%t) Error in writing reply header \n"))); - - return -1; - } - - return 0; -} - -int -TAO_GIOP_Message_Lite::generate_fragment_header (TAO_OutputCDR & /* cdr */, - CORBA::ULong /* request_id */) -{ - // GIOP fragmentation is not supported in GIOP lite. - return 0; -} - -int -TAO_GIOP_Message_Lite::format_message (TAO_OutputCDR &stream) -{ - // Get the header length - const size_t header_len = TAO_GIOP_LITE_HEADER_LEN; - - // Get the message size offset - const size_t offset = TAO_GIOP_LITE_MESSAGE_SIZE_OFFSET; - - // Ptr to first buffer. - char *buf = (char *) stream.buffer (); - - // Length of all buffers. - size_t total_len = - stream.total_length (); - - // NOTE: Here would also be a fine place to calculate a digital - // signature for the message and place it into a preallocated slot - // in the "ServiceContext". Similarly, this is a good spot to - // encrypt messages (or just the message bodies) if that's needed in - // this particular environment and that isn't handled by the - // networking infrastructure (e.g., IPSEC). - - CORBA::ULong bodylen = static_cast <CORBA::ULong> (total_len - header_len); - -#if !defined (ACE_ENABLE_SWAP_ON_WRITE) - *(reinterpret_cast <CORBA::ULong *> (buf + offset)) = bodylen; -#else - if (!stream.do_byte_swap ()) - *(reinterpret_cast <CORBA::ULong *> - (buf + offset)) = bodylen; - else - ACE_CDR::swap_4 (reinterpret_cast <char *> (&bodylen), - buf + offset); -#endif /* ACE_ENABLE_SWAP_ON_WRITE */ - - // Strictly speaking, should not need to loop here because the - // socket never gets set to a nonblocking mode ... some Linux - // versions seem to need it though. Leaving it costs little. - if (TAO_debug_level > 2) - { - // Check whether the output cdr stream is build up of multiple - // messageblocks. If so, consolidate them to one block that can be - // dumped - ACE_Message_Block* consolidated_block = 0; - if (stream.begin()->cont() != 0) - { - ACE_NEW_RETURN (consolidated_block, - ACE_Message_Block, - 0); - ACE_CDR::consolidate(consolidated_block, stream.begin()); - buf = (char *) (consolidated_block->rd_ptr ()); - } - /// - - this->dump_msg ("send", - reinterpret_cast <u_char *> (buf), - stream.length ()); - - // - delete consolidated_block; - consolidated_block = 0; - // - } - - return 0; -} - - -int -TAO_GIOP_Message_Lite::parse_incoming_messages (ACE_Message_Block &block) -{ - this->reset (); - - // Make sure we have enough bytes in the header to read all - // of the information. - if (block.length () < TAO_GIOP_LITE_HEADER_LEN) - { - return 1; - } - - // Get the read pointer - char *rd_ptr = block.rd_ptr (); - - // We don't need to do this sort of copy. But some compilers (read it - // as SunCC) have a problem in deferencing from the - // reinterpret_cast pointer of the <rd_ptr>, as the <rd_ptr> can be - // on stack. So let us go ahead with this copying... - char buf [4]; - buf[0] = *rd_ptr; - buf[1] = *(rd_ptr + 1); - buf[2] = *(rd_ptr + 2); - buf[3] = *(rd_ptr + 3); - - CORBA::ULong x = 0; -#if !defined (ACE_DISABLE_SWAP_ON_READ) - if (!(this->byte_order_ != TAO_ENCAP_BYTE_ORDER)) - { - x = *(reinterpret_cast <ACE_CDR::ULong*> (buf)); - } - else - { - ACE_CDR::swap_4 (buf, reinterpret_cast <char*> (&x)); - } -#else - x = *(reinterpret_cast <ACE_CDR::ULong*> (buf)); -#endif /* ACE_DISABLE_SWAP_ON_READ */ - - this->message_size_ = x; - - // Get the message type. - this->message_type_ = rd_ptr[TAO_GIOP_LITE_MESSAGE_TYPE_OFFSET]; - - return 0; -} - -TAO_Pluggable_Message_Type -TAO_GIOP_Message_Lite::message_type (void) const -{ - switch (this->message_type_) - { - case TAO_GIOP_REQUEST: - return TAO_PLUGGABLE_MESSAGE_REQUEST; - case TAO_GIOP_LOCATEREQUEST: - return TAO_PLUGGABLE_MESSAGE_LOCATEREQUEST; - - case TAO_GIOP_LOCATEREPLY: - return TAO_PLUGGABLE_MESSAGE_LOCATEREPLY; - case TAO_GIOP_REPLY: - return TAO_PLUGGABLE_MESSAGE_REPLY; - - case TAO_GIOP_CLOSECONNECTION: - return TAO_PLUGGABLE_MESSAGE_CLOSECONNECTION; - - case TAO_GIOP_CANCELREQUEST: - return TAO_PLUGGABLE_MESSAGE_CANCELREQUEST; - - case TAO_GIOP_MESSAGERROR: - case TAO_GIOP_FRAGMENT: - // Never happens: why?? - default: - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("TAO (%P|%t) %N:%l message_type : ") - ACE_TEXT ("wrong message.\n"))); - } - - // In case of some errors - return TAO_PLUGGABLE_MESSAGE_MESSAGERROR; -} - -int -TAO_GIOP_Message_Lite::parse_next_message (ACE_Message_Block &incoming, - TAO_Queued_Data &qd, - size_t &mesg_length) -{ - if (incoming.length () < TAO_GIOP_LITE_HEADER_LEN) - { - qd.missing_data_ = TAO_MISSING_DATA_UNDEFINED; - - return 0; /* incomplete header */ - } - else - { - if (this->parse_incoming_messages (incoming) == -1) - { - return -1; - } - - const size_t total_len = - this->message_size_ + TAO_GIOP_LITE_HEADER_LEN; - - if (total_len > incoming.length ()) - { - qd.missing_data_ = total_len - incoming.length (); - } - else - { - qd.missing_data_ = 0; - } - - this->init_queued_data (&qd); - - mesg_length = TAO_GIOP_LITE_HEADER_LEN + this->message_size_; - - return 1; /* parsed header successfully */ - } -} - -int -TAO_GIOP_Message_Lite::extract_next_message (ACE_Message_Block &incoming, - TAO_Queued_Data *&qd) -{ - if (incoming.length () < TAO_GIOP_LITE_HEADER_LEN) - { - if (incoming.length () > 0) - { - // Make a node which has a message block of the size of - // MESSAGE_HEADER_LEN. - qd = - this->make_queued_data (TAO_GIOP_LITE_HEADER_LEN); - - if (qd == 0) - { - return -1; /* out of memory */ - } - - qd->msg_block_->copy (incoming.rd_ptr (), - incoming.length ()); - qd->missing_data_ = TAO_MISSING_DATA_UNDEFINED; - } - return 0; - } - - if (this->parse_incoming_messages (incoming) == -1) - { - return -1; - } - - size_t copying_len = - this->message_size_ + TAO_GIOP_LITE_HEADER_LEN; - - qd = this->make_queued_data (copying_len); - - if (qd == 0) - { - return -1; /* out of memory */ - } - - if (copying_len > incoming.length ()) - { - qd->missing_data_ = copying_len - incoming.length (); - - copying_len = incoming.length (); - } - else - { - qd->missing_data_ = 0; - } - - qd->msg_block_->copy (incoming.rd_ptr (), - copying_len); - - incoming.rd_ptr (copying_len); - this->init_queued_data (qd); - - return 1; -} - -int -TAO_GIOP_Message_Lite::consolidate_node (TAO_Queued_Data *qd, - ACE_Message_Block &incoming) -{ - // Look to see whether we had atleast parsed the GIOP header ... - if (qd->missing_data_ == TAO_MISSING_DATA_UNDEFINED) - { - // The data length that has been stuck in there during the last - // read .... - size_t len = - qd->msg_block_->length (); - - // We know that we would have space for - // TAO_GIOP_MESSAGE_HEADER_LEN here. So copy that much of data - // from the <incoming> into the message block in <qd> - const size_t available = incoming.length (); - const size_t desired = TAO_GIOP_LITE_HEADER_LEN - len; - const size_t n_copy = ace_min (available, desired); - - // paranoid check, but would cause endless loop - if (n_copy == 0) - { - return -1; - } - - qd->msg_block_->copy (incoming.rd_ptr (), n_copy); - - // Move the rd_ptr () in the incoming message block.. - incoming.rd_ptr (n_copy); - - // verify there is now enough data to parse the header - if (qd->msg_block_->length () < TAO_GIOP_LITE_HEADER_LEN) - { - return 0; - } - - // Parse the message header now... - if (this->parse_incoming_messages (*qd->msg_block_) == -1) - return -1; - - // Now grow the message block so that we can copy the rest of - // the data... - if (ACE_CDR::grow (qd->msg_block_, - this->message_size_ + TAO_GIOP_LITE_HEADER_LEN) == -1) - { - /* memory allocation failed */ - return -1; - } - - // Copy the pay load.. - - // Calculate the bytes that needs to be copied in the queue... - size_t copy_len = this->message_size_; - - // If the data that needs to be copied is more than that is - // available to us .. - if (copy_len > incoming.length ()) - { - // Calculate the missing data.. - qd->missing_data_ = copy_len - incoming.length (); - - // Set the actual possible copy_len that is available... - copy_len = incoming.length (); - } - else - { - qd->missing_data_ = 0; - } - - // paranoid check - if (copy_len == 0) - { - return -1; - } - - // ..now we are set to copy the right amount of data to the - // node.. - qd->msg_block_->copy (incoming.rd_ptr (), - copy_len); - - // Set the <rd_ptr> of the <incoming>.. - incoming.rd_ptr (copy_len); - - // Get the other details... - this->init_queued_data (qd); - } - else - { - // @@todo: Need to abstract this out to a seperate method... - size_t copy_len = qd->missing_data_; - - if (copy_len > incoming.length ()) - { - // Calculate the missing data.. - qd->missing_data_ = copy_len - incoming.length (); - - // Set the actual possible copy_len that is available... - copy_len = incoming.length (); - } - - // Copy the right amount of data in to the node... - // node.. - qd->msg_block_->copy (incoming.rd_ptr (), - copy_len); - - // Set the <rd_ptr> of the <incoming>.. - qd->msg_block_->rd_ptr (copy_len); - - } - - return 0; -} - -int -TAO_GIOP_Message_Lite::process_request_message (TAO_Transport *transport, - TAO_Queued_Data *qd) -{ - // Set the upcall thread - this->orb_core_->lf_strategy ().set_upcall_thread ( - this->orb_core_->leader_follower ()); - - // A buffer that we will use to initialise the CDR stream - char repbuf[ACE_CDR::DEFAULT_BUFSIZE]; - -#if defined(ACE_INITIALIZE_MEMORY_BEFORE_USE) - (void) ACE_OS::memset (repbuf, - '\0', - sizeof repbuf); -#endif /* ACE_INITIALIZE_MEMORY_BEFORE_USE */ - - // Initialze an output CDR on the stack - TAO_OutputCDR output (repbuf, - sizeof repbuf, - TAO_ENCAP_BYTE_ORDER, - this->orb_core_->output_cdr_buffer_allocator (), - this->orb_core_->output_cdr_dblock_allocator (), - this->orb_core_->output_cdr_msgblock_allocator (), - this->orb_core_->orb_params ()->cdr_memcpy_tradeoff (), - qd->major_version_, - qd->minor_version_); - - transport->assign_translators(0,&output); - - // Get the read and write positions before we steal data. - size_t rd_pos = qd->msg_block_->rd_ptr () - qd->msg_block_->base (); - size_t wr_pos = qd->msg_block_->wr_ptr () - qd->msg_block_->base (); - rd_pos += TAO_GIOP_LITE_HEADER_LEN; - - if (TAO_debug_level > 0) - this->dump_msg ("recv", - reinterpret_cast <u_char *> (qd->msg_block_->rd_ptr ()), - qd->msg_block_->length ()); - - - // Create a input CDR stream. - // NOTE: We use the same data block in which we read the message and - // we pass it on to the higher layers of the ORB. So we dont to any - // copies at all here. The same is also done in the higher layers. - - TAO_InputCDR input_cdr (qd->msg_block_->data_block (), - ACE_Message_Block::DONT_DELETE, - rd_pos, - wr_pos, - qd->byte_order_, - qd->major_version_, - qd->minor_version_, - this->orb_core_); - - - // We know we have some request message. Check whether it is a - // GIOP_REQUEST or GIOP_LOCATE_REQUEST to take action. - switch (qd->msg_type_) - { - case TAO_PLUGGABLE_MESSAGE_REQUEST: - // Should be taken care by the state specific invocations. They - // could raise an exception or write things in the output CDR - // stream - return this->process_request (transport, - input_cdr, - output); - case TAO_PLUGGABLE_MESSAGE_LOCATEREQUEST: - return this->process_locate_request (transport, - input_cdr, - output); - default: - return -1; - } -} - -int -TAO_GIOP_Message_Lite::process_reply_message ( - TAO_Pluggable_Reply_Params ¶ms, - TAO_Queued_Data *qd - ) -{ - - - // Get the read and write positions before we steal data. - size_t rd_pos = qd->msg_block_->rd_ptr () - qd->msg_block_->base (); - size_t wr_pos = qd->msg_block_->wr_ptr () - qd->msg_block_->base (); - rd_pos += TAO_GIOP_LITE_HEADER_LEN; - - if (TAO_debug_level > 0) - this->dump_msg ("recv", - reinterpret_cast <u_char *> (qd->msg_block_->rd_ptr ()), - qd->msg_block_->length ()); - - - // Create a empty buffer on stack - // NOTE: We use the same data block in which we read the message and - // we pass it on to the higher layers of the ORB. So we dont to any - // copies at all here. The same is also done in the higher layers. - TAO_InputCDR input_cdr (qd->msg_block_->data_block (), - ACE_Message_Block::DONT_DELETE, - rd_pos, - wr_pos, - qd->byte_order_, - qd->major_version_, - qd->minor_version_, - this->orb_core_); - - // Reset the message state. Now, we are ready for the next nested - // upcall if any. - // this->message_handler_.reset (0); - - // We know we have some reply message. Check whether it is a - // GIOP_REPLY or GIOP_LOCATE_REPLY to take action. - - // Once we send the InputCDR stream we need to just forget about - // the stream and never touch that again for anything. We basically - // loose ownership of the data_block. - - // We know we have some reply message. Check whether it is a - // GIOP_REPLY or GIOP_LOCATE_REPLY to take action. - switch (qd->msg_type_) - { - case TAO_PLUGGABLE_MESSAGE_REPLY: - // Should be taken care by the state specific parsing - return this->parse_reply (input_cdr, - params); - case TAO_PLUGGABLE_MESSAGE_LOCATEREPLY: - // We call parse_reply () here because, the message format for - // the LOCATEREPLY & REPLY are same. - return this->parse_reply (input_cdr, - params); - default: - return -1; - } -} - -int -TAO_GIOP_Message_Lite::generate_exception_reply ( - TAO_OutputCDR &cdr, - TAO_Pluggable_Reply_Params_Base ¶ms, - const CORBA::Exception &x) -{ - // A new try/catch block, but if something goes wrong now we have no - // hope, just abort. - - try - { - // Make the GIOP & reply header. They are version specific. - this->write_reply_header (cdr, - params); - x._tao_encode (cdr); - } - catch (const ::CORBA::Exception&) - { - // Now we know that while handling the error an other error - // happened -> no hope, close connection. - - // Close the handle. - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t|%N|%l) cannot marshal exception, ") - ACE_TEXT ("generate_exception_reply ()\n"))); - return -1; - } - - return 0; -} - - -int -TAO_GIOP_Message_Lite::write_protocol_header ( - TAO_GIOP_Message_Type type, - TAO_OutputCDR &msg) -{ - // Reset the message type - msg.reset (); - - // @@ Bala: this is something to think harder about: right now we - // leave the space to store the length, and later we set it, but the - // way we do it is CDR specific... Maybe the XXXStream classes - // should support a 'save your current position' method that returns - // a 'Mememto' (check the GoF book), later the CDR stream could be - // restored to that state, and the size written to it. - // @@ Then again, i don't know how would that work with fragments - // (eventually we may want TAO to generate fragments), or protocols - // based on chunking.... - // - // Write a dummy <size> later it is set to the right value... @@ - CORBA::ULong size = 0; - msg.write_ulong (size); - - msg.write_octet ((CORBA::Octet) type); - - return 1; -} - - -int -TAO_GIOP_Message_Lite::process_request (TAO_Transport *transport, - TAO_InputCDR &cdr, - TAO_OutputCDR &output) -{ - // This will extract the request header, set <response_required> - // and <sync_with_server> as appropriate. - TAO_ServerRequest request (this, - cdr, - output, - transport, - this->orb_core_); - - CORBA::ULong request_id = 0; - CORBA::Boolean response_required = 0; - - int parse_error = 0; - - try - { - parse_error = - this->parse_request_header (request); - - TAO_Codeset_Manager *csm = request.orb_core()->codeset_manager(); - if (csm) - { - csm->process_service_context(request); - transport->assign_translators(&cdr,&output); - } - - // Throw an exception if the - if (parse_error != 0) - throw ::CORBA::MARSHAL (0, CORBA::COMPLETED_NO); - request_id = request.request_id (); - - response_required = request.response_expected (); - - CORBA::Object_var forward_to; - - // Do this before the reply is sent. - this->orb_core_->adapter_registry ()->dispatch (request.object_key (), - request, - forward_to - ); - - if (!CORBA::is_nil (forward_to.in ())) - { - // We should forward to another object... - TAO_Pluggable_Reply_Params reply_params (transport); - reply_params.request_id_ = request_id; - reply_params.reply_status_ = TAO_GIOP_LOCATION_FORWARD; - reply_params.svc_ctx_.length (0); - - // Send back the reply service context list. - reply_params.service_context_notowned (&request.reply_service_info ()); - - // Make the GIOP header and Reply header - this->generate_reply_header (output, - reply_params); - - if (!(output << forward_to.in ())) - { - if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("TAO (%P|%t) ERROR: Unable to marshal ") - ACE_TEXT ("forward reference.\n"))); - - return -1; - } - - int result = transport->send_message (output); - if (result == -1) - { - if (TAO_debug_level > 0) - { - // No exception but some kind of error, yet a - // response is required. - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("TAO: (%P|%t|%N|%l) %p: ") - ACE_TEXT ("cannot send reply\n"), - ACE_TEXT ("TAO_GIOP_Message_Lite::process_request"))); - } - } - return result; - } - } - // Only CORBA exceptions are caught here. - catch ( ::CORBA::Exception& ex) - { - int result = 0; - - if (response_required) - { - result = this->send_reply_exception (transport, - this->orb_core_, - request_id, - &request.reply_service_info (), - &ex); - if (result == -1) - { - if (TAO_debug_level > 0) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("TAO: (%P|%t|%N|%l) %p: ") - ACE_TEXT ("cannot send exception\n"), - ACE_TEXT ("process_request ()"))); - ex._tao_print_exception ( - "TAO_GIOP_Message_Lite::process_request[2]"); - } - } - - } - else if (TAO_debug_level > 0) - { - // It is unfortunate that an exception (probably a system - // exception) was thrown by the upcall code (even by the - // user) when the client was not expecting a response. - // However, in this case, we cannot close the connection - // down, since it really isn't the client's fault. - - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("(%P|%t) exception thrown ") - ACE_TEXT ("but client is not waiting a response\n"))); - - ex._tao_print_exception ("TAO: "); - } - - return result; - } - catch (...) - { - if (response_required) - { - CORBA::UNKNOWN exception ( - CORBA::SystemException::_tao_minor_code ( - TAO_UNHANDLED_SERVER_CXX_EXCEPTION, - 0 - ), - CORBA::COMPLETED_MAYBE - ); - - if (this->send_reply_exception (transport, - this->orb_core_, - request_id, - &request.reply_service_info (), - &exception) == -1 - && TAO_debug_level > 0) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("TAO (%P|%t) - TAO_GIOP_Message_Lite::process_request[3], ") - ACE_TEXT ("%p: ") - ACE_TEXT ("cannot send exception\n"), - ACE_TEXT ("process_request ()"))); - exception._tao_print_exception ( - "TAO_GIOP_Message_Lite::process_request[3]"); - } - } - else if (TAO_debug_level > 0) - { - // It is unfotunate that an exception (probably a system - // exception) was thrown by the upcall code (even by the - // user) when the client was not expecting a response. - // However, in this case, we cannot close the connection - // down, since it really isn't the client's fault. - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("(%P|%t|%N|%l) exception thrown ") - ACE_TEXT ("but client is not waiting a response\n"))); - } - - // Propagate the non-CORBA C++ exception up to the application - // server. - throw; - } - - return 0; -} - - -int -TAO_GIOP_Message_Lite::process_locate_request (TAO_Transport *transport, - TAO_InputCDR &input, - TAO_OutputCDR &output) -{ - // This will extract the request header, set <response_required> as - // appropriate. - TAO_GIOP_Locate_Request_Header locate_request (input, - this->orb_core_); - - TAO_GIOP_Locate_Status_Msg status_info; - - // Defaulting. - status_info.status = TAO_GIOP_UNKNOWN_OBJECT; - - CORBA::Boolean response_required = 1; - - try - { - int parse_error = - this->parse_locate_header (locate_request); - - if (parse_error != 0) - { - throw ::CORBA::MARSHAL (0, CORBA::COMPLETED_NO); - } - - // Execute a fake request to find out if the object is there or - // if the POA can activate it on demand... - char repbuf[ACE_CDR::DEFAULT_BUFSIZE]; - TAO_OutputCDR dummy_output (repbuf, - sizeof repbuf); - // This output CDR is not used! - - TAO::ObjectKey tmp_key (locate_request.object_key ().length (), - locate_request.object_key ().length (), - locate_request.object_key ().get_buffer (), - 0); - - // Set it to an error state - parse_error = 1; - CORBA::ULong req_id = locate_request.request_id (); - - // We will send the reply. The ServerRequest class need not send - // the reply - CORBA::Boolean deferred_reply = 1; - TAO_ServerRequest server_request (this, - req_id, - response_required, - deferred_reply, - tmp_key, - "_non_existent", - dummy_output, - transport, - this->orb_core_, - parse_error); - - if (parse_error != 0) - { - throw ::CORBA::MARSHAL (0, CORBA::COMPLETED_NO); - } - - CORBA::Object_var forward_to; - - this->orb_core_->adapter_registry ()->dispatch (server_request.object_key (), - server_request, - forward_to - ); - - if (!CORBA::is_nil (forward_to.in ())) - { - status_info.status = TAO_GIOP_OBJECT_FORWARD; - status_info.forward_location_var = forward_to; - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) - TAO_GIOP_Message_Lite::process_locate_request, ") - ACE_TEXT ("called: forwarding\n"))); - } - else if (server_request.exception_type () == TAO_GIOP_NO_EXCEPTION) - { - // We got no exception, so the object is here. - status_info.status = TAO_GIOP_OBJECT_HERE; - if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) - TAO_GIOP_Message_Lite::process_locate_request, ") - ACE_TEXT ("found\n"))); - } - else - { - status_info.forward_location_var = server_request.forward_location (); - - if (!CORBA::is_nil (status_info.forward_location_var.in ())) - { - status_info.status = TAO_GIOP_OBJECT_FORWARD; - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) - TAO_GIOP_Message_Lite::process_locate_request, ") - ACE_TEXT ("forwarding\n"))); - } - else - { - // Normal exception, so the object is not here - status_info.status = TAO_GIOP_UNKNOWN_OBJECT; - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) - TAO_GIOP_Message_Lite::process_locate_request, ") - ACE_TEXT ("not here\n"))); - } - } - } - - catch (const ::CORBA::Exception&) - { - // Normal exception, so the object is not here - status_info.status = TAO_GIOP_UNKNOWN_OBJECT; - if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) TAO_GIOP_Message_Lite::process_locate_request - ") - ACE_TEXT ("CORBA exception raised\n"))); - } - catch (...) - { - // Normal exception, so the object is not here - status_info.status = TAO_GIOP_UNKNOWN_OBJECT; - if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) TAO_GIOP_Message_Lite::process_locate_request - ") - ACE_TEXT ("C++ exception raised\n"))); - } - - return this->make_send_locate_reply (transport, - output, - locate_request, - status_info); -} - - -int -TAO_GIOP_Message_Lite::make_send_locate_reply ( - TAO_Transport *transport, - TAO_OutputCDR &output, - TAO_GIOP_Locate_Request_Header &request, - TAO_GIOP_Locate_Status_Msg &status_info - ) -{ - // Note here we are making the Locate reply header which is *QUITE* - // different from the reply header made by the make_reply () call.. - // Make the GIOP message header - this->write_protocol_header (TAO_GIOP_LOCATEREPLY, - output); - - // This writes the header & body - this->write_locate_reply_mesg (output, - request.request_id (), - status_info); - - // Send the message - int result = transport->send_message (output); - - // Print out message if there is an error - if (result == -1) - { - if (TAO_debug_level > 0) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("TAO: (%P|%t) %p: cannot send reply\n"), - ACE_TEXT ("TAO_GIOP_Message_Lite::make_send_locate_reply"))); - } - } - - return result; -} - -int -TAO_GIOP_Message_Lite::parse_reply (TAO_InputCDR &cdr, - TAO_Pluggable_Reply_Params ¶ms) -{ - - // Read the request id - if (!cdr.read_ulong (params.request_id_)) - { - if (TAO_debug_level > 0) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t|%N|%l) : ") - ACE_TEXT ("TAO_GIOP_Message_Lite::parse_reply, ") - ACE_TEXT ("extracting request id\n"))); - } - - return -1; - } - - CORBA::ULong rep_stat = 0; - - // and the reply status type. status can be NO_EXCEPTION, - // SYSTEM_EXCEPTION, USER_EXCEPTION, LOCATION_FORWARD - // CAnnot handle LOCATION_FORWARD_PERM here - if (!cdr.read_ulong (rep_stat)) - { - if (TAO_debug_level > 0) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t|%N|%l) : ") - ACE_TEXT ("TAO_GIOP_Message_Lite::parse_reply, ") - ACE_TEXT ("extracting reply status\n"))); - } - - return -1; - } - - // Pass the right Pluggable interface code to the transport layer - switch (rep_stat) - { - // Request completed successfully - case TAO_GIOP_NO_EXCEPTION: - params.reply_status_ = TAO_PLUGGABLE_MESSAGE_NO_EXCEPTION; - break; - - // Request terminated with user exception - case TAO_GIOP_USER_EXCEPTION: - params.reply_status_ = TAO_PLUGGABLE_MESSAGE_USER_EXCEPTION; - break; - // Request terminated with system exception - case TAO_GIOP_SYSTEM_EXCEPTION: - params.reply_status_ = TAO_PLUGGABLE_MESSAGE_SYSTEM_EXCEPTION; - break; - // Reply is a location forward type - case TAO_GIOP_LOCATION_FORWARD: - params.reply_status_ = TAO_PLUGGABLE_MESSAGE_LOCATION_FORWARD; - break; - default: - if (TAO_debug_level > 0) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%N|%l) Unknown reply status \n"))); - } - } - - params.input_cdr_= &cdr; - - if (params.transport_->tms ()->dispatch_reply (params) == -1) - { - // Something really critical happened, we will forget about - // every reply on this connection. - if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, - "TAO (%P|%t) - GIOP_Message_Lite[%d]::process_parsed_messages, " - "dispatch reply failed\n", - params.transport_->id ())); - - return -1; - } - - return 0; -} - - - -int -TAO_GIOP_Message_Lite::write_reply_header ( - TAO_OutputCDR &output, - TAO_Pluggable_Reply_Params_Base &reply - /* */ - ) -{ - // Write the GIOP Lite header first - this->write_protocol_header (TAO_GIOP_REPLY, - output); - - // Write the request ID - output.write_ulong (reply.request_id_); - - // Write the reply status - switch (reply.reply_status_) - { - case TAO_PLUGGABLE_MESSAGE_NO_EXCEPTION: - output.write_ulong (TAO_GIOP_NO_EXCEPTION); - break; - case TAO_PLUGGABLE_MESSAGE_LOCATION_FORWARD: - output.write_ulong (TAO_GIOP_LOCATION_FORWARD); - break; - case TAO_PLUGGABLE_MESSAGE_SYSTEM_EXCEPTION: - output.write_ulong (TAO_GIOP_SYSTEM_EXCEPTION); - break; - case TAO_PLUGGABLE_MESSAGE_USER_EXCEPTION: - output.write_ulong (TAO_GIOP_USER_EXCEPTION); - break; - default: - // Some other specifc exception - output.write_ulong (reply.reply_status_); - break; - } - - return 1; -} - -int -TAO_GIOP_Message_Lite::write_request_header ( - const TAO_Operation_Details &opdetails, - TAO_Target_Specification &spec, - TAO_OutputCDR &out_stream - ) -{ - out_stream << opdetails.request_id (); - - const CORBA::Octet response_flags = opdetails.response_flags (); - - // @@ (JP) Temporary hack until all of GIOP 1.2 is implemented. - if (response_flags == TAO_TWOWAY_RESPONSE_FLAG) - { - out_stream << ACE_OutputCDR::from_octet (1); - } - // Sync scope - ignored by server if request is not oneway. - else if (response_flags == CORBA::Octet (Messaging::SYNC_WITH_TRANSPORT) - || response_flags == CORBA::Octet (Messaging::SYNC_NONE) - || response_flags == CORBA::Octet (TAO::SYNC_EAGER_BUFFERING) - || response_flags == CORBA::Octet (TAO::SYNC_DELAYED_BUFFERING)) - { - // No response required. - out_stream << ACE_OutputCDR::from_octet (0); - } - else if (response_flags == CORBA::Octet (Messaging::SYNC_WITH_SERVER)) - { - // Return before dispatching servant. We're also setting the high - // bit here. This is a temporary fix until the rest of GIOP 1.2 is - // implemented in TAO. - out_stream << ACE_OutputCDR::from_octet (129); - } - else if (response_flags == CORBA::Octet (Messaging::SYNC_WITH_TARGET)) - { - // Return after dispatching servant. - out_stream << ACE_OutputCDR::from_octet (3); - } - else - { - // Until more flags are defined by the OMG. - return 0; - } - - // In this case we cannot recognise anything other than the Object - // key as the address disposition variable. But we do a sanity check - // anyway. - const TAO::ObjectKey *key = spec.object_key (); - - if (key != 0) - { - // Put in the object key - out_stream << *key; - } - else - { - if (TAO_debug_level) - { - ACE_DEBUG (( - LM_DEBUG, - ACE_TEXT ("(%N |%l) Unable to handle this request \n") - )); - } - - return 0; - } - - out_stream.write_string (opdetails.opname_len (), - opdetails.opname ()); - - return 1; -} - -int -TAO_GIOP_Message_Lite::write_locate_request_header ( - CORBA::ULong request_id, - TAO_Target_Specification &spec, - TAO_OutputCDR &msg - ) -{ - msg << request_id; - - // In this case we cannot recognise anything other than the Object - // key as the address disposition variable. But we do a sanity check - // anyway. - const TAO::ObjectKey *key = spec.object_key (); - - if (key) - { - // Put in the object key - msg << *key; - } - else - { - if (TAO_debug_level) - { - ACE_DEBUG (( - LM_DEBUG, - ACE_TEXT ("(%N |%l) Unable to handle this request \n") - )); - } - - return 0; - } - - return 1; -} - - -int -TAO_GIOP_Message_Lite::parse_request_header (TAO_ServerRequest &request) -{ - // Get the input CDR in the request class - TAO_InputCDR & input = *request.incoming (); - - CORBA::Boolean hdr_status = (CORBA::Boolean) input.good_bit (); - - CORBA::ULong req_id = 0; - - // Get the rest of the request header ... - hdr_status = hdr_status && input.read_ulong (req_id); - - request.request_id (req_id); - - CORBA::Octet response_flags = CORBA::Octet(); - hdr_status = hdr_status && input.read_octet (response_flags); - request.response_expected ((response_flags != 0)); - - // The high bit of the octet has been set if the SyncScope policy - // value is SYNC_WITH_SERVER. This is a temporary hack until all - // of GIOP 1.2 is in place. Then we can check the version in the - // message header instead. - request.sync_with_server ((response_flags == 129)); - - // We use ad-hoc demarshalling here: there is no need to increase - // the reference count on the CDR message block, because this key - // will not outlive the request (or the message block). - CORBA::Long key_length = 0; - hdr_status = hdr_status && input.read_long (key_length); - - if (hdr_status) - { - request.object_key ().replace (key_length, key_length, - (CORBA::Octet*)input.rd_ptr (), - 0); - input.skip_bytes (key_length); - } - - if (input.char_translator () == 0) - { - CORBA::ULong length = 0; - hdr_status = hdr_status && input.read_ulong (length); - - if (hdr_status) - { - // Do not include NULL character at the end. - // @@ This is not getting demarshaled using the codeset - // translators! - - // Notice that there are no memory allocations involved - // here! - - request.operation (input.rd_ptr (), - length - 1, - 0 /* TAO_ServerRequest does NOT own string */); - - hdr_status = input.skip_bytes (length); - } - } - else - { - // @@ We could optimize for this case too, i.e. do in-place - // demarshaling of the string... But there is an issue - // pending on the OMG as to whether the operation should be - // sent in the connection negotiated codeset or always in - // ISO8859-1. - CORBA::String_var tmp; - hdr_status = hdr_status && input.read_string (tmp.inout ()); - - request.operation (tmp._retn (), - 0, - 1 /* TAO_ServerRequest owns string */); - } - - return hdr_status ? 0 : -1; -} - -int -TAO_GIOP_Message_Lite::parse_locate_header ( - TAO_GIOP_Locate_Request_Header &request - ) -{ - // Get the stream. - TAO_InputCDR &msg = request.incoming_stream (); - - CORBA::Boolean hdr_status = 1; - - // Get the request id. - CORBA::ULong req_id = 0; - hdr_status = msg.read_ulong (req_id); - - // Store it in the Locate request classes. - request.request_id (req_id); - - TAO::ObjectKey &object_key = - request.object_key (); - - // Note that here there are no unions and so no problems. - hdr_status = hdr_status && (msg >> object_key); - - return hdr_status ? 0 : -1; -} - -int -TAO_GIOP_Message_Lite::send_reply_exception ( - TAO_Transport *transport, - TAO_ORB_Core* orb_core, - CORBA::ULong request_id, - IOP::ServiceContextList *svc_info, - CORBA::Exception *x - ) -{ - // Create a new output CDR stream - char repbuf[ACE_CDR::DEFAULT_BUFSIZE]; - -#if defined(ACE_INITIALIZE_MEMORY_BEFORE_USE) - (void) ACE_OS::memset (repbuf, - '\0', - sizeof repbuf); -#endif /* ACE_INITIALIZE_MEMORY_BEFORE_USE */ - TAO_OutputCDR output (repbuf, - sizeof repbuf, - TAO_ENCAP_BYTE_ORDER, - orb_core->output_cdr_buffer_allocator (), - orb_core->output_cdr_dblock_allocator (), - orb_core->output_cdr_msgblock_allocator (), - orb_core->orb_params ()->cdr_memcpy_tradeoff (), - TAO_DEF_GIOP_MAJOR, - TAO_DEF_GIOP_MINOR); - - transport->assign_translators(0,&output); - - // Make the GIOP & reply header. They are version specific. - TAO_Pluggable_Reply_Params reply_params (transport); - reply_params.request_id_ = request_id; - reply_params.svc_ctx_.length (0); - - // Send back the service context we received. (RTCORBA relies on - // this). - reply_params.service_context_notowned (svc_info); - - // A new try/catch block, but if something goes wrong now we have no - // hope, just abort. - - try - { - // Write the exception. - reply_params.reply_status_ = TAO_GIOP_USER_EXCEPTION; - - if (CORBA::SystemException::_downcast (x) != 0) - { - reply_params.reply_status_ = TAO_GIOP_SYSTEM_EXCEPTION; - } - - // Make the GIOP & reply header. They are version specific. - this->write_reply_header (output, - reply_params); - - - x->_tao_encode (output); - } - catch (const ::CORBA::Exception&) - { - // Now we know that while handling the error an other error - // happened -> no hope, close connection. - - // Close the handle. - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t|%N|%l) cannot marshal exception on transport %u: %p\n"), - transport->id (), - ACE_TEXT ("send_reply_exception ()"))); - return -1; - } - - return transport->send_message (output); -} - - -int -TAO_GIOP_Message_Lite::write_locate_reply_mesg ( - TAO_OutputCDR & output, - CORBA::ULong request_id, - TAO_GIOP_Locate_Status_Msg &status_info - ) -{ - // Note here we are making the Locate reply header which is *QUITE* - // different from the reply header made by the make_reply () call.. - - // Make the GIOP message header - this->write_protocol_header (TAO_GIOP_LOCATEREPLY, - output); - - // Make the header for the locate request - output.write_ulong (request_id); - output.write_ulong (status_info.status); - - if (status_info.status == TAO_GIOP_OBJECT_FORWARD) - { - CORBA::Object_ptr object_ptr = status_info.forward_location_var.in (); - - if ((output << object_ptr) == 0) - { - if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t|%N|%l) make_locate_reply-") - ACE_TEXT ("cannot marshal object reference\n"))); - } - } - - return 1; -} - -// Send an "I can't understand you" message -- again, the message is -// prefabricated for simplicity. This implies abortive disconnect (at -// the application level, if not at the level of TCP). -// -// NOTE that IIOPLite will still benefit from TCP's orderly disconnect. -int -TAO_GIOP_Message_Lite::send_error (TAO_Transport *transport) -{ - const char error_message [TAO_GIOP_LITE_HEADER_LEN] = - { - // The following works on non-ASCII platforms, such as MVS (which - // uses EBCDIC). - TAO_GIOP_MESSAGERROR, - 0, 0, 0, 0 - }; - - this->dump_msg ("send_error", - (const u_char *) error_message, - TAO_GIOP_LITE_HEADER_LEN); - - ACE_Data_Block data_block (TAO_GIOP_LITE_HEADER_LEN, - ACE_Message_Block::MB_DATA, - error_message, - 0, - 0, - ACE_Message_Block::DONT_DELETE, - 0); - ACE_Message_Block message_block(&data_block); - message_block.wr_ptr (TAO_GIOP_LITE_HEADER_LEN); - - size_t bt; - int result = transport->send_message_block_chain (&message_block, - bt); - if (result == -1) - { - if (TAO_debug_level > 0) - { - ACE_DEBUG (( - LM_DEBUG, - ACE_TEXT ("TAO (%N|%l|%P|%t) error sending error to transport %u, errno = %d\n"), - transport->id (), errno - )); - } - } - - return result; -} - -void -TAO_GIOP_Message_Lite::dump_msg (const char *label, - const u_char *ptr, - size_t len) -{ - if (TAO_debug_level >= 5) - { - static const char *names [] = - { - "Request", - "Reply", - "CancelRequest", - "LocateRequest", - "LocateReply", - "CloseConnection", - "MessageError", - "Fragment" - }; - - // Message name. - const char *message_name = "UNKNOWN MESSAGE"; - u_long slot = ptr[TAO_GIOP_LITE_MESSAGE_TYPE_OFFSET]; - - if (slot < sizeof (names)/sizeof(names[0])) - { - message_name = names [slot]; - } - - // Byte order. - int byte_order = TAO_ENCAP_BYTE_ORDER; - - // request/reply id. - CORBA::ULong tmp = 0; - CORBA::ULong *id = &tmp; - - if (ptr[TAO_GIOP_LITE_MESSAGE_TYPE_OFFSET] == TAO_GIOP_REQUEST || - ptr[TAO_GIOP_LITE_MESSAGE_TYPE_OFFSET] == TAO_GIOP_REPLY) - { - // We are not sure where the read pointer is pointing - // to. So, try to align teh pointer to a 4 byte boundary. - char *buf = ACE_ptr_align_binary (ptr + TAO_GIOP_LITE_HEADER_LEN, 4); - - id = reinterpret_cast <CORBA::ULong *> (buf); - } - - // Print. - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P | %t):%s GIOP lite msg, ") - ACE_TEXT ("%d data bytes, %s endian, <%s = %d> \n"), - ACE_TEXT_CHAR_TO_TCHAR(label), - len - TAO_GIOP_LITE_HEADER_LEN, - (byte_order == TAO_ENCAP_BYTE_ORDER) ? ACE_TEXT("my") : ACE_TEXT("other"), - ACE_TEXT_CHAR_TO_TCHAR (message_name), - *id)); - - if (TAO_debug_level >= 10) - ACE_HEX_DUMP ((LM_DEBUG, - (const char *) ptr, - len, - ACE_TEXT ("GIOP lite message"))); - } -} - -TAO_Queued_Data * -TAO_GIOP_Message_Lite::make_queued_data (size_t sz) -{ - // Make a datablock for the size requested + something. The - // "something" is required because we are going to align the data - // block in the message block. During alignment we could loose some - // bytes. As we may not know how many bytes will be lost, we will - // allocate ACE_CDR::MAX_ALIGNMENT extra. - ACE_Data_Block *db = - this->orb_core_->create_input_cdr_data_block (sz + - ACE_CDR::MAX_ALIGNMENT); - - TAO_Queued_Data *qd = - TAO_Queued_Data::make_queued_data ( - this->orb_core_->transport_message_buffer_allocator (), - this->orb_core_->input_cdr_msgblock_allocator (), - db); - - if (qd == 0) - { - db->release (); - return 0; - } - - return qd; -} - -int -TAO_GIOP_Message_Lite::generate_locate_reply_header ( - TAO_OutputCDR & /*cdr*/, - TAO_Pluggable_Reply_Params_Base & /*params*/) -{ - return 0; -} - - -int -TAO_GIOP_Message_Lite::is_ready_for_bidirectional (TAO_OutputCDR & ) -{ - // No we dont support.. - return 0; -} - -size_t -TAO_GIOP_Message_Lite::header_length (void) const -{ - return TAO_GIOP_LITE_HEADER_LEN; -} - -size_t -TAO_GIOP_Message_Lite::fragment_header_length (CORBA::Octet, - CORBA::Octet) const -{ - return 0; -} - -void -TAO_GIOP_Message_Lite::init_queued_data (TAO_Queued_Data* qd) const -{ - qd->byte_order_ = TAO_ENCAP_BYTE_ORDER; - qd->major_version_ = TAO_DEF_GIOP_MAJOR; - qd->minor_version_ = TAO_DEF_GIOP_MINOR; - qd->msg_type_ = this->message_type (); -} - -/* @return -1 error, 0 ok */ -int -TAO_GIOP_Message_Lite::consolidate_fragmented_message (TAO_Queued_Data* /* qd */, - TAO_Queued_Data *& /* msg */) -{ - if (TAO_debug_level > 3) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("(%P | %t):%s GIOP lite msg, ") - ACE_TEXT ("Error, fragmented messages not supported\n"))); - } - return -1; // not implemented, not supported -} - - - -/// Remove all fragments from stack corelating to CancelRequest @a qd. -/// @return -1 on failure, 0 on success, 1 no fragment on stack -/// relating to CancelRequest. -int -TAO_GIOP_Message_Lite::discard_fragmented_message (const TAO_Queued_Data *) -{ - return 1; // no fragment on stack relating to cancel-request -} - -TAO_GIOP_Fragmentation_Strategy * -TAO_GIOP_Message_Lite::fragmentation_strategy (void) -{ - return 0; // Fragmentation is unsupported in GIOP lite. -} - - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/GIOP_Message_Lite.h b/TAO/tao/GIOP_Message_Lite.h deleted file mode 100644 index 3eb46c95ba3..00000000000 --- a/TAO/tao/GIOP_Message_Lite.h +++ /dev/null @@ -1,303 +0,0 @@ -// -*- C++ -*- -// -// =================================================================== -/** - * @file GIOP_Message_Lite.h - * - * $Id$ - * - * @author Balachandran Natarajan <bala@cs.wustl.edu> - * @author Carlos O'Ryan <coryan@uci.edu> - */ -// =================================================================== - -#ifndef TAO_GIOP_MESSAGE_LITE_H -#define TAO_GIOP_MESSAGE_LITE_H - -#include /**/ "ace/pre.h" - -#include "tao/Pluggable_Messaging.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/Pluggable_Messaging_Utils.h" -#include "tao/GIOP_Utils.h" -#include "tao/CDR.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -class TAO_Operation_Details; -class TAO_Pluggable_Reply_Params; -class TAO_GIOP_Locate_Request_Header; -class TAO_Queued_Data; -class TAO_ServerRequest; -class TAO_GIOP_Message_Version; - -/** - * @class TAO_GIOP_Message_Lite - * - * @brief Definitions of GIOPLite specific stuff - * - * This protocol is a modified version of GIOP. This is more suited - * for homogenous platforms. - */ -class TAO_Export TAO_GIOP_Message_Lite : public TAO_Pluggable_Messaging -{ -public: - - /// Constructor - TAO_GIOP_Message_Lite (TAO_ORB_Core *orb_core, - size_t input_cdr_size = ACE_CDR::DEFAULT_BUFSIZE); - - /// Dtor - virtual ~TAO_GIOP_Message_Lite (void); - - /// Initialize the object -- this is a dummy for GIOPlite - virtual void init (CORBA::Octet, CORBA::Octet); - - /// Reset the messaging the object - virtual void reset (void); - - /// Write the RequestHeader in to the @a cdr stream. The underlying - /// implementation of the mesaging should do the right thing. - virtual int generate_request_header (TAO_Operation_Details &op, - TAO_Target_Specification &spec, - TAO_OutputCDR &cdr); - - /// Write the RequestHeader in to the @a cdr stream. - virtual int generate_locate_request_header ( - TAO_Operation_Details &op, - TAO_Target_Specification &spec, - TAO_OutputCDR &cdr); - - /// Write the reply header - virtual int generate_reply_header ( - TAO_OutputCDR &cdr, - TAO_Pluggable_Reply_Params_Base ¶ms - ); - - virtual int generate_fragment_header (TAO_OutputCDR & cdr, - CORBA::ULong request_id); - - /// Format the message. As we have not written the message length in - /// the header, we make use of this oppurtunity to insert and format - /// the message. - virtual int format_message (TAO_OutputCDR &cdr); - -private: - /// Parse the incoming messages.. - /// - /// \retval -1 There was some error parsing the GIOP header - /// \retval 0 The GIOP header was parsed correctly - /// \retval 1 There was not enough data in the message block to - /// parse the header - int parse_incoming_messages (ACE_Message_Block &message_block); - - /// Get the message type. The return value would be one of the - /// following: - /// TAO_PLUGGABLE_MESSAGE_REQUEST, - /// TAO_PLUGGABLE_MESSAGE_REPLY, - /// TAO_PLUGGABLE_MESSAGE_CLOSECONNECTION, - /// TAO_PLUGGABLE_MESSAGE_MESSAGE_ERROR. - /// TAO_PLUGGABLE_MESSAGE_MESSAGE_CANCELREQUEST. - TAO_Pluggable_Message_Type message_type (void) const; - -public: - /// Parse the details of the next message from the @a incoming - /// and initializes attributes of @a qd. Returns 0 if the message - /// header could not be parsed completely, returns a 1 if the message - /// header could be parsed completely and returns -1 on error. - virtual int parse_next_message (ACE_Message_Block &incoming, - TAO_Queued_Data &qd, /* out */ - size_t &mesg_length); /* out */ - - - /// Extract the details of the next message from the @a incoming - /// through @a qd. Returns 0 if the message header could not be - /// parsed completely, returns a 1 if the message header could be - /// parsed completely and returns -1 on error. - virtual int extract_next_message (ACE_Message_Block &incoming, - TAO_Queued_Data *&qd); - - /// Check whether the node @a qd needs consolidation from @a incoming - virtual int consolidate_node (TAO_Queued_Data *qd, - ACE_Message_Block &incoming); - - /// Process the request message that we have received on the - /// connection - virtual int process_request_message (TAO_Transport *transport, - TAO_Queued_Data *qd); - - /// Parse the reply message that we received and return the reply - /// information through @a reply_info - virtual int process_reply_message ( - TAO_Pluggable_Reply_Params &reply_info, - TAO_Queued_Data *qd); - - /// Generate a reply message with the exception @a ex. - virtual int generate_exception_reply ( - TAO_OutputCDR &cdr, - TAO_Pluggable_Reply_Params_Base ¶ms, - const CORBA::Exception &x - ); - - /// Consolidate fragmented message with associated fragments, being - /// stored withi this class. If reliable transport is used (like - /// TCP) fragments are partialy ordered on stack, last fragment on - /// top. Otherwise If un-reliable transport is used (like UDP) - /// fragments may be dis-ordered, and must be ordered before - /// consolidation. @return 0 on success and @a msg points to - /// consolidated message, 1 if there are still fragmens outstanding, - /// in case of error -1 is being returned. In any case @a qd must be - /// released by method implementation. - virtual int consolidate_fragmented_message (TAO_Queued_Data *qd, - TAO_Queued_Data *&msg); - - /// Discard all fragments associated to request-id encoded in - /// cancel_request. This operation will never be called - /// concurrently by multiplpe threads nor concurrently to - /// consolidate_fragmented_message @r 0 on success, 1 if no matching - /// fragment chain exists, -1 on error - virtual int discard_fragmented_message (const TAO_Queued_Data *cancel_request); - - /// Outgoing GIOP message fragmentation strategy. - virtual TAO_GIOP_Fragmentation_Strategy * fragmentation_strategy (void); - -private: - - /// Writes the GIOP header in to @a msg - /// @note If the GIOP header happens to change in the future, we can - /// push this method in to the generator_parser classes. - int write_protocol_header (TAO_GIOP_Message_Type t, - TAO_OutputCDR &msg); - - /// Processes the GIOP_REQUEST messages - int process_request (TAO_Transport *transport, - TAO_InputCDR &input, - TAO_OutputCDR &output); - - /// Processes the GIOP_LOCATE_REQUEST messages - int process_locate_request (TAO_Transport *transport, - TAO_InputCDR &input, - TAO_OutputCDR &output); - - /// Make a GIOP_LOCATEREPLY and hand that over to the transport so - /// that it can be sent over the connection. - /// @note As on date 1.1 & 1.2 seem to have similar headers. Till an - /// unmanageable difference comes let them be implemented here. - int make_send_locate_reply (TAO_Transport *transport, - TAO_OutputCDR &output, - TAO_GIOP_Locate_Request_Header &request, - TAO_GIOP_Locate_Status_Msg &status); - - /// Send error messages - int send_error (TAO_Transport *transport); - - /// Close a connection, first sending GIOP::CloseConnection. - void send_close_connection (const TAO_GIOP_Message_Version &version, - TAO_Transport *transport, - void *ctx); - - /// We must send a LocateReply through @a transport, this request - /// resulted in some kind of exception. - int send_reply_exception (TAO_Transport *transport, - TAO_ORB_Core* orb_core, - CORBA::ULong request_id, - IOP::ServiceContextList *svc_info, - CORBA::Exception *x); - - /// Print out a debug messages.. - void dump_msg (const char *label, - const u_char *ptr, - size_t len); - - TAO_Queued_Data *make_queued_data (size_t sz); - - /// Write the locate reply header - virtual int generate_locate_reply_header ( - TAO_OutputCDR & /*cdr*/, - TAO_Pluggable_Reply_Params_Base & /*params*/); - - /// Is the messaging object ready for processing BiDirectional - /// request/response? - virtual int is_ready_for_bidirectional (TAO_OutputCDR &msg); - - /// Header length - virtual size_t header_length (void) const; - - /// Fragment header length - virtual size_t fragment_header_length (CORBA::Octet major, - CORBA::Octet minor) const; - - virtual TAO_OutputCDR &out_stream (void); - -private: - - /// Write the request header in to <msg> - int write_request_header ( - const TAO_Operation_Details &opdetails, - TAO_Target_Specification &spec, - TAO_OutputCDR &msg); - - /// Write the LocateRequest header - int write_locate_request_header ( - CORBA::ULong request_id, - TAO_Target_Specification &spec, - TAO_OutputCDR &msg); - - /// Write the reply header in to <output> - int write_reply_header ( - TAO_OutputCDR &output, - TAO_Pluggable_Reply_Params_Base &reply - ); - - /// Writes the locate _reply message in to the <output> - int write_locate_reply_mesg ( - TAO_OutputCDR &output, - CORBA::ULong request_id, - TAO_GIOP_Locate_Status_Msg &status); - - /// Parse the Request Header from the incoming stream. This will do a - /// version specific parsing of the incoming Request header - int parse_request_header (TAO_ServerRequest &); - - /// Parse the Loacte Request Header from the incoming stream. This will do a - /// version specific parsing of the incoming Request header - int parse_locate_header ( - TAO_GIOP_Locate_Request_Header &); - - /// Parse the reply message - int parse_reply (TAO_InputCDR &input, - TAO_Pluggable_Reply_Params ¶ms); - - /// Parse the locate reply message from the server - int parse_locate_reply (TAO_InputCDR &input, - TAO_Pluggable_Reply_Params ¶ms); - - /// Initialize the relevant portions of a TAO_Queued_Data - void init_queued_data (TAO_Queued_Data* qd) const; - -private: - - /// Our copy of the ORB core... - TAO_ORB_Core *orb_core_; - - /// The message type that we are going to process.. - CORBA::Octet message_type_; - - /// The pay load size - CORBA::ULong message_size_; - - /// The byte order.. - /// @note GIOP lite cannot work between heterogenous platforms.. - CORBA::Octet byte_order_; - - TAO_OutputCDR cdr_; -}; - -TAO_END_VERSIONED_NAMESPACE_DECL - -#include /**/ "ace/post.h" -#endif /*TAO_GIOP_MESSAGE_LITE_H*/ diff --git a/TAO/tao/IIOP_Acceptor.cpp b/TAO/tao/IIOP_Acceptor.cpp index da6899ae6f1..5713e47f86f 100644 --- a/TAO/tao/IIOP_Acceptor.cpp +++ b/TAO/tao/IIOP_Acceptor.cpp @@ -29,7 +29,7 @@ ACE_RCSID (tao, TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_IIOP_Acceptor::TAO_IIOP_Acceptor (CORBA::Boolean flag) +TAO_IIOP_Acceptor::TAO_IIOP_Acceptor (void) : TAO_Acceptor (IOP::TAG_INTERNET_IOP), addrs_ (0), port_span_ (1), @@ -38,7 +38,6 @@ TAO_IIOP_Acceptor::TAO_IIOP_Acceptor (CORBA::Boolean flag) endpoint_count_ (0), version_ (TAO_DEF_GIOP_MAJOR, TAO_DEF_GIOP_MINOR), orb_core_ (0), - lite_flag_ (flag), reuse_addr_ (1), #if defined (ACE_HAS_IPV6) default_address_ (static_cast<unsigned short> (0), ACE_IPV6_ANY, AF_INET6), @@ -442,8 +441,7 @@ TAO_IIOP_Acceptor::open_i (const ACE_INET_Addr& addr, ACE_Reactor *reactor) { ACE_NEW_RETURN (this->creation_strategy_, - CREATION_STRATEGY (this->orb_core_, - this->lite_flag_), + CREATION_STRATEGY (this->orb_core_), -1); ACE_NEW_RETURN (this->concurrency_strategy_, @@ -774,7 +772,7 @@ TAO_IIOP_Acceptor::parse_address (const char *address, if (len >= sizeof (tmp_host)) return -1; - + ACE_OS::memcpy (tmp_host, address, len); tmp_host[len] = '\0'; } diff --git a/TAO/tao/IIOP_Acceptor.h b/TAO/tao/IIOP_Acceptor.h index ea40333fa27..1df656ca838 100644 --- a/TAO/tao/IIOP_Acceptor.h +++ b/TAO/tao/IIOP_Acceptor.h @@ -56,7 +56,7 @@ public: //@@ TAO_ACCEPTOR_SPL_CONCRETE_METHODS_COPY_HOOK_START /// Constructor. - TAO_IIOP_Acceptor (CORBA::Boolean flag = false); + TAO_IIOP_Acceptor (void); /// Destructor. ~TAO_IIOP_Acceptor (void); @@ -255,9 +255,6 @@ protected: /// ORB Core. TAO_ORB_Core *orb_core_; - /// Should we use GIOP lite?? - const bool lite_flag_; - /// Enable socket option SO_REUSEADDR to be set int reuse_addr_; diff --git a/TAO/tao/IIOP_Connection_Handler.cpp b/TAO/tao/IIOP_Connection_Handler.cpp index eb56835c1f4..9a3a02f3448 100644 --- a/TAO/tao/IIOP_Connection_Handler.cpp +++ b/TAO/tao/IIOP_Connection_Handler.cpp @@ -36,27 +36,19 @@ TAO_IIOP_Connection_Handler::TAO_IIOP_Connection_Handler (ACE_Thread_Manager *t) TAO_IIOP_Connection_Handler::TAO_IIOP_Connection_Handler ( - TAO_ORB_Core *orb_core, - CORBA::Boolean flag) + TAO_ORB_Core *orb_core) : TAO_IIOP_SVC_HANDLER (orb_core->thr_mgr (), 0, 0), TAO_Connection_Handler (orb_core), dscp_codepoint_ (IPDSFIELD_DSCP_DEFAULT << 2) { TAO_IIOP_Transport* specific_transport = 0; ACE_NEW (specific_transport, - TAO_IIOP_Transport (this, orb_core, flag)); + TAO_IIOP_Transport (this, orb_core)); // store this pointer (indirectly increment ref count) this->transport (specific_transport); } -TAO_IIOP_Connection_Handler::TAO_IIOP_Connection_Handler (TAO_ORB_Core *orb_core) - : TAO_IIOP_SVC_HANDLER (orb_core->thr_mgr (), 0, 0), - TAO_Connection_Handler (orb_core), - dscp_codepoint_ (IPDSFIELD_DSCP_DEFAULT << 2) -{ -} - TAO_IIOP_Connection_Handler::~TAO_IIOP_Connection_Handler (void) { delete this->transport (); diff --git a/TAO/tao/IIOP_Connection_Handler.h b/TAO/tao/IIOP_Connection_Handler.h index 42011955fd9..29913c3fa0f 100644 --- a/TAO/tao/IIOP_Connection_Handler.h +++ b/TAO/tao/IIOP_Connection_Handler.h @@ -67,8 +67,7 @@ public: TAO_IIOP_Connection_Handler (ACE_Thread_Manager * = 0); /// Constructor. - TAO_IIOP_Connection_Handler (TAO_ORB_Core *orb_core, - CORBA::Boolean flag); + TAO_IIOP_Connection_Handler (TAO_ORB_Core *orb_core); /// Destructor. ~TAO_IIOP_Connection_Handler (void); @@ -115,16 +114,6 @@ public: protected: - /// Constructor that could be used by the derived classes. - /** - * Sometimes new pluggable protocols which have similarities with - * IIOP may be tempted to this class for their use. Classical - * example being that of IIOP_SSL_Connection_Handler. This - * constructor just initializes its base class and sets all of its - * contents to the default value, if any - */ - TAO_IIOP_Connection_Handler (TAO_ORB_Core *orb_core); - //@{ /** * @name TAO_Connection Handler overloads diff --git a/TAO/tao/IIOP_Connector.cpp b/TAO/tao/IIOP_Connector.cpp index 5616761969b..00f354afa23 100644 --- a/TAO/tao/IIOP_Connector.cpp +++ b/TAO/tao/IIOP_Connector.cpp @@ -86,9 +86,8 @@ TAO_IIOP_Connector::~TAO_IIOP_Connector (void) } //@@ TAO_CONNECTOR_SPL_COPY_HOOK_START -TAO_IIOP_Connector::TAO_IIOP_Connector (CORBA::Boolean flag) +TAO_IIOP_Connector::TAO_IIOP_Connector (void) : TAO_Connector (IOP::TAG_INTERNET_IOP) - , lite_flag_ (flag) , connect_strategy_ () , base_connector_ () { @@ -114,8 +113,7 @@ TAO_IIOP_Connector::open (TAO_ORB_Core *orb_core) ACE_NEW_RETURN (connect_creation_strategy, TAO_IIOP_CONNECT_CREATION_STRATEGY (orb_core->thr_mgr (), - orb_core, - this->lite_flag_), + orb_core), -1); /// Our activation strategy diff --git a/TAO/tao/IIOP_Connector.h b/TAO/tao/IIOP_Connector.h index 04e09b1c37d..bfc2fd3c95b 100644 --- a/TAO/tao/IIOP_Connector.h +++ b/TAO/tao/IIOP_Connector.h @@ -55,7 +55,7 @@ class TAO_Export TAO_IIOP_Connector : public TAO_Connector public: // = Initialization and termination methods. /// Constructor. - TAO_IIOP_Connector (CORBA::Boolean flag = false); + TAO_IIOP_Connector (void); /// Destructor. ~TAO_IIOP_Connector (void); @@ -123,11 +123,6 @@ protected: */ //@@ TAO_CONNECTOR_SPL_COPY_HOOK_START -protected: - - /// Do we need to use a GIOP_Lite for sending messages? - const bool lite_flag_; - private: /// This is the first half of making a connection. Both make_connection /// and make_parallel_connection will start out using begin_connection. diff --git a/TAO/tao/IIOP_Lite_Factory.cpp b/TAO/tao/IIOP_Lite_Factory.cpp deleted file mode 100644 index 9056fbf34e8..00000000000 --- a/TAO/tao/IIOP_Lite_Factory.cpp +++ /dev/null @@ -1,101 +0,0 @@ -#include "tao/IIOP_Lite_Factory.h" - -#if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0) - -#include "tao/IIOP_Acceptor.h" -#include "tao/IIOP_Connector.h" -#include "tao/IOP_IORC.h" -#include "ace/OS_NS_strings.h" - -ACE_RCSID (tao, - IIOP_Factory, - "$Id$") - - -static const char the_prefix[] = "iiop"; - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -TAO_IIOP_Lite_Protocol_Factory::TAO_IIOP_Lite_Protocol_Factory (void) - : TAO_Protocol_Factory (IOP::TAG_INTERNET_IOP) -{ -} - -TAO_IIOP_Lite_Protocol_Factory::~TAO_IIOP_Lite_Protocol_Factory (void) -{ - -} - -int -TAO_IIOP_Lite_Protocol_Factory::match_prefix (const ACE_CString &prefix) -{ - // Check for the proper prefix for this protocol. - return (ACE_OS::strcasecmp (prefix.c_str (), ::the_prefix) == 0); -} - -const char * -TAO_IIOP_Lite_Protocol_Factory::prefix (void) const -{ - return ::the_prefix; -} - -char -TAO_IIOP_Lite_Protocol_Factory::options_delimiter (void) const -{ - return '/'; -} - -TAO_Acceptor * -TAO_IIOP_Lite_Protocol_Factory::make_acceptor (void) -{ - TAO_Acceptor *acceptor = 0; - - // We are a Lite factory - CORBA::Boolean lite_flag = true; - ACE_NEW_RETURN (acceptor, - TAO_IIOP_Acceptor (lite_flag), - 0); - - return acceptor; -} - -int -TAO_IIOP_Lite_Protocol_Factory::init (int /*argc*/, - ACE_TCHAR* /*argv*/ []) -{ - return 0; -} - -TAO_Connector * -TAO_IIOP_Lite_Protocol_Factory::make_connector (void) -{ - TAO_Connector *connector = 0; - - // We are a Lite factory - CORBA::Boolean lite_flag = true; - - ACE_NEW_RETURN (connector, - TAO_IIOP_Connector (lite_flag), - 0); - return connector; -} - -int -TAO_IIOP_Lite_Protocol_Factory::requires_explicit_endpoint (void) const -{ - return 0; -} - -TAO_END_VERSIONED_NAMESPACE_DECL - -ACE_STATIC_SVC_DEFINE (TAO_IIOP_Lite_Protocol_Factory, - ACE_TEXT ("IIOP_Lite_Factory"), - ACE_SVC_OBJ_T, - &ACE_SVC_NAME (TAO_IIOP_Lite_Protocol_Factory), - ACE_Service_Type::DELETE_THIS | - ACE_Service_Type::DELETE_OBJ, - 0) - -ACE_FACTORY_DEFINE (TAO, TAO_IIOP_Lite_Protocol_Factory) - -#endif /* TAO_HAS_IIOP && TAO_HAS_IIOP != 0 */ diff --git a/TAO/tao/IIOP_Lite_Factory.h b/TAO/tao/IIOP_Lite_Factory.h deleted file mode 100644 index 5bf56335b77..00000000000 --- a/TAO/tao/IIOP_Lite_Factory.h +++ /dev/null @@ -1,71 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file IIOP_Lite_Factory.h - * - * $Id$ - * - * @author Fred Kuhns <fredk@cs.wustl.edu> - */ -//============================================================================= - - -#ifndef TAO_IIOP_LITE_FACTORY_H -#define TAO_IIOP_LITE_FACTORY_H - -#include /**/ "ace/pre.h" - -#include "tao/orbconf.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0) - -#include "tao/Protocol_Factory.h" -#include "ace/Service_Config.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -class TAO_Acceptor; -class TAO_Connector; - -class TAO_Export TAO_IIOP_Lite_Protocol_Factory : - public TAO_Protocol_Factory -{ -public: - TAO_IIOP_Lite_Protocol_Factory (void); - - virtual ~TAO_IIOP_Lite_Protocol_Factory (void); - - // = Service Configurator hooks. - /// Dynamic linking hook - virtual int init (int argc, ACE_TCHAR* argv[]); - - /// Verify prefix is a match - virtual int match_prefix (const ACE_CString &prefix); - - /// Returns the prefix used by the protocol. - virtual const char *prefix (void) const; - - /// Return the character used to mark where an endpoint ends and - /// where its options begin. - virtual char options_delimiter (void) const; - - // = Check Protocol_Factory.h for a description of these methods. - virtual TAO_Acceptor *make_acceptor (void); - virtual TAO_Connector *make_connector (void); - virtual int requires_explicit_endpoint (void) const; -}; - -TAO_END_VERSIONED_NAMESPACE_DECL - -ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_IIOP_Lite_Protocol_Factory) -ACE_FACTORY_DECLARE (TAO, TAO_IIOP_Lite_Protocol_Factory) - -#endif /* TAO_HAS_IIOP && TAO_HAS_IIOP != 0 */ - -#include /**/ "ace/post.h" -#endif /* TAO_IIOP_Lite_factory_H */ diff --git a/TAO/tao/IIOP_Transport.cpp b/TAO/tao/IIOP_Transport.cpp index 9ca5e3de92c..ccb7a2c4ca1 100644 --- a/TAO/tao/IIOP_Transport.cpp +++ b/TAO/tao/IIOP_Transport.cpp @@ -24,8 +24,7 @@ ACE_RCSID (tao, TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_IIOP_Transport::TAO_IIOP_Transport (TAO_IIOP_Connection_Handler *handler, - TAO_ORB_Core *orb_core, - CORBA::Boolean ) + TAO_ORB_Core *orb_core) : TAO_Transport (IOP::TAG_INTERNET_IOP, orb_core) , connection_handler_ (handler) diff --git a/TAO/tao/IIOP_Transport.h b/TAO/tao/IIOP_Transport.h index 8c947e3b258..9b76cecf3c5 100644 --- a/TAO/tao/IIOP_Transport.h +++ b/TAO/tao/IIOP_Transport.h @@ -56,8 +56,7 @@ public: /// Constructor. TAO_IIOP_Transport (TAO_IIOP_Connection_Handler *handler, - TAO_ORB_Core *orb_core, - CORBA::Boolean flag); + TAO_ORB_Core *orb_core); protected: diff --git a/TAO/tao/Makefile.am b/TAO/tao/Makefile.am index f24e0a013cc..31fd33614f6 100644 --- a/TAO/tao/Makefile.am +++ b/TAO/tao/Makefile.am @@ -786,7 +786,6 @@ libTAO_la_SOURCES = \ GIOP_Message_Generator_Parser_11.cpp \ GIOP_Message_Generator_Parser_12.cpp \ GIOP_Message_Generator_Parser_Impl.cpp \ - GIOP_Message_Lite.cpp \ GIOP_Message_Locate_Header.cpp \ GIOP_Message_State.cpp \ GIOP_Message_Version.cpp \ @@ -802,7 +801,6 @@ libTAO_la_SOURCES = \ IIOP_Endpoint.cpp \ IIOP_EndpointsC.cpp \ IIOP_Factory.cpp \ - IIOP_Lite_Factory.cpp \ IIOP_Profile.cpp \ IIOP_Transport.cpp \ IOPC.cpp \ @@ -1111,7 +1109,6 @@ nobase_include_HEADERS = \ GIOP_Message_Generator_Parser_12.h \ GIOP_Message_Generator_Parser_Impl.h \ GIOP_Message_Generator_Parser_Impl.inl \ - GIOP_Message_Lite.h \ GIOP_Message_Locate_Header.h \ GIOP_Message_Locate_Header.inl \ GIOP_Message_State.h \ @@ -1139,7 +1136,6 @@ nobase_include_HEADERS = \ IIOP_EndpointsC.h \ IIOP_EndpointsS.h \ IIOP_Factory.h \ - IIOP_Lite_Factory.h \ IIOP_Profile.h \ IIOP_Transport.h \ IOP.pidl \ @@ -5675,7 +5671,6 @@ libTAO_Strategies_la_SOURCES = \ Strategies/SCIOP_Connector.cpp \ Strategies/SCIOP_Endpoint.cpp \ Strategies/SCIOP_Factory.cpp \ - Strategies/SCIOP_Lite_Factory.cpp \ Strategies/SCIOP_Profile.cpp \ Strategies/SCIOP_Transport.cpp \ Strategies/SHMIOP_Acceptor.cpp \ @@ -5691,7 +5686,6 @@ libTAO_Strategies_la_SOURCES = \ Strategies/UIOP_Connector.cpp \ Strategies/UIOP_Endpoint.cpp \ Strategies/UIOP_Factory.cpp \ - Strategies/UIOP_Lite_Factory.cpp \ Strategies/UIOP_Profile.cpp \ Strategies/UIOP_Transport.cpp \ Strategies/advanced_resource.cpp \ @@ -5744,7 +5738,6 @@ nobase_include_HEADERS += \ Strategies/SCIOP_Endpoint.h \ Strategies/SCIOP_Endpoint.inl \ Strategies/SCIOP_Factory.h \ - Strategies/SCIOP_Lite_Factory.h \ Strategies/SCIOP_Profile.h \ Strategies/SCIOP_Transport.h \ Strategies/SHMIOP_Acceptor.h \ @@ -5762,7 +5755,6 @@ nobase_include_HEADERS += \ Strategies/UIOP_Endpoint.h \ Strategies/UIOP_Endpoint.inl \ Strategies/UIOP_Factory.h \ - Strategies/UIOP_Lite_Factory.h \ Strategies/UIOP_Profile.h \ Strategies/UIOP_Transport.h \ Strategies/advanced_resource.h \ diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp index 9f1b2dc52ec..ebf0dbbe3ab 100644 --- a/TAO/tao/ORB_Core.cpp +++ b/TAO/tao/ORB_Core.cpp @@ -376,9 +376,6 @@ TAO_ORB_Core::init (int &argc, char *argv[] ) // arguments and stash it for use initializing other components such // as the RootPOA. - // @@ GIOPLite should be an alternative ORB Messaging protocols, fredk - // int giop_lite = 0; - bool use_ior = true; int cdr_tradeoff = ACE_DEFAULT_CDR_MEMCPY_TRADEOFF; diff --git a/TAO/tao/Strategies/COIOP_Acceptor.cpp b/TAO/tao/Strategies/COIOP_Acceptor.cpp index 3b3d3d88e28..2d01aa8b8ca 100644 --- a/TAO/tao/Strategies/COIOP_Acceptor.cpp +++ b/TAO/tao/Strategies/COIOP_Acceptor.cpp @@ -22,12 +22,11 @@ ACE_RCSID (Strategies, TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_COIOP_Acceptor::TAO_COIOP_Acceptor (CORBA::Boolean flag) +TAO_COIOP_Acceptor::TAO_COIOP_Acceptor (void) : TAO_Acceptor (TAO_TAG_COIOP_PROFILE), uuid_ (*ACE_Utils::UUID_GENERATOR::instance ()->generateUUID ()), version_ (TAO_DEF_GIOP_MAJOR, TAO_DEF_GIOP_MINOR), - orb_core_ (0), - lite_flag_ (flag) + orb_core_ (0) { } diff --git a/TAO/tao/Strategies/COIOP_Acceptor.h b/TAO/tao/Strategies/COIOP_Acceptor.h index 35f7967be94..1f1756037ca 100644 --- a/TAO/tao/Strategies/COIOP_Acceptor.h +++ b/TAO/tao/Strategies/COIOP_Acceptor.h @@ -46,7 +46,7 @@ class TAO_Strategies_Export TAO_COIOP_Acceptor : public TAO_Acceptor { public: /// Constructor. - TAO_COIOP_Acceptor (CORBA::Boolean flag = false); + TAO_COIOP_Acceptor (void); /// Destructor. ~TAO_COIOP_Acceptor (void); @@ -113,9 +113,6 @@ protected: /// ORB Core. TAO_ORB_Core *orb_core_; - - /// Should we use GIOP lite?? - CORBA::Boolean lite_flag_; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Strategies/COIOP_Connection_Handler.cpp b/TAO/tao/Strategies/COIOP_Connection_Handler.cpp index b6c8c3a0b13..3d72a9eface 100644 --- a/TAO/tao/Strategies/COIOP_Connection_Handler.cpp +++ b/TAO/tao/Strategies/COIOP_Connection_Handler.cpp @@ -37,14 +37,13 @@ TAO_COIOP_Connection_Handler::TAO_COIOP_Connection_Handler (ACE_Thread_Manager * } -TAO_COIOP_Connection_Handler::TAO_COIOP_Connection_Handler (TAO_ORB_Core *orb_core, - CORBA::Boolean flag) +TAO_COIOP_Connection_Handler::TAO_COIOP_Connection_Handler (TAO_ORB_Core *orb_core) : TAO_COIOP_SVC_HANDLER (orb_core->thr_mgr (), 0, 0), TAO_Connection_Handler (orb_core) { TAO_COIOP_Transport* specific_transport = 0; ACE_NEW (specific_transport, - TAO_COIOP_Transport(this, orb_core, flag)); + TAO_COIOP_Transport(this, orb_core)); // store this pointer (indirectly increment ref count) this->transport (specific_transport); diff --git a/TAO/tao/Strategies/COIOP_Connection_Handler.h b/TAO/tao/Strategies/COIOP_Connection_Handler.h index 8b3df6ef915..eecdb1fe635 100644 --- a/TAO/tao/Strategies/COIOP_Connection_Handler.h +++ b/TAO/tao/Strategies/COIOP_Connection_Handler.h @@ -52,8 +52,7 @@ public: TAO_COIOP_Connection_Handler (ACE_Thread_Manager* t = 0); /// Constructor. - TAO_COIOP_Connection_Handler (TAO_ORB_Core *orb_core, - CORBA::Boolean flag); + TAO_COIOP_Connection_Handler (TAO_ORB_Core *orb_core); /// Destructor. ~TAO_COIOP_Connection_Handler (void); diff --git a/TAO/tao/Strategies/COIOP_Connector.cpp b/TAO/tao/Strategies/COIOP_Connector.cpp index d986c4e9b24..d73aaa6544f 100644 --- a/TAO/tao/Strategies/COIOP_Connector.cpp +++ b/TAO/tao/Strategies/COIOP_Connector.cpp @@ -22,9 +22,8 @@ ACE_RCSID (Strategies, TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_COIOP_Connector::TAO_COIOP_Connector (CORBA::Boolean flag) - : TAO_Connector (TAO_TAG_COIOP_PROFILE), - lite_flag_ (flag) +TAO_COIOP_Connector::TAO_COIOP_Connector (void) + : TAO_Connector (TAO_TAG_COIOP_PROFILE) { } diff --git a/TAO/tao/Strategies/COIOP_Connector.h b/TAO/tao/Strategies/COIOP_Connector.h index 1b7be889cd9..a538a632fc2 100644 --- a/TAO/tao/Strategies/COIOP_Connector.h +++ b/TAO/tao/Strategies/COIOP_Connector.h @@ -49,7 +49,7 @@ class TAO_Strategies_Export TAO_COIOP_Connector : public TAO_Connector public: // = Initialization and termination methods. /// Constructor. - TAO_COIOP_Connector (CORBA::Boolean flag = false); + TAO_COIOP_Connector (void); /// Destructor. ~TAO_COIOP_Connector (void); @@ -90,11 +90,6 @@ protected: /// Cancel the passed cvs handler from the connector int cancel_svc_handler (TAO_Connection_Handler * svc_handler); -protected: - - /// Do we need to use a GIOP_Lite for sending messages? - CORBA::Boolean lite_flag_; - private: /// Return the remote endpoint, a helper function diff --git a/TAO/tao/Strategies/COIOP_Transport.cpp b/TAO/tao/Strategies/COIOP_Transport.cpp index 7f3dfd91d76..13d932a561a 100644 --- a/TAO/tao/Strategies/COIOP_Transport.cpp +++ b/TAO/tao/Strategies/COIOP_Transport.cpp @@ -18,15 +18,13 @@ #include "tao/debug.h" #include "tao/Resume_Handle.h" #include "tao/GIOP_Message_Base.h" -#include "tao/GIOP_Message_Lite.h" ACE_RCSID (tao, COIOP_Transport, "$Id$") TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_COIOP_Transport::TAO_COIOP_Transport (TAO_COIOP_Connection_Handler *handler, - TAO_ORB_Core *orb_core, - CORBA::Boolean flag) + TAO_ORB_Core *orb_core) : TAO_Transport (TAO_TAG_COIOP_PROFILE, orb_core) , connection_handler_ (handler) @@ -38,22 +36,9 @@ TAO_COIOP_Transport::TAO_COIOP_Transport (TAO_COIOP_Connection_Handler *handler, */ //@@ MESSAGING_SPL_COMMENT_HOOK_START - // @@ 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)); - } - else - { - // Use the normal GIOP object - ACE_NEW (this->messaging_object_, - TAO_GIOP_Message_Base (orb_core, - this)); - } - + ACE_NEW (this->messaging_object_, + TAO_GIOP_Message_Base (orb_core, + this)); //@@ MESSAGING_SPL_COMMENT_HOOK_END } diff --git a/TAO/tao/Strategies/COIOP_Transport.h b/TAO/tao/Strategies/COIOP_Transport.h index 56eecf56ea3..126d58e8bd0 100644 --- a/TAO/tao/Strategies/COIOP_Transport.h +++ b/TAO/tao/Strategies/COIOP_Transport.h @@ -53,8 +53,7 @@ public: /// Constructor. TAO_COIOP_Transport (TAO_COIOP_Connection_Handler *handler, - TAO_ORB_Core *orb_core, - CORBA::Boolean flag); + TAO_ORB_Core *orb_core); /// Default destructor. ~TAO_COIOP_Transport (void); diff --git a/TAO/tao/Strategies/DIOP_Acceptor.cpp b/TAO/tao/Strategies/DIOP_Acceptor.cpp index 84d7d84c1fb..d559f5ec223 100644 --- a/TAO/tao/Strategies/DIOP_Acceptor.cpp +++ b/TAO/tao/Strategies/DIOP_Acceptor.cpp @@ -28,14 +28,13 @@ ACE_RCSID (Strategies, TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_DIOP_Acceptor::TAO_DIOP_Acceptor (CORBA::Boolean flag) +TAO_DIOP_Acceptor::TAO_DIOP_Acceptor (void) : TAO_Acceptor (TAO_TAG_DIOP_PROFILE), addrs_ (0), hosts_ (0), endpoint_count_ (0), version_ (TAO_DEF_GIOP_MAJOR, TAO_DEF_GIOP_MINOR), orb_core_ (0), - lite_flag_ (flag), #if defined (ACE_HAS_IPV6) default_address_ (static_cast<unsigned short> (0), ACE_IPV6_ANY, AF_INET6), #else @@ -402,8 +401,7 @@ TAO_DIOP_Acceptor::open_i (const ACE_INET_Addr& addr, ACE_Reactor *reactor) { ACE_NEW_RETURN (this->connection_handler_, - TAO_DIOP_Connection_Handler (this->orb_core_, - this->lite_flag_), + TAO_DIOP_Connection_Handler (this->orb_core_), -1); this->connection_handler_->local_addr (addr); diff --git a/TAO/tao/Strategies/DIOP_Acceptor.h b/TAO/tao/Strategies/DIOP_Acceptor.h index 6dd90a72e43..d69693f9820 100644 --- a/TAO/tao/Strategies/DIOP_Acceptor.h +++ b/TAO/tao/Strategies/DIOP_Acceptor.h @@ -47,7 +47,7 @@ class TAO_Strategies_Export TAO_DIOP_Acceptor : public TAO_Acceptor { public: /// Constructor. - TAO_DIOP_Acceptor (CORBA::Boolean flag = false); + TAO_DIOP_Acceptor (void); /// Destructor. ~TAO_DIOP_Acceptor (void); @@ -194,9 +194,6 @@ protected: /// ORB Core. TAO_ORB_Core *orb_core_; - /// Should we use GIOP lite?? - CORBA::Boolean lite_flag_; - /// Address for default endpoint ACE_INET_Addr default_address_; diff --git a/TAO/tao/Strategies/DIOP_Connection_Handler.cpp b/TAO/tao/Strategies/DIOP_Connection_Handler.cpp index 940d69d8897..f6c8c347ceb 100644 --- a/TAO/tao/Strategies/DIOP_Connection_Handler.cpp +++ b/TAO/tao/Strategies/DIOP_Connection_Handler.cpp @@ -41,15 +41,14 @@ TAO_DIOP_Connection_Handler::TAO_DIOP_Connection_Handler (ACE_Thread_Manager *t) } -TAO_DIOP_Connection_Handler::TAO_DIOP_Connection_Handler (TAO_ORB_Core *orb_core, - CORBA::Boolean flag) +TAO_DIOP_Connection_Handler::TAO_DIOP_Connection_Handler (TAO_ORB_Core *orb_core) : TAO_DIOP_SVC_HANDLER (orb_core->thr_mgr (), 0, 0), TAO_Connection_Handler (orb_core), dscp_codepoint_ (IPDSFIELD_DSCP_DEFAULT << 2) { TAO_DIOP_Transport* specific_transport = 0; ACE_NEW (specific_transport, - TAO_DIOP_Transport (this, orb_core, flag)); + TAO_DIOP_Transport (this, orb_core)); // store this pointer (indirectly increment ref count) this->transport (specific_transport); @@ -321,8 +320,7 @@ TAO_DIOP_Connection_Handler::add_transport_to_cache (void) // Add the handler to Cache return this->orb_core ()->lane_resources () - .transport_cache ().cache_transport (&prop, - this->transport ()); + .transport_cache ().cache_transport (&prop, this->transport ()); } int diff --git a/TAO/tao/Strategies/DIOP_Connection_Handler.h b/TAO/tao/Strategies/DIOP_Connection_Handler.h index c1e09e75e56..fd5336a5de7 100644 --- a/TAO/tao/Strategies/DIOP_Connection_Handler.h +++ b/TAO/tao/Strategies/DIOP_Connection_Handler.h @@ -53,7 +53,7 @@ public: TAO_DIOP_Connection_Handler (ACE_Thread_Manager* t = 0); /// Constructor. - TAO_DIOP_Connection_Handler (TAO_ORB_Core *orb_core, CORBA::Boolean flag); + TAO_DIOP_Connection_Handler (TAO_ORB_Core *orb_core); /// Destructor. ~TAO_DIOP_Connection_Handler (void); diff --git a/TAO/tao/Strategies/DIOP_Connector.cpp b/TAO/tao/Strategies/DIOP_Connector.cpp index 048c2830cd9..b4ae02e12ce 100644 --- a/TAO/tao/Strategies/DIOP_Connector.cpp +++ b/TAO/tao/Strategies/DIOP_Connector.cpp @@ -27,9 +27,8 @@ ACE_RCSID (Strategies, TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_DIOP_Connector::TAO_DIOP_Connector (CORBA::Boolean flag) - : TAO_Connector (TAO_TAG_DIOP_PROFILE), - lite_flag_ (flag) +TAO_DIOP_Connector::TAO_DIOP_Connector (void) + : TAO_Connector (TAO_TAG_DIOP_PROFILE) { } @@ -131,8 +130,7 @@ TAO_DIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *, TAO_DIOP_Connection_Handler *svc_handler = 0; ACE_NEW_RETURN (svc_handler, - TAO_DIOP_Connection_Handler (this->orb_core (), - this->lite_flag_), + TAO_DIOP_Connection_Handler (this->orb_core ()), 0); u_short port = 0; diff --git a/TAO/tao/Strategies/DIOP_Connector.h b/TAO/tao/Strategies/DIOP_Connector.h index 2e4befc78b8..f9ed820c634 100644 --- a/TAO/tao/Strategies/DIOP_Connector.h +++ b/TAO/tao/Strategies/DIOP_Connector.h @@ -49,7 +49,7 @@ class TAO_Strategies_Export TAO_DIOP_Connector : public TAO_Connector public: // = Initialization and termination methods. /// Constructor. - TAO_DIOP_Connector (CORBA::Boolean flag = false); + TAO_DIOP_Connector (void); /// Destructor. ~TAO_DIOP_Connector (void); @@ -90,11 +90,6 @@ protected: /// Cancel the passed cvs handler from the connector int cancel_svc_handler (TAO_Connection_Handler * svc_handler); -protected: - - /// Do we need to use a GIOP_Lite for sending messages? - CORBA::Boolean lite_flag_; - private: /// Return the remote endpoint, a helper function diff --git a/TAO/tao/Strategies/DIOP_Transport.cpp b/TAO/tao/Strategies/DIOP_Transport.cpp index 9541913700f..54fd7904e3f 100644 --- a/TAO/tao/Strategies/DIOP_Transport.cpp +++ b/TAO/tao/Strategies/DIOP_Transport.cpp @@ -18,15 +18,13 @@ #include "tao/debug.h" #include "tao/Resume_Handle.h" #include "tao/GIOP_Message_Base.h" -#include "tao/GIOP_Message_Lite.h" ACE_RCSID (tao, DIOP_Transport, "$Id$") TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_DIOP_Transport::TAO_DIOP_Transport (TAO_DIOP_Connection_Handler *handler, - TAO_ORB_Core *orb_core, - CORBA::Boolean flag) + TAO_ORB_Core *orb_core) : TAO_Transport (TAO_TAG_DIOP_PROFILE, orb_core) , connection_handler_ (handler) @@ -38,23 +36,11 @@ TAO_DIOP_Transport::TAO_DIOP_Transport (TAO_DIOP_Connection_Handler *handler, */ //@@ MESSAGING_SPL_COMMENT_HOOK_START - // @@ 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, - this, - ACE_MAX_DGRAM_SIZE)); - } + // Use the normal GIOP object + ACE_NEW (this->messaging_object_, + TAO_GIOP_Message_Base (orb_core, + this, + ACE_MAX_DGRAM_SIZE)); //@@ MESSAGING_SPL_COMMENT_HOOK_END diff --git a/TAO/tao/Strategies/DIOP_Transport.h b/TAO/tao/Strategies/DIOP_Transport.h index 2cae623c67e..1c4c0cb6b3a 100644 --- a/TAO/tao/Strategies/DIOP_Transport.h +++ b/TAO/tao/Strategies/DIOP_Transport.h @@ -57,8 +57,7 @@ public: /// Constructor. TAO_DIOP_Transport (TAO_DIOP_Connection_Handler *handler, - TAO_ORB_Core *orb_core, - CORBA::Boolean flag); + TAO_ORB_Core *orb_core); /// Default destructor. ~TAO_DIOP_Transport (void); diff --git a/TAO/tao/Strategies/SCIOP_Acceptor.cpp b/TAO/tao/Strategies/SCIOP_Acceptor.cpp index 84c96550cdd..100d71db9ba 100644 --- a/TAO/tao/Strategies/SCIOP_Acceptor.cpp +++ b/TAO/tao/Strategies/SCIOP_Acceptor.cpp @@ -21,7 +21,7 @@ ACE_RCSID(tao, TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_SCIOP_Acceptor::TAO_SCIOP_Acceptor (CORBA::Boolean flag) +TAO_SCIOP_Acceptor::TAO_SCIOP_Acceptor (void) : TAO_Acceptor (TAO_TAG_SCIOP_PROFILE), addrs_ (0), port_span_ (1), @@ -30,7 +30,6 @@ TAO_SCIOP_Acceptor::TAO_SCIOP_Acceptor (CORBA::Boolean flag) hostname_in_ior_ (0), version_ (TAO_DEF_SCIOP_MAJOR, TAO_DEF_SCIOP_MINOR), orb_core_ (0), - lite_flag_ (flag), base_acceptor_ (), creation_strategy_ (0), concurrency_strategy_ (0), @@ -501,8 +500,7 @@ TAO_SCIOP_Acceptor::open_i (const ACE_Multihomed_INET_Addr& addr, ACE_Reactor *reactor) { ACE_NEW_RETURN (this->creation_strategy_, - TAO_SCIOP_CREATION_STRATEGY (this->orb_core_, - this->lite_flag_), + TAO_SCIOP_CREATION_STRATEGY (this->orb_core_), -1); ACE_NEW_RETURN (this->concurrency_strategy_, diff --git a/TAO/tao/Strategies/SCIOP_Acceptor.h b/TAO/tao/Strategies/SCIOP_Acceptor.h index 25e985c0845..2f6827d80bf 100644 --- a/TAO/tao/Strategies/SCIOP_Acceptor.h +++ b/TAO/tao/Strategies/SCIOP_Acceptor.h @@ -48,7 +48,7 @@ class TAO_Strategies_Export TAO_SCIOP_Acceptor : public TAO_Acceptor { public: /// Constructor. - TAO_SCIOP_Acceptor (CORBA::Boolean flag = false); + TAO_SCIOP_Acceptor (void); /// Destructor. ~TAO_SCIOP_Acceptor (void); @@ -204,9 +204,6 @@ protected: /// ORB Core. TAO_ORB_Core *orb_core_; - /// Should we use GIOP lite?? - CORBA::Boolean lite_flag_; - private: /// the concrete acceptor, as a pointer to it's base class. diff --git a/TAO/tao/Strategies/SCIOP_Connector.cpp b/TAO/tao/Strategies/SCIOP_Connector.cpp index da977043497..883b8b69b17 100644 --- a/TAO/tao/Strategies/SCIOP_Connector.cpp +++ b/TAO/tao/Strategies/SCIOP_Connector.cpp @@ -27,9 +27,8 @@ ACE_RCSID (TAO, TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_SCIOP_Connector::TAO_SCIOP_Connector (CORBA::Boolean flag) +TAO_SCIOP_Connector::TAO_SCIOP_Connector (void) : TAO_Connector (TAO_TAG_SCIOP_PROFILE), - lite_flag_ (flag), connect_strategy_ (), base_connector_ () { @@ -59,8 +58,7 @@ TAO_SCIOP_Connector::open (TAO_ORB_Core *orb_core) ACE_NEW_RETURN (connect_creation_strategy, TAO_SCIOP_CONNECT_CREATION_STRATEGY (orb_core->thr_mgr (), - orb_core, - this->lite_flag_), + orb_core), -1); /// Our activation strategy diff --git a/TAO/tao/Strategies/SCIOP_Connector.h b/TAO/tao/Strategies/SCIOP_Connector.h index 2327ce9880e..f6a61b52bd9 100644 --- a/TAO/tao/Strategies/SCIOP_Connector.h +++ b/TAO/tao/Strategies/SCIOP_Connector.h @@ -50,7 +50,7 @@ class TAO_Strategies_Export TAO_SCIOP_Connector : public TAO_Connector public: // = Initialization and termination methods. /// Constructor. - TAO_SCIOP_Connector (CORBA::Boolean flag = false); + TAO_SCIOP_Connector (void); /// Destructor. ~TAO_SCIOP_Connector (void); @@ -98,12 +98,6 @@ protected: /// Cancel the passed cvs handler from the connector int cancel_svc_handler (TAO_Connection_Handler * svc_handler); -protected: - - /// Do we need to use a GIOP_Lite for sending messages? - CORBA::Boolean lite_flag_; - - private: /// Return the remote endpoint, a helper function diff --git a/TAO/tao/Strategies/SCIOP_Lite_Factory.cpp b/TAO/tao/Strategies/SCIOP_Lite_Factory.cpp deleted file mode 100644 index 451be1d5f1a..00000000000 --- a/TAO/tao/Strategies/SCIOP_Lite_Factory.cpp +++ /dev/null @@ -1,98 +0,0 @@ -#include "tao/Strategies/SCIOP_Lite_Factory.h" -#include "tao/Strategies/SCIOP_Acceptor.h" -#include "tao/Strategies/SCIOP_Connector.h" -#include "ace/Dynamic_Service.h" -#include "ace/Get_Opt.h" -#include "ace/OS_NS_strings.h" - -#if TAO_HAS_SCIOP == 1 - -ACE_RCSID(tao, SCIOP_Factory, "$Id$") - -static const char prefix_[] = "sciop"; - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -TAO_SCIOP_Lite_Protocol_Factory::TAO_SCIOP_Lite_Protocol_Factory (void) - : TAO_Protocol_Factory (TAO_TAG_SCIOP_PROFILE) -{ -} - -TAO_SCIOP_Lite_Protocol_Factory::~TAO_SCIOP_Lite_Protocol_Factory (void) -{ - -} - -int -TAO_SCIOP_Lite_Protocol_Factory::match_prefix (const ACE_CString &prefix) -{ - // Check for the proper prefix for this protocol. - return (ACE_OS::strcasecmp (prefix.c_str (), ::prefix_) == 0); -} - -const char * -TAO_SCIOP_Lite_Protocol_Factory::prefix (void) const -{ - return ::prefix_; -} - -char -TAO_SCIOP_Lite_Protocol_Factory::options_delimiter (void) const -{ - return '/'; -} - -TAO_Acceptor * -TAO_SCIOP_Lite_Protocol_Factory::make_acceptor (void) -{ - TAO_Acceptor *acceptor = 0; - - // We are a Lite factory - CORBA::Boolean lite_flag = 1; - ACE_NEW_RETURN (acceptor, - TAO_SCIOP_Acceptor (lite_flag), - 0); - - return acceptor; -} - -int -TAO_SCIOP_Lite_Protocol_Factory::init (int /*argc*/, - ACE_TCHAR* /*argv*/ []) -{ - return 0; -} - -TAO_Connector * -TAO_SCIOP_Lite_Protocol_Factory::make_connector (void) -{ - TAO_Connector *connector = 0; - - // We are a Lite factory - CORBA::Boolean lite_flag = 1; - - ACE_NEW_RETURN (connector, - TAO_SCIOP_Connector (lite_flag), - 0); - return connector; -} - -int -TAO_SCIOP_Lite_Protocol_Factory::requires_explicit_endpoint (void) const -{ - return 0; -} - -TAO_END_VERSIONED_NAMESPACE_DECL - -ACE_STATIC_SVC_DEFINE (TAO_SCIOP_Lite_Protocol_Factory, - ACE_TEXT ("SCIOP_Lite_Factory"), - ACE_SVC_OBJ_T, - &ACE_SVC_NAME (TAO_SCIOP_Lite_Protocol_Factory), - ACE_Service_Type::DELETE_THIS | - ACE_Service_Type::DELETE_OBJ, - 0) - -ACE_FACTORY_DEFINE (TAO, TAO_SCIOP_Lite_Protocol_Factory) - -#endif /* TAO_HAS_SCIOP == 1 */ diff --git a/TAO/tao/Strategies/SCIOP_Lite_Factory.h b/TAO/tao/Strategies/SCIOP_Lite_Factory.h deleted file mode 100644 index 2c5ee683006..00000000000 --- a/TAO/tao/Strategies/SCIOP_Lite_Factory.h +++ /dev/null @@ -1,71 +0,0 @@ -// -*- C++ -*- - -// $Id$ -//========================================================================== -/** - * @file SCIOP_Lite_Factory.h - * - * @author Jason Cohen, Lockheed Martin ATL <jcohen@atl.lmco.com> - * @author Keith O'Hara, Lockheed Martin ATL - */ -//========================================================================== - - -#ifndef TAO_SCIOP_LITE_FACTORY_H -#define TAO_SCIOP_LITE_FACTORY_H -#include /**/ "ace/pre.h" - -#include "tao/orbconf.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#if TAO_HAS_SCIOP == 1 - -#include "tao/Strategies/strategies_export.h" -#include "ace/Service_Config.h" -#include "tao/Protocol_Factory.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -class TAO_Acceptor; -class TAO_Connector; - -class TAO_Strategies_Export TAO_SCIOP_Lite_Protocol_Factory : - public TAO_Protocol_Factory -{ -public: - TAO_SCIOP_Lite_Protocol_Factory (void); - - virtual ~TAO_SCIOP_Lite_Protocol_Factory (void); - - // = Service Configurator hooks. - /// Dynamic linking hook - virtual int init (int argc, ACE_TCHAR* argv[]); - - /// Verify prefix is a match - virtual int match_prefix (const ACE_CString &prefix); - - /// Returns the prefix used by the protocol. - virtual const char *prefix (void) const; - - /// Return the character used to mark where an endpoint ends and - /// where its options begin. - virtual char options_delimiter (void) const; - - // = Check Protocol_Factory.h for a description of these methods. - virtual TAO_Acceptor *make_acceptor (void); - virtual TAO_Connector *make_connector (void); - virtual int requires_explicit_endpoint (void) const; -}; - -TAO_END_VERSIONED_NAMESPACE_DECL - -ACE_STATIC_SVC_DECLARE_EXPORT (TAO_Strategies, TAO_SCIOP_Lite_Protocol_Factory) -ACE_FACTORY_DECLARE (TAO_Strategies, TAO_SCIOP_Lite_Protocol_Factory) - -#endif /* TAO_HAS_SCIOP == 1 */ - -#include /**/ "ace/post.h" -#endif /* TAO_SCIOP_Lite_factory_H */ diff --git a/TAO/tao/Strategies/SCIOP_Transport.cpp b/TAO/tao/Strategies/SCIOP_Transport.cpp index 65b0fe7b905..073cf32c2cd 100644 --- a/TAO/tao/Strategies/SCIOP_Transport.cpp +++ b/TAO/tao/Strategies/SCIOP_Transport.cpp @@ -28,28 +28,14 @@ ACE_RCSID (tao, TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_SCIOP_Transport::TAO_SCIOP_Transport (TAO_SCIOP_Connection_Handler *handler, - TAO_ORB_Core *orb_core, - CORBA::Boolean ) + TAO_ORB_Core *orb_core) : TAO_Transport (TAO_TAG_SCIOP_PROFILE, orb_core) , connection_handler_ (handler) , messaging_object_ (0) { -#if 0 - // First step in deprecating this. - if (flag) - { - // Use the lite version of the protocol - ACE_NEW (this->messaging_object_, - TAO_GIOP_Message_Lite (orb_core)); - } - else -#endif /*if 0*/ - { - // Use the normal GIOP object - ACE_NEW (this->messaging_object_, - TAO_GIOP_Message_Base (orb_core, this)); - } + ACE_NEW (this->messaging_object_, + TAO_GIOP_Message_Base (orb_core, this)); } TAO_SCIOP_Transport::~TAO_SCIOP_Transport (void) diff --git a/TAO/tao/Strategies/SCIOP_Transport.h b/TAO/tao/Strategies/SCIOP_Transport.h index c99b24aa10d..aa454a75ad3 100644 --- a/TAO/tao/Strategies/SCIOP_Transport.h +++ b/TAO/tao/Strategies/SCIOP_Transport.h @@ -51,8 +51,7 @@ public: /// Constructor. TAO_SCIOP_Transport (TAO_SCIOP_Connection_Handler *handler, - TAO_ORB_Core *orb_core, - CORBA::Boolean flag); + TAO_ORB_Core *orb_core); protected: diff --git a/TAO/tao/Strategies/SHMIOP_Acceptor.cpp b/TAO/tao/Strategies/SHMIOP_Acceptor.cpp index 0e25183cd37..d625e4283c1 100644 --- a/TAO/tao/Strategies/SHMIOP_Acceptor.cpp +++ b/TAO/tao/Strategies/SHMIOP_Acceptor.cpp @@ -21,7 +21,7 @@ ACE_RCSID (Strategies, TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_SHMIOP_Acceptor::TAO_SHMIOP_Acceptor (CORBA::Boolean flag) +TAO_SHMIOP_Acceptor::TAO_SHMIOP_Acceptor (void) : TAO_Acceptor (TAO_TAG_SHMEM_PROFILE), version_ (TAO_DEF_GIOP_MAJOR, TAO_DEF_GIOP_MINOR), orb_core_ (0), @@ -30,8 +30,7 @@ TAO_SHMIOP_Acceptor::TAO_SHMIOP_Acceptor (CORBA::Boolean flag) concurrency_strategy_ (0), accept_strategy_ (0), mmap_file_prefix_ (0), - mmap_size_ (1024 * 1024), - lite_flag_ (flag) + mmap_size_ (1024 * 1024) { } @@ -243,8 +242,7 @@ TAO_SHMIOP_Acceptor::open_i (TAO_ORB_Core* orb_core, ACE_Reactor *reactor) this->orb_core_ = orb_core; ACE_NEW_RETURN (this->creation_strategy_, - TAO_SHMIOP_CREATION_STRATEGY (this->orb_core_, - this->lite_flag_), + TAO_SHMIOP_CREATION_STRATEGY (this->orb_core_), -1); ACE_NEW_RETURN (this->concurrency_strategy_, diff --git a/TAO/tao/Strategies/SHMIOP_Acceptor.h b/TAO/tao/Strategies/SHMIOP_Acceptor.h index d48b2ec0326..a1f8e8af093 100644 --- a/TAO/tao/Strategies/SHMIOP_Acceptor.h +++ b/TAO/tao/Strategies/SHMIOP_Acceptor.h @@ -1,7 +1,5 @@ // -*- C++ -*- // $Id$ - -// $Id$ // =================================================================== /** * @file SHMIOP_Acceptor.h @@ -45,7 +43,7 @@ class TAO_Strategies_Export TAO_SHMIOP_Acceptor : public TAO_Acceptor { public: /// Constructor. - TAO_SHMIOP_Acceptor (CORBA::Boolean flag = false); + TAO_SHMIOP_Acceptor (void); /// Destructor. ~TAO_SHMIOP_Acceptor (void); @@ -140,9 +138,6 @@ private: /// Determine the minimum size of mmap file. This dictate the /// maximum size of a CORBA method invocation. ACE_OFF_T mmap_size_; - - /// Should we use GIOP lite?? - CORBA::Boolean lite_flag_; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp b/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp index 43d791314ee..5d7685b824d 100644 --- a/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp +++ b/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp @@ -39,14 +39,13 @@ TAO_SHMIOP_Connection_Handler::TAO_SHMIOP_Connection_Handler (ACE_Thread_Manager } -TAO_SHMIOP_Connection_Handler::TAO_SHMIOP_Connection_Handler (TAO_ORB_Core *orb_core, - CORBA::Boolean flag) +TAO_SHMIOP_Connection_Handler::TAO_SHMIOP_Connection_Handler (TAO_ORB_Core *orb_core) : TAO_SHMIOP_SVC_HANDLER (orb_core->thr_mgr (), 0, 0), TAO_Connection_Handler (orb_core) { TAO_SHMIOP_Transport* specific_transport = 0; ACE_NEW (specific_transport, - TAO_SHMIOP_Transport(this, orb_core, flag)); + TAO_SHMIOP_Transport(this, orb_core)); // store this pointer (indirectly increment ref count) this->transport (specific_transport); diff --git a/TAO/tao/Strategies/SHMIOP_Connection_Handler.h b/TAO/tao/Strategies/SHMIOP_Connection_Handler.h index 8b432e5750f..ce3d080d4b0 100644 --- a/TAO/tao/Strategies/SHMIOP_Connection_Handler.h +++ b/TAO/tao/Strategies/SHMIOP_Connection_Handler.h @@ -51,8 +51,7 @@ public: TAO_SHMIOP_Connection_Handler (ACE_Thread_Manager* t = 0); /// Constructor. - TAO_SHMIOP_Connection_Handler (TAO_ORB_Core *orb_core, - CORBA::Boolean flag); + TAO_SHMIOP_Connection_Handler (TAO_ORB_Core *orb_core); /// Destructor. ~TAO_SHMIOP_Connection_Handler (void); diff --git a/TAO/tao/Strategies/SHMIOP_Connector.cpp b/TAO/tao/Strategies/SHMIOP_Connector.cpp index 6e4e621d82b..a4b7f899f2e 100644 --- a/TAO/tao/Strategies/SHMIOP_Connector.cpp +++ b/TAO/tao/Strategies/SHMIOP_Connector.cpp @@ -23,11 +23,10 @@ ACE_RCSID (Strategies, TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_SHMIOP_Connector::TAO_SHMIOP_Connector (CORBA::Boolean flag) +TAO_SHMIOP_Connector::TAO_SHMIOP_Connector (void) : TAO_Connector (TAO_TAG_SHMEM_PROFILE), connect_strategy_ (), - base_connector_ (), - lite_flag_ (flag) + base_connector_ () { } @@ -53,8 +52,7 @@ TAO_SHMIOP_Connector::open (TAO_ORB_Core *orb_core) ACE_NEW_RETURN (connect_creation_strategy, TAO_SHMIOP_CONNECT_CREATION_STRATEGY (orb_core->thr_mgr (), - orb_core, - this->lite_flag_), + orb_core), -1); /// Our activation strategy diff --git a/TAO/tao/Strategies/SHMIOP_Connector.h b/TAO/tao/Strategies/SHMIOP_Connector.h index 295672e9d28..cf56fd06bee 100644 --- a/TAO/tao/Strategies/SHMIOP_Connector.h +++ b/TAO/tao/Strategies/SHMIOP_Connector.h @@ -52,7 +52,7 @@ class TAO_Strategies_Export TAO_SHMIOP_Connector : public TAO_Connector { public: /// Constructor. - TAO_SHMIOP_Connector (CORBA::Boolean flag = false); + TAO_SHMIOP_Connector (void); /// Default destructor ~TAO_SHMIOP_Connector (void); @@ -123,9 +123,6 @@ private: /// The connector initiating connection requests for SHMIOP. TAO_SHMIOP_BASE_CONNECTOR base_connector_; - - /// Are we using GIOP lite? - CORBA::Boolean lite_flag_; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Strategies/SHMIOP_Transport.cpp b/TAO/tao/Strategies/SHMIOP_Transport.cpp index 6f66f057062..f5d009a8587 100644 --- a/TAO/tao/Strategies/SHMIOP_Transport.cpp +++ b/TAO/tao/Strategies/SHMIOP_Transport.cpp @@ -15,7 +15,6 @@ #include "tao/debug.h" #include "tao/Resume_Handle.h" #include "tao/GIOP_Message_Base.h" -#include "tao/GIOP_Message_Lite.h" ACE_RCSID (Strategies, SHMIOP_Transport, "$Id$") @@ -23,8 +22,7 @@ ACE_RCSID (Strategies, SHMIOP_Transport, "$Id$") TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_SHMIOP_Transport::TAO_SHMIOP_Transport (TAO_SHMIOP_Connection_Handler *handler, - TAO_ORB_Core *orb_core, - CORBA::Boolean flag) + TAO_ORB_Core *orb_core) : TAO_Transport (TAO_TAG_SHMEM_PROFILE, orb_core), connection_handler_ (handler), @@ -35,18 +33,8 @@ TAO_SHMIOP_Transport::TAO_SHMIOP_Transport (TAO_SHMIOP_Connection_Handler *handl * object is known a priori. In this case, the flag is ignored. */ //@@ MESSAGING_SPL_COMMENT_HOOK_START - if (flag) - { - // Use the lite version of the protocol - ACE_NEW (this->messaging_object_, - TAO_GIOP_Message_Lite (orb_core)); - } - else - { - // Use the normal GIOP object - ACE_NEW (this->messaging_object_, - TAO_GIOP_Message_Base (orb_core, this)); - } + ACE_NEW (this->messaging_object_, + TAO_GIOP_Message_Base (orb_core, this)); //@@ MESSAGING_SPL_COMMENT_HOOK_END } diff --git a/TAO/tao/Strategies/SHMIOP_Transport.h b/TAO/tao/Strategies/SHMIOP_Transport.h index 7224a002623..09203f4fe99 100644 --- a/TAO/tao/Strategies/SHMIOP_Transport.h +++ b/TAO/tao/Strategies/SHMIOP_Transport.h @@ -57,8 +57,7 @@ public: /// Constructor. TAO_SHMIOP_Transport (TAO_SHMIOP_Connection_Handler *handler, - TAO_ORB_Core *orb_core, - CORBA::Boolean flag); + TAO_ORB_Core *orb_core); /// Default destructor. ~TAO_SHMIOP_Transport (void); diff --git a/TAO/tao/Strategies/UIOP_Acceptor.cpp b/TAO/tao/Strategies/UIOP_Acceptor.cpp index d668a3ee78a..f0d5abd19ed 100644 --- a/TAO/tao/Strategies/UIOP_Acceptor.cpp +++ b/TAO/tao/Strategies/UIOP_Acceptor.cpp @@ -29,8 +29,7 @@ TAO_UIOP_Acceptor::TAO_UIOP_Acceptor (CORBA::Boolean flag) accept_strategy_ (0), version_ (TAO_DEF_GIOP_MAJOR, TAO_DEF_GIOP_MINOR), orb_core_ (0), - unlink_on_close_ (true), - lite_flag_ (flag) + unlink_on_close_ (true) { } @@ -244,8 +243,7 @@ TAO_UIOP_Acceptor::open_i (const char *rendezvous, ACE_Reactor *reactor) { ACE_NEW_RETURN (this->creation_strategy_, - TAO_UIOP_CREATION_STRATEGY (this->orb_core_, - this->lite_flag_), + TAO_UIOP_CREATION_STRATEGY (this->orb_core_), -1); ACE_NEW_RETURN (this->concurrency_strategy_, diff --git a/TAO/tao/Strategies/UIOP_Acceptor.h b/TAO/tao/Strategies/UIOP_Acceptor.h index be767003245..21d33bca6d6 100644 --- a/TAO/tao/Strategies/UIOP_Acceptor.h +++ b/TAO/tao/Strategies/UIOP_Acceptor.h @@ -132,9 +132,6 @@ private: /// be unlinked on close. This is really only used when an error /// occurs. bool unlink_on_close_; - - /// Should we use GIOP lite?? - const bool lite_flag_; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Strategies/UIOP_Connection_Handler.cpp b/TAO/tao/Strategies/UIOP_Connection_Handler.cpp index b249252d523..1db0f6a87b6 100644 --- a/TAO/tao/Strategies/UIOP_Connection_Handler.cpp +++ b/TAO/tao/Strategies/UIOP_Connection_Handler.cpp @@ -13,7 +13,6 @@ #include "tao/Timeprobe.h" #include "tao/Server_Strategy_Factory.h" #include "tao/Base_Transport_Property.h" -#include "tao/GIOP_Message_Lite.h" #include "tao/Transport_Cache_Manager.h" #include "tao/Resume_Handle.h" #include "tao/Thread_Lane_Resources.h" @@ -38,15 +37,13 @@ TAO_UIOP_Connection_Handler::TAO_UIOP_Connection_Handler (ACE_Thread_Manager *t) } -TAO_UIOP_Connection_Handler::TAO_UIOP_Connection_Handler ( - TAO_ORB_Core *orb_core, - CORBA::Boolean flag) +TAO_UIOP_Connection_Handler::TAO_UIOP_Connection_Handler (TAO_ORB_Core *orb_core) : TAO_UIOP_SVC_HANDLER (orb_core->thr_mgr (), 0, 0), TAO_Connection_Handler (orb_core) { TAO_UIOP_Transport* specific_transport = 0; ACE_NEW (specific_transport, - TAO_UIOP_Transport (this, orb_core, flag)); + TAO_UIOP_Transport (this, orb_core)); // store this pointer (indirectly increment ref count) this->transport (specific_transport); diff --git a/TAO/tao/Strategies/UIOP_Connection_Handler.h b/TAO/tao/Strategies/UIOP_Connection_Handler.h index d1d3358d7b8..6b40184b3e2 100644 --- a/TAO/tao/Strategies/UIOP_Connection_Handler.h +++ b/TAO/tao/Strategies/UIOP_Connection_Handler.h @@ -51,8 +51,7 @@ public: TAO_UIOP_Connection_Handler (ACE_Thread_Manager* t = 0); /// Constructor. - TAO_UIOP_Connection_Handler (TAO_ORB_Core *orb_core, - CORBA::Boolean flag); + TAO_UIOP_Connection_Handler (TAO_ORB_Core *orb_core); /// Destructor. ~TAO_UIOP_Connection_Handler (void); diff --git a/TAO/tao/Strategies/UIOP_Connector.cpp b/TAO/tao/Strategies/UIOP_Connector.cpp index 9fd67d0804b..2af80adeeb9 100644 --- a/TAO/tao/Strategies/UIOP_Connector.cpp +++ b/TAO/tao/Strategies/UIOP_Connector.cpp @@ -23,11 +23,10 @@ ACE_RCSID(Strategies, TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_UIOP_Connector::TAO_UIOP_Connector (CORBA::Boolean flag) +TAO_UIOP_Connector::TAO_UIOP_Connector (void) : TAO_Connector (TAO_TAG_UIOP_PROFILE), connect_strategy_ (), - base_connector_ (), - lite_flag_ (flag) + base_connector_ () { } @@ -50,8 +49,7 @@ TAO_UIOP_Connector::open (TAO_ORB_Core *orb_core) ACE_NEW_RETURN (connect_creation_strategy, TAO_UIOP_CONNECT_CREATION_STRATEGY (orb_core->thr_mgr (), - orb_core, - this->lite_flag_), + orb_core), -1); /// Our activation strategy diff --git a/TAO/tao/Strategies/UIOP_Connector.h b/TAO/tao/Strategies/UIOP_Connector.h index 1b464857928..a12dd13fb2b 100644 --- a/TAO/tao/Strategies/UIOP_Connector.h +++ b/TAO/tao/Strategies/UIOP_Connector.h @@ -55,7 +55,7 @@ public: * @@ Do we want to pass in the tag here or should it be statically * defined? */ - TAO_UIOP_Connector (CORBA::Boolean flag = false); + TAO_UIOP_Connector (void); /// Destructor ~TAO_UIOP_Connector (void); @@ -128,9 +128,6 @@ private: /// The connector initiating connection requests for UIOP. TAO_UIOP_BASE_CONNECTOR base_connector_; - - /// Do we need to use a GIOP_Lite for sending messages? - const bool lite_flag_; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Strategies/UIOP_Lite_Factory.cpp b/TAO/tao/Strategies/UIOP_Lite_Factory.cpp deleted file mode 100644 index 0ab0d04ffd2..00000000000 --- a/TAO/tao/Strategies/UIOP_Lite_Factory.cpp +++ /dev/null @@ -1,104 +0,0 @@ -#include "tao/Strategies/UIOP_Lite_Factory.h" - -#if TAO_HAS_UIOP == 1 - -#include "tao/Strategies/UIOP_Acceptor.h" -#include "tao/Strategies/UIOP_Connector.h" - -#include "tao/ORB_Constants.h" - -#include "ace/Dynamic_Service.h" -#include "ace/OS_NS_strings.h" - - -ACE_RCSID (Strategies, - UIOP_Lite_Factory, - "$Id$") - - -static const char prefix_[] = "uiop"; - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -TAO_UIOP_Lite_Protocol_Factory::TAO_UIOP_Lite_Protocol_Factory (void) - : TAO_Protocol_Factory (TAO_TAG_UIOP_PROFILE) -{ -} - -TAO_UIOP_Lite_Protocol_Factory::~TAO_UIOP_Lite_Protocol_Factory (void) -{ -} - -int -TAO_UIOP_Lite_Protocol_Factory::match_prefix (const ACE_CString &prefix) -{ - // Check for the proper prefix for this protocol. - return (ACE_OS::strcasecmp (prefix.c_str (), ::prefix_) == 0); -} - -const char * -TAO_UIOP_Lite_Protocol_Factory::prefix (void) const -{ - return ::prefix_; -} - -char -TAO_UIOP_Lite_Protocol_Factory::options_delimiter (void) const -{ - return '|'; -} - -TAO_Acceptor * -TAO_UIOP_Lite_Protocol_Factory::make_acceptor (void) -{ - TAO_Acceptor *acceptor = 0; - - // We are Lite factory - CORBA::Boolean lite_factory = true; - ACE_NEW_RETURN (acceptor, - TAO_UIOP_Acceptor (lite_factory), - 0); - - return acceptor; -} - -int -TAO_UIOP_Lite_Protocol_Factory::init (int /* argc */, ACE_TCHAR* /* argv */ []) -{ - return 0; -} - -TAO_Connector * -TAO_UIOP_Lite_Protocol_Factory::make_connector (void) -{ - TAO_Connector *connector = 0; - - // We are a lite factory - CORBA::Boolean lite_factory = true; - ACE_NEW_RETURN (connector, - TAO_UIOP_Connector (lite_factory), - 0); - - return connector; -} - -int -TAO_UIOP_Lite_Protocol_Factory::requires_explicit_endpoint (void) const -{ - return 1; -} - -TAO_END_VERSIONED_NAMESPACE_DECL - -ACE_STATIC_SVC_DEFINE (TAO_UIOP_Lite_Protocol_Factory, - ACE_TEXT ("UIOP_Lite_Factory"), - ACE_SVC_OBJ_T, - &ACE_SVC_NAME (TAO_UIOP_Lite_Protocol_Factory), - ACE_Service_Type::DELETE_THIS | - ACE_Service_Type::DELETE_OBJ, - 0) - -ACE_FACTORY_DEFINE (TAO_Strategies, TAO_UIOP_Lite_Protocol_Factory) - - -#endif /* TAO_HAS_UIOP == 1 */ diff --git a/TAO/tao/Strategies/UIOP_Lite_Factory.h b/TAO/tao/Strategies/UIOP_Lite_Factory.h deleted file mode 100644 index f3818176aa6..00000000000 --- a/TAO/tao/Strategies/UIOP_Lite_Factory.h +++ /dev/null @@ -1,82 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file UIOP_Lite_Factory.h - * - * $Id$ - * - * @author Fred Kuhns <fredk@cs.wustl.edu> - * @author Ossama Othman <othman@cs.wustl.edu> - */ -//============================================================================= - - -#ifndef TAO_UIOP_LITE_FACTORY_H -#define TAO_UIOP_LITE_FACTORY_H - -#include /**/ "ace/pre.h" - -#include "tao/orbconf.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -# if TAO_HAS_UIOP == 1 - -#include "ace/Service_Config.h" -#include "tao/Strategies/strategies_export.h" -#include "tao/Protocol_Factory.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -class TAO_Acceptor; -class TAO_Connector; - -class TAO_Strategies_Export TAO_UIOP_Lite_Protocol_Factory : - public TAO_Protocol_Factory -{ -public: - /// Constructor. - TAO_UIOP_Lite_Protocol_Factory (void); - - /// Destructor. - virtual ~TAO_UIOP_Lite_Protocol_Factory (void); - - // = Service Configurator hooks. - /// Dynamic linking hook - virtual int init (int argc, ACE_TCHAR* argv[]); - - /// Verify prefix is a match - virtual int match_prefix (const ACE_CString &prefix); - - /// Returns the prefix used by the protocol. - virtual const char *prefix (void) const; - - /// Return the character used to mark where an endpoint ends and - /// where its options begin. - virtual char options_delimiter (void) const; - - /** - * @name Protocol factory methods Methods - * - * Please check the documentation in Protocol_Factory.h for details. - */ - //@{ - virtual TAO_Acceptor *make_acceptor (void); - virtual TAO_Connector *make_connector (void); - virtual int requires_explicit_endpoint (void) const; - //@} -}; - -TAO_END_VERSIONED_NAMESPACE_DECL - -ACE_STATIC_SVC_DECLARE (TAO_UIOP_Lite_Protocol_Factory) -ACE_FACTORY_DECLARE (TAO_Strategies, TAO_UIOP_Lite_Protocol_Factory) - -# endif /* TAO_HAS_UIOP == 1 */ - -#include /**/ "ace/post.h" - -#endif /* TAO_UIOP_LITE_FACTORY_H */ diff --git a/TAO/tao/Strategies/UIOP_Transport.cpp b/TAO/tao/Strategies/UIOP_Transport.cpp index cce1c02c833..6c45e899914 100644 --- a/TAO/tao/Strategies/UIOP_Transport.cpp +++ b/TAO/tao/Strategies/UIOP_Transport.cpp @@ -14,7 +14,6 @@ #include "tao/ORB_Core.h" #include "tao/debug.h" #include "tao/GIOP_Message_Base.h" -#include "tao/GIOP_Message_Lite.h" ACE_RCSID (Strategies, UIOP_Transport, @@ -24,8 +23,7 @@ ACE_RCSID (Strategies, TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_UIOP_Transport::TAO_UIOP_Transport (TAO_UIOP_Connection_Handler *handler, - TAO_ORB_Core *orb_core, - CORBA::Boolean flag) + TAO_ORB_Core *orb_core) : TAO_Transport (TAO_TAG_UIOP_PROFILE, orb_core) , connection_handler_ (handler) @@ -37,18 +35,9 @@ TAO_UIOP_Transport::TAO_UIOP_Transport (TAO_UIOP_Connection_Handler *handler, * object is known a priori. In this case, the flag is ignored. */ //@@ MESSAGING_SPL_COMMENT_HOOK_START - if (flag) - { - // Use the lite version of the protocol - ACE_NEW (this->messaging_object_, - TAO_GIOP_Message_Lite (orb_core)); - } - else - { - // Use the normal GIOP object - ACE_NEW (this->messaging_object_, - TAO_GIOP_Message_Base (orb_core, this)); - } + // Use the normal GIOP object + ACE_NEW (this->messaging_object_, + TAO_GIOP_Message_Base (orb_core, this)); //@@ MESSAGING_SPL_COMMENT_HOOK_END } diff --git a/TAO/tao/Strategies/UIOP_Transport.h b/TAO/tao/Strategies/UIOP_Transport.h index 1a7599f45fb..88f0fc16a28 100644 --- a/TAO/tao/Strategies/UIOP_Transport.h +++ b/TAO/tao/Strategies/UIOP_Transport.h @@ -55,8 +55,7 @@ public: /// Constructor. TAO_UIOP_Transport (TAO_UIOP_Connection_Handler *handler, - TAO_ORB_Core *orb_core, - CORBA::Boolean flag); + TAO_ORB_Core *orb_core); /// Default destructor. ~TAO_UIOP_Transport (void); diff --git a/TAO/tao/params.cpp b/TAO/tao/params.cpp index 5778ec068dd..af6a7da0146 100644 --- a/TAO/tao/params.cpp +++ b/TAO/tao/params.cpp @@ -27,7 +27,6 @@ TAO_ORB_Parameters::TAO_ORB_Parameters (void) , sock_dontroute_ (0) , cdr_memcpy_tradeoff_ (ACE_DEFAULT_CDR_MEMCPY_TRADEOFF) , max_message_size_ (0) // Disable outgoing GIOP fragments by default - , use_lite_protocol_ (0) , use_dotted_decimal_addresses_ (0) , cache_incoming_by_dotted_decimal_address_ (0) , linger_ (-1) diff --git a/TAO/tao/params.h b/TAO/tao/params.h index 3c9f3ca79f6..c4639f7da86 100644 --- a/TAO/tao/params.h +++ b/TAO/tao/params.h @@ -295,9 +295,6 @@ private: */ ACE_CDR::ULong max_message_size_; - /// For selecting a liteweight version of the GIOP protocol. - int use_lite_protocol_; - /// For selecting a address notation int use_dotted_decimal_addresses_; diff --git a/TAO/tao/tao.mpc b/TAO/tao/tao.mpc index c79c6f9f046..adb3f9f0f4b 100644 --- a/TAO/tao/tao.mpc +++ b/TAO/tao/tao.mpc @@ -79,7 +79,6 @@ project(TAO) : acelib, install, tao_output, taodefaults, pidl, extra_core, tao_v GIOP_Message_Generator_Parser_11.cpp GIOP_Message_Generator_Parser_12.cpp GIOP_Message_Generator_Parser_Impl.cpp - GIOP_Message_Lite.cpp GIOP_Message_Locate_Header.cpp GIOP_Message_State.cpp GIOP_Message_Version.cpp @@ -94,7 +93,6 @@ project(TAO) : acelib, install, tao_output, taodefaults, pidl, extra_core, tao_v IIOP_Endpoint.cpp IIOP_EndpointsC.cpp IIOP_Factory.cpp - IIOP_Lite_Factory.cpp IIOP_Profile.cpp IIOP_Transport.cpp IIOPC.cpp @@ -350,7 +348,6 @@ project(TAO) : acelib, install, tao_output, taodefaults, pidl, extra_core, tao_v GIOP_Message_Generator_Parser_12.h GIOP_Message_Generator_Parser.h GIOP_Message_Generator_Parser_Impl.h - GIOP_Message_Lite.h GIOP_Message_Locate_Header.h GIOP_Message_State.h GIOP_Message_Version.h @@ -369,7 +366,6 @@ project(TAO) : acelib, install, tao_output, taodefaults, pidl, extra_core, tao_v IIOP_EndpointsC.h IIOP_EndpointsS.h IIOP_Factory.h - IIOP_Lite_Factory.h IIOP_Profile.h IIOP_Transport.h Incoming_Message_Queue.h |