diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2000-12-08 19:13:09 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2000-12-08 19:13:09 +0000 |
| commit | 20d40b81fa880f37581ef1a667ddc7a51b5ce9d7 (patch) | |
| tree | fc1227e146dd2bf415cb24d94222a946c4fa9189 | |
| parent | 2f3365a4b46f93570c26f01f87b40be2a7f17a36 (diff) | |
| download | ATCD-20d40b81fa880f37581ef1a667ddc7a51b5ce9d7.tar.gz | |
ChangeLogTag: Fri Dec 8 13:06:40 2000 Balachandran Natarajan <bala@cs.wustl.edu>
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 27 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Makefile.SSLIOP | 535 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.cpp | 36 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.h | 12 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp | 115 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h | 67 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp | 36 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h | 10 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp | 113 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h | 62 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp | 8 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h | 4 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.i | 3 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp | 574 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h | 177 | ||||
| -rw-r--r-- | TAO/tao/IIOP_Connector.cpp | 6 |
16 files changed, 729 insertions, 1056 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index bb23e34d0f1..612ff7f2e4b 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,30 @@ +Fri Dec 8 13:06:40 2000 Balachandran Natarajan <bala@cs.wustl.edu> + + * orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.cpp: + * orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.h: + * orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp: + * orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.i: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h: Replicated changes + from IIOP. + + * orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h: + * orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.cpp: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.i: New files + for the connection handler. + + * tao/IIOP_Connector.cpp: Fixed some typos in #pragma + instantiation. + Fri Dec 8 07:48:32 2000 Christopher Kohlhoff <chris@kohlhoff.com> * tao/Makefile.bor: diff --git a/TAO/orbsvcs/orbsvcs/Makefile.SSLIOP b/TAO/orbsvcs/orbsvcs/Makefile.SSLIOP index 34469e5b01b..db2705c1373 100644 --- a/TAO/orbsvcs/orbsvcs/Makefile.SSLIOP +++ b/TAO/orbsvcs/orbsvcs/Makefile.SSLIOP @@ -41,7 +41,7 @@ IDL_SRC = \ FILES = \ SSLIOP/IIOP_SSL_Acceptor \ - SSLIOP/IIOP_SSL_Connect \ + SSLIOP/IIOP_SSL_Connection_Handler \ SSLIOP/IIOP_SSL_Connector \ SSLIOP/SSLIOP_Current \ SSLIOP/SSLIOP_Current_Impl \ @@ -53,7 +53,7 @@ FILES = \ SSLIOP/SSLIOP_Transport \ SSLIOP/SSLIOP_Connector \ SSLIOP/SSLIOP_Acceptor \ - SSLIOP/SSLIOP_Connect \ + SSLIOP/SSLIOP_Connection_Handler \ SSLIOP/ssl_endpoints LSRC = $(addsuffix .cpp,$(FILES)) $(notdir $(IDL_SRC)) @@ -97,8 +97,9 @@ realclean: clean .obj/IIOP_SSL_Acceptor.o .obj/IIOP_SSL_Acceptor.so .shobj/IIOP_SSL_Acceptor.o .shobj/IIOP_SSL_Acceptor.so: SSLIOP/IIOP_SSL_Acceptor.cpp \ SSLIOP/IIOP_SSL_Acceptor.h \ - $(ACE_ROOT)/ace/pre.h \ - SSLIOP/SSLIOP_Export.h \ + $(ACE_ROOT)/ace/pre.h SSLIOP/SSLIOP_Export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -107,7 +108,7 @@ realclean: clean $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Errno.inl \ - SSLIOP/IIOP_SSL_Connect.h \ + SSLIOP/IIOP_SSL_Connection_Handler.h \ SSLIOPC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ @@ -241,17 +242,9 @@ realclean: clean $(TAO_ROOT)/tao/OctetSeqC.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/TAO_Server_Request.h \ - $(TAO_ROOT)/tao/GIOP_Message_Base.h \ - $(TAO_ROOT)/tao/GIOP_Message_State.h \ - $(TAO_ROOT)/tao/Pluggable_Messaging.h \ - $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \ + $(TAO_ROOT)/tao/Tagged_Profile.h \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ - $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \ - $(TAO_ROOT)/tao/Pluggable_Messaging.i \ - $(TAO_ROOT)/tao/GIOP_Message_State.i \ - $(TAO_ROOT)/tao/GIOP_Message_Base.i \ - $(TAO_ROOT)/tao/Tagged_Profile.h \ $(TAO_ROOT)/tao/GIOPC.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ $(TAO_ROOT)/tao/Object_KeyC.i \ @@ -329,6 +322,8 @@ realclean: clean $(TAO_ROOT)/tao/CONV_FRAMEC.h \ $(TAO_ROOT)/tao/CONV_FRAMEC.i \ $(TAO_ROOT)/tao/Tagged_Components.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ $(TAO_ROOT)/tao/Profile.i \ $(TAO_ROOT)/tao/MProfile.i \ $(TAO_ROOT)/tao/ORB_Core.h \ @@ -425,7 +420,7 @@ realclean: clean Security/security_export.h \ SecurityC.i \ SSLIOPC.i \ - $(TAO_ROOT)/tao/IIOP_Connect.h \ + $(TAO_ROOT)/tao/IIOP_Connection_Handler.h \ $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Svc_Handler.h \ $(ACE_ROOT)/ace/Task.h \ @@ -460,7 +455,7 @@ realclean: clean $(ACE_ROOT)/ace/SOCK_IO.i \ $(ACE_ROOT)/ace/SOCK_Stream.i \ $(TAO_ROOT)/tao/IIOP_Transport.i \ - $(TAO_ROOT)/tao/IIOP_Connect.i \ + $(TAO_ROOT)/tao/IIOP_Connection_Handler.i \ $(TAO_ROOT)/tao/IIOP_Acceptor.h \ $(TAO_ROOT)/tao/Acceptor_Impl.h \ $(TAO_ROOT)/tao/Acceptor_Impl.i \ @@ -474,10 +469,11 @@ realclean: clean $(ACE_ROOT)/ace/SOCK_Acceptor.i \ $(TAO_ROOT)/tao/IIOP_Acceptor.i -.obj/IIOP_SSL_Connect.o .obj/IIOP_SSL_Connect.so .shobj/IIOP_SSL_Connect.o .shobj/IIOP_SSL_Connect.so: SSLIOP/IIOP_SSL_Connect.cpp \ - SSLIOP/IIOP_SSL_Connect.h \ - $(ACE_ROOT)/ace/pre.h \ - SSLIOP/SSLIOP_Export.h \ +.obj/IIOP_SSL_Connection_Handler.o .obj/IIOP_SSL_Connection_Handler.so .shobj/IIOP_SSL_Connection_Handler.o .shobj/IIOP_SSL_Connection_Handler.so: SSLIOP/IIOP_SSL_Connection_Handler.cpp \ + SSLIOP/IIOP_SSL_Connection_Handler.h \ + $(ACE_ROOT)/ace/pre.h SSLIOP/SSLIOP_Export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -619,17 +615,9 @@ realclean: clean $(TAO_ROOT)/tao/OctetSeqC.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/TAO_Server_Request.h \ - $(TAO_ROOT)/tao/GIOP_Message_Base.h \ - $(TAO_ROOT)/tao/GIOP_Message_State.h \ - $(TAO_ROOT)/tao/Pluggable_Messaging.h \ - $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \ + $(TAO_ROOT)/tao/Tagged_Profile.h \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ - $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \ - $(TAO_ROOT)/tao/Pluggable_Messaging.i \ - $(TAO_ROOT)/tao/GIOP_Message_State.i \ - $(TAO_ROOT)/tao/GIOP_Message_Base.i \ - $(TAO_ROOT)/tao/Tagged_Profile.h \ $(TAO_ROOT)/tao/GIOPC.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ $(TAO_ROOT)/tao/Object_KeyC.i \ @@ -707,6 +695,8 @@ realclean: clean $(TAO_ROOT)/tao/CONV_FRAMEC.h \ $(TAO_ROOT)/tao/CONV_FRAMEC.i \ $(TAO_ROOT)/tao/Tagged_Components.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ $(TAO_ROOT)/tao/Profile.i \ $(TAO_ROOT)/tao/MProfile.i \ $(TAO_ROOT)/tao/ORB_Core.h \ @@ -803,7 +793,7 @@ realclean: clean Security/security_export.h \ SecurityC.i \ SSLIOPC.i \ - $(TAO_ROOT)/tao/IIOP_Connect.h \ + $(TAO_ROOT)/tao/IIOP_Connection_Handler.h \ $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Svc_Handler.h \ $(ACE_ROOT)/ace/Task.h \ @@ -838,7 +828,7 @@ realclean: clean $(ACE_ROOT)/ace/SOCK_IO.i \ $(ACE_ROOT)/ace/SOCK_Stream.i \ $(TAO_ROOT)/tao/IIOP_Transport.i \ - $(TAO_ROOT)/tao/IIOP_Connect.i \ + $(TAO_ROOT)/tao/IIOP_Connection_Handler.i \ SSLIOP/SSLIOP_Current.h SSLIOP/SSLIOP_Current_Impl.h \ SSLIOP/SSLIOP_Current_Impl.inl SSLIOP/SSLIOP_Current.inl \ $(TAO_ROOT)/tao/Timeprobe.h \ @@ -846,8 +836,9 @@ realclean: clean .obj/IIOP_SSL_Connector.o .obj/IIOP_SSL_Connector.so .shobj/IIOP_SSL_Connector.o .shobj/IIOP_SSL_Connector.so: SSLIOP/IIOP_SSL_Connector.cpp \ SSLIOP/IIOP_SSL_Connector.h \ - $(ACE_ROOT)/ace/pre.h \ - SSLIOP/SSLIOP_Export.h \ + $(ACE_ROOT)/ace/pre.h SSLIOP/SSLIOP_Export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -856,7 +847,7 @@ realclean: clean $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Errno.inl \ - SSLIOP/IIOP_SSL_Connect.h \ + SSLIOP/IIOP_SSL_Connection_Handler.h \ SSLIOPC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ @@ -990,17 +981,9 @@ realclean: clean $(TAO_ROOT)/tao/OctetSeqC.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/TAO_Server_Request.h \ - $(TAO_ROOT)/tao/GIOP_Message_Base.h \ - $(TAO_ROOT)/tao/GIOP_Message_State.h \ - $(TAO_ROOT)/tao/Pluggable_Messaging.h \ - $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \ + $(TAO_ROOT)/tao/Tagged_Profile.h \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ - $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \ - $(TAO_ROOT)/tao/Pluggable_Messaging.i \ - $(TAO_ROOT)/tao/GIOP_Message_State.i \ - $(TAO_ROOT)/tao/GIOP_Message_Base.i \ - $(TAO_ROOT)/tao/Tagged_Profile.h \ $(TAO_ROOT)/tao/GIOPC.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ $(TAO_ROOT)/tao/Object_KeyC.i \ @@ -1078,6 +1061,8 @@ realclean: clean $(TAO_ROOT)/tao/CONV_FRAMEC.h \ $(TAO_ROOT)/tao/CONV_FRAMEC.i \ $(TAO_ROOT)/tao/Tagged_Components.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ $(TAO_ROOT)/tao/Profile.i \ $(TAO_ROOT)/tao/MProfile.i \ $(TAO_ROOT)/tao/ORB_Core.h \ @@ -1174,7 +1159,7 @@ realclean: clean Security/security_export.h \ SecurityC.i \ SSLIOPC.i \ - $(TAO_ROOT)/tao/IIOP_Connect.h \ + $(TAO_ROOT)/tao/IIOP_Connection_Handler.h \ $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Svc_Handler.h \ $(ACE_ROOT)/ace/Task.h \ @@ -1209,21 +1194,26 @@ realclean: clean $(ACE_ROOT)/ace/SOCK_IO.i \ $(ACE_ROOT)/ace/SOCK_Stream.i \ $(TAO_ROOT)/tao/IIOP_Transport.i \ - $(TAO_ROOT)/tao/IIOP_Connect.i \ + $(TAO_ROOT)/tao/IIOP_Connection_Handler.i \ $(TAO_ROOT)/tao/IIOP_Connector.h \ $(ACE_ROOT)/ace/Connector.h \ $(ACE_ROOT)/ace/Connector.cpp \ $(ACE_ROOT)/ace/SOCK_Connector.h \ $(ACE_ROOT)/ace/Time_Value.h \ $(ACE_ROOT)/ace/SOCK_Connector.i \ + $(TAO_ROOT)/tao/Connector_Impl.h \ + $(TAO_ROOT)/tao/Connector_Impl.inl \ + $(TAO_ROOT)/tao/Connector_Impl.cpp \ + SSLIOP/SSLIOP_Endpoint.h SSLIOP/SSLIOP_Endpoint.i \ $(TAO_ROOT)/tao/Base_Connection_Property.h \ $(TAO_ROOT)/tao/Base_Connection_Property.inl \ $(TAO_ROOT)/tao/IIOP_Endpoint.h \ $(TAO_ROOT)/tao/IIOP_Endpoint.i .obj/SSLIOP_Current.o .obj/SSLIOP_Current.so .shobj/SSLIOP_Current.o .shobj/SSLIOP_Current.so: SSLIOP/SSLIOP_Current.cpp SSLIOP/SSLIOP_Current.h \ - $(ACE_ROOT)/ace/pre.h \ - SSLIOP/SSLIOP_Export.h \ + $(ACE_ROOT)/ace/pre.h SSLIOP/SSLIOP_Export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -1366,17 +1356,9 @@ realclean: clean $(TAO_ROOT)/tao/OctetSeqC.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/TAO_Server_Request.h \ - $(TAO_ROOT)/tao/GIOP_Message_Base.h \ - $(TAO_ROOT)/tao/GIOP_Message_State.h \ - $(TAO_ROOT)/tao/Pluggable_Messaging.h \ - $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \ + $(TAO_ROOT)/tao/Tagged_Profile.h \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ - $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \ - $(TAO_ROOT)/tao/Pluggable_Messaging.i \ - $(TAO_ROOT)/tao/GIOP_Message_State.i \ - $(TAO_ROOT)/tao/GIOP_Message_Base.i \ - $(TAO_ROOT)/tao/Tagged_Profile.h \ $(TAO_ROOT)/tao/GIOPC.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ $(TAO_ROOT)/tao/Object_KeyC.i \ @@ -1454,6 +1436,8 @@ realclean: clean $(TAO_ROOT)/tao/CONV_FRAMEC.h \ $(TAO_ROOT)/tao/CONV_FRAMEC.i \ $(TAO_ROOT)/tao/Tagged_Components.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ $(TAO_ROOT)/tao/Profile.i \ $(TAO_ROOT)/tao/MProfile.i \ $(TAO_ROOT)/tao/ORB_Core.h \ @@ -1554,8 +1538,9 @@ realclean: clean .obj/SSLIOP_Current_Impl.o .obj/SSLIOP_Current_Impl.so .shobj/SSLIOP_Current_Impl.o .shobj/SSLIOP_Current_Impl.so: SSLIOP/SSLIOP_Current_Impl.cpp \ SSLIOP/SSLIOP_Current_Impl.h \ - $(ACE_ROOT)/ace/pre.h \ - SSLIOP/SSLIOP_Export.h \ + $(ACE_ROOT)/ace/pre.h SSLIOP/SSLIOP_Export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -1697,17 +1682,9 @@ realclean: clean $(TAO_ROOT)/tao/OctetSeqC.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/TAO_Server_Request.h \ - $(TAO_ROOT)/tao/GIOP_Message_Base.h \ - $(TAO_ROOT)/tao/GIOP_Message_State.h \ - $(TAO_ROOT)/tao/Pluggable_Messaging.h \ - $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \ + $(TAO_ROOT)/tao/Tagged_Profile.h \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ - $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \ - $(TAO_ROOT)/tao/Pluggable_Messaging.i \ - $(TAO_ROOT)/tao/GIOP_Message_State.i \ - $(TAO_ROOT)/tao/GIOP_Message_Base.i \ - $(TAO_ROOT)/tao/Tagged_Profile.h \ $(TAO_ROOT)/tao/GIOPC.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ $(TAO_ROOT)/tao/Object_KeyC.i \ @@ -1785,6 +1762,8 @@ realclean: clean $(TAO_ROOT)/tao/CONV_FRAMEC.h \ $(TAO_ROOT)/tao/CONV_FRAMEC.i \ $(TAO_ROOT)/tao/Tagged_Components.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ $(TAO_ROOT)/tao/Profile.i \ $(TAO_ROOT)/tao/MProfile.i \ $(TAO_ROOT)/tao/ORB_Core.h \ @@ -1886,8 +1865,9 @@ realclean: clean .obj/SSLIOP_Invocation_Interceptor.o .obj/SSLIOP_Invocation_Interceptor.so .shobj/SSLIOP_Invocation_Interceptor.o .shobj/SSLIOP_Invocation_Interceptor.so: \ SSLIOP/SSLIOP_Invocation_Interceptor.cpp \ SSLIOP/SSLIOP_Invocation_Interceptor.h \ - $(ACE_ROOT)/ace/pre.h \ - SSLIOP/SSLIOP_Export.h \ + $(ACE_ROOT)/ace/pre.h SSLIOP/SSLIOP_Export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -2029,17 +2009,9 @@ realclean: clean $(TAO_ROOT)/tao/OctetSeqC.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/TAO_Server_Request.h \ - $(TAO_ROOT)/tao/GIOP_Message_Base.h \ - $(TAO_ROOT)/tao/GIOP_Message_State.h \ - $(TAO_ROOT)/tao/Pluggable_Messaging.h \ - $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \ + $(TAO_ROOT)/tao/Tagged_Profile.h \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ - $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \ - $(TAO_ROOT)/tao/Pluggable_Messaging.i \ - $(TAO_ROOT)/tao/GIOP_Message_State.i \ - $(TAO_ROOT)/tao/GIOP_Message_Base.i \ - $(TAO_ROOT)/tao/Tagged_Profile.h \ $(TAO_ROOT)/tao/GIOPC.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ $(TAO_ROOT)/tao/Object_KeyC.i \ @@ -2117,6 +2089,8 @@ realclean: clean $(TAO_ROOT)/tao/CONV_FRAMEC.h \ $(TAO_ROOT)/tao/CONV_FRAMEC.i \ $(TAO_ROOT)/tao/Tagged_Components.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ $(TAO_ROOT)/tao/Profile.i \ $(TAO_ROOT)/tao/MProfile.i \ $(TAO_ROOT)/tao/ORB_Core.h \ @@ -2216,8 +2190,9 @@ realclean: clean .obj/SSLIOP_ORBInitializer.o .obj/SSLIOP_ORBInitializer.so .shobj/SSLIOP_ORBInitializer.o .shobj/SSLIOP_ORBInitializer.so: SSLIOP/SSLIOP_ORBInitializer.cpp \ SSLIOP/SSLIOP_ORBInitializer.h \ - $(ACE_ROOT)/ace/pre.h \ - SSLIOP/SSLIOP_Export.h \ + $(ACE_ROOT)/ace/pre.h SSLIOP/SSLIOP_Export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -2379,14 +2354,6 @@ realclean: clean $(TAO_ROOT)/tao/OctetSeqC.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/TAO_Server_Request.h \ - $(TAO_ROOT)/tao/GIOP_Message_Base.h \ - $(TAO_ROOT)/tao/GIOP_Message_State.h \ - $(TAO_ROOT)/tao/Pluggable_Messaging.h \ - $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \ - $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \ - $(TAO_ROOT)/tao/Pluggable_Messaging.i \ - $(TAO_ROOT)/tao/GIOP_Message_State.i \ - $(TAO_ROOT)/tao/GIOP_Message_Base.i \ $(TAO_ROOT)/tao/Tagged_Profile.h \ $(TAO_ROOT)/tao/GIOPC.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -2462,6 +2429,8 @@ realclean: clean $(TAO_ROOT)/tao/CONV_FRAMEC.h \ $(TAO_ROOT)/tao/CONV_FRAMEC.i \ $(TAO_ROOT)/tao/Tagged_Components.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ $(TAO_ROOT)/tao/Profile.i \ $(TAO_ROOT)/tao/MProfile.i \ $(TAO_ROOT)/tao/ORB_Core.h \ @@ -2549,8 +2518,9 @@ realclean: clean $(TAO_ROOT)/tao/ORBInitInfo.h .obj/SSLIOP_Factory.o .obj/SSLIOP_Factory.so .shobj/SSLIOP_Factory.o .shobj/SSLIOP_Factory.so: SSLIOP/SSLIOP_Factory.cpp SSLIOP/SSLIOP_Factory.h \ - $(ACE_ROOT)/ace/pre.h \ - SSLIOP/SSLIOP_Export.h \ + $(ACE_ROOT)/ace/pre.h SSLIOP/SSLIOP_Export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -2669,7 +2639,7 @@ realclean: clean $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ SSLIOP/SSLIOP_Acceptor.h SSLIOP/IIOP_SSL_Acceptor.h \ - SSLIOP/IIOP_SSL_Connect.h \ + SSLIOP/IIOP_SSL_Connection_Handler.h \ SSLIOPC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/Environment.h \ @@ -2714,17 +2684,9 @@ realclean: clean $(TAO_ROOT)/tao/OctetSeqC.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/TAO_Server_Request.h \ - $(TAO_ROOT)/tao/GIOP_Message_Base.h \ - $(TAO_ROOT)/tao/GIOP_Message_State.h \ - $(TAO_ROOT)/tao/Pluggable_Messaging.h \ - $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \ + $(TAO_ROOT)/tao/Tagged_Profile.h \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ - $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \ - $(TAO_ROOT)/tao/Pluggable_Messaging.i \ - $(TAO_ROOT)/tao/GIOP_Message_State.i \ - $(TAO_ROOT)/tao/GIOP_Message_Base.i \ - $(TAO_ROOT)/tao/Tagged_Profile.h \ $(TAO_ROOT)/tao/GIOPC.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ $(TAO_ROOT)/tao/Object_KeyC.i \ @@ -2783,6 +2745,8 @@ realclean: clean $(TAO_ROOT)/tao/CONV_FRAMEC.h \ $(TAO_ROOT)/tao/CONV_FRAMEC.i \ $(TAO_ROOT)/tao/Tagged_Components.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ $(TAO_ROOT)/tao/Profile.i \ $(TAO_ROOT)/tao/MProfile.i \ $(TAO_ROOT)/tao/ORB_Core.h \ @@ -2878,7 +2842,7 @@ realclean: clean Security/security_export.h \ SecurityC.i \ SSLIOPC.i \ - $(TAO_ROOT)/tao/IIOP_Connect.h \ + $(TAO_ROOT)/tao/IIOP_Connection_Handler.h \ $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Svc_Handler.h \ $(ACE_ROOT)/ace/Task.h \ @@ -2913,7 +2877,7 @@ realclean: clean $(ACE_ROOT)/ace/SOCK_IO.i \ $(ACE_ROOT)/ace/SOCK_Stream.i \ $(TAO_ROOT)/tao/IIOP_Transport.i \ - $(TAO_ROOT)/tao/IIOP_Connect.i \ + $(TAO_ROOT)/tao/IIOP_Connection_Handler.i \ $(TAO_ROOT)/tao/IIOP_Acceptor.h \ $(TAO_ROOT)/tao/Acceptor_Impl.h \ $(TAO_ROOT)/tao/Acceptor_Impl.i \ @@ -2926,21 +2890,16 @@ realclean: clean $(ACE_ROOT)/ace/Time_Value.h \ $(ACE_ROOT)/ace/SOCK_Acceptor.i \ $(TAO_ROOT)/tao/IIOP_Acceptor.i \ - SSLIOP/SSLIOP_Connect.h \ - $(TAO_ROOT)/tao/GIOP_Message_Acceptors.h \ - $(TAO_ROOT)/tao/GIOP_Message_Accept_State.h \ - $(TAO_ROOT)/tao/GIOP_Message_Headers.h \ - $(TAO_ROOT)/tao/GIOP_Message_Headers.i \ - $(TAO_ROOT)/tao/GIOP_Message_Accept_State.i \ - $(TAO_ROOT)/tao/GIOP_Message_Acceptors.i \ - SSLIOP/SSLIOP_Transport.h \ + SSLIOP/SSLIOP_Connection_Handler.h SSLIOP/SSLIOP_Transport.h \ $(ACE_ROOT)/ace/SSL/SSL_SOCK_Stream.h \ - $(ACE_ROOT)/ace/SSL/SSL_SOCK.h \ $(ACE_ROOT)/ace/SSL/SSL_Export.h \ + $(ACE_ROOT)/ace/SSL/SSL_SOCK.h \ $(ACE_ROOT)/ace/SSL/SSL_SOCK.i \ $(ACE_ROOT)/ace/SSL/SSL_Context.h \ $(ACE_ROOT)/ace/SSL/SSL_Context.i \ $(ACE_ROOT)/ace/SSL/SSL_SOCK_Stream.i \ + $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \ + $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \ SSLIOP/SSLIOP_Current_Impl.h SSLIOP/SSLIOP_Current_Impl.inl \ SSLIOP/SSLIOP_Connect.i \ $(ACE_ROOT)/ace/SSL/SSL_SOCK_Acceptor.h \ @@ -2954,10 +2913,15 @@ realclean: clean $(TAO_ROOT)/tao/IIOP_Connector.h \ $(ACE_ROOT)/ace/Connector.h \ $(ACE_ROOT)/ace/Connector.cpp \ + $(TAO_ROOT)/tao/Connector_Impl.h \ + $(TAO_ROOT)/tao/Connector_Impl.inl \ + $(TAO_ROOT)/tao/Connector_Impl.cpp \ SSLIOP/SSLIOP_ORBInitializer.h .obj/SSLIOP_Profile.o .obj/SSLIOP_Profile.so .shobj/SSLIOP_Profile.o .shobj/SSLIOP_Profile.so: SSLIOP/SSLIOP_Profile.cpp SSLIOP/SSLIOP_Profile.h \ $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -3102,17 +3066,9 @@ realclean: clean $(TAO_ROOT)/tao/OctetSeqC.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/TAO_Server_Request.h \ - $(TAO_ROOT)/tao/GIOP_Message_Base.h \ - $(TAO_ROOT)/tao/GIOP_Message_State.h \ - $(TAO_ROOT)/tao/Pluggable_Messaging.h \ - $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \ + $(TAO_ROOT)/tao/Tagged_Profile.h \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ - $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \ - $(TAO_ROOT)/tao/Pluggable_Messaging.i \ - $(TAO_ROOT)/tao/GIOP_Message_State.i \ - $(TAO_ROOT)/tao/GIOP_Message_Base.i \ - $(TAO_ROOT)/tao/Tagged_Profile.h \ $(TAO_ROOT)/tao/GIOPC.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ $(TAO_ROOT)/tao/Object_KeyC.i \ @@ -3190,6 +3146,8 @@ realclean: clean $(TAO_ROOT)/tao/CONV_FRAMEC.h \ $(TAO_ROOT)/tao/CONV_FRAMEC.i \ $(TAO_ROOT)/tao/Tagged_Components.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ $(TAO_ROOT)/tao/Profile.i \ $(TAO_ROOT)/tao/MProfile.i \ $(TAO_ROOT)/tao/ORB_Core.h \ @@ -3296,8 +3254,9 @@ realclean: clean SSLIOP/SSLIOP_Profile.i SSLIOP/ssl_endpoints.h SSLIOP/ssl_endpoints.i .obj/SSLIOP_Endpoint.o .obj/SSLIOP_Endpoint.so .shobj/SSLIOP_Endpoint.o .shobj/SSLIOP_Endpoint.so: SSLIOP/SSLIOP_Endpoint.cpp SSLIOP/SSLIOP_Endpoint.h \ - $(ACE_ROOT)/ace/pre.h \ - SSLIOP/SSLIOP_Export.h \ + $(ACE_ROOT)/ace/pre.h SSLIOP/SSLIOP_Export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -3441,17 +3400,9 @@ realclean: clean $(TAO_ROOT)/tao/OctetSeqC.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/TAO_Server_Request.h \ - $(TAO_ROOT)/tao/GIOP_Message_Base.h \ - $(TAO_ROOT)/tao/GIOP_Message_State.h \ - $(TAO_ROOT)/tao/Pluggable_Messaging.h \ - $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \ + $(TAO_ROOT)/tao/Tagged_Profile.h \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ - $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \ - $(TAO_ROOT)/tao/Pluggable_Messaging.i \ - $(TAO_ROOT)/tao/GIOP_Message_State.i \ - $(TAO_ROOT)/tao/GIOP_Message_Base.i \ - $(TAO_ROOT)/tao/Tagged_Profile.h \ $(TAO_ROOT)/tao/GIOPC.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ $(TAO_ROOT)/tao/Object_KeyC.i \ @@ -3529,6 +3480,8 @@ realclean: clean $(TAO_ROOT)/tao/CONV_FRAMEC.h \ $(TAO_ROOT)/tao/CONV_FRAMEC.i \ $(TAO_ROOT)/tao/Tagged_Components.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ $(TAO_ROOT)/tao/Profile.i \ $(TAO_ROOT)/tao/MProfile.i \ $(TAO_ROOT)/tao/ORB_Core.h \ @@ -3623,14 +3576,8 @@ realclean: clean Security/security_export.h \ SecurityC.i \ SSLIOPC.i \ - SSLIOP/SSLIOP_Endpoint.i SSLIOP/SSLIOP_Connect.h \ + SSLIOP/SSLIOP_Endpoint.i SSLIOP/SSLIOP_Connection_Handler.h \ $(TAO_ROOT)/tao/Wait_Strategy.h \ - $(TAO_ROOT)/tao/GIOP_Message_Acceptors.h \ - $(TAO_ROOT)/tao/GIOP_Message_Accept_State.h \ - $(TAO_ROOT)/tao/GIOP_Message_Headers.h \ - $(TAO_ROOT)/tao/GIOP_Message_Headers.i \ - $(TAO_ROOT)/tao/GIOP_Message_Accept_State.i \ - $(TAO_ROOT)/tao/GIOP_Message_Acceptors.i \ $(TAO_ROOT)/tao/Connection_Handler.h \ $(ACE_ROOT)/ace/SOCK.h \ $(ACE_ROOT)/ace/Addr.h \ @@ -3642,7 +3589,7 @@ realclean: clean $(ACE_ROOT)/ace/INET_Addr.i \ $(ACE_ROOT)/ace/SOCK.i \ $(TAO_ROOT)/tao/Connection_Handler.inl \ - $(TAO_ROOT)/tao/IIOP_Connect.h \ + $(TAO_ROOT)/tao/IIOP_Connection_Handler.h \ $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Svc_Handler.h \ $(ACE_ROOT)/ace/Task.h \ @@ -3665,24 +3612,27 @@ realclean: clean $(ACE_ROOT)/ace/SOCK_IO.i \ $(ACE_ROOT)/ace/SOCK_Stream.i \ $(TAO_ROOT)/tao/IIOP_Transport.i \ - $(TAO_ROOT)/tao/IIOP_Connect.i \ + $(TAO_ROOT)/tao/IIOP_Connection_Handler.i \ SSLIOP/SSLIOP_Transport.h \ $(ACE_ROOT)/ace/SSL/SSL_SOCK_Stream.h \ - $(ACE_ROOT)/ace/SSL/SSL_SOCK.h \ $(ACE_ROOT)/ace/SSL/SSL_Export.h \ + $(ACE_ROOT)/ace/SSL/SSL_SOCK.h \ $(ACE_ROOT)/ace/SSL/SSL_SOCK.i \ $(ACE_ROOT)/ace/SSL/SSL_Context.h \ $(ACE_ROOT)/ace/SSL/SSL_Context.i \ $(ACE_ROOT)/ace/SSL/SSL_SOCK_Stream.i \ + $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \ + $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \ SSLIOP/SSLIOP_Current_Impl.h SSLIOP/SSLIOP_Current_Impl.inl \ SSLIOP/SSLIOP_Connect.i \ $(TAO_ROOT)/tao/IIOP_Endpoint.h \ $(TAO_ROOT)/tao/IIOP_Endpoint.i .obj/SSLIOP_Transport.o .obj/SSLIOP_Transport.so .shobj/SSLIOP_Transport.o .shobj/SSLIOP_Transport.so: SSLIOP/SSLIOP_Transport.cpp \ - SSLIOP/SSLIOP_Transport.h \ - $(ACE_ROOT)/ace/pre.h \ + SSLIOP/SSLIOP_Transport.h $(ACE_ROOT)/ace/pre.h \ SSLIOP/SSLIOP_Export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -3692,8 +3642,8 @@ realclean: clean $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Errno.inl \ $(ACE_ROOT)/ace/SSL/SSL_SOCK_Stream.h \ - $(ACE_ROOT)/ace/SOCK_Stream.h \ - $(ACE_ROOT)/ace/SOCK_IO.h \ + $(ACE_ROOT)/ace/SSL/SSL_Export.h \ + $(ACE_ROOT)/ace/SSL/SSL_SOCK.h \ $(ACE_ROOT)/ace/SOCK.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ @@ -3730,11 +3680,15 @@ realclean: clean $(ACE_ROOT)/ace/INET_Addr.h \ $(ACE_ROOT)/ace/INET_Addr.i \ $(ACE_ROOT)/ace/SOCK.i \ - $(ACE_ROOT)/ace/SOCK_IO.i \ - $(ACE_ROOT)/ace/SOCK_Stream.i \ - $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/SSL/SSL_SOCK.i \ + $(ACE_ROOT)/ace/SSL/SSL_Context.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ $(ACE_ROOT)/ace/Synch_T.i \ $(ACE_ROOT)/ace/Thread.h \ $(ACE_ROOT)/ace/Thread_Adapter.h \ @@ -3750,14 +3704,6 @@ realclean: clean $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/SSL/SSL_SOCK.h \ - $(ACE_ROOT)/ace/SSL/SSL_Export.h \ - $(ACE_ROOT)/ace/SSL/SSL_SOCK.i \ - $(ACE_ROOT)/ace/SSL/SSL_Context.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Singleton.i \ $(ACE_ROOT)/ace/Singleton.cpp \ $(ACE_ROOT)/ace/Object_Manager.h \ @@ -3766,6 +3712,10 @@ realclean: clean $(ACE_ROOT)/ace/Managed_Object.i \ $(ACE_ROOT)/ace/Managed_Object.cpp \ $(ACE_ROOT)/ace/SSL/SSL_Context.i \ + $(ACE_ROOT)/ace/SOCK_Stream.h \ + $(ACE_ROOT)/ace/SOCK_IO.h \ + $(ACE_ROOT)/ace/SOCK_IO.i \ + $(ACE_ROOT)/ace/SOCK_Stream.i \ $(ACE_ROOT)/ace/SSL/SSL_SOCK_Stream.i \ $(ACE_ROOT)/ace/Svc_Handler.h \ $(ACE_ROOT)/ace/Synch_Options.h \ @@ -3899,25 +3849,11 @@ realclean: clean $(TAO_ROOT)/tao/target_specification.i \ $(TAO_ROOT)/tao/operation_details.i \ $(TAO_ROOT)/tao/GIOP_Message_State.h \ - $(TAO_ROOT)/tao/Pluggable_Messaging.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \ $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \ - $(TAO_ROOT)/tao/Pluggable_Messaging.i \ - $(TAO_ROOT)/tao/GIOP_Message_State.i \ - SSLIOP/SSLIOP_Connect.h \ + SSLIOP/SSLIOP_Connection_Handler.h \ $(TAO_ROOT)/tao/Wait_Strategy.h \ - $(TAO_ROOT)/tao/GIOP_Message_Acceptors.h \ - $(TAO_ROOT)/tao/GIOP_Message_Base.h \ - $(TAO_ROOT)/tao/GIOP_Message_Base.i \ - $(TAO_ROOT)/tao/GIOP_Message_Accept_State.h \ - $(TAO_ROOT)/tao/GIOP_Message_Headers.h \ - $(TAO_ROOT)/tao/Tagged_Profile.h \ - $(TAO_ROOT)/tao/GIOPC.h \ - $(TAO_ROOT)/tao/GIOPC.i \ - $(TAO_ROOT)/tao/Tagged_Profile.i \ - $(TAO_ROOT)/tao/GIOP_Message_Headers.i \ - $(TAO_ROOT)/tao/GIOP_Message_Accept_State.i \ - $(TAO_ROOT)/tao/GIOP_Message_Acceptors.i \ $(TAO_ROOT)/tao/Connection_Handler.h \ $(TAO_ROOT)/tao/Connection_Cache_Manager.h \ $(TAO_ROOT)/tao/Cache_Entries.h \ @@ -3928,12 +3864,12 @@ realclean: clean $(TAO_ROOT)/tao/Cache_Entries.inl \ $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \ $(TAO_ROOT)/tao/Connection_Handler.inl \ - $(TAO_ROOT)/tao/IIOP_Connect.h \ + $(TAO_ROOT)/tao/IIOP_Connection_Handler.h \ $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.cpp \ $(TAO_ROOT)/tao/IIOP_Transport.h \ $(TAO_ROOT)/tao/IIOP_Transport.i \ - $(TAO_ROOT)/tao/IIOP_Connect.i \ + $(TAO_ROOT)/tao/IIOP_Connection_Handler.i \ SSLIOP/SSLIOP_Current_Impl.h \ SSLIOPC.h \ $(TAO_ROOT)/tao/corba.h \ @@ -3964,6 +3900,10 @@ realclean: clean $(TAO_ROOT)/tao/OctetSeqC.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/TAO_Server_Request.h \ + $(TAO_ROOT)/tao/Tagged_Profile.h \ + $(TAO_ROOT)/tao/GIOPC.h \ + $(TAO_ROOT)/tao/GIOPC.i \ + $(TAO_ROOT)/tao/Tagged_Profile.i \ $(TAO_ROOT)/tao/TAO_Server_Request.i \ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/LocalObject.h \ @@ -4071,13 +4011,12 @@ realclean: clean $(ACE_ROOT)/ace/Timeprobe.h \ $(TAO_ROOT)/tao/Transport_Mux_Strategy.h \ $(TAO_ROOT)/tao/Sync_Strategies.h \ - $(TAO_ROOT)/tao/Sync_Strategies.i \ - $(TAO_ROOT)/tao/GIOP_Message_Connectors.h \ - $(TAO_ROOT)/tao/GIOP_Message_Connectors.i + $(TAO_ROOT)/tao/Sync_Strategies.i .obj/SSLIOP_Connector.o .obj/SSLIOP_Connector.so .shobj/SSLIOP_Connector.o .shobj/SSLIOP_Connector.so: SSLIOP/SSLIOP_Connector.cpp \ - SSLIOP/SSLIOP_Connector.h \ - $(ACE_ROOT)/ace/pre.h \ + SSLIOP/SSLIOP_Connector.h $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -4087,9 +4026,9 @@ realclean: clean $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Errno.inl \ $(ACE_ROOT)/ace/SSL/SSL_SOCK_Connector.h \ - $(ACE_ROOT)/ace/SOCK_Connector.h \ - $(ACE_ROOT)/ace/SOCK_Stream.h \ - $(ACE_ROOT)/ace/SOCK_IO.h \ + $(ACE_ROOT)/ace/SSL/SSL_Export.h \ + $(ACE_ROOT)/ace/SSL/SSL_SOCK_Stream.h \ + $(ACE_ROOT)/ace/SSL/SSL_SOCK.h \ $(ACE_ROOT)/ace/SOCK.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ @@ -4126,14 +4065,15 @@ realclean: clean $(ACE_ROOT)/ace/INET_Addr.h \ $(ACE_ROOT)/ace/INET_Addr.i \ $(ACE_ROOT)/ace/SOCK.i \ - $(ACE_ROOT)/ace/SOCK_IO.i \ - $(ACE_ROOT)/ace/SOCK_Stream.i \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/SOCK_Connector.i \ - $(ACE_ROOT)/ace/SSL/SSL_SOCK_Stream.h \ - $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/SSL/SSL_SOCK.i \ + $(ACE_ROOT)/ace/SSL/SSL_Context.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ $(ACE_ROOT)/ace/Synch_T.i \ $(ACE_ROOT)/ace/Thread.h \ $(ACE_ROOT)/ace/Thread_Adapter.h \ @@ -4149,14 +4089,6 @@ realclean: clean $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/SSL/SSL_SOCK.h \ - $(ACE_ROOT)/ace/SSL/SSL_Export.h \ - $(ACE_ROOT)/ace/SSL/SSL_SOCK.i \ - $(ACE_ROOT)/ace/SSL/SSL_Context.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Singleton.i \ $(ACE_ROOT)/ace/Singleton.cpp \ $(ACE_ROOT)/ace/Object_Manager.h \ @@ -4165,10 +4097,17 @@ realclean: clean $(ACE_ROOT)/ace/Managed_Object.i \ $(ACE_ROOT)/ace/Managed_Object.cpp \ $(ACE_ROOT)/ace/SSL/SSL_Context.i \ + $(ACE_ROOT)/ace/SOCK_Stream.h \ + $(ACE_ROOT)/ace/SOCK_IO.h \ + $(ACE_ROOT)/ace/SOCK_IO.i \ + $(ACE_ROOT)/ace/SOCK_Stream.i \ $(ACE_ROOT)/ace/SSL/SSL_SOCK_Stream.i \ + $(ACE_ROOT)/ace/SOCK_Connector.h \ + $(ACE_ROOT)/ace/Time_Value.h \ + $(ACE_ROOT)/ace/SOCK_Connector.i \ $(ACE_ROOT)/ace/SSL/SSL_SOCK_Connector.i \ SSLIOP/IIOP_SSL_Connector.h SSLIOP/SSLIOP_Export.h \ - SSLIOP/IIOP_SSL_Connect.h \ + SSLIOP/IIOP_SSL_Connection_Handler.h \ SSLIOPC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ @@ -4254,17 +4193,9 @@ realclean: clean $(TAO_ROOT)/tao/OctetSeqC.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/TAO_Server_Request.h \ - $(TAO_ROOT)/tao/GIOP_Message_Base.h \ - $(TAO_ROOT)/tao/GIOP_Message_State.h \ - $(TAO_ROOT)/tao/Pluggable_Messaging.h \ - $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \ + $(TAO_ROOT)/tao/Tagged_Profile.h \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ - $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \ - $(TAO_ROOT)/tao/Pluggable_Messaging.i \ - $(TAO_ROOT)/tao/GIOP_Message_State.i \ - $(TAO_ROOT)/tao/GIOP_Message_Base.i \ - $(TAO_ROOT)/tao/Tagged_Profile.h \ $(TAO_ROOT)/tao/GIOPC.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ $(TAO_ROOT)/tao/Object_KeyC.i \ @@ -4334,6 +4265,8 @@ realclean: clean $(TAO_ROOT)/tao/CONV_FRAMEC.h \ $(TAO_ROOT)/tao/CONV_FRAMEC.i \ $(TAO_ROOT)/tao/Tagged_Components.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ $(TAO_ROOT)/tao/Profile.i \ $(TAO_ROOT)/tao/MProfile.i \ $(TAO_ROOT)/tao/ORB_Core.h \ @@ -4430,7 +4363,7 @@ realclean: clean Security/security_export.h \ SecurityC.i \ SSLIOPC.i \ - $(TAO_ROOT)/tao/IIOP_Connect.h \ + $(TAO_ROOT)/tao/IIOP_Connection_Handler.h \ $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Svc_Handler.h \ $(ACE_ROOT)/ace/Task.h \ @@ -4452,21 +4385,19 @@ realclean: clean $(TAO_ROOT)/tao/Connection_Handler.inl \ $(TAO_ROOT)/tao/IIOP_Transport.h \ $(TAO_ROOT)/tao/IIOP_Transport.i \ - $(TAO_ROOT)/tao/IIOP_Connect.i \ + $(TAO_ROOT)/tao/IIOP_Connection_Handler.i \ $(TAO_ROOT)/tao/IIOP_Connector.h \ $(ACE_ROOT)/ace/Connector.h \ $(ACE_ROOT)/ace/Connector.cpp \ - SSLIOP/SSLIOP_Connect.h \ - $(TAO_ROOT)/tao/GIOP_Message_Acceptors.h \ - $(TAO_ROOT)/tao/GIOP_Message_Accept_State.h \ - $(TAO_ROOT)/tao/GIOP_Message_Headers.h \ - $(TAO_ROOT)/tao/GIOP_Message_Headers.i \ - $(TAO_ROOT)/tao/GIOP_Message_Accept_State.i \ - $(TAO_ROOT)/tao/GIOP_Message_Acceptors.i \ - SSLIOP/SSLIOP_Transport.h SSLIOP/SSLIOP_Current_Impl.h \ - SSLIOP/SSLIOP_Current_Impl.inl SSLIOP/SSLIOP_Connect.i \ - SSLIOP/SSLIOP_Profile.h SSLIOP/SSLIOP_Endpoint.h \ - SSLIOP/SSLIOP_Endpoint.i \ + $(TAO_ROOT)/tao/Connector_Impl.h \ + $(TAO_ROOT)/tao/Connector_Impl.inl \ + $(TAO_ROOT)/tao/Connector_Impl.cpp \ + SSLIOP/SSLIOP_Connection_Handler.h SSLIOP/SSLIOP_Transport.h \ + $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \ + $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \ + SSLIOP/SSLIOP_Current_Impl.h SSLIOP/SSLIOP_Current_Impl.inl \ + SSLIOP/SSLIOP_Connect.i SSLIOP/SSLIOP_Profile.h \ + SSLIOP/SSLIOP_Endpoint.h SSLIOP/SSLIOP_Endpoint.i \ $(TAO_ROOT)/tao/IIOP_Profile.h \ $(TAO_ROOT)/tao/IIOP_Endpoint.h \ $(TAO_ROOT)/tao/IIOP_Endpoint.i \ @@ -4478,6 +4409,8 @@ realclean: clean .obj/SSLIOP_Acceptor.o .obj/SSLIOP_Acceptor.so .shobj/SSLIOP_Acceptor.o .shobj/SSLIOP_Acceptor.so: SSLIOP/SSLIOP_Acceptor.cpp SSLIOP/SSLIOP_Acceptor.h \ $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -4487,7 +4420,7 @@ realclean: clean $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Errno.inl \ SSLIOP/IIOP_SSL_Acceptor.h SSLIOP/SSLIOP_Export.h \ - SSLIOP/IIOP_SSL_Connect.h \ + SSLIOP/IIOP_SSL_Connection_Handler.h \ SSLIOPC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ @@ -4621,17 +4554,9 @@ realclean: clean $(TAO_ROOT)/tao/OctetSeqC.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/TAO_Server_Request.h \ - $(TAO_ROOT)/tao/GIOP_Message_Base.h \ - $(TAO_ROOT)/tao/GIOP_Message_State.h \ - $(TAO_ROOT)/tao/Pluggable_Messaging.h \ - $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \ + $(TAO_ROOT)/tao/Tagged_Profile.h \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ - $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \ - $(TAO_ROOT)/tao/Pluggable_Messaging.i \ - $(TAO_ROOT)/tao/GIOP_Message_State.i \ - $(TAO_ROOT)/tao/GIOP_Message_Base.i \ - $(TAO_ROOT)/tao/Tagged_Profile.h \ $(TAO_ROOT)/tao/GIOPC.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ $(TAO_ROOT)/tao/Object_KeyC.i \ @@ -4709,6 +4634,8 @@ realclean: clean $(TAO_ROOT)/tao/CONV_FRAMEC.h \ $(TAO_ROOT)/tao/CONV_FRAMEC.i \ $(TAO_ROOT)/tao/Tagged_Components.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ $(TAO_ROOT)/tao/Profile.i \ $(TAO_ROOT)/tao/MProfile.i \ $(TAO_ROOT)/tao/ORB_Core.h \ @@ -4805,7 +4732,7 @@ realclean: clean Security/security_export.h \ SecurityC.i \ SSLIOPC.i \ - $(TAO_ROOT)/tao/IIOP_Connect.h \ + $(TAO_ROOT)/tao/IIOP_Connection_Handler.h \ $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Svc_Handler.h \ $(ACE_ROOT)/ace/Task.h \ @@ -4840,7 +4767,7 @@ realclean: clean $(ACE_ROOT)/ace/SOCK_IO.i \ $(ACE_ROOT)/ace/SOCK_Stream.i \ $(TAO_ROOT)/tao/IIOP_Transport.i \ - $(TAO_ROOT)/tao/IIOP_Connect.i \ + $(TAO_ROOT)/tao/IIOP_Connection_Handler.i \ $(TAO_ROOT)/tao/IIOP_Acceptor.h \ $(TAO_ROOT)/tao/Acceptor_Impl.h \ $(TAO_ROOT)/tao/Acceptor_Impl.i \ @@ -4853,21 +4780,16 @@ realclean: clean $(ACE_ROOT)/ace/Time_Value.h \ $(ACE_ROOT)/ace/SOCK_Acceptor.i \ $(TAO_ROOT)/tao/IIOP_Acceptor.i \ - SSLIOP/SSLIOP_Connect.h \ - $(TAO_ROOT)/tao/GIOP_Message_Acceptors.h \ - $(TAO_ROOT)/tao/GIOP_Message_Accept_State.h \ - $(TAO_ROOT)/tao/GIOP_Message_Headers.h \ - $(TAO_ROOT)/tao/GIOP_Message_Headers.i \ - $(TAO_ROOT)/tao/GIOP_Message_Accept_State.i \ - $(TAO_ROOT)/tao/GIOP_Message_Acceptors.i \ - SSLIOP/SSLIOP_Transport.h \ + SSLIOP/SSLIOP_Connection_Handler.h SSLIOP/SSLIOP_Transport.h \ $(ACE_ROOT)/ace/SSL/SSL_SOCK_Stream.h \ - $(ACE_ROOT)/ace/SSL/SSL_SOCK.h \ $(ACE_ROOT)/ace/SSL/SSL_Export.h \ + $(ACE_ROOT)/ace/SSL/SSL_SOCK.h \ $(ACE_ROOT)/ace/SSL/SSL_SOCK.i \ $(ACE_ROOT)/ace/SSL/SSL_Context.h \ $(ACE_ROOT)/ace/SSL/SSL_Context.i \ $(ACE_ROOT)/ace/SSL/SSL_SOCK_Stream.i \ + $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \ + $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \ SSLIOP/SSLIOP_Current_Impl.h SSLIOP/SSLIOP_Current_Impl.inl \ SSLIOP/SSLIOP_Connect.i \ $(ACE_ROOT)/ace/SSL/SSL_SOCK_Acceptor.h \ @@ -4897,8 +4819,11 @@ realclean: clean $(TAO_ROOT)/tao/RTCORBAS.i \ $(TAO_ROOT)/tao/RT_Policy_i.i -.obj/SSLIOP_Connect.o .obj/SSLIOP_Connect.so .shobj/SSLIOP_Connect.o .shobj/SSLIOP_Connect.so: SSLIOP/SSLIOP_Connect.cpp SSLIOP/SSLIOP_Connect.h \ +.obj/SSLIOP_Connection_Handler.o .obj/SSLIOP_Connection_Handler.so .shobj/SSLIOP_Connection_Handler.o .shobj/SSLIOP_Connection_Handler.so: SSLIOP/SSLIOP_Connection_Handler.cpp \ + SSLIOP/SSLIOP_Connection_Handler.h \ $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -5007,43 +4932,6 @@ realclean: clean $(TAO_ROOT)/tao/TAO_Export.h \ $(TAO_ROOT)/tao/corbafwd.i \ $(TAO_ROOT)/tao/Wait_Strategy.h \ - $(TAO_ROOT)/tao/GIOP_Message_Acceptors.h \ - $(TAO_ROOT)/tao/GIOP_Message_Base.h \ - $(TAO_ROOT)/tao/GIOP_Message_State.h \ - $(TAO_ROOT)/tao/Pluggable_Messaging.h \ - $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \ - $(TAO_ROOT)/tao/IOPC.h \ - $(TAO_ROOT)/tao/CDR.h \ - $(ACE_ROOT)/ace/CDR_Stream.h \ - $(ACE_ROOT)/ace/CDR_Stream.i \ - $(TAO_ROOT)/tao/CDR.i \ - $(TAO_ROOT)/tao/Sequence.h \ - $(TAO_ROOT)/tao/Managed_Types.h \ - $(TAO_ROOT)/tao/Managed_Types.i \ - $(TAO_ROOT)/tao/Sequence.i \ - $(TAO_ROOT)/tao/Sequence_T.h \ - $(TAO_ROOT)/tao/Sequence_T.i \ - $(TAO_ROOT)/tao/Sequence_T.cpp \ - $(TAO_ROOT)/tao/IOPC.i \ - $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \ - $(TAO_ROOT)/tao/Exception.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ - $(TAO_ROOT)/tao/Exception.i \ - $(TAO_ROOT)/tao/Pluggable_Messaging.i \ - $(TAO_ROOT)/tao/GIOP_Message_State.i \ - $(TAO_ROOT)/tao/GIOP_Message_Base.i \ - $(TAO_ROOT)/tao/GIOP_Message_Accept_State.h \ - $(TAO_ROOT)/tao/GIOP_Message_Headers.h \ - $(TAO_ROOT)/tao/Tagged_Profile.h \ - $(TAO_ROOT)/tao/GIOPC.h \ - $(TAO_ROOT)/tao/Object_KeyC.h \ - $(TAO_ROOT)/tao/Object_KeyC.i \ - $(TAO_ROOT)/tao/GIOPC.i \ - $(TAO_ROOT)/tao/Tagged_Profile.i \ - $(TAO_ROOT)/tao/GIOP_Message_Headers.i \ - $(TAO_ROOT)/tao/GIOP_Message_Accept_State.i \ - $(TAO_ROOT)/tao/GIOP_Message_Acceptors.i \ $(TAO_ROOT)/tao/Connection_Handler.h \ $(ACE_ROOT)/ace/SOCK.h \ $(ACE_ROOT)/ace/Addr.h \ @@ -5068,6 +4956,8 @@ realclean: clean $(ACE_ROOT)/ace/Shared_Object.h \ $(ACE_ROOT)/ace/Shared_Object.i \ $(ACE_ROOT)/ace/Service_Object.i \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Service_Config.i \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ $(TAO_ROOT)/tao/Cache_Entries.h \ @@ -5078,7 +4968,7 @@ realclean: clean $(TAO_ROOT)/tao/Cache_Entries.inl \ $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \ $(TAO_ROOT)/tao/Connection_Handler.inl \ - $(TAO_ROOT)/tao/IIOP_Connect.h \ + $(TAO_ROOT)/tao/IIOP_Connection_Handler.h \ $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Svc_Handler.h \ $(ACE_ROOT)/ace/Synch_Options.h \ @@ -5129,27 +5019,48 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.cpp \ $(TAO_ROOT)/tao/IIOP_Transport.h \ $(TAO_ROOT)/tao/Pluggable.h \ + $(TAO_ROOT)/tao/Sequence.h \ + $(TAO_ROOT)/tao/Managed_Types.h \ + $(TAO_ROOT)/tao/Managed_Types.i \ + $(TAO_ROOT)/tao/Sequence.i \ + $(TAO_ROOT)/tao/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(TAO_ROOT)/tao/Exception.i \ $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/Pluggable.i \ - $(TAO_ROOT)/tao/operation_details.h \ - $(TAO_ROOT)/tao/target_specification.h \ - $(TAO_ROOT)/tao/target_specification.i \ - $(TAO_ROOT)/tao/operation_details.i \ $(ACE_ROOT)/ace/SOCK_Stream.h \ $(ACE_ROOT)/ace/SOCK_IO.h \ $(ACE_ROOT)/ace/SOCK_IO.i \ $(ACE_ROOT)/ace/SOCK_Stream.i \ $(TAO_ROOT)/tao/IIOP_Transport.i \ - $(TAO_ROOT)/tao/IIOP_Connect.i \ + $(TAO_ROOT)/tao/IIOP_Connection_Handler.i \ SSLIOP/SSLIOP_Transport.h SSLIOP/SSLIOP_Export.h \ $(ACE_ROOT)/ace/SSL/SSL_SOCK_Stream.h \ - $(ACE_ROOT)/ace/SSL/SSL_SOCK.h \ $(ACE_ROOT)/ace/SSL/SSL_Export.h \ + $(ACE_ROOT)/ace/SSL/SSL_SOCK.h \ $(ACE_ROOT)/ace/SSL/SSL_SOCK.i \ $(ACE_ROOT)/ace/SSL/SSL_Context.h \ $(ACE_ROOT)/ace/SSL/SSL_Context.i \ $(ACE_ROOT)/ace/SSL/SSL_SOCK_Stream.i \ + $(TAO_ROOT)/tao/operation_details.h \ + $(TAO_ROOT)/tao/target_specification.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/target_specification.i \ + $(TAO_ROOT)/tao/operation_details.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \ + $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \ SSLIOP/SSLIOP_Current_Impl.h \ SSLIOPC.h \ $(TAO_ROOT)/tao/corba.h \ @@ -5180,6 +5091,10 @@ realclean: clean $(TAO_ROOT)/tao/OctetSeqC.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/TAO_Server_Request.h \ + $(TAO_ROOT)/tao/Tagged_Profile.h \ + $(TAO_ROOT)/tao/GIOPC.h \ + $(TAO_ROOT)/tao/GIOPC.i \ + $(TAO_ROOT)/tao/Tagged_Profile.i \ $(TAO_ROOT)/tao/TAO_Server_Request.i \ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/LocalObject.h \ @@ -5284,10 +5199,6 @@ realclean: clean $(TAO_ROOT)/tao/Base_Connection_Property.inl \ $(TAO_ROOT)/tao/Messaging_Policy_i.h \ $(TAO_ROOT)/tao/Messaging_Policy_i.i \ - $(TAO_ROOT)/tao/GIOP_Message_Lite.h \ - $(TAO_ROOT)/tao/GIOP_Utils.h \ - $(TAO_ROOT)/tao/GIOP_Utils.i \ - $(TAO_ROOT)/tao/GIOP_Message_Lite.i \ $(TAO_ROOT)/tao/IIOP_Endpoint.h \ $(TAO_ROOT)/tao/IIOP_Endpoint.i @@ -5295,6 +5206,8 @@ realclean: clean $(ACE_ROOT)/ace/pre.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -5434,17 +5347,9 @@ realclean: clean $(TAO_ROOT)/tao/OctetSeqC.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/TAO_Server_Request.h \ - $(TAO_ROOT)/tao/GIOP_Message_Base.h \ - $(TAO_ROOT)/tao/GIOP_Message_State.h \ - $(TAO_ROOT)/tao/Pluggable_Messaging.h \ - $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \ + $(TAO_ROOT)/tao/Tagged_Profile.h \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ - $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \ - $(TAO_ROOT)/tao/Pluggable_Messaging.i \ - $(TAO_ROOT)/tao/GIOP_Message_State.i \ - $(TAO_ROOT)/tao/GIOP_Message_Base.i \ - $(TAO_ROOT)/tao/Tagged_Profile.h \ $(TAO_ROOT)/tao/GIOPC.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ $(TAO_ROOT)/tao/Object_KeyC.i \ @@ -5522,6 +5427,8 @@ realclean: clean $(TAO_ROOT)/tao/CONV_FRAMEC.h \ $(TAO_ROOT)/tao/CONV_FRAMEC.i \ $(TAO_ROOT)/tao/Tagged_Components.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ $(TAO_ROOT)/tao/Profile.i \ $(TAO_ROOT)/tao/MProfile.i \ $(TAO_ROOT)/tao/ORB_Core.h \ @@ -5625,6 +5532,8 @@ realclean: clean $(TAO_ROOT)/tao/IOPS.h \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/TAO_Export.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -5734,8 +5643,7 @@ realclean: clean $(TAO_ROOT)/tao/IOPS_T.h \ $(TAO_ROOT)/tao/IOPS_T.i \ $(TAO_ROOT)/tao/IOPS_T.cpp \ - $(TAO_ROOT)/tao/IOPS.i \ - SecurityS.h \ + $(TAO_ROOT)/tao/IOPS.i SecurityS.h \ $(TAO_ROOT)/tao/TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/Any.h \ @@ -5757,8 +5665,7 @@ realclean: clean $(TAO_ROOT)/tao/TimeBaseS_T.h \ $(TAO_ROOT)/tao/TimeBaseS_T.i \ $(TAO_ROOT)/tao/TimeBaseS_T.cpp \ - $(TAO_ROOT)/tao/TimeBaseS.i \ - SecurityC.h \ + $(TAO_ROOT)/tao/TimeBaseS.i SecurityC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Services.h \ @@ -5778,14 +5685,6 @@ realclean: clean $(TAO_ROOT)/tao/OctetSeqC.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/TAO_Server_Request.h \ - $(TAO_ROOT)/tao/GIOP_Message_Base.h \ - $(TAO_ROOT)/tao/GIOP_Message_State.h \ - $(TAO_ROOT)/tao/Pluggable_Messaging.h \ - $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \ - $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \ - $(TAO_ROOT)/tao/Pluggable_Messaging.i \ - $(TAO_ROOT)/tao/GIOP_Message_State.i \ - $(TAO_ROOT)/tao/GIOP_Message_Base.i \ $(TAO_ROOT)/tao/Tagged_Profile.h \ $(TAO_ROOT)/tao/GIOPC.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -5864,6 +5763,8 @@ realclean: clean $(TAO_ROOT)/tao/CONV_FRAMEC.h \ $(TAO_ROOT)/tao/CONV_FRAMEC.i \ $(TAO_ROOT)/tao/Tagged_Components.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ $(TAO_ROOT)/tao/Profile.i \ $(TAO_ROOT)/tao/MProfile.i \ $(TAO_ROOT)/tao/ORB_Core.h \ @@ -5995,6 +5896,8 @@ realclean: clean .obj/SSLIOPC.o .obj/SSLIOPC.so .shobj/SSLIOPC.o .shobj/SSLIOPC.so: SSLIOPC.cpp SSLIOPC.h \ $(ACE_ROOT)/ace/pre.h \ $(TAO_ROOT)/tao/corba.h \ + $(ACE_ROOT)/ace/config-sunos5.6.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -6134,17 +6037,9 @@ realclean: clean $(TAO_ROOT)/tao/OctetSeqC.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/TAO_Server_Request.h \ - $(TAO_ROOT)/tao/GIOP_Message_Base.h \ - $(TAO_ROOT)/tao/GIOP_Message_State.h \ - $(TAO_ROOT)/tao/Pluggable_Messaging.h \ - $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \ + $(TAO_ROOT)/tao/Tagged_Profile.h \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ - $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \ - $(TAO_ROOT)/tao/Pluggable_Messaging.i \ - $(TAO_ROOT)/tao/GIOP_Message_State.i \ - $(TAO_ROOT)/tao/GIOP_Message_Base.i \ - $(TAO_ROOT)/tao/Tagged_Profile.h \ $(TAO_ROOT)/tao/GIOPC.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ $(TAO_ROOT)/tao/Object_KeyC.i \ @@ -6222,6 +6117,8 @@ realclean: clean $(TAO_ROOT)/tao/CONV_FRAMEC.h \ $(TAO_ROOT)/tao/CONV_FRAMEC.i \ $(TAO_ROOT)/tao/Tagged_Components.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ $(TAO_ROOT)/tao/Profile.i \ $(TAO_ROOT)/tao/MProfile.i \ $(TAO_ROOT)/tao/ORB_Core.h \ diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.cpp index 320f468f572..0853e8886db 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.cpp @@ -11,27 +11,27 @@ ACE_RCSID(TAO_SSLIOP, IIOP_SSL_Acceptor, "$Id$") #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Acceptor<TAO_IIOP_SSL_Server_Connection_Handler, ACE_SOCK_ACCEPTOR>; -template class ACE_Strategy_Acceptor<TAO_IIOP_SSL_Server_Connection_Handler, ACE_SOCK_ACCEPTOR>; -template class ACE_Accept_Strategy<TAO_IIOP_SSL_Server_Connection_Handler, ACE_SOCK_ACCEPTOR>; -template class ACE_Creation_Strategy<TAO_IIOP_SSL_Server_Connection_Handler>; -template class ACE_Concurrency_Strategy<TAO_IIOP_SSL_Server_Connection_Handler>; -template class ACE_Scheduling_Strategy<TAO_IIOP_SSL_Server_Connection_Handler>; -template class TAO_Creation_Strategy<TAO_IIOP_SSL_Server_Connection_Handler>; -template class TAO_Concurrency_Strategy<TAO_IIOP_SSL_Server_Connection_Handler>; -template class TAO_Accept_Strategy<TAO_IIOP_SSL_Server_Connection_Handler, ACE_SOCK_ACCEPTOR>; +template class ACE_Acceptor<TAO_IIOP_SSL_Connection_Handler, ACE_SOCK_ACCEPTOR>; +template class ACE_Strategy_Acceptor<TAO_IIOP_SSL_Connection_Handler, ACE_SOCK_ACCEPTOR>; +template class ACE_Accept_Strategy<TAO_IIOP_SSL_Connection_Handler, ACE_SOCK_ACCEPTOR>; +template class ACE_Creation_Strategy<TAO_IIOP_SSL_Connection_Handler>; +template class ACE_Concurrency_Strategy<TAO_IIOP_SSL_Connection_Handler>; +template class ACE_Scheduling_Strategy<TAO_IIOP_SSL_Connection_Handler>; +template class TAO_Creation_Strategy<TAO_IIOP_SSL_Connection_Handler>; +template class TAO_Concurrency_Strategy<TAO_IIOP_SSL_Connection_Handler>; +template class TAO_Accept_Strategy<TAO_IIOP_SSL_Connection_Handler, ACE_SOCK_ACCEPTOR>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Acceptor<TAO_IIOP_SSL_Server_Connection_Handler, ACE_SOCK_ACCEPTOR> -#pragma instantiate ACE_Strategy_Acceptor<TAO_IIOP_SSL_Server_Connection_Handler, ACE_SOCK_ACCEPTOR> -#pragma instantiate ACE_Accept_Strategy<TAO_IIOP_SSL_Server_Connection_Handler, ACE_SOCK_ACCEPTOR> -#pragma instantiate ACE_Creation_Strategy<TAO_IIOP_SSL_Server_Connection_Handler> -#pragma instantiate ACE_Concurrency_Strategy<TAO_IIOP_SSL_Server_Connection_Handler> -#pragma instantiate ACE_Scheduling_Strategy<TAO_IIOP_SSL_Server_Connection_Handler> -#pragma instantiate TAO_Creation_Strategy<TAO_IIOP_SSL_Server_Connection_Handler> -#pragma instantiate TAO_Concurrency_Strategy<TAO_IIOP_SSL_Server_Connection_Handler> -#pragma instantiate TAO_Accept_Strategy<TAO_IIOP_SSL_Server_Connection_Handler, ACE_SOCK_ACCEPTOR> +#pragma instantiate ACE_Acceptor<TAO_IIOP_SSL_Connection_Handler, ACE_SOCK_ACCEPTOR> +#pragma instantiate ACE_Strategy_Acceptor<TAO_IIOP_SSL_Connection_Handler, ACE_SOCK_ACCEPTOR> +#pragma instantiate ACE_Accept_Strategy<TAO_IIOP_SSL_Connection_Handler, ACE_SOCK_ACCEPTOR> +#pragma instantiate ACE_Creation_Strategy<TAO_IIOP_SSL_Connection_Handler> +#pragma instantiate ACE_Concurrency_Strategy<TAO_IIOP_SSL_Connection_Handler> +#pragma instantiate ACE_Scheduling_Strategy<TAO_IIOP_SSL_Connection_Handler> +#pragma instantiate TAO_Creation_Strategy<TAO_IIOP_SSL_Connection_Handler> +#pragma instantiate TAO_Concurrency_Strategy<TAO_IIOP_SSL_Connection_Handler> +#pragma instantiate TAO_Accept_Strategy<TAO_IIOP_SSL_Connection_Handler, ACE_SOCK_ACCEPTOR> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.h b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.h index 81845dd4f14..879c79a6e88 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.h @@ -24,7 +24,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "IIOP_SSL_Connect.h" +#include "IIOP_SSL_Connection_Handler.h" #include "tao/IIOP_Acceptor.h" // TAO IIOP_SSL_Acceptor concrete call defination @@ -38,17 +38,17 @@ * since it uses a different a set of Acceptor strategies. In * particular, it overrides the open_i() method to use the Acceptor * strategies tailored to use the SSL aware server connection handler. - * See the TAO_IIOP_SSL_Server_Connection_Handler notes for details. + * See the TAO_IIOP_SSL_Connection_Handler notes for details. */ class TAO_SSLIOP_Export TAO_IIOP_SSL_Acceptor : public TAO_IIOP_Acceptor { public: - typedef ACE_Strategy_Acceptor<TAO_IIOP_SSL_Server_Connection_Handler, ACE_SOCK_ACCEPTOR> TAO_IIOP_SSL_BASE_ACCEPTOR; - typedef TAO_Creation_Strategy<TAO_IIOP_SSL_Server_Connection_Handler> TAO_IIOP_SSL_CREATION_STRATEGY; - typedef TAO_Concurrency_Strategy<TAO_IIOP_SSL_Server_Connection_Handler> TAO_IIOP_SSL_CONCURRENCY_STRATEGY; - typedef TAO_Accept_Strategy<TAO_IIOP_SSL_Server_Connection_Handler, ACE_SOCK_ACCEPTOR> TAO_IIOP_SSL_ACCEPT_STRATEGY; + typedef ACE_Strategy_Acceptor<TAO_IIOP_SSL_Connection_Handler, ACE_SOCK_ACCEPTOR> TAO_IIOP_SSL_BASE_ACCEPTOR; + typedef TAO_Creation_Strategy<TAO_IIOP_SSL_Connection_Handler> TAO_IIOP_SSL_CREATION_STRATEGY; + typedef TAO_Concurrency_Strategy<TAO_IIOP_SSL_Connection_Handler> TAO_IIOP_SSL_CONCURRENCY_STRATEGY; + typedef TAO_Accept_Strategy<TAO_IIOP_SSL_Connection_Handler, ACE_SOCK_ACCEPTOR> TAO_IIOP_SSL_ACCEPT_STRATEGY; /// Constructor. TAO_IIOP_SSL_Acceptor (CORBA::Boolean flag = 0); diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp index 87111cdec90..e16c7252ff6 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp @@ -16,43 +16,8 @@ ACE_RCSID(TAO_SSLIOP, IIOP_SSL_Connector, "$Id$") -TAO_IIOP_SSL_Connect_Creation_Strategy:: -TAO_IIOP_SSL_Connect_Creation_Strategy (ACE_Thread_Manager* t, - TAO_ORB_Core *orb_core, - void *arg, - CORBA::Boolean flag) - : ACE_Creation_Strategy<TAO_IIOP_SSL_Client_Connection_Handler> (t), - orb_core_ (orb_core), - arg_ (arg), - lite_flag_ (flag) -{ -} - -TAO_IIOP_SSL_Connect_Creation_Strategy:: -~TAO_IIOP_SSL_Connect_Creation_Strategy (void) -{ -} - -int -TAO_IIOP_SSL_Connect_Creation_Strategy::make_svc_handler ( - TAO_IIOP_SSL_Client_Connection_Handler *&sh) -{ - if (sh == 0) - ACE_NEW_RETURN (sh, - TAO_IIOP_SSL_Client_Connection_Handler ( - this->orb_core_->thr_mgr (), - this->orb_core_, - this->lite_flag_, - this->arg_), - -1); - return 0; -} - -// **************************************************************** - TAO_IIOP_SSL_Connector::TAO_IIOP_SSL_Connector (CORBA::Boolean flag) : TAO_IIOP_Connector (flag), - null_activation_strategy_ (), connect_strategy_ (), base_connector_ () { @@ -70,26 +35,36 @@ TAO_IIOP_SSL_Connector::open (TAO_ORB_Core *orb_core) if (this->init_tcp_properties () != 0) return -1; - TAO_IIOP_SSL_Connect_Creation_Strategy *connect_creation_strategy = 0; + /// Our connect creation strategy + TAO_IIOP_SSL_CONNECT_CREATION_STRATEGY *connect_creation_strategy = 0; ACE_NEW_RETURN (connect_creation_strategy, - TAO_IIOP_SSL_Connect_Creation_Strategy ( - this->orb_core ()->thr_mgr (), - this->orb_core (), - &(this->tcp_properties_), - this->lite_flag_), + TAO_IIOP_SSL_CONNECT_CREATION_STRATEGY + (orb_core->thr_mgr (), + orb_core, + &(this->tcp_properties_), + this->lite_flag_), -1); + /// Our activation strategy + TAO_IIOP_SSL_CONNECT_CONCURRENCY_STRATEGY *concurrency_strategy = 0; + + ACE_NEW_RETURN (concurrency_strategy, + TAO_IIOP_SSL_CONNECT_CONCURRENCY_STRATEGY (orb_core), + -1); + + return this->base_connector_.open (this->orb_core ()->reactor (), connect_creation_strategy, &this->connect_strategy_, - &this->null_activation_strategy_); + concurrency_strategy); } int TAO_IIOP_SSL_Connector::close (void) { delete this->base_connector_.creation_strategy (); + delete this->base_connector_.concurrency_strategy (); return this->base_connector_.close (); } @@ -142,7 +117,7 @@ TAO_IIOP_SSL_Connector::connect (TAO_Connection_Descriptor_Interface *desc, } int result = 0; - TAO_IIOP_SSL_Client_Connection_Handler *svc_handler = 0; + TAO_IIOP_SSL_Connection_Handler *svc_handler = 0; TAO_Connection_Handler *conn_handler = 0; // Check the Cache first for connections @@ -155,7 +130,7 @@ TAO_IIOP_SSL_Connector::connect (TAO_Connection_Descriptor_Interface *desc, ACE_TEXT ("got an existing connection \n"))); // We have found a connection and a handler svc_handler = - ACE_dynamic_cast (TAO_IIOP_SSL_Client_Connection_Handler *, + ACE_dynamic_cast (TAO_IIOP_SSL_Connection_Handler *, conn_handler); } else @@ -240,34 +215,36 @@ TAO_IIOP_SSL_Connector::preconnect (const char *) #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_NOOP_Concurrency_Strategy<TAO_IIOP_SSL_Client_Connection_Handler>; -template class ACE_Concurrency_Strategy<TAO_IIOP_SSL_Client_Connection_Handler>; -template class ACE_Creation_Strategy<TAO_IIOP_SSL_Client_Connection_Handler>; -template class ACE_Strategy_Connector<TAO_IIOP_SSL_Client_Connection_Handler, ACE_SOCK_CONNECTOR>; -template class ACE_Connect_Strategy<TAO_IIOP_SSL_Client_Connection_Handler, ACE_SOCK_CONNECTOR>; -template class ACE_Connector<TAO_IIOP_SSL_Client_Connection_Handler, ACE_SOCK_CONNECTOR>; -template class ACE_Svc_Tuple<TAO_IIOP_SSL_Client_Connection_Handler>; +template class TAO_Connect_Concurrency_Strategy<TAO_IIOP_SSL_Connection_Handler>; +template class TAO_Connect_Creation_Strategy<TAO_IIOP_SSL_Connection_Handler>; +template class ACE_Strategy_Connector<TAO_IIOP_SSL_Connection_Handler, ACE_SOCK_CONNECTOR>; +template class ACE_Connect_Strategy<TAO_IIOP_SSL_Connection_Handler, ACE_SOCK_CONNECTOR>; +template class ACE_Connector<TAO_IIOP_SSL_Connection_Handler, ACE_SOCK_CONNECTOR>; +template class ACE_Svc_Tuple<TAO_IIOP_SSL_Connection_Handler>; -template class ACE_Map_Manager<int, ACE_Svc_Tuple<TAO_IIOP_SSL_Client_Connection_Handler> *, ACE_SYNCH_RW_MUTEX>; -template class ACE_Map_Iterator_Base<int, ACE_Svc_Tuple<TAO_IIOP_SSL_Client_Connection_Handler> *, ACE_SYNCH_RW_MUTEX>; -template class ACE_Map_Entry<int,ACE_Svc_Tuple<TAO_IIOP_SSL_Client_Connection_Handler>*>; -template class ACE_Map_Iterator<int,ACE_Svc_Tuple<TAO_IIOP_SSL_Client_Connection_Handler>*,ACE_SYNCH_RW_MUTEX>; -template class ACE_Map_Reverse_Iterator<int,ACE_Svc_Tuple<TAO_IIOP_SSL_Client_Connection_Handler>*,ACE_SYNCH_RW_MUTEX>; +template class ACE_Map_Manager<int, ACE_Svc_Tuple<TAO_IIOP_SSL_Connection_Handler> *, ACE_SYNCH_RW_MUTEX>; +template class ACE_Map_Iterator_Base<int, ACE_Svc_Tuple<TAO_IIOP_SSL_Connection_Handler> *, ACE_SYNCH_RW_MUTEX>; +template class ACE_Map_Entry<int,ACE_Svc_Tuple<TAO_IIOP_SSL_Connection_Handler>*>; +template class ACE_Map_Iterator<int,ACE_Svc_Tuple<TAO_IIOP_SSL_Connection_Handler>*,ACE_SYNCH_RW_MUTEX>; +template class ACE_Map_Reverse_Iterator<int,ACE_Svc_Tuple<TAO_IIOP_SSL_Connection_Handler>*,ACE_SYNCH_RW_MUTEX>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_NOOP_Concurrency_Strategy<TAO_IIOP_SSL_Client_Connection_Handler> -#pragma instantiate ACE_Concurrency_Strategy<TAO_IIOP_SSL_Client_Connection_Handler> -#pragma instantiate ACE_Strategy_Connector<TAO_IIOP_SSL_Client_Connection_Handler, ACE_SOCK_CONNECTOR> -#pragma instantiate ACE_Connect_Strategy<TAO_IIOP_SSL_Client_Connection_Handler, ACE_SOCK_CONNECTOR> - -#pragma instantiate ACE_Connector<TAO_IIOP_SSL_Client_Connection_Handler, ACE_SOCK_Connector> -#pragma instantiate ACE_Creation_Strategy<TAO_IIOP_SSL_Client_Connection_Handler> -#pragma instantiate ACE_Svc_Tuple<TAO_IIOP_SSL_Client_Connection_Handler> -#pragma instantiate ACE_Map_Manager<int, ACE_Svc_Tuple<TAO_IIOP_SSL_Client_Connection_Handler> *, ACE_SYNCH_RW_MUTEX> -#pragma instantiate ACE_Map_Iterator_Base<int, ACE_Svc_Tuple<TAO_IIOP_SSL_Client_Connection_Handler> *, ACE_SYNCH_RW_MUTEX> -#pragma instantiate ACE_Map_Entry<int,ACE_Svc_Tuple<TAO_IIOP_SSL_Client_Connection_Handler>*> -#pragma instantiate ACE_Map_Iterator<int,ACE_Svc_Tuple<TAO_IIOP_SSL_Client_Connection_Handler>*,ACE_SYNCH_RW_MUTEX> -#pragma instantiate ACE_Map_Reverse_Iterator<int,ACE_Svc_Tuple<TAO_IIOP_SSL_Client_Connection_Handler>*,ACE_SYNCH_RW_MUTEX> +#pragma instantiate TAO_Connect_Concurrency_Strategy<TAO_IIOP_SSL_Connection_Handler> +#pragma instantiate TAO_Connect_Creation_Strategy<TAO_IIOP_SSL_Connection_Handler> +#pragma instantiate ACE_Strategy_Connector<TAO_IIOP_SSL_Connection_Handler, ACE_SOCK_CONNECTOR> +#pragma instantiate ACE_Connect_Strategy<TAO_IIOP_SSL_Connection_Handler, ACE_SOCK_CONNECTOR> +#pragma instantiate ACE_Connector<TAO_IIOP_SSL_Connection_Handler, ACE_SOCK_Connector> +#pragma instantiate ACE_Svc_Tuple<TAO_IIOP_SSL_Connection_Handler> + + +#pragma instantiate ACE_Connector<TAO_IIOP_SSL_Connection_Handler, ACE_SOCK_Connector> +#pragma instantiate ACE_Creation_Strategy<TAO_IIOP_SSL_Connection_Handler> +#pragma instantiate ACE_Svc_Tuple<TAO_IIOP_SSL_Connection_Handler> +#pragma instantiate ACE_Map_Manager<int, ACE_Svc_Tuple<TAO_IIOP_SSL_Connection_Handler> *, ACE_SYNCH_RW_MUTEX> +#pragma instantiate ACE_Map_Iterator_Base<int, ACE_Svc_Tuple<TAO_IIOP_SSL_Connection_Handler> *, ACE_SYNCH_RW_MUTEX> +#pragma instantiate ACE_Map_Entry<int,ACE_Svc_Tuple<TAO_IIOP_SSL_Connection_Handler>*> +#pragma instantiate ACE_Map_Iterator<int,ACE_Svc_Tuple<TAO_IIOP_SSL_Connection_Handler>*,ACE_SYNCH_RW_MUTEX> +#pragma instantiate ACE_Map_Reverse_Iterator<int,ACE_Svc_Tuple<TAO_IIOP_SSL_Connection_Handler>*,ACE_SYNCH_RW_MUTEX> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h index cf181558596..0c582b853af 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h @@ -24,54 +24,10 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "IIOP_SSL_Connect.h" +#include "IIOP_SSL_Connection_Handler.h" #include "tao/IIOP_Connector.h" -// **************************************************************** -/** - * @class TAO_IIOP_SSL_Connect_Creation_Strategy - * - * @brief Helper creation strategy - * - * Creates UIOP_Client_Connection_Handler objects but satisfies - * the interface required by the - * ACE_Creation_Strategy<TAO_IIOP_SSL_Client_Connection_Handler> - */ -class TAO_SSLIOP_Export TAO_IIOP_SSL_Connect_Creation_Strategy - : public ACE_Creation_Strategy<TAO_IIOP_SSL_Client_Connection_Handler> -{ -public: - /** - * Constructor. <arg> parameter is used to pass any special - * state/info to the service handler upon creation. Currently used - * by IIOP and UIOP to pass protocol configuration properties. - */ - TAO_IIOP_SSL_Connect_Creation_Strategy (ACE_Thread_Manager * = 0, - TAO_ORB_Core* orb_core = 0, - void *arg = 0, - CORBA::Boolean flag = 0); - - /// Default destructor g++, 2.7.2 appear to need it. - ~TAO_IIOP_SSL_Connect_Creation_Strategy (void); - - /// Makes TAO_IIOP_SSL_Client_Connection_Handlers - virtual int make_svc_handler (TAO_IIOP_SSL_Client_Connection_Handler *&sh); - -private: - - /// The ORB core. - TAO_ORB_Core* orb_core_; - - /// Some info/state to be passed to the service handler we create. - void *arg_; - - /// Are we using GIOP lite? - CORBA::Boolean lite_flag_; -}; - -// **************************************************************** - /** * @class TAO_IIOP_SSL_Connector * @@ -102,28 +58,27 @@ public: public: - typedef ACE_NOOP_Concurrency_Strategy<TAO_IIOP_SSL_Client_Connection_Handler> - TAO_NULL_ACTIVATION_STRATEGY; + typedef TAO_Connect_Concurrency_Strategy<TAO_IIOP_SSL_Connection_Handler> + TAO_IIOP_SSL_CONNECT_CONCURRENCY_STRATEGY; + + typedef TAO_Connect_Creation_Strategy<TAO_IIOP_SSL_Connection_Handler> + TAO_IIOP_SSL_CONNECT_CREATION_STRATEGY; - typedef ACE_Connect_Strategy<TAO_IIOP_SSL_Client_Connection_Handler, + typedef ACE_Connect_Strategy<TAO_IIOP_SSL_Connection_Handler, ACE_SOCK_CONNECTOR> - TAO_CONNECT_STRATEGY ; + TAO_IIOP_SSL_CONNECT_STRATEGY ; - typedef ACE_Strategy_Connector<TAO_IIOP_SSL_Client_Connection_Handler, + typedef ACE_Strategy_Connector<TAO_IIOP_SSL_Connection_Handler, ACE_SOCK_CONNECTOR> TAO_IIOP_SSL_BASE_CONNECTOR; private: - /// Our activation strategy - TAO_NULL_ACTIVATION_STRATEGY null_activation_strategy_; - /// Our connect strategy - TAO_CONNECT_STRATEGY connect_strategy_; + TAO_IIOP_SSL_CONNECT_STRATEGY connect_strategy_; - /// The connector initiating connection requests for IIOP. + /// The connector initiating connection requests for IIOP_SSL. TAO_IIOP_SSL_BASE_CONNECTOR base_connector_; - }; #include "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp index 1a911209160..a17aa49dbe2 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp @@ -18,27 +18,27 @@ ACE_RCSID(TAO_SSLIOP, SSLIOP_Acceptor, "$Id$") #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Acceptor<TAO_SSLIOP_Server_Connection_Handler, ACE_SSL_SOCK_ACCEPTOR>; -template class ACE_Strategy_Acceptor<TAO_SSLIOP_Server_Connection_Handler, ACE_SSL_SOCK_ACCEPTOR>; -template class ACE_Accept_Strategy<TAO_SSLIOP_Server_Connection_Handler, ACE_SSL_SOCK_ACCEPTOR>; -template class ACE_Creation_Strategy<TAO_SSLIOP_Server_Connection_Handler>; -template class ACE_Concurrency_Strategy<TAO_SSLIOP_Server_Connection_Handler>; -template class ACE_Scheduling_Strategy<TAO_SSLIOP_Server_Connection_Handler>; -template class TAO_Creation_Strategy<TAO_SSLIOP_Server_Connection_Handler>; -template class TAO_Concurrency_Strategy<TAO_SSLIOP_Server_Connection_Handler>; -template class TAO_Accept_Strategy<TAO_SSLIOP_Server_Connection_Handler, ACE_SSL_SOCK_ACCEPTOR>; +template class ACE_Acceptor<TAO_SSLIOP_Connection_Handler, ACE_SSL_SOCK_ACCEPTOR>; +template class ACE_Strategy_Acceptor<TAO_SSLIOP_Connection_Handler, ACE_SSL_SOCK_ACCEPTOR>; +template class ACE_Accept_Strategy<TAO_SSLIOP_Connection_Handler, ACE_SSL_SOCK_ACCEPTOR>; +template class ACE_Creation_Strategy<TAO_SSLIOP_Connection_Handler>; +template class ACE_Concurrency_Strategy<TAO_SSLIOP_Connection_Handler>; +template class ACE_Scheduling_Strategy<TAO_SSLIOP_Connection_Handler>; +template class TAO_Creation_Strategy<TAO_SSLIOP_Connection_Handler>; +template class TAO_Concurrency_Strategy<TAO_SSLIOP_Connection_Handler>; +template class TAO_Accept_Strategy<TAO_SSLIOP_Connection_Handler, ACE_SSL_SOCK_ACCEPTOR>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Acceptor<TAO_SSLIOP_Server_Connection_Handler, ACE_SSL_SOCK_ACCEPTOR> -#pragma instantiate ACE_Strategy_Acceptor<TAO_SSLIOP_Server_Connection_Handler, ACE_SSL_SOCK_ACCEPTOR> -#pragma instantiate ACE_Accept_Strategy<TAO_SSLIOP_Server_Connection_Handler, ACE_SSL_SOCK_ACCEPTOR> -#pragma instantiate ACE_Creation_Strategy<TAO_SSLIOP_Server_Connection_Handler> -#pragma instantiate ACE_Concurrency_Strategy<TAO_SSLIOP_Server_Connection_Handler> -#pragma instantiate ACE_Scheduling_Strategy<TAO_SSLIOP_Server_Connection_Handler> -#pragma instantiate TAO_Creation_Strategy<TAO_SSLIOP_Server_Connection_Handler> -#pragma instantiate TAO_Concurrency_Strategy<TAO_SSLIOP_Server_Connection_Handler> -#pragma instantiate TAO_Accept_Strategy<TAO_SSLIOP_Server_Connection_Handler, ACE_SSL_SOCK_ACCEPTOR> +#pragma instantiate ACE_Acceptor<TAO_SSLIOP_Connection_Handler, ACE_SSL_SOCK_ACCEPTOR> +#pragma instantiate ACE_Strategy_Acceptor<TAO_SSLIOP_Connection_Handler, ACE_SSL_SOCK_ACCEPTOR> +#pragma instantiate ACE_Accept_Strategy<TAO_SSLIOP_Connection_Handler, ACE_SSL_SOCK_ACCEPTOR> +#pragma instantiate ACE_Creation_Strategy<TAO_SSLIOP_Connection_Handler> +#pragma instantiate ACE_Concurrency_Strategy<TAO_SSLIOP_Connection_Handler> +#pragma instantiate ACE_Scheduling_Strategy<TAO_SSLIOP_Connection_Handler> +#pragma instantiate TAO_Creation_Strategy<TAO_SSLIOP_Connection_Handler> +#pragma instantiate TAO_Concurrency_Strategy<TAO_SSLIOP_Connection_Handler> +#pragma instantiate TAO_Accept_Strategy<TAO_SSLIOP_Connection_Handler, ACE_SSL_SOCK_ACCEPTOR> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h index 6b88e2cce1e..9bfe9aa0cff 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h @@ -31,7 +31,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "IIOP_SSL_Acceptor.h" -#include "SSLIOP_Connect.h" +#include "SSLIOP_Connection_Handler.h" #include "ace/SSL/SSL_SOCK_Acceptor.h" #include "orbsvcs/SSLIOPC.h" @@ -54,10 +54,10 @@ public: ~TAO_SSLIOP_Acceptor (void); // Destructor. - typedef ACE_Strategy_Acceptor<TAO_SSLIOP_Server_Connection_Handler, ACE_SSL_SOCK_ACCEPTOR> TAO_SSLIOP_BASE_ACCEPTOR; - typedef TAO_Creation_Strategy<TAO_SSLIOP_Server_Connection_Handler> TAO_SSLIOP_CREATION_STRATEGY; - typedef TAO_Concurrency_Strategy<TAO_SSLIOP_Server_Connection_Handler> TAO_SSLIOP_CONCURRENCY_STRATEGY; - typedef TAO_Accept_Strategy<TAO_SSLIOP_Server_Connection_Handler, ACE_SSL_SOCK_ACCEPTOR> TAO_SSLIOP_ACCEPT_STRATEGY; + typedef ACE_Strategy_Acceptor<TAO_SSLIOP_Connection_Handler, ACE_SSL_SOCK_ACCEPTOR> TAO_SSLIOP_BASE_ACCEPTOR; + typedef TAO_Creation_Strategy<TAO_SSLIOP_Connection_Handler> TAO_SSLIOP_CREATION_STRATEGY; + typedef TAO_Concurrency_Strategy<TAO_SSLIOP_Connection_Handler> TAO_SSLIOP_CONCURRENCY_STRATEGY; + typedef TAO_Accept_Strategy<TAO_SSLIOP_Connection_Handler, ACE_SSL_SOCK_ACCEPTOR> TAO_SSLIOP_ACCEPT_STRATEGY; // = The TAO_Acceptor methods, check the documentation in // Pluggable.h for details. diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp index 6c490946c88..99404e41e08 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp @@ -13,37 +13,9 @@ ACE_RCSID(TAO_SSLIOP, SSLIOP_Connector, "$Id$") -TAO_SSLIOP_Connect_Creation_Strategy:: -TAO_SSLIOP_Connect_Creation_Strategy (ACE_Thread_Manager* t, - TAO_ORB_Core *orb_core, - void *arg) - : ACE_Creation_Strategy<TAO_SSLIOP_Client_Connection_Handler> (t), - orb_core_ (orb_core), - arg_ (arg) -{ -} - -int -TAO_SSLIOP_Connect_Creation_Strategy::make_svc_handler - (TAO_SSLIOP_Client_Connection_Handler *&sh) -{ - if (sh == 0) - ACE_NEW_RETURN (sh, - TAO_SSLIOP_Client_Connection_Handler - (this->orb_core_->thr_mgr (), - this->orb_core_, - 0, - this->arg_), - -1); - return 0; -} - -// **************************************************************** - TAO_SSLIOP_Connector::TAO_SSLIOP_Connector (int no_protection) : TAO_IIOP_SSL_Connector (), no_protection_ (no_protection), - null_activation_strategy_ (), connect_strategy_ (), base_connector_ () { @@ -55,19 +27,28 @@ TAO_SSLIOP_Connector::open (TAO_ORB_Core *orb_core) if (this->TAO_IIOP_SSL_Connector::open (orb_core) == -1) return -1; - TAO_SSLIOP_Connect_Creation_Strategy *connect_creation_strategy = 0; + // Our connect creation strategy + TAO_SSLIOP_CONNECT_CREATION_STRATEGY *connect_creation_strategy = 0; ACE_NEW_RETURN (connect_creation_strategy, - TAO_SSLIOP_Connect_Creation_Strategy - (this->orb_core ()->thr_mgr (), - this->orb_core (), - &(this->tcp_properties_)), + TAO_SSLIOP_CONNECT_CREATION_STRATEGY + (orb_core->thr_mgr (), + orb_core, + &(this->tcp_properties_), + this->lite_flag_), + -1); + + // Our activation strategy + TAO_SSLIOP_CONNECT_CONCURRENCY_STRATEGY *concurrency_strategy = 0; + + ACE_NEW_RETURN (concurrency_strategy, + TAO_SSLIOP_CONNECT_CONCURRENCY_STRATEGY (orb_core), -1); return this->base_connector_.open (this->orb_core ()->reactor (), connect_creation_strategy, &this->connect_strategy_, - &this->null_activation_strategy_); + concurrency_strategy); } int @@ -76,6 +57,7 @@ TAO_SSLIOP_Connector::close (void) (void) this->TAO_IIOP_SSL_Connector::close (); delete this->base_connector_.creation_strategy (); + delete this->base_connector_.concurrency_strategy (); return this->base_connector_.close (); } @@ -177,7 +159,7 @@ TAO_SSLIOP_Connector::connect (TAO_Connection_Descriptor_Interface *desc, remote_address.set_port_number (ssl_component.port); int result = 0; - TAO_SSLIOP_Client_Connection_Handler *svc_handler = 0; + TAO_SSLIOP_Connection_Handler *svc_handler = 0; TAO_Connection_Handler *conn_handler = 0; // Check the Cache first for connections @@ -191,7 +173,7 @@ TAO_SSLIOP_Connector::connect (TAO_Connection_Descriptor_Interface *desc, // We have found a connection and a handler svc_handler = - ACE_dynamic_cast (TAO_SSLIOP_Client_Connection_Handler *, + ACE_dynamic_cast (TAO_SSLIOP_Connection_Handler *, conn_handler); } else @@ -309,36 +291,39 @@ TAO_SSLIOP_Connector::make_profile (const char *endpoint, #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_NOOP_Concurrency_Strategy<TAO_SSLIOP_Client_Connection_Handler>; -template class ACE_Concurrency_Strategy<TAO_SSLIOP_Client_Connection_Handler>; -template class ACE_Creation_Strategy<TAO_SSLIOP_Client_Connection_Handler>; -template class ACE_Strategy_Connector<TAO_SSLIOP_Client_Connection_Handler, ACE_SSL_SOCK_CONNECTOR>; -template class ACE_Connect_Strategy<TAO_SSLIOP_Client_Connection_Handler, ACE_SSL_SOCK_CONNECTOR>; -template class ACE_Connector<TAO_SSLIOP_Client_Connection_Handler, ACE_SSL_SOCK_CONNECTOR>; -template class ACE_Svc_Tuple<TAO_SSLIOP_Client_Connection_Handler>; - -template class ACE_Map_Manager<int, ACE_Svc_Tuple<TAO_SSLIOP_Client_Connection_Handler> *, ACE_SYNCH_RW_MUTEX>; -template class ACE_Map_Iterator_Base<int, ACE_Svc_Tuple<TAO_SSLIOP_Client_Connection_Handler> *, ACE_SYNCH_RW_MUTEX>; -template class ACE_Map_Entry<int,ACE_Svc_Tuple<TAO_SSLIOP_Client_Connection_Handler>*>; -template class ACE_Map_Iterator<int,ACE_Svc_Tuple<TAO_SSLIOP_Client_Connection_Handler>*,ACE_SYNCH_RW_MUTEX>; -template class ACE_Map_Reverse_Iterator<int,ACE_Svc_Tuple<TAO_SSLIOP_Client_Connection_Handler>*,ACE_SYNCH_RW_MUTEX>; -template class ACE_Auto_Basic_Array_Ptr<TAO_SSLIOP_Client_Connection_Handler*>; + +template class TAO_Connect_Concurrency_Strategy<TAO_SSLIOP_Connection_Handler>; +template class TAO_Connect_Creation_Strategy<TAO_SSLIOP_Connection_Handler>; +template class ACE_Strategy_Connector<TAO_SSLIOP_Connection_Handler, ACE_SSL_SOCK_CONNECTOR>; +template class ACE_Connect_Strategy<TAO_SSLIOP_Connection_Handler, ACE_SSL_SOCK_CONNECTOR>; +template class ACE_Connector<TAO_SSLIOP_Connection_Handler, ACE_SSL_SOCK_CONNECTOR>; +template class ACE_Svc_Tuple<TAO_SSLIOP_Connection_Handler>; + + +template class ACE_Map_Manager<int, ACE_Svc_Tuple<TAO_SSLIOP_Connection_Handler> *, ACE_SYNCH_RW_MUTEX>; +template class ACE_Map_Iterator_Base<int, ACE_Svc_Tuple<TAO_SSLIOP_Connection_Handler> *, ACE_SYNCH_RW_MUTEX>; +template class ACE_Map_Entry<int,ACE_Svc_Tuple<TAO_SSLIOP_Connection_Handler>*>; +template class ACE_Map_Iterator<int,ACE_Svc_Tuple<TAO_SSLIOP_Connection_Handler>*,ACE_SYNCH_RW_MUTEX>; +template class ACE_Map_Reverse_Iterator<int,ACE_Svc_Tuple<TAO_SSLIOP_Connection_Handler>*,ACE_SYNCH_RW_MUTEX>; +template class ACE_Auto_Basic_Array_Ptr<TAO_SSLIOP_Connection_Handler*>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_NOOP_Concurrency_Strategy<TAO_SSLIOP_Client_Connection_Handler> -#pragma instantiate ACE_Concurrency_Strategy<TAO_SSLIOP_Client_Connection_Handler> -#pragma instantiate ACE_Strategy_Connector<TAO_SSLIOP_Client_Connection_Handler, ACE_SOCK_CONNECTOR> -#pragma instantiate ACE_Connect_Strategy<TAO_SSLIOP_Client_Connection_Handler, ACE_SOCK_CONNECTOR> - -#pragma instantiate ACE_Connector<TAO_SSLIOP_Client_Connection_Handler, ACE_SOCK_Connector> -#pragma instantiate ACE_Creation_Strategy<TAO_SSLIOP_Client_Connection_Handler> -#pragma instantiate ACE_Svc_Tuple<TAO_SSLIOP_Client_Connection_Handler> -#pragma instantiate ACE_Map_Manager<int, ACE_Svc_Tuple<TAO_SSLIOP_Client_Connection_Handler> *, ACE_SYNCH_RW_MUTEX> -#pragma instantiate ACE_Map_Iterator_Base<int, ACE_Svc_Tuple<TAO_SSLIOP_Client_Connection_Handler> *, ACE_SYNCH_RW_MUTEX> -#pragma instantiate ACE_Map_Entry<int,ACE_Svc_Tuple<TAO_SSLIOP_Client_Connection_Handler>*> -#pragma instantiate ACE_Map_Iterator<int,ACE_Svc_Tuple<TAO_SSLIOP_Client_Connection_Handler>*,ACE_SYNCH_RW_MUTEX> -#pragma instantiate ACE_Map_Reverse_Iterator<int,ACE_Svc_Tuple<TAO_SSLIOP_Client_Connection_Handler>*,ACE_SYNCH_RW_MUTEX> -#pragma instantiate ACE_Auto_Basic_Array_Ptr<TAO_SSLIOP_Client_Connection_Handler*> +#pragma instantiate TAO_Connect_Concurrency_Strategy<TAO_SSLIOP_Connection_Handler> +#pragma instantiate TAO_Connect_Creation_Strategy<TAO_SSLIOP_Connection_Handler> +#pragma instantiate ACE_Strategy_Connector<TAO_SSLIOP_Connection_Handler, ACE_SSL_SOCK_CONNECTOR> +#pragma instantiate ACE_Connect_Strategy<TAO_SSLIOP_Connection_Handler, ACE_SSL_SOCK_CONNECTOR> +#pragma instantiate ACE_Connector<TAO_SSLIOP_Connection_Handler, ACE_SSL_SOCK_CONNECTOR> +#pragma instantiate ACE_Svc_Tuple<TAO_SSLIOP_Connection_Handler> + +#pragma instantiate ACE_Connector<TAO_SSLIOP_Connection_Handler, ACE_SOCK_CONNECTOR> +#pragma instantiate ACE_Creation_Strategy<TAO_SSLIOP_Connection_Handler> +#pragma instantiate ACE_Svc_Tuple<TAO_SSLIOP_Connection_Handler> +#pragma instantiate ACE_Map_Manager<int, ACE_Svc_Tuple<TAO_SSLIOP_Connection_Handler> *, ACE_SYNCH_RW_MUTEX> +#pragma instantiate ACE_Map_Iterator_Base<int, ACE_Svc_Tuple<TAO_SSLIOP_Connection_Handler> *, ACE_SYNCH_RW_MUTEX> +#pragma instantiate ACE_Map_Entry<int,ACE_Svc_Tuple<TAO_SSLIOP_Connection_Handler>*> +#pragma instantiate ACE_Map_Iterator<int,ACE_Svc_Tuple<TAO_SSLIOP_Connection_Handler>*,ACE_SYNCH_RW_MUTEX> +#pragma instantiate ACE_Map_Reverse_Iterator<int,ACE_Svc_Tuple<TAO_SSLIOP_Connection_Handler>*,ACE_SYNCH_RW_MUTEX> +#pragma instantiate ACE_Auto_Basic_Array_Ptr<TAO_SSLIOP_Connection_Handler*> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h index ef8d451acd8..f3ba32050d5 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h @@ -32,44 +32,11 @@ #include "ace/SSL/SSL_SOCK_Connector.h" #include "IIOP_SSL_Connector.h" -#include "SSLIOP_Connect.h" +#include "SSLIOP_Connection_Handler.h" #include "tao/Resource_Factory.h" class TAO_Base_Connection_Property; -// **************************************************************** - -class TAO_SSLIOP_Export TAO_SSLIOP_Connect_Creation_Strategy - : public ACE_Creation_Strategy<TAO_SSLIOP_Client_Connection_Handler> -{ - // = TITLE - // Helper creation strategy - // - // = DESCRIPTION - // Creates SSLIOP_Client_Connection_Handler objects but satisfies - // the interface required by the - // ACE_Creation_Strategy<TAO_SSLIOP_Client_Connection_Handler>. - // -public: - TAO_SSLIOP_Connect_Creation_Strategy (ACE_Thread_Manager * = 0, - TAO_ORB_Core* orb_core = 0, - void *arg = 0); - // Constructor. <arg> parameter is used to pass any special - // state/info to the service handler upon creation. Currently used - // to pass protocol configuration properties. - - virtual int make_svc_handler (TAO_SSLIOP_Client_Connection_Handler *&sh); - // Makes TAO_SSLIOP_Client_Connection_Handlers - -private: - TAO_ORB_Core* orb_core_; - // The ORB - - void *arg_; - // Some info/state to be passed to the service handler we create. -}; - -// **************************************************************** class TAO_SSLIOP_Export TAO_SSLIOP_Connector : public TAO_IIOP_SSL_Connector { @@ -107,16 +74,20 @@ protected: public: - typedef ACE_NOOP_Concurrency_Strategy<TAO_SSLIOP_Client_Connection_Handler> - TAO_SSLIOP_NULL_ACTIVATION_STRATEGY; - typedef ACE_Connect_Strategy<TAO_SSLIOP_Client_Connection_Handler, - ACE_SSL_SOCK_CONNECTOR> - TAO_SSLIOP_CONNECT_STRATEGY; + typedef TAO_Connect_Concurrency_Strategy<TAO_SSLIOP_Connection_Handler> + TAO_SSLIOP_CONNECT_CONCURRENCY_STRATEGY; + + typedef TAO_Connect_Creation_Strategy<TAO_SSLIOP_Connection_Handler> + TAO_SSLIOP_CONNECT_CREATION_STRATEGY; - typedef ACE_Strategy_Connector<TAO_SSLIOP_Client_Connection_Handler, - ACE_SSL_SOCK_CONNECTOR> - TAO_SSLIOP_BASE_CONNECTOR; + typedef ACE_Connect_Strategy<TAO_SSLIOP_Connection_Handler, + ACE_SOCK_CONNECTOR> + TAO_SSLIOP_CONNECT_STRATEGY ; + + typedef ACE_Strategy_Connector<TAO_SSLIOP_Connection_Handler, + ACE_SOCK_CONNECTOR> + TAO_SSLIOP_BASE_CONNECTOR; private: @@ -124,14 +95,11 @@ private: // If zero, connect to IIOP over SSL port by default. // Otherwise, connect to the insecure IIOP port. - TAO_SSLIOP_NULL_ACTIVATION_STRATEGY null_activation_strategy_; - // Our activation strategy - + /// Our connect strategy TAO_SSLIOP_CONNECT_STRATEGY connect_strategy_; - // Our connect strategy + /// The connector initiating connection requests for IIOP. TAO_SSLIOP_BASE_CONNECTOR base_connector_; - // The connector initiating connection requests for IIOP. }; diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp index 1da2071801c..3b39c06ca4d 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp @@ -3,7 +3,7 @@ // $Id$ #include "SSLIOP_Endpoint.h" -#include "SSLIOP_Connect.h" +#include "SSLIOP_Connection_Handler.h" #include "tao/IIOP_Endpoint.h" #include "tao/debug.h" @@ -16,7 +16,7 @@ ACE_RCSID(tao, SSLIOP_Endpoint, "$Id$") TAO_SSLIOP_Endpoint::TAO_SSLIOP_Endpoint (const SSLIOP::SSL *ssl_component, TAO_IIOP_Endpoint *iiop_endp) : TAO_Endpoint (TAO_TAG_IIOP_PROFILE), - ssl_hint_ (0), + // ssl_hint_ (0), next_ (0), iiop_endpoint_ (iiop_endp) { @@ -88,11 +88,11 @@ TAO_SSLIOP_Endpoint::reset_hint (void) this->iiop_endpoint_->reset_hint (); // @@ Who is doing the locking here! - if (this->ssl_hint_) + /*if (this->ssl_hint_) { this->ssl_hint_->cleanup_hint (); this->ssl_hint_ = 0; - } + }*/ } TAO_Endpoint * diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h index 9b5dfb282ca..c00fb1e9799 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h @@ -72,7 +72,7 @@ public: const SSLIOP::SSL &ssl_component (void) const; // Return SSL component corresponding to this endpoint. - TAO_SSLIOP_Client_Connection_Handler *&ssl_hint (void); + // TAO_SSLIOP_Client_Connection_Handler *&ssl_hint (void); // Access to our <hint_>. CORBA::Boolean is_equivalent (const TAO_Endpoint *other_endpoint); @@ -97,7 +97,7 @@ private: // Cache the SSL tagged component in a decoded format. Notice that // we do not need to marshal this object! - TAO_SSLIOP_Client_Connection_Handler *ssl_hint_; + // TAO_SSLIOP_Client_Connection_Handler *ssl_hint_; // Hint indicating the last successfully used connection handler for // a connection established through this endpoint's acceptor. diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.i b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.i index da1fe1add6d..ece77ba3229 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.i +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.i @@ -15,8 +15,9 @@ TAO_SSLIOP_Endpoint::ssl_component (void) const return this->ssl_component_; } -ACE_INLINE TAO_SSLIOP_Client_Connection_Handler *& +/*ACE_INLINE TAO_SSLIOP_Client_Connection_Handler *& TAO_SSLIOP_Endpoint::ssl_hint(void) { return this->ssl_hint_; } +*/ diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp index 64f8433a76a..6e480c5319d 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp @@ -6,7 +6,7 @@ ACE_RCSID (TAO_SSLIOP, SSLIOP_Transport, "$Id$") -#include "SSLIOP_Connect.h" +#include "SSLIOP_Connection_Handler.h" #include "SSLIOP_Profile.h" #include "tao/Timeprobe.h" #include "tao/CDR.h" @@ -16,72 +16,64 @@ ACE_RCSID (TAO_SSLIOP, SSLIOP_Transport, "$Id$") #include "tao/Stub.h" #include "tao/ORB_Core.h" #include "tao/debug.h" +#include "tao/GIOP_Message_Base.h" -#include "tao/GIOP_Message_Connectors.h" -#if defined (ACE_ENABLE_TIMEPROBES) -static const char *TAO_Transport_Timeprobe_Description[] = - { - "SSLIOP_Transport::send - start", - "SSLIOP_Transport::send - end", - - "SSLIOP_Transport::receive - start", - "SSLIOP_Transport::receive - end", - - "SSLIOP_Client_Transport::start_request - start", - "SSLIOP_Client_Transport::start_request - end" - }; - -enum - { - TAO_SSLIOP_TRANSPORT_SEND_START = 2200, - TAO_SSLIOP_TRANSPORT_SEND_END, - - TAO_SSLIOP_TRANSPORT_RECEIVE_START, - TAO_SSLIOP_TRANSPORT_RECEIVE_END, - - TAO_SSLIOP_CLIENT_TRANSPORT_START_REQUEST_START, - TAO_SSLIOP_CLIENT_TRANSPORT_START_REQUEST_END - }; - - -// Setup Timeprobes -ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_Transport_Timeprobe_Description, - TAO_SSLIOP_TRANSPORT_SEND_START); - -#endif /* ACE_ENABLE_TIMEPROBES */ - -TAO_SSLIOP_Transport::TAO_SSLIOP_Transport (TAO_ORB_Core *orb_core) +TAO_SSLIOP_Transport::TAO_SSLIOP_Transport (TAO_SSLIOP_Connection_Handler *handler, + TAO_ORB_Core *orb_core, + CORBA::Boolean /*flag*/) : TAO_Transport (TAO_TAG_IIOP_PROFILE, - orb_core) + orb_core), + connection_handler_ (handler), + messaging_object_ (0) { + // Use the normal GIOP object + ACE_NEW (this->messaging_object_, + TAO_GIOP_Message_Base (orb_core)); + } TAO_SSLIOP_Transport::~TAO_SSLIOP_Transport (void) { + delete this->messaging_object_; } -int -TAO_SSLIOP_Transport::idle (void) +TAO_SSL_SVC_HANDLER * +TAO_SSLIOP_Transport::service_handler (void) { - return this->service_handler ()->idle (); + return this->connection_handler_; } - - ACE_HANDLE TAO_SSLIOP_Transport::handle (void) { - return this->service_handler ()->get_handle (); + return this->connection_handler_->get_handle (); } ACE_Event_Handler * TAO_SSLIOP_Transport::event_handler (void) { - return this->service_handler (); + return this->connection_handler_; +} + +void +TAO_SSLIOP_Transport::close_connection (void) +{ + // First close the handle + this->connection_handler_->handle_close (); + + // Now, purge the entry + this->connection_handler_->purge_entry (); +} + +int +TAO_SSLIOP_Transport::idle (void) +{ + return this->connection_handler_->make_idle (); } + ssize_t TAO_SSLIOP_Transport::send (TAO_Stub *stub, int two_way, @@ -104,13 +96,12 @@ TAO_SSLIOP_Transport::send (TAO_Stub *stub, } } + ssize_t TAO_SSLIOP_Transport::send (const ACE_Message_Block *message_block, const ACE_Time_Value *max_wait_time, size_t *bt) { - TAO_FUNCTION_PP_TIMEPROBE (TAO_SSLIOP_TRANSPORT_SEND_START); - // @@ This code should be refactored into ACE.cpp or something // similar! @@ -180,363 +171,302 @@ TAO_SSLIOP_Transport::send (const ACE_Message_Block *message_block, ssize_t TAO_SSLIOP_Transport::send (const u_char *buf, size_t len, - const ACE_Time_Value * /* max_wait_time */) + const ACE_Time_Value * /*max_wait_time*/) { - TAO_FUNCTION_PP_TIMEPROBE (TAO_SSLIOP_TRANSPORT_SEND_START); - return this->service_handler ()->peer ().send_n (buf, len /*, - max_wait_time */); + max_wait_time*/); } ssize_t TAO_SSLIOP_Transport::recv (char *buf, size_t len, - const ACE_Time_Value * /* max_wait_time */) + const ACE_Time_Value * /*max_wait_time*/) { - TAO_FUNCTION_PP_TIMEPROBE (TAO_SSLIOP_TRANSPORT_RECEIVE_START); - return this->service_handler ()->peer ().recv_n (buf, - len /*, - max_wait_time */); + len /*, + max_wait_time*/); } -// Default action to be taken for send request. + int -TAO_SSLIOP_Transport::send_request (TAO_Stub *, - TAO_ORB_Core * /* orb_core */, - TAO_OutputCDR & /* stream */, - int /* twoway */, - ACE_Time_Value * /* max_wait_time */) +TAO_SSLIOP_Transport::read_process_message (ACE_Time_Value *max_wait_time, + int block) { - return -1; -} + // Read the message of the socket + int result = this->messaging_object_->read_message (this, + block, + max_wait_time); -CORBA::Boolean -TAO_SSLIOP_Transport::send_request_header (TAO_Operation_Details &, - TAO_Target_Specification &, - TAO_OutputCDR &) -{ - // We should never be here. So return an error. - return 0; -} + if (result == -1) + { + if (TAO_debug_level > 0) + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT ("TAO (%P|%t) - %p\n"), + ACE_TEXT ("SSLIOP_Transport::read_message, failure in read_message ()"))); -// **************************************************************** + this->tms_->connection_closed (); + return -1; + } + if (result == 0) + return result; -TAO_SSLIOP_Client_Transport::TAO_SSLIOP_Client_Transport ( - TAO_SSLIOP_Client_Connection_Handler *handler, - TAO_ORB_Core *orb_core) - : TAO_SSLIOP_Transport (orb_core), - handler_ (handler), - client_mesg_factory_ (0), - orb_core_ (orb_core), - params_ () -{ -} + // Now we know that we have been able to read the complete message + // here.. + return this->process_message (); -TAO_SSLIOP_Client_Transport::~TAO_SSLIOP_Client_Transport (void) -{ - delete this->client_mesg_factory_; } + int -TAO_SSLIOP_Client_Transport::idle (void) +TAO_SSLIOP_Transport::register_handler (void) { - return this->handler_->make_idle (); -} + // @@ It seems like this method should go away, the right reactor is + // picked at object creation time. + ACE_Reactor *r = this->orb_core_->reactor (); -void -TAO_SSLIOP_Client_Transport::start_request (TAO_ORB_Core * /* orb_core */, - TAO_Target_Specification & /* spec */, - TAO_OutputCDR &output, - CORBA::Environment &ACE_TRY_ENV) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - TAO_FUNCTION_PP_TIMEPROBE (TAO_SSLIOP_CLIENT_TRANSPORT_START_REQUEST_START); + if (r == this->connection_handler_->reactor ()) + return 0; - if (this->client_mesg_factory_->write_protocol_header - (TAO_PLUGGABLE_MESSAGE_REQUEST, - output) == 0) - ACE_THROW (CORBA::MARSHAL ()); -} + // About to be registered with the reactor, so bump the ref + // count + this->connection_handler_->incr_ref_count (); -void -TAO_SSLIOP_Client_Transport::start_locate (TAO_ORB_Core * /* orb_core */, - TAO_Target_Specification & spec, - TAO_Operation_Details & opdetails, - TAO_OutputCDR &output, - CORBA::Environment &ACE_TRY_ENV) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - // See this is GIOP way of doing this..But anyway IIOP will be tied - // up with GIOP. (comment from Bala?) - if (this->client_mesg_factory_->write_protocol_header - (TAO_PLUGGABLE_MESSAGE_LOCATEREQUEST, - output) == 0) - ACE_THROW (CORBA::MARSHAL ()); + // Set the flag in the Connection Handler + this->connection_handler_->is_registered (1); - if (this->client_mesg_factory_->write_message_header ( - opdetails, - TAO_PLUGGABLE_MESSAGE_LOCATE_REQUEST_HEADER, - spec, - output) == 0) - ACE_THROW (CORBA::MARSHAL ()); + + // Register the handler with the reactor + return r->register_handler (this->connection_handler_, + ACE_Event_Handler::READ_MASK); } + int -TAO_SSLIOP_Client_Transport::send_request (TAO_Stub *stub, - TAO_ORB_Core *orb_core, - TAO_OutputCDR &stream, - int two_way, - ACE_Time_Value *max_wait_time) +TAO_SSLIOP_Transport::send_request (TAO_Stub *stub, + TAO_ORB_Core *orb_core, + TAO_OutputCDR &stream, + int two_way, + ACE_Time_Value *max_wait_time) { if (this->ws_->sending_request (orb_core, two_way) == -1) return -1; - if (this->client_mesg_factory_->send_message (this, - stream, - max_wait_time, - stub, - two_way) == -1) + if (this->send_message (stream, + stub, + two_way, + max_wait_time) == -1) + return -1; return this->idle_after_send (); } -// Return 0, when the reply is not read fully, 1 if it is read fully. -// @@ This code should go in the TAO_Transport class is repeated for -// each transport!! int -TAO_SSLIOP_Client_Transport::handle_client_input (int /* block */, - ACE_Time_Value *max_wait_time) +TAO_SSLIOP_Transport::send_message (TAO_OutputCDR &stream, + TAO_Stub *stub, + int twoway, + ACE_Time_Value *max_wait_time) { + // Format the message in the stream first + if (this->messaging_object_->format_message (stream) != 0) + return -1; - // Notice that the message_state is only modified in one thread at a - // time because the reactor does not call handle_input() for the - // same Event_Handler in two threads at the same time. + // 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. - // Get the message state from the Transport Mux Strategy. - TAO_GIOP_Message_State* message_state = - this->tms_->get_message_state (); + // This guarantees to send all data (bytes) or return an error. + ssize_t n = this->send (stub, + twoway, + stream.begin (), + max_wait_time); - if (message_state == 0) + if (n == -1) { - if (TAO_debug_level > 0) + if (TAO_debug_level) ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) ") - ACE_TEXT ("SSLIOP_Transport::handle_client_input -") - ACE_TEXT (" nil message state\n"))); - return -1; - } - - int result = - this->client_mesg_factory_->handle_input (this, - this->orb_core_, - *message_state, - max_wait_time); + ACE_TEXT ("TAO: (%P|%t|%N|%l) closing conn %d after fault %p\n"), + this->handle (), + ACE_TEXT ("send_message ()\n"))); - if (result == -1) - { - if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) - %p\n"), - ACE_TEXT ("SSLIOP_Transport::handle_client_input, ") - ACE_TEXT ("handle_input"))); return -1; } - if (result == 0) - return result; - - // OK, the complete message is here... - - result = this->client_mesg_factory_->parse_reply (*message_state, - this->params_); - if (result == -1) + // EOF. + if (n == 0) { - if (TAO_debug_level > 0) + if (TAO_debug_level) ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) - %p\n"), - ACE_TEXT ("SSLIOP_Transport::handle_client_input, ") - ACE_TEXT ("parse reply"))); - message_state->reset (); + ACE_TEXT ("TAO: (%P|%t|%N|%l) send_message () \n") + ACE_TEXT ("EOF, closing conn %d\n"), + this->handle())); return -1; } - result = - this->tms_->dispatch_reply (this->params_.request_id_, - this->params_.reply_status_, - message_state->giop_version, - this->params_.svc_ctx_, - message_state); + return 1; +} - if (result == -1) - { - if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("TAO (%P|%t) : SSLIOP_Client_Transport::") - ACE_TEXT ("handle_client_input - ") - ACE_TEXT ("dispatch reply failed\n"))); - message_state->reset (); - return -1; - } - if (result == 0) - { - message_state->reset (); - return 0; - } +void +TAO_SSLIOP_Transport::start_request (TAO_ORB_Core * /*orb_core*/, + TAO_Target_Specification & /*spec */, + TAO_OutputCDR & /*output */, + CORBA::Environment & /*ACE_TRY_ENV*/) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + // TAO_FUNCTION_PP_TIMEPROBE (TAO_IIOP_CLIENT_TRANSPORT_START_REQUEST_START); - // This is a NOOP for the Exclusive request case, but it actually - // destroys the stream in the muxed case. - this->tms_->destroy_message_state (message_state); + // @@ This method should NO longer be required.. - return result; + /* if (this->client_mesg_factory_->write_protocol_header + (TAO_PLUGGABLE_MESSAGE_REQUEST, + output) == 0) + ACE_THROW (CORBA::MARSHAL ());*/ } -int -TAO_SSLIOP_Client_Transport::register_handler (void) -{ - // @@ It seems like this method should go away, the right reactor is - // picked at object creation time. - ACE_Reactor *r = this->orb_core ()->reactor (); - if (r == this->service_handler ()->reactor ()) - return 0; - // About to be registered with the reactor, so bump the ref - // count - this->handler_->incr_ref_count (); +void +TAO_SSLIOP_Transport::start_locate (TAO_ORB_Core * /*orb_core*/, + TAO_Target_Specification &spec, + TAO_Operation_Details &opdetails, + TAO_OutputCDR &output, + CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) +{ + if (this->messaging_object_->generate_locate_request_header (opdetails, + spec, + output) == -1) + ACE_THROW (CORBA::MARSHAL ()); +} - // Set the flag in the Connection Handler - this->handler_->is_registered (1); - // Register the handler with the reactor - return r->register_handler (this->handler_, - ACE_Event_Handler::READ_MASK); +CORBA::Boolean +TAO_SSLIOP_Transport::send_request_header (TAO_Operation_Details &opdetails, + TAO_Target_Specification &spec, + TAO_OutputCDR &msg) +{ + // We are going to pass on this request to the underlying messaging + // layer. It should take care of this request + if (this->messaging_object_->generate_request_header (opdetails, + spec, + msg) == -1) + return 0; + return 1; } int -TAO_SSLIOP_Client_Transport::messaging_init (CORBA::Octet major, - CORBA::Octet minor) +TAO_SSLIOP_Transport::messaging_init (CORBA::Octet major, + CORBA::Octet minor) { - // DO NOT add support for GIOPlite to SSLIOP. It introduces - // security holes! - - if (this->client_mesg_factory_ == 0) - { - if (major == TAO_DEF_GIOP_MAJOR) - { - if (minor > TAO_DEF_GIOP_MINOR) - minor = TAO_DEF_GIOP_MINOR; - - switch (minor) - { - case 0: - ACE_NEW_RETURN (this->client_mesg_factory_, - TAO_GIOP_Message_Connector_10, - 0); - break; - case 1: - ACE_NEW_RETURN (this->client_mesg_factory_, - TAO_GIOP_Message_Connector_11, - 0); - break; - case 2: - ACE_NEW_RETURN (this->client_mesg_factory_, - TAO_GIOP_Message_Connector_12, - 0); - break; - default: - if (TAO_debug_level > 0) - { - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("(%N|%l|%p|%t) ") - ACE_TEXT ("No matching minor ") - ACE_TEXT ("version number \n")), - 0); - } - } - } - else - { - if (TAO_debug_level > 0) - { - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("(%N|%l|%p|%t) ") - ACE_TEXT ("No matching minor ") - ACE_TEXT ("version number \n")), - 0); - } - } - } - + this->messaging_object_->init (major, + minor); return 1; } -TAO_SSL_SVC_HANDLER * -TAO_SSLIOP_Client_Transport::service_handler (void) +int +TAO_SSLIOP_Transport::process_message (void) { - return this->handler_; -} + // Get the <message_type> that we have received + TAO_Pluggable_Message_Type t = + this->messaging_object_->message_type (); -CORBA::Boolean -TAO_SSLIOP_Client_Transport::send_request_header ( - TAO_Operation_Details &opdetails, - TAO_Target_Specification &spec, - TAO_OutputCDR & msg) -{ - // We are going to pass on this request to the underlying messaging - // layer. It should take care of this request. - CORBA::Boolean retval = - this->client_mesg_factory_->write_message_header ( - opdetails, - TAO_PLUGGABLE_MESSAGE_REQUEST_HEADER, - spec, - msg); - - return retval; -} -void -TAO_SSLIOP_Client_Transport::close_connection (void) -{ - this->service_handler ()->handle_close (); + int result = 0; + if (t == TAO_PLUGGABLE_MESSAGE_CLOSECONNECTION) + { + if (TAO_debug_level > 0) + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT ("TAO (%P|%t) - %p\n"), + ACE_TEXT ("Close Connection Message recd \n"))); - this->handler_->purge_entry (); -} + this->tms_->connection_closed (); + } + else if (t == TAO_PLUGGABLE_MESSAGE_REQUEST) + { + if (this->messaging_object_->process_request_message (this, + this->orb_core ()) == -1) + return -1; + } + else if (t == TAO_PLUGGABLE_MESSAGE_REPLY) + { + TAO_Pluggable_Reply_Params params (this->orb_core ()); + if (this->messaging_object_->process_reply_message (params) == -1) + { -// ********************************************************************* + if (TAO_debug_level > 0) + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT ("TAO (%P|%t) - %p\n"), + ACE_TEXT ("SSLIOP_Transport::process_message, process_reply_message ()"))); -TAO_SSLIOP_Server_Transport::TAO_SSLIOP_Server_Transport ( - TAO_SSLIOP_Server_Connection_Handler *handler, - TAO_ORB_Core* orb_core) - : TAO_SSLIOP_Transport (orb_core), - message_state_ (orb_core), - handler_ (handler) -{ -} + this->messaging_object_->reset (); + this->tms_->connection_closed (); + return -1; + } -TAO_SSLIOP_Server_Transport::~TAO_SSLIOP_Server_Transport (void) -{ -} -int -TAO_SSLIOP_Server_Transport::idle (void) -{ - return this->handler_->make_idle (); -} + result = + this->tms_->dispatch_reply (params); + + // @@ Somehow it seems dangerous to reset the state *after* + // dispatching the request, what if another threads receives + // another reply in the same connection? + // My guess is that it works as follows: + // - For the exclusive case there can be no such thread. + // - The the muxed case each thread has its own message_state. + // I'm pretty sure this comment is right. Could somebody else + // please look at it and confirm my guess? + + // @@ The above comment was found in the older versions of the + // code. The code was also written in such a way that, when + // the client thread on a call from handle_input () from the + // reactor a call would be made on the handle_client_input + // (). The implementation of handle_client_input () looked so + // flaky. It used to create a message state upon entry in to + // the function using the TMS and destroy that on exit. All + // this was fine _theoretically_ for multiple threads. But + // the flakiness was originating in the implementation of + // get_message_state () where we were creating message state + // only once and dishing it out for every thread till one of + // them destroy's it. So, it looked broken. That has been + // changed. Why?. To my knowledge, the reactor does not call + // handle_input () on two threads at the same time. So, IMHO + // that defeats the purpose of creating a message state for + // every thread. This is just my guess. If we run in to + // problems this place needs to be revisited. If someone else + // is going to take a look please contact bala@cs.wustl.edu + // for details on this-- Bala + + if (result == -1) + { + if (TAO_debug_level > 0) + ACE_ERROR ((LM_ERROR, + ACE_TEXT ("TAO (%P|%t) : SSLIOP_Client_Transport::") + ACE_TEXT ("handle_client_input - ") + ACE_TEXT ("dispatch reply failed\n"))); + this->messaging_object_->reset (); + this->tms_->connection_closed (); + return -1; + } -TAO_SSL_SVC_HANDLER * -TAO_SSLIOP_Server_Transport::service_handler (void) -{ - return this->handler_; -} + if (result == 0) + { + this->messaging_object_->reset (); + return 0; + } -void -TAO_SSLIOP_Server_Transport::close_connection (void) -{ - this->service_handler ()->handle_close (); - this->handler_->purge_entry (); + + // This is a NOOP for the Exclusive request case, but it actually + // destroys the stream in the muxed case. + //this->tms_->destroy_message_state (message_state); + } + else if (t == TAO_PLUGGABLE_MESSAGE_MESSAGERROR) + { + return -1; + } + + this->messaging_object_->reset (); + return 1; } diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h index c167d8b61c8..bda09d40414 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h @@ -41,92 +41,81 @@ // Forward decls. class TAO_SSLIOP_Handler_Base; -class TAO_SSLIOP_Client_Connection_Handler; -class TAO_SSLIOP_Server_Connection_Handler; +class TAO_SSLIOP_Connection_Handler; class TAO_ORB_Core; +class TAO_Pluggable_Messaging; typedef ACE_Svc_Handler<ACE_SSL_SOCK_STREAM, ACE_NULL_SYNCH> TAO_SSL_SVC_HANDLER; + + class TAO_SSLIOP_Export TAO_SSLIOP_Transport : public TAO_Transport { - // = TITLE - // This class acts as a bridge class to the transport specific - // connection handler (handler_). - // - // = DESCRIPTION - // Specialization of the base TAO_Transport class to handle the IIOP - // protocol. This class in turn will be further specialized for - // the client and server side. public: - TAO_SSLIOP_Transport (TAO_ORB_Core *orb_core); - // Base object's creator method. - ~TAO_SSLIOP_Transport (void); - // Default destructor. + /// Constructor. + TAO_SSLIOP_Transport (TAO_SSLIOP_Connection_Handler *handler, + TAO_ORB_Core *orb_core, + CORBA::Boolean flag); - TAO_SSLIOP_Handler_Base *&handler (void); - // Return a reference to the corresponding connection handler. + /// Default destructor. + ~TAO_SSLIOP_Transport (void); - // = The TAO_Transport methods, please check the documentation in - // "tao/Pluggable.h" for more details. + /// Return the connection service handler + TAO_SSL_SVC_HANDLER *service_handler (void); - virtual int idle (void); + /// The TAO_Transport methods, please check the documentation in + /// "tao/Pluggable.h" for more details. virtual ACE_HANDLE handle (void); + virtual ACE_Event_Handler *event_handler (void); + + virtual void close_connection (void); + + virtual int idle (void); + + /// Write the complete Message_Block chain to the connection. virtual ssize_t send (TAO_Stub *stub, int two_way, const ACE_Message_Block *mblk, const ACE_Time_Value *s = 0); + virtual ssize_t send (const ACE_Message_Block *mblk, const ACE_Time_Value *s = 0, size_t *bytes_transferred = 0); + + + /// Write the contents of the buffer of length len to the + /// connection. virtual ssize_t send (const u_char *buf, size_t len, const ACE_Time_Value *s = 0); + + /// Read len bytes from into buf. virtual ssize_t recv (char *buf, size_t len, const ACE_Time_Value *s = 0); + + /// Read and process the message from the connection. The processing + /// of the message is done by delegating the work to the underlying + /// messaging object + virtual int read_process_message (ACE_Time_Value *max_time_value = 0, + int block =0); + + virtual int register_handler (void); + + /// @@TODO: These methods IMHO should have more meaningful + /// names. The names seem to indicate nothing. virtual int send_request (TAO_Stub *stub, - TAO_ORB_Core *orb_core , + TAO_ORB_Core *orb_core, TAO_OutputCDR &stream, int twoway, ACE_Time_Value *max_wait_time); - virtual CORBA::Boolean - send_request_header (TAO_Operation_Details &opdetails, - TAO_Target_Specification &spec, - TAO_OutputCDR &msg); - - virtual TAO_SSL_SVC_HANDLER *service_handler (void) = 0; - // Return the connection service handler -}; - - -class TAO_SSLIOP_Export TAO_SSLIOP_Client_Transport - : public TAO_SSLIOP_Transport -{ - // = TITLE - // The Transport class used for Client side communication with a - // server. - // - // = DESCRIPTION - // Specialization of the TAO_SSLIOP_Transport class for client - // side. Methods related to sending one and two way requests - // lives here. -public: - TAO_SSLIOP_Client_Transport (TAO_SSLIOP_Client_Connection_Handler *handler, - TAO_ORB_Core *orb_core); - // Constructor. Note, TAO_SSLIOP_Handler_Base is the base class for - // both TAO_SSLIOP_Client_Connection_Handler and - // TAO_SSLIOP_Server_Connection_Handler. - - ~TAO_SSLIOP_Client_Transport (void); - // destructor - - // = The TAO_Transport methods, please check the documentation in - // "tao/Pluggable.h" for more details. - virtual void close_connection (void); - virtual int idle (void); + virtual int send_message (TAO_OutputCDR &stream, + TAO_Stub *stub = 0, + int twoway = 1, + ACE_Time_Value *max_time_wait = 0); virtual void start_request (TAO_ORB_Core *orb_core, TAO_Target_Specification &spec, @@ -141,88 +130,32 @@ public: CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual int send_request (TAO_Stub *stub, - TAO_ORB_Core *orb_core, - TAO_OutputCDR &stream, - int twoway, - ACE_Time_Value *max_wait_time); - virtual int handle_client_input (int block = 0, - ACE_Time_Value *max_time_value = 0); - virtual int register_handler (void); virtual CORBA::Boolean send_request_header (TAO_Operation_Details &opdetails, TAO_Target_Specification &spec, TAO_OutputCDR &msg); - virtual TAO_SSL_SVC_HANDLER *service_handler (void); - - int messaging_init (CORBA::Octet major, - CORBA::Octet minor); - // Initialize the messaging object. - - // void use_lite (CORBA::Boolean flag); - // Use the lite GIOP implementation - // @@ The lite implementation of GIOP is not supported for SSLIOP - // since it introduces security holes. - // -Ossama + /// Initialising the messaging object + virtual int messaging_init (CORBA::Octet major, + CORBA::Octet minor); private: - TAO_SSLIOP_Client_Connection_Handler *handler_; - // The connection service handler used for accessing lower layer - // communication protocols. - - TAO_Pluggable_Messaging *client_mesg_factory_; - // The message_factor instance specific for this particular - // transport protocol. - TAO_ORB_Core *orb_core_; - // Our ORB core - - TAO_Pluggable_Reply_Params params_; - // The reply data that is sent back by the server -}; - -// **************************************************************** - -class TAO_SSLIOP_Export TAO_SSLIOP_Server_Transport - : public TAO_SSLIOP_Transport -{ - // = TITLE - // The Transport class used for server communication with a - // connected client. - // - // = DESCRIPTION - // Specialization of the TAO_SSLIOP_Transport class for the server side. - // methods for reading messages (requests) and sending replies live - // here. -public: - - TAO_SSLIOP_Server_Transport (TAO_SSLIOP_Server_Connection_Handler *handler, - TAO_ORB_Core *orb_core); - // Default creator method. - - ~TAO_SSLIOP_Server_Transport (void); - // Default destructor - - // Please see Pluggable.h for documentation - virtual int idle (void); - virtual void close_connection (void); - - virtual TAO_SSL_SVC_HANDLER *service_handler (void); - - TAO_GIOP_Message_State message_state_; - // This keep the state of the current message, to enable - // non-blocking reads, fragment reassembly, etc. + /// Process the message that we have read + int process_message (void); private: - TAO_SSLIOP_Server_Connection_Handler *handler_; - // The connection service handler used for accessing lower layer - // communication protocols. + /// The connection service handler used for accessing lower layer + /// communication protocols. + TAO_SSLIOP_Connection_Handler *connection_handler_; + /// Our messaging object. + TAO_Pluggable_Messaging *messaging_object_; }; + #include "ace/post.h" #endif /* TAO_SSLIOP_TRANSPORT_H */ diff --git a/TAO/tao/IIOP_Connector.cpp b/TAO/tao/IIOP_Connector.cpp index 5c0e0fe5355..fb4115ad299 100644 --- a/TAO/tao/IIOP_Connector.cpp +++ b/TAO/tao/IIOP_Connector.cpp @@ -547,11 +547,11 @@ template class ACE_Auto_Basic_Array_Ptr<TAO_IIOP_Connection_Handler*>; #pragma instantiate ACE_Auto_Basic_Array_Ptr<ACE_INET_Addr> #pragma instantiate ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> > -#pragma instantiate TAO_Connect_Concurrency_Strategy<TAO_IIOP_Connection_Handler>; -#pragma instantiate TAO_Connect_Creation_Strategy<TAO_IIOP_Connection_Handler>; +#pragma instantiate TAO_Connect_Concurrency_Strategy<TAO_IIOP_Connection_Handler> +#pragma instantiate TAO_Connect_Creation_Strategy<TAO_IIOP_Connection_Handler> #pragma instantiate ACE_Strategy_Connector<TAO_IIOP_Connection_Handler, ACE_SOCK_CONNECTOR> #pragma instantiate ACE_Connect_Strategy<TAO_IIOP_Connection_Handler, ACE_SOCK_CONNECTOR> -#pragma instantiate ACE_Connector<TAO_IIOP_Connection_Handler, ACE_SOCK_Connector> +#pragma instantiate ACE_Connector<TAO_IIOP_Connection_Handler, ACE_SOCK_CONNECTOR> #pragma instantiate ACE_Svc_Tuple<TAO_IIOP_Connection_Handler> #pragma instantiate ACE_Map_Manager<int, ACE_Svc_Tuple<TAO_IIOP_Connection_Handler> *, ACE_SYNCH_RW_MUTEX> |