diff options
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/Freeze/.depend | 10 | ||||
| -rw-r--r-- | cpp/src/Glacier/.depend | 12 | ||||
| -rw-r--r-- | cpp/src/Glacier/GlacierRouter.cpp | 40 | ||||
| -rw-r--r-- | cpp/src/Glacier/GlacierStarter.cpp | 6 | ||||
| -rw-r--r-- | cpp/src/Glacier/Makefile | 4 | ||||
| -rw-r--r-- | cpp/src/Glacier/StarterI.cpp | 10 | ||||
| -rw-r--r-- | cpp/src/Glacier/StarterI.h | 2 | ||||
| -rw-r--r-- | cpp/src/Ice/.depend | 99 | ||||
| -rw-r--r-- | cpp/src/Ice/Application.cpp | 5 | ||||
| -rw-r--r-- | cpp/src/Ice/CommunicatorI.cpp | 29 | ||||
| -rw-r--r-- | cpp/src/Ice/CommunicatorI.h | 16 | ||||
| -rw-r--r-- | cpp/src/Ice/ConnectionFactory.cpp | 10 | ||||
| -rw-r--r-- | cpp/src/Ice/Endpoint.cpp | 1246 | ||||
| -rw-r--r-- | cpp/src/Ice/Endpoint.h | 164 | ||||
| -rw-r--r-- | cpp/src/Ice/EndpointFactory.cpp | 147 | ||||
| -rw-r--r-- | cpp/src/Ice/EndpointFactory.h | 63 | ||||
| -rw-r--r-- | cpp/src/Ice/Exception.cpp | 15 | ||||
| -rw-r--r-- | cpp/src/Ice/Initialize.cpp | 63 | ||||
| -rw-r--r-- | cpp/src/Ice/Instance.cpp | 177 | ||||
| -rw-r--r-- | cpp/src/Ice/Instance.h | 13 | ||||
| -rw-r--r-- | cpp/src/Ice/Makefile | 122 | ||||
| -rw-r--r-- | cpp/src/Ice/Network.cpp | 2 | ||||
| -rw-r--r-- | cpp/src/Ice/ObjectAdapterI.cpp | 3 | ||||
| -rw-r--r-- | cpp/src/Ice/PluginManagerI.cpp | 262 | ||||
| -rw-r--r-- | cpp/src/Ice/PluginManagerI.h | 55 | ||||
| -rw-r--r-- | cpp/src/Ice/PropertiesI.cpp | 121 | ||||
| -rw-r--r-- | cpp/src/Ice/PropertiesI.h | 11 | ||||
| -rw-r--r-- | cpp/src/Ice/Proxy.cpp | 5 | ||||
| -rw-r--r-- | cpp/src/Ice/ReferenceFactory.cpp | 11 | ||||
| -rw-r--r-- | cpp/src/Ice/SslExtensionInternal.cpp | 36 | ||||
| -rw-r--r-- | cpp/src/Ice/SslExtensionInternal.h | 39 | ||||
| -rw-r--r-- | cpp/src/Ice/SslFactory.cpp | 123 | ||||
| -rw-r--r-- | cpp/src/Ice/SslFactory.h | 52 | ||||
| -rw-r--r-- | cpp/src/Ice/SystemInternal.cpp | 40 | ||||
| -rw-r--r-- | cpp/src/Ice/TcpEndpoint.cpp | 379 | ||||
| -rw-r--r-- | cpp/src/Ice/TcpEndpoint.h | 82 | ||||
| -rw-r--r-- | cpp/src/Ice/TraceUtil.cpp | 61 | ||||
| -rw-r--r-- | cpp/src/Ice/UdpEndpoint.cpp | 372 | ||||
| -rw-r--r-- | cpp/src/Ice/UdpEndpoint.h | 82 | ||||
| -rw-r--r-- | cpp/src/Ice/UnknownEndpoint.cpp | 185 | ||||
| -rw-r--r-- | cpp/src/Ice/UnknownEndpoint.h | 59 | ||||
| -rw-r--r-- | cpp/src/IceBox/.depend | 6 | ||||
| -rw-r--r-- | cpp/src/IceBox/Admin.cpp | 9 | ||||
| -rw-r--r-- | cpp/src/IceBox/Server.cpp | 8 | ||||
| -rw-r--r-- | cpp/src/IceBox/ServiceManagerI.cpp | 27 | ||||
| -rw-r--r-- | cpp/src/IcePack/.depend | 16 | ||||
| -rw-r--r-- | cpp/src/IcePack/Client.cpp | 8 | ||||
| -rw-r--r-- | cpp/src/IcePack/Server.cpp | 9 | ||||
| -rw-r--r-- | cpp/src/IcePatch/.depend | 12 | ||||
| -rw-r--r-- | cpp/src/IcePatch/Client.cpp | 36 | ||||
| -rw-r--r-- | cpp/src/IcePatch/Makefile | 4 | ||||
| -rw-r--r-- | cpp/src/IcePatch/Server.cpp | 15 | ||||
| -rw-r--r-- | cpp/src/IceSSL/.depend | 35 | ||||
| -rw-r--r-- | cpp/src/IceSSL/BaseCerts.cpp (renamed from cpp/src/Ice/BaseCerts.cpp) | 3 | ||||
| -rw-r--r-- | cpp/src/IceSSL/BaseCerts.h (renamed from cpp/src/Ice/BaseCerts.h) | 2 | ||||
| -rw-r--r-- | cpp/src/IceSSL/CertificateAuthority.cpp (renamed from cpp/src/Ice/CertificateAuthority.cpp) | 2 | ||||
| -rw-r--r-- | cpp/src/IceSSL/CertificateAuthority.h (renamed from cpp/src/Ice/CertificateAuthority.h) | 0 | ||||
| -rw-r--r-- | cpp/src/IceSSL/CertificateDesc.cpp (renamed from cpp/src/Ice/CertificateDesc.cpp) | 3 | ||||
| -rw-r--r-- | cpp/src/IceSSL/CertificateDesc.h (renamed from cpp/src/Ice/CertificateDesc.h) | 8 | ||||
| -rw-r--r-- | cpp/src/IceSSL/CertificateVerifierOpenSSL.cpp (renamed from cpp/src/Ice/CertificateVerifierOpenSSL.cpp) | 2 | ||||
| -rw-r--r-- | cpp/src/IceSSL/ConfigParser.cpp (renamed from cpp/src/Ice/ConfigParser.cpp) | 8 | ||||
| -rw-r--r-- | cpp/src/IceSSL/ConfigParser.h (renamed from cpp/src/Ice/ConfigParser.h) | 10 | ||||
| -rw-r--r-- | cpp/src/IceSSL/ConfigParserErrorReporter.cpp (renamed from cpp/src/Ice/ConfigParserErrorReporter.cpp) | 14 | ||||
| -rw-r--r-- | cpp/src/IceSSL/ConfigParserErrorReporter.h (renamed from cpp/src/Ice/ConfigParserErrorReporter.h) | 0 | ||||
| -rw-r--r-- | cpp/src/IceSSL/ContextOpenSSL.cpp (renamed from cpp/src/Ice/ContextOpenSSL.cpp) | 47 | ||||
| -rw-r--r-- | cpp/src/IceSSL/ContextOpenSSL.h (renamed from cpp/src/Ice/ContextOpenSSL.h) | 30 | ||||
| -rw-r--r-- | cpp/src/IceSSL/ContextOpenSSLClient.cpp (renamed from cpp/src/Ice/ContextOpenSSLClient.cpp) | 58 | ||||
| -rw-r--r-- | cpp/src/IceSSL/ContextOpenSSLClient.h (renamed from cpp/src/Ice/ContextOpenSSLClient.h) | 6 | ||||
| -rw-r--r-- | cpp/src/IceSSL/ContextOpenSSLF.h (renamed from cpp/src/Ice/ContextOpenSSLF.h) | 0 | ||||
| -rw-r--r-- | cpp/src/IceSSL/ContextOpenSSLServer.cpp (renamed from cpp/src/Ice/ContextOpenSSLServer.cpp) | 64 | ||||
| -rw-r--r-- | cpp/src/IceSSL/ContextOpenSSLServer.h (renamed from cpp/src/Ice/ContextOpenSSLServer.h) | 6 | ||||
| -rw-r--r-- | cpp/src/IceSSL/Convert.cpp (renamed from cpp/src/Ice/SslIceUtils.cpp) | 2 | ||||
| -rw-r--r-- | cpp/src/IceSSL/Convert.h (renamed from cpp/src/Ice/SslIceUtils.h) | 4 | ||||
| -rw-r--r-- | cpp/src/IceSSL/DHParams.cpp (renamed from cpp/src/Ice/DHParams.cpp) | 2 | ||||
| -rw-r--r-- | cpp/src/IceSSL/DHParams.h (renamed from cpp/src/Ice/DHParams.h) | 2 | ||||
| -rw-r--r-- | cpp/src/IceSSL/DHParamsF.h (renamed from cpp/src/Ice/DHParamsF.h) | 0 | ||||
| -rw-r--r-- | cpp/src/IceSSL/DefaultCertificateVerifier.cpp (renamed from cpp/src/Ice/DefaultCertificateVerifier.cpp) | 6 | ||||
| -rw-r--r-- | cpp/src/IceSSL/DefaultCertificateVerifier.h (renamed from cpp/src/Ice/DefaultCertificateVerifier.h) | 2 | ||||
| -rw-r--r-- | cpp/src/IceSSL/GeneralConfig.cpp (renamed from cpp/src/Ice/GeneralConfig.cpp) | 2 | ||||
| -rw-r--r-- | cpp/src/IceSSL/GeneralConfig.h (renamed from cpp/src/Ice/GeneralConfig.h) | 3 | ||||
| -rw-r--r-- | cpp/src/IceSSL/Makefile | 118 | ||||
| -rw-r--r-- | cpp/src/IceSSL/OpenSSL.h (renamed from cpp/src/Ice/OpenSSL.h) | 2 | ||||
| -rw-r--r-- | cpp/src/IceSSL/OpenSSLJanitors.cpp (renamed from cpp/src/Ice/OpenSSLJanitors.cpp) | 2 | ||||
| -rw-r--r-- | cpp/src/IceSSL/OpenSSLJanitors.h (renamed from cpp/src/Ice/OpenSSLJanitors.h) | 0 | ||||
| -rw-r--r-- | cpp/src/IceSSL/OpenSSLPluginI.cpp (renamed from cpp/src/Ice/SystemOpenSSL.cpp) | 217 | ||||
| -rw-r--r-- | cpp/src/IceSSL/OpenSSLPluginI.h (renamed from cpp/src/Ice/SystemOpenSSL.h) | 63 | ||||
| -rw-r--r-- | cpp/src/IceSSL/OpenSSLUtils.cpp (renamed from cpp/src/Ice/OpenSSLUtils.cpp) | 33 | ||||
| -rw-r--r-- | cpp/src/IceSSL/OpenSSLUtils.h (renamed from cpp/src/Ice/OpenSSLUtils.h) | 0 | ||||
| -rw-r--r-- | cpp/src/IceSSL/PluginBaseI.cpp | 36 | ||||
| -rw-r--r-- | cpp/src/IceSSL/PluginBaseI.h (renamed from cpp/src/Ice/SystemInternal.h) | 24 | ||||
| -rw-r--r-- | cpp/src/IceSSL/PluginBaseIF.h (renamed from cpp/src/Ice/SystemInternalF.h) | 12 | ||||
| -rw-r--r-- | cpp/src/IceSSL/RSACertificateGen.cpp (renamed from cpp/src/Ice/RSACertificateGen.cpp) | 16 | ||||
| -rw-r--r-- | cpp/src/IceSSL/RSAKeyPair.cpp (renamed from cpp/src/Ice/RSAKeyPair.cpp) | 6 | ||||
| -rw-r--r-- | cpp/src/IceSSL/RSAPrivateKey.cpp (renamed from cpp/src/Ice/RSAPrivateKey.cpp) | 8 | ||||
| -rw-r--r-- | cpp/src/IceSSL/RSAPublicKey.cpp (renamed from cpp/src/Ice/RSAPublicKey.cpp) | 8 | ||||
| -rw-r--r-- | cpp/src/IceSSL/SingleCertificateVerifier.cpp (renamed from cpp/src/Ice/SingleCertificateVerifier.cpp) | 4 | ||||
| -rw-r--r-- | cpp/src/IceSSL/SingleCertificateVerifier.h (renamed from cpp/src/Ice/SingleCertificateVerifier.h) | 2 | ||||
| -rw-r--r-- | cpp/src/IceSSL/SslAcceptor.cpp (renamed from cpp/src/Ice/SslAcceptor.cpp) | 43 | ||||
| -rw-r--r-- | cpp/src/IceSSL/SslAcceptor.h (renamed from cpp/src/Ice/SslAcceptor.h) | 12 | ||||
| -rw-r--r-- | cpp/src/IceSSL/SslConnection.cpp (renamed from cpp/src/Ice/SslConnection.cpp) | 2 | ||||
| -rw-r--r-- | cpp/src/IceSSL/SslConnection.h (renamed from cpp/src/Ice/SslConnection.h) | 4 | ||||
| -rw-r--r-- | cpp/src/IceSSL/SslConnectionF.h (renamed from cpp/src/Ice/SslConnectionF.h) | 0 | ||||
| -rw-r--r-- | cpp/src/IceSSL/SslConnectionOpenSSL.cpp (renamed from cpp/src/Ice/SslConnectionOpenSSL.cpp) | 118 | ||||
| -rw-r--r-- | cpp/src/IceSSL/SslConnectionOpenSSL.h (renamed from cpp/src/Ice/SslConnectionOpenSSL.h) | 30 | ||||
| -rw-r--r-- | cpp/src/IceSSL/SslConnectionOpenSSLClient.cpp (renamed from cpp/src/Ice/SslConnectionOpenSSLClient.cpp) | 53 | ||||
| -rw-r--r-- | cpp/src/IceSSL/SslConnectionOpenSSLClient.h (renamed from cpp/src/Ice/SslConnectionOpenSSLClient.h) | 4 | ||||
| -rw-r--r-- | cpp/src/IceSSL/SslConnectionOpenSSLF.h (renamed from cpp/src/Ice/SslConnectionOpenSSLF.h) | 0 | ||||
| -rw-r--r-- | cpp/src/IceSSL/SslConnectionOpenSSLServer.cpp (renamed from cpp/src/Ice/SslConnectionOpenSSLServer.cpp) | 40 | ||||
| -rw-r--r-- | cpp/src/IceSSL/SslConnectionOpenSSLServer.h (renamed from cpp/src/Ice/SslConnectionOpenSSLServer.h) | 4 | ||||
| -rw-r--r-- | cpp/src/IceSSL/SslConnector.cpp (renamed from cpp/src/Ice/SslConnector.cpp) | 39 | ||||
| -rw-r--r-- | cpp/src/IceSSL/SslConnector.h (renamed from cpp/src/Ice/SslConnector.h) | 12 | ||||
| -rw-r--r-- | cpp/src/IceSSL/SslEndpoint.cpp | 379 | ||||
| -rw-r--r-- | cpp/src/IceSSL/SslEndpoint.h | 80 | ||||
| -rw-r--r-- | cpp/src/IceSSL/SslException.cpp (renamed from cpp/src/Ice/SslException2.cpp) | 8 | ||||
| -rw-r--r-- | cpp/src/IceSSL/SslTransceiver.cpp (renamed from cpp/src/Ice/SslTransceiver.cpp) | 26 | ||||
| -rw-r--r-- | cpp/src/IceSSL/SslTransceiver.h (renamed from cpp/src/Ice/SslTransceiver.h) | 16 | ||||
| -rw-r--r-- | cpp/src/IceSSL/TempCerts.cpp (renamed from cpp/src/Ice/TempCerts.cpp) | 2 | ||||
| -rw-r--r-- | cpp/src/IceSSL/TempCerts.h (renamed from cpp/src/Ice/TempCerts.h) | 2 | ||||
| -rw-r--r-- | cpp/src/IceStorm/.depend | 28 | ||||
| -rw-r--r-- | cpp/src/IceStorm/Admin.cpp | 9 | ||||
| -rw-r--r-- | cpp/src/IceStorm/Makefile | 6 | ||||
| -rw-r--r-- | cpp/src/IceStorm/Server.cpp | 4 | ||||
| -rw-r--r-- | cpp/src/IceWall/.depend | 2 | ||||
| -rw-r--r-- | cpp/src/IceXML/.depend | 2 | ||||
| -rw-r--r-- | cpp/src/IceXML/Makefile | 4 | ||||
| -rw-r--r-- | cpp/src/Makefile | 1 | ||||
| -rw-r--r-- | cpp/src/slice2wsdl/Makefile | 4 | ||||
| -rw-r--r-- | cpp/src/slice2xsd/Makefile | 6 |
128 files changed, 3534 insertions, 2661 deletions
diff --git a/cpp/src/Freeze/.depend b/cpp/src/Freeze/.depend index 3b54eac4753..35069a2cdfc 100644 --- a/cpp/src/Freeze/.depend +++ b/cpp/src/Freeze/.depend @@ -1,7 +1,7 @@ DB.o: DB.cpp ../../include/Freeze/DB.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/CommunicatorF.h ../../include/Freeze/DBException.h ../../include/Freeze/DBF.h ../../include/Freeze/EvictorF.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Stream.h ../../include/Ice/BuiltinSequences.h -DBException.o: DBException.cpp ../../include/Freeze/DBException.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Stream.h ../../include/Ice/BuiltinSequences.h +DBException.o: DBException.cpp ../../include/Freeze/DBException.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h Evictor.o: Evictor.cpp ../../include/Freeze/Evictor.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ServantLocator.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Freeze/DBException.h ../../include/Freeze/DBF.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Stream.h ../../include/Ice/BuiltinSequences.h -DBI.o: DBI.cpp ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Freeze/DBException.h ../Freeze/DBI.h ../../include/IceUtil/IceUtil.h ../../include/IceUtil/Functional.h ../../include/IceUtil/Unicode.h ../../include/IceUtil/UUID.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/RecMutex.h ../../include/IceUtil/RWRecMutex.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/IceUtil/Thread.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Base64.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h ../../include/Ice/Properties.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Communicator.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/SystemF.h ../../include/Ice/SslExtensionF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Freeze/DB.h ../../include/Freeze/DBF.h ../../include/Freeze/EvictorF.h ../Freeze/EvictorI.h ../../include/Freeze/Evictor.h ../Freeze/IdentityObjectDict.h ../../include/Freeze/Map.h ../../include/Freeze/Initialize.h -EvictorI.o: EvictorI.cpp ../../include/Ice/Object.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Lock.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/StreamF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../Freeze/EvictorI.h ../../include/IceUtil/IceUtil.h ../../include/IceUtil/Functional.h ../../include/IceUtil/Unicode.h ../../include/IceUtil/UUID.h ../../include/IceUtil/RecMutex.h ../../include/IceUtil/RWRecMutex.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/IceUtil/Thread.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Base64.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Communicator.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Outgoing.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/SystemF.h ../../include/Ice/SslExtensionF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Freeze/Evictor.h ../../include/Freeze/DBException.h ../../include/Freeze/DBF.h ../Freeze/IdentityObjectDict.h ../../include/Freeze/Map.h ../../include/Freeze/DB.h ../../include/Freeze/EvictorF.h -IdentityObjectDict.o: IdentityObjectDict.cpp ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../Freeze/IdentityObjectDict.h ../../include/Freeze/Map.h ../../include/Freeze/DB.h ../../include/Ice/CommunicatorF.h ../../include/Freeze/DBException.h ../../include/Freeze/DBF.h ../../include/Freeze/EvictorF.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/PropertiesF.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h ../../include/Ice/Properties.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Communicator.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/SystemF.h ../../include/Ice/SslExtensionF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h -Application.o: Application.cpp ../../include/Freeze/Application.h ../../include/Ice/Application.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h ../../include/Ice/Properties.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Communicator.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/SystemF.h ../../include/Ice/SslExtensionF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Freeze/Freeze.h ../../include/Freeze/Initialize.h ../../include/Freeze/DBF.h ../../include/Freeze/DB.h ../../include/Freeze/DBException.h ../../include/Freeze/EvictorF.h ../../include/Freeze/Evictor.h ../../include/Freeze/Map.h +DBI.o: DBI.cpp ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Freeze/DBException.h ../Freeze/DBI.h ../../include/IceUtil/IceUtil.h ../../include/IceUtil/Functional.h ../../include/IceUtil/Unicode.h ../../include/IceUtil/UUID.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/RecMutex.h ../../include/IceUtil/RWRecMutex.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/IceUtil/Thread.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Base64.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Communicator.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Freeze/DB.h ../../include/Freeze/DBF.h ../../include/Freeze/EvictorF.h ../Freeze/EvictorI.h ../../include/Freeze/Evictor.h ../Freeze/IdentityObjectDict.h ../../include/Freeze/Map.h ../../include/Freeze/Initialize.h +EvictorI.o: EvictorI.cpp ../../include/Ice/Object.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Lock.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/StreamF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../Freeze/EvictorI.h ../../include/IceUtil/IceUtil.h ../../include/IceUtil/Functional.h ../../include/IceUtil/Unicode.h ../../include/IceUtil/UUID.h ../../include/IceUtil/RecMutex.h ../../include/IceUtil/RWRecMutex.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/IceUtil/Thread.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Base64.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Communicator.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Outgoing.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Freeze/Evictor.h ../../include/Freeze/DBException.h ../../include/Freeze/DBF.h ../Freeze/IdentityObjectDict.h ../../include/Freeze/Map.h ../../include/Freeze/DB.h ../../include/Freeze/EvictorF.h +IdentityObjectDict.o: IdentityObjectDict.cpp ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../Freeze/IdentityObjectDict.h ../../include/Freeze/Map.h ../../include/Freeze/DB.h ../../include/Ice/CommunicatorF.h ../../include/Freeze/DBException.h ../../include/Freeze/DBF.h ../../include/Freeze/EvictorF.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/PropertiesF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Communicator.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h +Application.o: Application.cpp ../../include/Freeze/Application.h ../../include/Ice/Application.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Communicator.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Freeze/Freeze.h ../../include/Freeze/Initialize.h ../../include/Freeze/DBF.h ../../include/Freeze/DB.h ../../include/Freeze/DBException.h ../../include/Freeze/EvictorF.h ../../include/Freeze/Evictor.h ../../include/Freeze/Map.h diff --git a/cpp/src/Glacier/.depend b/cpp/src/Glacier/.depend index 32fbe495dfe..d9ab431a78a 100644 --- a/cpp/src/Glacier/.depend +++ b/cpp/src/Glacier/.depend @@ -2,9 +2,9 @@ Starter.o: Starter.cpp ../../include/Glacier/Starter.h ../../include/Ice/LocalOb Router.o: Router.cpp ../../include/Glacier/Router.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/Router.h ../../include/Glacier/SessionF.h ../../include/Ice/LocalException.h ../../include/Ice/ObjectFactory.h ../../include/Ice/Stream.h ../../include/Ice/BuiltinSequences.h Session.o: Session.cpp ../../include/Glacier/Session.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/LocalException.h ../../include/Ice/ObjectFactory.h ../../include/Ice/Stream.h ../../include/Ice/BuiltinSequences.h SessionManager.o: SessionManager.cpp ../../include/Glacier/SessionManager.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Glacier/SessionF.h ../../include/Ice/LocalException.h ../../include/Ice/ObjectFactory.h ../../include/Ice/Stream.h ../../include/Ice/BuiltinSequences.h -GlacierRouter.o: GlacierRouter.cpp ../../include/Ice/Application.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h ../../include/Ice/Properties.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Communicator.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/SystemF.h ../../include/Ice/SslExtensionF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/RoutingTable.h ../../include/Ice/RoutingTableF.h ../Glacier/RouterI.h ../../include/Glacier/Router.h ../../include/Ice/Router.h ../../include/Glacier/SessionF.h ../../include/Glacier/SessionManagerF.h ../Glacier/ClientBlobject.h ../Glacier/ServerBlobject.h ../../include/Glacier/SessionManager.h ../../include/IceUtil/Base64.h ../../include/Ice/CertificateVerifierF.h ../../include/Ice/System.h ../../include/Ice/SslExtension.h -RouterI.o: RouterI.cpp ../../include/Ice/RoutingTable.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Lock.h ../../include/Ice/RoutingTableF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../Glacier/RouterI.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h ../../include/Ice/Properties.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Communicator.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/SystemF.h ../../include/Ice/SslExtensionF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Glacier/Router.h ../../include/Ice/Router.h ../../include/Glacier/SessionF.h ../../include/Glacier/SessionManagerF.h ../../include/Glacier/Session.h ../../include/Glacier/SessionManager.h -ClientBlobject.o: ClientBlobject.cpp ../../include/Ice/RoutingTable.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Lock.h ../../include/Ice/RoutingTableF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/IdentityUtil.h ../../include/Ice/Identity.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/StreamF.h ../Glacier/ClientBlobject.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Communicator.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/SystemF.h ../../include/Ice/SslExtensionF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h -ServerBlobject.o: ServerBlobject.cpp ../../include/Ice/RoutingTable.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Lock.h ../../include/Ice/RoutingTableF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../Glacier/ServerBlobject.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h ../../include/Ice/Properties.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Communicator.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/SystemF.h ../../include/Ice/SslExtensionF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h -GlacierStarter.o: GlacierStarter.cpp ../../include/Ice/Application.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h ../../include/Ice/Properties.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Communicator.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/SystemF.h ../../include/Ice/SslExtensionF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../Glacier/StarterI.h ../../include/Ice/RSACertificateGen.h ../../include/Ice/RSAKeyPairF.h ../../include/Glacier/Starter.h ../../include/Glacier/Router.h ../../include/Ice/Router.h ../../include/Glacier/SessionF.h -StarterI.o: StarterI.cpp ../../include/IceUtil/UUID.h ../../include/IceUtil/Config.h ../../include/Ice/RSAKeyPair.h ../../include/IceUtil/Shared.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/StreamF.h ../../include/Ice/RSAKeyPairF.h ../../include/Ice/RSACertificateGenF.h ../../include/Ice/RSAPrivateKeyF.h ../../include/Ice/RSAPublicKeyF.h ../Glacier/StarterI.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Communicator.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/SystemF.h ../../include/Ice/SslExtensionF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/RSACertificateGen.h ../../include/Glacier/Starter.h ../../include/Glacier/Router.h ../../include/Ice/Router.h ../../include/Glacier/SessionF.h +GlacierRouter.o: GlacierRouter.cpp ../../include/Ice/Application.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Communicator.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/RoutingTable.h ../../include/Ice/RoutingTableF.h ../Glacier/RouterI.h ../../include/Glacier/Router.h ../../include/Ice/Router.h ../../include/Glacier/SessionF.h ../../include/Glacier/SessionManagerF.h ../Glacier/ClientBlobject.h ../Glacier/ServerBlobject.h ../../include/Glacier/SessionManager.h ../../include/IceUtil/Base64.h ../../include/IceSSL/CertificateVerifierF.h ../../include/IceSSL/Plugin.h ../../include/Ice/Plugin.h +RouterI.o: RouterI.cpp ../../include/Ice/RoutingTable.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Lock.h ../../include/Ice/RoutingTableF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../Glacier/RouterI.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Communicator.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Glacier/Router.h ../../include/Ice/Router.h ../../include/Glacier/SessionF.h ../../include/Glacier/SessionManagerF.h ../../include/Glacier/Session.h ../../include/Glacier/SessionManager.h +ClientBlobject.o: ClientBlobject.cpp ../../include/Ice/RoutingTable.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Lock.h ../../include/Ice/RoutingTableF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/IdentityUtil.h ../../include/Ice/Identity.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/StreamF.h ../Glacier/ClientBlobject.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Communicator.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h +ServerBlobject.o: ServerBlobject.cpp ../../include/Ice/RoutingTable.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Lock.h ../../include/Ice/RoutingTableF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../Glacier/ServerBlobject.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Communicator.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h +GlacierStarter.o: GlacierStarter.cpp ../../include/Ice/Application.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Communicator.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../Glacier/StarterI.h ../../include/IceSSL/RSACertificateGen.h ../../include/IceSSL/RSAKeyPairF.h ../../include/Glacier/Starter.h ../../include/Glacier/Router.h ../../include/Ice/Router.h ../../include/Glacier/SessionF.h +StarterI.o: StarterI.cpp ../../include/IceUtil/UUID.h ../../include/IceUtil/Config.h ../../include/IceSSL/RSAKeyPair.h ../../include/IceUtil/Shared.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/StreamF.h ../../include/IceSSL/RSAKeyPairF.h ../../include/IceSSL/RSACertificateGenF.h ../../include/IceSSL/RSAPrivateKeyF.h ../../include/IceSSL/RSAPublicKeyF.h ../Glacier/StarterI.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Communicator.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/IceSSL/RSACertificateGen.h ../../include/Glacier/Starter.h ../../include/Glacier/Router.h ../../include/Ice/Router.h ../../include/Glacier/SessionF.h diff --git a/cpp/src/Glacier/GlacierRouter.cpp b/cpp/src/Glacier/GlacierRouter.cpp index 83e2dd8dbbe..12e14962739 100644 --- a/cpp/src/Glacier/GlacierRouter.cpp +++ b/cpp/src/Glacier/GlacierRouter.cpp @@ -15,9 +15,8 @@ #include <Glacier/ServerBlobject.h> #include <Glacier/SessionManager.h> #include <IceUtil/Base64.h> -#include <Ice/CertificateVerifierF.h> -#include <Ice/System.h> -#include <Ice/SslExtension.h> +#include <IceSSL/CertificateVerifierF.h> +#include <IceSSL/Plugin.h> using namespace std; using namespace Ice; @@ -123,32 +122,39 @@ Glacier::RouterApp::run(int argc, char* argv[]) PropertiesPtr properties = communicator()->getProperties(); - string clientConfig = properties->getProperty("Ice.SSL.Client.Config"); - string serverConfig = properties->getProperty("Ice.SSL.Server.Config"); + string clientConfig = properties->getProperty("IceSSL.Client.Config"); + string serverConfig = properties->getProperty("IceSSL.Server.Config"); - // Only do this if we've been configured for SSL + // + // Only do this if we've been configured for SSL. + // if (!clientConfig.empty() && !serverConfig.empty()) { IceSSL::ContextType contextType = IceSSL::ClientServer; - // Get our SSL System - IceSSL::SystemPtr sslSystem = communicator()->getSslSystem(); + // + // Get the SSL plugin. + // + PluginManagerPtr pluginManager = communicator()->getPluginManager(); + PluginPtr plugin = pluginManager->getPlugin("IceSSL"); + IceSSL::PluginPtr sslPlugin = IceSSL::PluginPtr::dynamicCast(plugin); + assert(sslPlugin); - // The system must configure itself (using config files as specified) - sslSystem->configure(contextType); + // + // The plug-in must configure itself (using config files as specified). + // + sslPlugin->configure(contextType); // If we have been told only to only accept a single certificate. string clientCertBase64 = properties->getProperty("Glacier.Router.AcceptCert"); if (!clientCertBase64.empty()) { - // Get an instance of the SSL Extension itself - IceSSL::SslExtensionPtr sslExtension = communicator()->getSslExtension(); // Install a Certificate Verifier that only accepts indicated certificate. Ice::ByteSeq clientCert = IceUtil::Base64::decode(clientCertBase64); - sslSystem->setCertificateVerifier(contextType, sslExtension->getSingleCertVerifier(clientCert)); + sslPlugin->setCertificateVerifier(contextType, sslPlugin->getSingleCertVerifier(clientCert)); // Add the Client's certificate as a trusted certificate. - sslSystem->addTrustedCertificateBase64(contextType, clientCertBase64); + sslPlugin->addTrustedCertificateBase64(contextType, clientCertBase64); } } @@ -287,8 +293,6 @@ Glacier::RouterApp::run(int argc, char* argv[]) int main(int argc, char* argv[]) { - addArgumentPrefix("Glacier"); - // // Make sure that this process doesn't use a router. // @@ -296,6 +300,10 @@ main(int argc, char* argv[]) try { defaultProperties = getDefaultProperties(argc, argv); + StringSeq args = argsToStringSeq(argc, argv); + args = defaultProperties->parseCommandLineOptions("Ice", args); + args = defaultProperties->parseCommandLineOptions("Glacier", args); + stringSeqToArgs(args, argc, argv); } catch(const Exception& ex) { diff --git a/cpp/src/Glacier/GlacierStarter.cpp b/cpp/src/Glacier/GlacierStarter.cpp index 72a62255d84..d6261946db3 100644 --- a/cpp/src/Glacier/GlacierStarter.cpp +++ b/cpp/src/Glacier/GlacierStarter.cpp @@ -180,8 +180,6 @@ main(int argc, char* argv[]) action.sa_flags = 0; sigaction(SIGCHLD, &action, 0); - addArgumentPrefix("Glacier"); - // // Make sure that this process doesn't use a router. // @@ -189,6 +187,10 @@ main(int argc, char* argv[]) try { defaultProperties = getDefaultProperties(argc, argv); + StringSeq args = argsToStringSeq(argc, argv); + args = defaultProperties->parseCommandLineOptions("Ice", args); + args = defaultProperties->parseCommandLineOptions("Glacier", args); + stringSeqToArgs(args, argc, argv); } catch(const Exception& ex) { diff --git a/cpp/src/Glacier/Makefile b/cpp/src/Glacier/Makefile index bd45fc05715..6e4d933d3a6 100644 --- a/cpp/src/Glacier/Makefile +++ b/cpp/src/Glacier/Makefile @@ -56,11 +56,11 @@ $(NAME): $(VERSIONED_NAME) $(ROUTER): $(ROBJS) rm -f $@ - $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(ROBJS) -lGlacier $(LIBS) + $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(ROBJS) -lGlacier $(SSL_LIBS) $(LIBS) $(STARTER): $(SOBJS) rm -f $@ - $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(SOBJS) -lGlacier $(LIBS) + $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(SOBJS) -lGlacier $(SSL_LIBS) $(LIBS) $(HDIR)/Starter.h Starter.cpp: $(SDIR)/Starter.ice $(SLICE2CPP) rm -f $(HDIR)/Starter.h Starter.cpp diff --git a/cpp/src/Glacier/StarterI.cpp b/cpp/src/Glacier/StarterI.cpp index 3c6cb9e014e..c52f3a28e06 100644 --- a/cpp/src/Glacier/StarterI.cpp +++ b/cpp/src/Glacier/StarterI.cpp @@ -13,7 +13,7 @@ #endif #include <IceUtil/UUID.h> -#include <Ice/RSAKeyPair.h> +#include <IceSSL/RSAKeyPair.h> #include <Glacier/StarterI.h> #include <fcntl.h> #include <shadow.h> @@ -173,10 +173,10 @@ Glacier::StarterI::startRouter(const string& userId, const string& password, Byt // be seen with `ps'. Keys and certificate should rather be // passed through a pipe? (ML will take care of this...) // - args.push_back("--Ice.SSL.Server.Overrides.RSA.PrivateKey=" + routerPrivateKeyBase64); - args.push_back("--Ice.SSL.Server.Overrides.RSA.Certificate=" + routerCertificateBase64); - args.push_back("--Ice.SSL.Client.Overrides.RSA.PrivateKey=" + routerPrivateKeyBase64); - args.push_back("--Ice.SSL.Client.Overrides.RSA.Certificate=" + routerCertificateBase64); + args.push_back("--IceSSL.Server.Overrides.RSA.PrivateKey=" + routerPrivateKeyBase64); + args.push_back("--IceSSL.Server.Overrides.RSA.Certificate=" + routerCertificateBase64); + args.push_back("--IceSSL.Client.Overrides.RSA.PrivateKey=" + routerPrivateKeyBase64); + args.push_back("--IceSSL.Client.Overrides.RSA.Certificate=" + routerCertificateBase64); args.push_back("--Glacier.Router.AcceptCert=" + clientCertificateBase64); args.push_back("--Glacier.Router.UserId=" + userId); diff --git a/cpp/src/Glacier/StarterI.h b/cpp/src/Glacier/StarterI.h index 6a5a1aa07bc..41ba2958f2a 100644 --- a/cpp/src/Glacier/StarterI.h +++ b/cpp/src/Glacier/StarterI.h @@ -12,7 +12,7 @@ #define GLACIER_GLACIER_I_H #include <Ice/Ice.h> -#include <Ice/RSACertificateGen.h> +#include <IceSSL/RSACertificateGen.h> #include <Glacier/Starter.h> namespace Glacier diff --git a/cpp/src/Ice/.depend b/cpp/src/Ice/.depend index 5317d97df42..e2c56418575 100644 --- a/cpp/src/Ice/.depend +++ b/cpp/src/Ice/.depend @@ -1,92 +1,61 @@ -Initialize.o: Initialize.cpp ../Ice/CommunicatorI.h ../../include/IceUtil/RecMutex.h ../../include/IceUtil/Config.h ../../include/IceUtil/Lock.h ../Ice/ThreadPoolF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/Communicator.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/LoggerF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/SystemF.h ../../include/Ice/SslExtensionF.h ../Ice/SystemInternalF.h ../Ice/PropertiesI.h ../../include/Ice/Properties.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/LocalException.h -Application.o: Application.cpp ../../include/Ice/Application.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h ../../include/Ice/Properties.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Communicator.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/SystemF.h ../../include/Ice/SslExtensionF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h -Exception.o: Exception.cpp ../../include/Ice/Exception.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/Identity.h ../Ice/Network.h ../../include/Ice/Stream.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/IdentityUtil.h +Initialize.o: Initialize.cpp ../Ice/CommunicatorI.h ../../include/IceUtil/RecMutex.h ../../include/IceUtil/Config.h ../../include/IceUtil/Lock.h ../Ice/ThreadPoolF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Communicator.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/LoggerF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/PluginF.h ../Ice/PropertiesI.h ../../include/Ice/Properties.h ../../include/Ice/LocalException.h +Application.o: Application.cpp ../../include/Ice/Application.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Communicator.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h +Exception.o: Exception.cpp ../../include/Ice/Exception.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/Identity.h ../Ice/Network.h ../../include/Ice/Stream.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/IdentityUtil.h ../../include/Ice/Plugin.h LocalException.o: LocalException.cpp ../../include/Ice/LocalException.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/Identity.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Stream.h ../../include/Ice/BuiltinSequences.h Properties.o: Properties.cpp ../../include/Ice/Properties.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Stream.h PropertiesI.o: PropertiesI.cpp ../Ice/PropertiesI.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Config.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Lock.h ../../include/Ice/Properties.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h -Logger.o: Logger.cpp ../../include/Ice/Logger.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Stream.h ../../include/Ice/BuiltinSequences.h +Logger.o: Logger.cpp ../../include/Ice/Logger.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h LoggerUtil.o: LoggerUtil.cpp ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/Logger.h LoggerI.o: LoggerI.cpp ../Ice/LoggerI.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Config.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Lock.h ../../include/Ice/Logger.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h SysLoggerI.o: SysLoggerI.cpp ../Ice/SysLoggerI.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Config.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Lock.h ../../include/Ice/Logger.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h Stream.o: Stream.cpp ../../include/Ice/Stream.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h -BuiltinSequences.o: BuiltinSequences.cpp ../../include/Ice/BuiltinSequences.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h -BasicStream.o: BasicStream.cpp ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../Ice/Instance.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/RecMutex.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../Ice/RouterInfoF.h ../Ice/ReferenceFactoryF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/ConnectionFactoryF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/SystemF.h ../Ice/SystemInternalF.h ../../include/Ice/Object.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Proxy.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../Ice/ProxyFactory.h ../../include/Ice/ObjectFactory.h ../Ice/ObjectFactoryManager.h ../../include/Ice/UserExceptionFactory.h ../Ice/UserExceptionFactoryManager.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/LocalException.h +BuiltinSequences.o: BuiltinSequences.cpp ../../include/Ice/BuiltinSequences.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Stream.h +BasicStream.o: BasicStream.cpp ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../Ice/Instance.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/RecMutex.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../Ice/RouterInfoF.h ../Ice/ReferenceFactoryF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/ConnectionFactoryF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/EndpointFactoryF.h ../../include/Ice/PluginF.h ../../include/Ice/Object.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Proxy.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../Ice/ProxyFactory.h ../../include/Ice/ObjectFactory.h ../Ice/ObjectFactoryManager.h ../../include/Ice/UserExceptionFactory.h ../Ice/UserExceptionFactoryManager.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/LocalException.h TraceLevels.o: TraceLevels.cpp ../Ice/TraceLevels.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../Ice/TraceLevelsF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/PropertiesF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/StreamF.h ../../include/Ice/Properties.h ../../include/Ice/BuiltinSequences.h -TraceUtil.o: TraceUtil.cpp ../Ice/TraceUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../Ice/TraceLevelsF.h ../Ice/Instance.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/RecMutex.h ../../include/Ice/InstanceF.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../Ice/RouterInfoF.h ../Ice/ReferenceFactoryF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/ConnectionFactoryF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/SystemF.h ../Ice/SystemInternalF.h ../../include/Ice/Object.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Proxy.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../Ice/TraceLevels.h ../../include/Ice/Logger.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../Ice/Protocol.h ../../include/Ice/IdentityUtil.h -Instance.o: Instance.cpp ../Ice/Instance.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Lock.h ../../include/IceUtil/RecMutex.h ../../include/Ice/InstanceF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../Ice/RouterInfoF.h ../Ice/ReferenceFactoryF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/ConnectionFactoryF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/SystemF.h ../Ice/SystemInternalF.h ../Ice/TraceLevels.h ../Ice/RouterInfo.h ../../include/Ice/RouterF.h ../../include/Ice/Proxy.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/RoutingTableF.h ../Ice/ReferenceFactory.h ../Ice/Reference.h ../Ice/ProxyFactory.h ../Ice/ThreadPool.h ../../include/IceUtil/Thread.h ../Ice/EventHandlerF.h ../Ice/ConnectionFactory.h ../Ice/AcceptorF.h ../Ice/TransceiverF.h ../Ice/EventHandler.h ../Ice/ObjectFactoryManager.h ../Ice/UserExceptionFactoryManager.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/LocalException.h ../Ice/ObjectAdapterFactory.h ../Ice/ObjectAdapterI.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/Properties.h ../../include/Ice/BuiltinSequences.h ../Ice/LoggerI.h ../../include/Ice/Logger.h ../Ice/Network.h ../Ice/SystemInternal.h ../../include/Ice/System.h ../../include/Ice/CertificateVerifierF.h ../Ice/SslConnectionF.h ../Ice/SslFactory.h ../Ice/SysLoggerI.h -Communicator.o: Communicator.cpp ../../include/Ice/Communicator.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/LoggerF.h ../../include/Ice/PropertiesF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/SystemF.h ../../include/Ice/SslExtensionF.h ../../include/Ice/LocalException.h ../../include/Ice/ObjectFactory.h ../../include/Ice/Stream.h ../../include/Ice/BuiltinSequences.h -CommunicatorI.o: CommunicatorI.cpp ../Ice/CommunicatorI.h ../../include/IceUtil/RecMutex.h ../../include/IceUtil/Config.h ../../include/IceUtil/Lock.h ../Ice/ThreadPoolF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/Communicator.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/LoggerF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/SystemF.h ../../include/Ice/SslExtensionF.h ../Ice/SystemInternalF.h ../Ice/Instance.h ../Ice/TraceLevelsF.h ../Ice/RouterInfoF.h ../Ice/ReferenceFactoryF.h ../../include/Ice/ConnectionFactoryF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/Properties.h ../../include/Ice/BuiltinSequences.h ../Ice/ReferenceFactory.h ../Ice/Reference.h ../Ice/ProxyFactory.h ../Ice/ThreadPool.h ../../include/IceUtil/Thread.h ../Ice/EventHandlerF.h ../Ice/ObjectFactoryManager.h ../Ice/UserExceptionFactoryManager.h ../Ice/ObjectAdapterFactory.h ../Ice/ObjectAdapterI.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LocalException.h ../Ice/SslExtensionInternal.h ../../include/Ice/SslExtension.h ../../include/Ice/CertificateVerifierF.h ../Ice/SystemInternal.h ../../include/Ice/System.h ../Ice/SslConnectionF.h -ObjectFactory.o: ObjectFactory.cpp ../../include/Ice/ObjectFactory.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Stream.h ../../include/Ice/BuiltinSequences.h +TraceUtil.o: TraceUtil.cpp ../Ice/TraceUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../Ice/TraceLevelsF.h ../Ice/Instance.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/RecMutex.h ../../include/Ice/InstanceF.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../Ice/RouterInfoF.h ../Ice/ReferenceFactoryF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/ConnectionFactoryF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/EndpointFactoryF.h ../../include/Ice/PluginF.h ../../include/Ice/Object.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Proxy.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../Ice/TraceLevels.h ../../include/Ice/Logger.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../Ice/Protocol.h ../../include/Ice/IdentityUtil.h +Instance.o: Instance.cpp ../Ice/Instance.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Lock.h ../../include/IceUtil/RecMutex.h ../../include/Ice/InstanceF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../Ice/RouterInfoF.h ../Ice/ReferenceFactoryF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/ConnectionFactoryF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/EndpointFactoryF.h ../../include/Ice/PluginF.h ../Ice/TraceLevels.h ../Ice/RouterInfo.h ../../include/Ice/RouterF.h ../../include/Ice/Proxy.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/RoutingTableF.h ../Ice/ReferenceFactory.h ../Ice/Reference.h ../Ice/ProxyFactory.h ../Ice/ThreadPool.h ../../include/IceUtil/Thread.h ../Ice/EventHandlerF.h ../Ice/ConnectionFactory.h ../Ice/AcceptorF.h ../Ice/TransceiverF.h ../Ice/EventHandler.h ../Ice/ObjectFactoryManager.h ../Ice/UserExceptionFactoryManager.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/LocalException.h ../Ice/ObjectAdapterFactory.h ../Ice/ObjectAdapterI.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/Properties.h ../../include/Ice/BuiltinSequences.h ../Ice/LoggerI.h ../../include/Ice/Logger.h ../Ice/Network.h ../Ice/EndpointFactory.h ../Ice/TcpEndpoint.h ../Ice/Endpoint.h ../Ice/ConnectorF.h ../Ice/UdpEndpoint.h ../Ice/PluginManagerI.h ../../include/Ice/Plugin.h ../../include/Ice/DynamicLibraryF.h ../../include/Ice/Initialize.h ../Ice/SysLoggerI.h +Communicator.o: Communicator.cpp ../../include/Ice/Communicator.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/LoggerF.h ../../include/Ice/PropertiesF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/PluginF.h ../../include/Ice/LocalException.h ../../include/Ice/ObjectFactory.h ../../include/Ice/Stream.h ../../include/Ice/BuiltinSequences.h +CommunicatorI.o: CommunicatorI.cpp ../Ice/CommunicatorI.h ../../include/IceUtil/RecMutex.h ../../include/IceUtil/Config.h ../../include/IceUtil/Lock.h ../Ice/ThreadPoolF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Communicator.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/LoggerF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/PluginF.h ../Ice/Instance.h ../Ice/TraceLevelsF.h ../Ice/RouterInfoF.h ../Ice/ReferenceFactoryF.h ../../include/Ice/ConnectionFactoryF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/EndpointFactoryF.h ../../include/Ice/Properties.h ../Ice/ReferenceFactory.h ../Ice/Reference.h ../Ice/ProxyFactory.h ../Ice/ThreadPool.h ../../include/IceUtil/Thread.h ../Ice/EventHandlerF.h ../Ice/ObjectFactoryManager.h ../Ice/UserExceptionFactoryManager.h ../Ice/ObjectAdapterFactory.h ../Ice/ObjectAdapterI.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LocalException.h +ObjectFactory.o: ObjectFactory.cpp ../../include/Ice/ObjectFactory.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ObjectFactoryManager.o: ObjectFactoryManager.cpp ../Ice/ObjectFactoryManager.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Lock.h ../Ice/ObjectFactoryManagerF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/StreamF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/Functional.h ../../include/IceUtil/Functional.h ObjectAdapter.o: ObjectAdapter.cpp ../../include/Ice/ObjectAdapter.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/CommunicatorF.h ../../include/Ice/RouterF.h ../../include/Ice/LocalException.h ../../include/Ice/ObjectFactory.h ../../include/Ice/Stream.h ../../include/Ice/BuiltinSequences.h -ObjectAdapterI.o: ObjectAdapterI.cpp ../../include/IceUtil/UUID.h ../../include/IceUtil/Config.h ../Ice/ObjectAdapterI.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Lock.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/StreamF.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/CommunicatorF.h ../../include/Ice/RouterF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/ConnectionFactoryF.h ../../include/Ice/ServantLocator.h ../Ice/Instance.h ../../include/IceUtil/RecMutex.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../Ice/RouterInfoF.h ../Ice/ReferenceFactoryF.h ../Ice/ThreadPoolF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/SystemF.h ../Ice/SystemInternalF.h ../Ice/ProxyFactory.h ../Ice/ReferenceFactory.h ../Ice/Reference.h ../Ice/Endpoint.h ../Ice/TransceiverF.h ../Ice/ConnectorF.h ../Ice/AcceptorF.h ../Ice/ConnectionFactory.h ../Ice/EventHandler.h ../Ice/EventHandlerF.h ../Ice/RouterInfo.h ../../include/Ice/RoutingTableF.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Functional.h ../../include/IceUtil/Functional.h -ObjectAdapterFactory.o: ObjectAdapterFactory.cpp ../Ice/ObjectAdapterFactory.h ../Ice/ObjectAdapterI.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Lock.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/StreamF.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/CommunicatorF.h ../../include/Ice/RouterF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/ConnectionFactoryF.h ../../include/IceUtil/RecMutex.h ../../include/Ice/Functional.h ../../include/IceUtil/Functional.h ../Ice/Instance.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../Ice/RouterInfoF.h ../Ice/ReferenceFactoryF.h ../Ice/ThreadPoolF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/SystemF.h ../Ice/SystemInternalF.h +ObjectAdapterI.o: ObjectAdapterI.cpp ../../include/IceUtil/UUID.h ../../include/IceUtil/Config.h ../Ice/ObjectAdapterI.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Lock.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/StreamF.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/CommunicatorF.h ../../include/Ice/RouterF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/ConnectionFactoryF.h ../../include/Ice/ServantLocator.h ../Ice/Instance.h ../../include/IceUtil/RecMutex.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../Ice/RouterInfoF.h ../Ice/ReferenceFactoryF.h ../Ice/ThreadPoolF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/EndpointFactoryF.h ../../include/Ice/PluginF.h ../Ice/ProxyFactory.h ../Ice/ReferenceFactory.h ../Ice/Reference.h ../Ice/Endpoint.h ../Ice/TransceiverF.h ../Ice/ConnectorF.h ../Ice/AcceptorF.h ../Ice/EndpointFactory.h ../Ice/ConnectionFactory.h ../Ice/EventHandler.h ../Ice/EventHandlerF.h ../Ice/RouterInfo.h ../../include/Ice/RoutingTableF.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Functional.h ../../include/IceUtil/Functional.h +ObjectAdapterFactory.o: ObjectAdapterFactory.cpp ../Ice/ObjectAdapterFactory.h ../Ice/ObjectAdapterI.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Lock.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/StreamF.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/CommunicatorF.h ../../include/Ice/RouterF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/ConnectionFactoryF.h ../../include/IceUtil/RecMutex.h ../../include/Ice/Functional.h ../../include/IceUtil/Functional.h ../Ice/Instance.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../Ice/RouterInfoF.h ../Ice/ReferenceFactoryF.h ../Ice/ThreadPoolF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/EndpointFactoryF.h ../../include/Ice/PluginF.h ServantLocator.o: ServantLocator.cpp ../../include/Ice/ServantLocator.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Stream.h ../../include/Ice/BuiltinSequences.h -UserExceptionFactory.o: UserExceptionFactory.cpp ../../include/Ice/UserExceptionFactory.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Stream.h ../../include/Ice/BuiltinSequences.h +UserExceptionFactory.o: UserExceptionFactory.cpp ../../include/Ice/UserExceptionFactory.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h UserExceptionFactoryManager.o: UserExceptionFactoryManager.cpp ../Ice/UserExceptionFactoryManager.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Lock.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/StreamF.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/Functional.h ../../include/IceUtil/Functional.h -Endpoint.o: Endpoint.cpp ../Ice/Endpoint.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/Ice/EndpointF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/InstanceF.h ../Ice/TransceiverF.h ../Ice/ConnectorF.h ../Ice/AcceptorF.h ../Ice/Network.h ../Ice/TcpAcceptor.h ../Ice/TraceLevelsF.h ../../include/Ice/LoggerF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/StreamF.h ../Ice/Acceptor.h ../Ice/TcpConnector.h ../Ice/Connector.h ../Ice/TcpTransceiver.h ../Ice/Transceiver.h ../Ice/SslAcceptor.h ../Ice/SslConnector.h ../Ice/SslTransceiver.h ../Ice/SslConnectionF.h ../Ice/UdpTransceiver.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h ../Ice/Instance.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/RecMutex.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../Ice/RouterInfoF.h ../Ice/ReferenceFactoryF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/ConnectionFactoryF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/SystemF.h ../Ice/SystemInternalF.h -Reference.o: Reference.cpp ../Ice/Reference.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/Ice/ReferenceF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../Ice/ReferenceFactoryF.h ../../include/Ice/EndpointF.h ../../include/Ice/InstanceF.h ../../include/Ice/RouterF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/StreamF.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../Ice/RouterInfoF.h ../Ice/ReferenceFactory.h ../../include/Ice/LocalException.h ../Ice/Instance.h ../../include/IceUtil/RecMutex.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../Ice/ThreadPoolF.h ../../include/Ice/ConnectionFactoryF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/SystemF.h ../Ice/SystemInternalF.h ../../include/Ice/IdentityUtil.h ../Ice/Endpoint.h ../Ice/TransceiverF.h ../Ice/ConnectorF.h ../Ice/AcceptorF.h ../Ice/RouterInfo.h ../../include/Ice/RoutingTableF.h ../../include/Ice/Router.h -ReferenceFactory.o: ReferenceFactory.cpp ../Ice/ReferenceFactory.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Lock.h ../Ice/ReferenceFactoryF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../Ice/Reference.h ../../include/Ice/ReferenceF.h ../../include/Ice/EndpointF.h ../../include/Ice/InstanceF.h ../../include/Ice/RouterF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/StreamF.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../Ice/RouterInfoF.h ../Ice/ProxyFactory.h ../../include/Ice/LocalException.h ../Ice/Instance.h ../../include/IceUtil/RecMutex.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../Ice/ThreadPoolF.h ../../include/Ice/ConnectionFactoryF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/SystemF.h ../Ice/SystemInternalF.h ../../include/Ice/IdentityUtil.h ../Ice/Endpoint.h ../Ice/TransceiverF.h ../Ice/ConnectorF.h ../Ice/AcceptorF.h ../Ice/RouterInfo.h ../../include/Ice/RoutingTableF.h +Endpoint.o: Endpoint.cpp ../Ice/Endpoint.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/Ice/EndpointF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/InstanceF.h ../Ice/TransceiverF.h ../Ice/ConnectorF.h ../Ice/AcceptorF.h +EndpointFactory.o: EndpointFactory.cpp ../Ice/EndpointFactory.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Lock.h ../../include/Ice/InstanceF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/EndpointF.h ../../include/Ice/EndpointFactoryF.h ../Ice/Endpoint.h ../Ice/TransceiverF.h ../Ice/ConnectorF.h ../Ice/AcceptorF.h ../Ice/UnknownEndpoint.h ../Ice/Network.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/StreamF.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h ../Ice/Instance.h ../../include/IceUtil/RecMutex.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../Ice/RouterInfoF.h ../Ice/ReferenceFactoryF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/ConnectionFactoryF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/PluginF.h +TcpEndpoint.o: TcpEndpoint.cpp ../Ice/TcpEndpoint.h ../Ice/Endpoint.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/Ice/EndpointF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/InstanceF.h ../Ice/TransceiverF.h ../Ice/ConnectorF.h ../Ice/AcceptorF.h ../Ice/EndpointFactory.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/EndpointFactoryF.h ../Ice/Network.h ../Ice/TcpAcceptor.h ../Ice/TraceLevelsF.h ../../include/Ice/LoggerF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/StreamF.h ../Ice/Acceptor.h ../Ice/TcpConnector.h ../Ice/Connector.h ../Ice/TcpTransceiver.h ../Ice/Transceiver.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h ../Ice/Instance.h ../../include/IceUtil/RecMutex.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../Ice/RouterInfoF.h ../Ice/ReferenceFactoryF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/ConnectionFactoryF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/PluginF.h +UdpEndpoint.o: UdpEndpoint.cpp ../Ice/UdpEndpoint.h ../Ice/Endpoint.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/Ice/EndpointF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/InstanceF.h ../Ice/TransceiverF.h ../Ice/ConnectorF.h ../Ice/AcceptorF.h ../Ice/EndpointFactory.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/EndpointFactoryF.h ../Ice/Network.h ../Ice/UdpTransceiver.h ../Ice/TraceLevelsF.h ../../include/Ice/LoggerF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/StreamF.h ../Ice/Transceiver.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h ../Ice/Instance.h ../../include/IceUtil/RecMutex.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../Ice/RouterInfoF.h ../Ice/ReferenceFactoryF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/ConnectionFactoryF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/PluginF.h +UnknownEndpoint.o: UnknownEndpoint.cpp ../Ice/UnknownEndpoint.h ../Ice/Endpoint.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/Ice/EndpointF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/InstanceF.h ../Ice/TransceiverF.h ../Ice/ConnectorF.h ../Ice/AcceptorF.h ../Ice/EndpointFactory.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/EndpointFactoryF.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/StreamF.h ../Ice/Instance.h ../../include/IceUtil/RecMutex.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../Ice/RouterInfoF.h ../Ice/ReferenceFactoryF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/ConnectionFactoryF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/PluginF.h +Reference.o: Reference.cpp ../Ice/Reference.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/Ice/ReferenceF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../Ice/ReferenceFactoryF.h ../../include/Ice/EndpointF.h ../../include/Ice/InstanceF.h ../../include/Ice/RouterF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/StreamF.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../Ice/RouterInfoF.h ../Ice/ReferenceFactory.h ../../include/Ice/LocalException.h ../Ice/Instance.h ../../include/IceUtil/RecMutex.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../Ice/ThreadPoolF.h ../../include/Ice/ConnectionFactoryF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/EndpointFactoryF.h ../../include/Ice/PluginF.h ../../include/Ice/IdentityUtil.h ../Ice/Endpoint.h ../Ice/TransceiverF.h ../Ice/ConnectorF.h ../Ice/AcceptorF.h ../Ice/RouterInfo.h ../../include/Ice/RoutingTableF.h ../../include/Ice/Router.h +ReferenceFactory.o: ReferenceFactory.cpp ../Ice/ReferenceFactory.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Lock.h ../Ice/ReferenceFactoryF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../Ice/Reference.h ../../include/Ice/ReferenceF.h ../../include/Ice/EndpointF.h ../../include/Ice/InstanceF.h ../../include/Ice/RouterF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/StreamF.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../Ice/RouterInfoF.h ../Ice/ProxyFactory.h ../../include/Ice/LocalException.h ../Ice/Instance.h ../../include/IceUtil/RecMutex.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../Ice/ThreadPoolF.h ../../include/Ice/ConnectionFactoryF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/EndpointFactoryF.h ../../include/Ice/PluginF.h ../../include/Ice/IdentityUtil.h ../Ice/Endpoint.h ../Ice/TransceiverF.h ../Ice/ConnectorF.h ../Ice/AcceptorF.h ../Ice/EndpointFactory.h ../Ice/RouterInfo.h ../../include/Ice/RoutingTableF.h Identity.o: Identity.cpp ../../include/Ice/Identity.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Stream.h ../../include/Ice/BuiltinSequences.h IdentityUtil.o: IdentityUtil.cpp ../../include/Ice/IdentityUtil.h ../../include/Ice/Identity.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h Current.o: Current.cpp ../../include/Ice/Current.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/Identity.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Stream.h ../../include/Ice/BuiltinSequences.h Router.o: Router.cpp ../../include/Ice/Router.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/LocalException.h ../../include/Ice/ObjectFactory.h ../../include/Ice/Stream.h ../../include/Ice/BuiltinSequences.h RouterInfo.o: RouterInfo.cpp ../Ice/RouterInfo.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Lock.h ../Ice/RouterInfoF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/RouterF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/StreamF.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/RoutingTableF.h ../../include/Ice/Router.h ../../include/Ice/RoutingTable.h ../../include/Ice/LocalException.h RoutingTable.o: RoutingTable.cpp ../../include/Ice/RoutingTable.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Lock.h ../../include/Ice/RoutingTableF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/StreamF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h -Connection.o: Connection.cpp ../Ice/Connection.h ../../include/IceUtil/RecMutex.h ../../include/IceUtil/Config.h ../../include/IceUtil/Lock.h ../../include/Ice/ConnectionF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/ConnectionFactoryF.h ../../include/Ice/InstanceF.h ../Ice/TransceiverF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/EndpointF.h ../Ice/ThreadPoolF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../Ice/EventHandler.h ../Ice/EventHandlerF.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../Ice/Instance.h ../../include/IceUtil/Mutex.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../Ice/RouterInfoF.h ../Ice/ReferenceFactoryF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/SystemF.h ../Ice/SystemInternalF.h ../../include/Ice/LoggerUtil.h ../../include/Ice/Properties.h ../../include/Ice/BuiltinSequences.h ../Ice/TraceUtil.h ../Ice/Transceiver.h ../Ice/ThreadPool.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/IceUtil/Thread.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/Proxy.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/RouterF.h ../Ice/Endpoint.h ../Ice/ConnectorF.h ../Ice/AcceptorF.h ../../include/Ice/LocalException.h ../Ice/Protocol.h -ConnectionFactory.o: ConnectionFactory.cpp ../Ice/ConnectionFactory.h ../../include/IceUtil/RecMutex.h ../../include/IceUtil/Config.h ../../include/IceUtil/Lock.h ../../include/Ice/ConnectionFactoryF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/ConnectionF.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/EndpointF.h ../Ice/AcceptorF.h ../Ice/TransceiverF.h ../../include/Ice/RouterF.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../Ice/EventHandler.h ../Ice/EventHandlerF.h ../Ice/ThreadPoolF.h ../Ice/Connection.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../Ice/Instance.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../Ice/RouterInfoF.h ../Ice/ReferenceFactoryF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/SystemF.h ../Ice/SystemInternalF.h ../../include/Ice/LoggerUtil.h ../Ice/TraceLevels.h ../../include/Ice/Properties.h ../../include/Ice/BuiltinSequences.h ../Ice/Transceiver.h ../Ice/Connector.h ../Ice/ConnectorF.h ../Ice/Acceptor.h ../Ice/ThreadPool.h ../../include/IceUtil/Thread.h ../../include/Ice/ObjectAdapter.h ../Ice/Reference.h ../Ice/Endpoint.h ../Ice/RouterInfo.h ../../include/Ice/RoutingTableF.h ../../include/Ice/LocalException.h ../../include/Ice/Functional.h ../../include/IceUtil/Functional.h ../../include/Ice/SslException.h +Connection.o: Connection.cpp ../Ice/Connection.h ../../include/IceUtil/RecMutex.h ../../include/IceUtil/Config.h ../../include/IceUtil/Lock.h ../../include/Ice/ConnectionF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/ConnectionFactoryF.h ../../include/Ice/InstanceF.h ../Ice/TransceiverF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/EndpointF.h ../Ice/ThreadPoolF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../Ice/EventHandler.h ../Ice/EventHandlerF.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../Ice/Instance.h ../../include/IceUtil/Mutex.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../Ice/RouterInfoF.h ../Ice/ReferenceFactoryF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/EndpointFactoryF.h ../../include/Ice/PluginF.h ../../include/Ice/LoggerUtil.h ../../include/Ice/Properties.h ../../include/Ice/BuiltinSequences.h ../Ice/TraceUtil.h ../Ice/Transceiver.h ../Ice/ThreadPool.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/IceUtil/Thread.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/Proxy.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/RouterF.h ../Ice/Endpoint.h ../Ice/ConnectorF.h ../Ice/AcceptorF.h ../../include/Ice/LocalException.h ../Ice/Protocol.h +ConnectionFactory.o: ConnectionFactory.cpp ../Ice/ConnectionFactory.h ../../include/IceUtil/RecMutex.h ../../include/IceUtil/Config.h ../../include/IceUtil/Lock.h ../../include/Ice/ConnectionFactoryF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/ConnectionF.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/EndpointF.h ../Ice/AcceptorF.h ../Ice/TransceiverF.h ../../include/Ice/RouterF.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../Ice/EventHandler.h ../Ice/EventHandlerF.h ../Ice/ThreadPoolF.h ../Ice/Connection.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../Ice/Instance.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../Ice/RouterInfoF.h ../Ice/ReferenceFactoryF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/EndpointFactoryF.h ../../include/Ice/PluginF.h ../../include/Ice/LoggerUtil.h ../Ice/TraceLevels.h ../../include/Ice/Properties.h ../../include/Ice/BuiltinSequences.h ../Ice/Transceiver.h ../Ice/Connector.h ../Ice/ConnectorF.h ../Ice/Acceptor.h ../Ice/ThreadPool.h ../../include/IceUtil/Thread.h ../../include/Ice/ObjectAdapter.h ../Ice/Reference.h ../Ice/Endpoint.h ../Ice/RouterInfo.h ../../include/Ice/RoutingTableF.h ../../include/Ice/LocalException.h ../../include/Ice/Functional.h ../../include/IceUtil/Functional.h LocalObject.o: LocalObject.cpp ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/StreamF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h Object.o: Object.cpp ../../include/Ice/Object.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Lock.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/StreamF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Incoming.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/InstanceF.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Stream.h ../../include/Ice/BuiltinSequences.h -ProxyFactory.o: ProxyFactory.cpp ../Ice/ProxyFactory.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/InstanceF.h ../../include/Ice/ReferenceF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../Ice/Instance.h ../../include/IceUtil/RecMutex.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../Ice/RouterInfoF.h ../Ice/ReferenceFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/ConnectionFactoryF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/SystemF.h ../Ice/SystemInternalF.h ../../include/Ice/Proxy.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../Ice/ReferenceFactory.h ../Ice/Reference.h ../../include/Ice/RouterF.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h -Proxy.o: Proxy.cpp ../../include/Ice/Proxy.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/Handle.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/StreamF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../Ice/ProxyFactory.h ../../include/Ice/InstanceF.h ../../include/Ice/Object.h ../Ice/ObjectAdapterFactory.h ../Ice/ObjectAdapterI.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/CommunicatorF.h ../../include/Ice/RouterF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/ConnectionFactoryF.h ../../include/IceUtil/RecMutex.h ../Ice/Reference.h ../Ice/ReferenceFactoryF.h ../Ice/RouterInfoF.h ../Ice/Endpoint.h ../Ice/TransceiverF.h ../Ice/ConnectorF.h ../Ice/AcceptorF.h ../Ice/Instance.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../Ice/ThreadPoolF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/SystemF.h ../Ice/SystemInternalF.h ../../include/Ice/LoggerUtil.h ../Ice/TraceLevels.h ../Ice/ConnectionFactory.h ../Ice/EventHandler.h ../Ice/EventHandlerF.h ../Ice/Connection.h ../Ice/RouterInfo.h ../../include/Ice/RoutingTableF.h ../../include/Ice/LocalException.h ../../include/Ice/Functional.h ../../include/IceUtil/Functional.h ../../include/Ice/SslException.h -Outgoing.o: Outgoing.cpp ../../include/Ice/Outgoing.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Config.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Lock.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/ConnectionF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/ReferenceF.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Object.h ../Ice/Connection.h ../../include/IceUtil/RecMutex.h ../../include/Ice/ConnectionFactoryF.h ../Ice/TransceiverF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/EndpointF.h ../Ice/ThreadPoolF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../Ice/EventHandler.h ../Ice/EventHandlerF.h ../Ice/Reference.h ../Ice/ReferenceFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../Ice/RouterInfoF.h ../../include/Ice/LocalException.h ../Ice/Instance.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/SystemF.h ../Ice/SystemInternalF.h +ProxyFactory.o: ProxyFactory.cpp ../Ice/ProxyFactory.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/InstanceF.h ../../include/Ice/ReferenceF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../Ice/Instance.h ../../include/IceUtil/RecMutex.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../Ice/RouterInfoF.h ../Ice/ReferenceFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/ConnectionFactoryF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/EndpointFactoryF.h ../../include/Ice/PluginF.h ../../include/Ice/Proxy.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../Ice/ReferenceFactory.h ../Ice/Reference.h ../../include/Ice/RouterF.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h +Proxy.o: Proxy.cpp ../../include/Ice/Proxy.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/Handle.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/StreamF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../Ice/ProxyFactory.h ../../include/Ice/InstanceF.h ../../include/Ice/Object.h ../Ice/ObjectAdapterFactory.h ../Ice/ObjectAdapterI.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/CommunicatorF.h ../../include/Ice/RouterF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/ConnectionFactoryF.h ../../include/IceUtil/RecMutex.h ../Ice/Reference.h ../Ice/ReferenceFactoryF.h ../Ice/RouterInfoF.h ../Ice/Endpoint.h ../Ice/TransceiverF.h ../Ice/ConnectorF.h ../Ice/AcceptorF.h ../Ice/Instance.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../Ice/ThreadPoolF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/EndpointFactoryF.h ../../include/Ice/PluginF.h ../../include/Ice/LoggerUtil.h ../Ice/TraceLevels.h ../Ice/ConnectionFactory.h ../Ice/EventHandler.h ../Ice/EventHandlerF.h ../Ice/Connection.h ../Ice/RouterInfo.h ../../include/Ice/RoutingTableF.h ../../include/Ice/LocalException.h ../../include/Ice/Functional.h ../../include/IceUtil/Functional.h +Outgoing.o: Outgoing.cpp ../../include/Ice/Outgoing.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Config.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Lock.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/ConnectionF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/ReferenceF.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Object.h ../Ice/Connection.h ../../include/IceUtil/RecMutex.h ../../include/Ice/ConnectionFactoryF.h ../Ice/TransceiverF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/EndpointF.h ../Ice/ThreadPoolF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../Ice/EventHandler.h ../Ice/EventHandlerF.h ../Ice/Reference.h ../Ice/ReferenceFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../Ice/RouterInfoF.h ../../include/Ice/LocalException.h ../Ice/Instance.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/EndpointFactoryF.h ../../include/Ice/PluginF.h Incoming.o: Incoming.cpp ../../include/Ice/Incoming.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/InstanceF.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/CommunicatorF.h ../../include/Ice/RouterF.h ../../include/Ice/ServantLocator.h ../../include/Ice/LocalException.h Direct.o: Direct.cpp ../../include/Ice/Direct.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/CommunicatorF.h ../../include/Ice/RouterF.h ../../include/Ice/ServantLocator.h ../Ice/Reference.h ../Ice/ReferenceFactoryF.h ../Ice/RouterInfoF.h ../../include/Ice/LocalException.h Network.o: Network.cpp ../../include/IceUtil/Mutex.h ../../include/IceUtil/Config.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Lock.h ../Ice/Network.h ../../include/Ice/Config.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/Identity.h -ThreadPool.o: ThreadPool.cpp ../Ice/ThreadPool.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Lock.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/IceUtil/Thread.h ../../include/IceUtil/Handle.h ../Ice/ThreadPoolF.h ../../include/Ice/Handle.h ../../include/Ice/Config.h ../../include/Ice/InstanceF.h ../../include/Ice/LoggerF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../Ice/EventHandlerF.h ../Ice/EventHandler.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../Ice/Network.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h ../Ice/Instance.h ../../include/IceUtil/RecMutex.h ../../include/Ice/CommunicatorF.h ../Ice/TraceLevelsF.h ../Ice/RouterInfoF.h ../Ice/ReferenceFactoryF.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionFactoryF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/SystemF.h ../Ice/SystemInternalF.h ../../include/Ice/Properties.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/LoggerUtil.h ../../include/Ice/Functional.h ../../include/IceUtil/Functional.h ../Ice/Protocol.h ../Ice/ObjectAdapterFactory.h ../Ice/ObjectAdapterI.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/Proxy.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/RouterF.h -EventHandler.o: EventHandler.cpp ../Ice/EventHandler.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../Ice/EventHandlerF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/InstanceF.h ../Ice/ThreadPoolF.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/StreamF.h ../Ice/Instance.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/RecMutex.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../Ice/RouterInfoF.h ../Ice/ReferenceFactoryF.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionFactoryF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/SystemF.h ../Ice/SystemInternalF.h +ThreadPool.o: ThreadPool.cpp ../Ice/ThreadPool.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Lock.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/IceUtil/Thread.h ../../include/IceUtil/Handle.h ../Ice/ThreadPoolF.h ../../include/Ice/Handle.h ../../include/Ice/Config.h ../../include/Ice/InstanceF.h ../../include/Ice/LoggerF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../Ice/EventHandlerF.h ../Ice/EventHandler.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../Ice/Network.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h ../Ice/Instance.h ../../include/IceUtil/RecMutex.h ../../include/Ice/CommunicatorF.h ../Ice/TraceLevelsF.h ../Ice/RouterInfoF.h ../Ice/ReferenceFactoryF.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionFactoryF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/EndpointFactoryF.h ../../include/Ice/PluginF.h ../../include/Ice/Properties.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/LoggerUtil.h ../../include/Ice/Functional.h ../../include/IceUtil/Functional.h ../Ice/Protocol.h ../Ice/ObjectAdapterFactory.h ../Ice/ObjectAdapterI.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/Proxy.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/RouterF.h +EventHandler.o: EventHandler.cpp ../Ice/EventHandler.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../Ice/EventHandlerF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/InstanceF.h ../Ice/ThreadPoolF.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/StreamF.h ../Ice/Instance.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/RecMutex.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../Ice/RouterInfoF.h ../Ice/ReferenceFactoryF.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionFactoryF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/EndpointFactoryF.h ../../include/Ice/PluginF.h Connector.o: Connector.cpp ../Ice/Connector.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../Ice/ConnectorF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../Ice/TransceiverF.h Acceptor.o: Acceptor.cpp ../Ice/Acceptor.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../Ice/AcceptorF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../Ice/TransceiverF.h Transceiver.o: Transceiver.cpp ../Ice/Transceiver.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../Ice/TransceiverF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h -TcpConnector.o: TcpConnector.cpp ../Ice/TcpConnector.h ../Ice/TransceiverF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/InstanceF.h ../Ice/TraceLevelsF.h ../../include/Ice/LoggerF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../Ice/Connector.h ../Ice/ConnectorF.h ../Ice/TcpTransceiver.h ../Ice/Transceiver.h ../Ice/Instance.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/RecMutex.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../Ice/RouterInfoF.h ../Ice/ReferenceFactoryF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/ConnectionFactoryF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/SystemF.h ../Ice/SystemInternalF.h ../Ice/TraceLevels.h ../../include/Ice/LoggerUtil.h ../Ice/Network.h -TcpAcceptor.o: TcpAcceptor.cpp ../Ice/TcpAcceptor.h ../Ice/TransceiverF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/InstanceF.h ../Ice/TraceLevelsF.h ../../include/Ice/LoggerF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../Ice/Acceptor.h ../Ice/AcceptorF.h ../Ice/TcpTransceiver.h ../Ice/Transceiver.h ../Ice/Instance.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/RecMutex.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../Ice/RouterInfoF.h ../Ice/ReferenceFactoryF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/ConnectionFactoryF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/SystemF.h ../Ice/SystemInternalF.h ../Ice/TraceLevels.h ../../include/Ice/LoggerUtil.h ../Ice/Network.h -TcpTransceiver.o: TcpTransceiver.cpp ../Ice/TcpTransceiver.h ../../include/Ice/InstanceF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../Ice/TraceLevelsF.h ../../include/Ice/LoggerF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../Ice/Transceiver.h ../Ice/TransceiverF.h ../Ice/Instance.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/RecMutex.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../Ice/RouterInfoF.h ../Ice/ReferenceFactoryF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/ConnectionFactoryF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/SystemF.h ../Ice/SystemInternalF.h ../Ice/TraceLevels.h ../../include/Ice/LoggerUtil.h ../../include/Ice/Buffer.h ../Ice/Network.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h -SslException.o: SslException.cpp ../../include/Ice/SslException.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Stream.h ../../include/Ice/BuiltinSequences.h -SslException2.o: SslException2.cpp ../../include/Ice/LocalException.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/Identity.h ../../include/Ice/SslException.h -SslConnector.o: SslConnector.cpp ../Ice/SystemInternal.h ../../include/Ice/System.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/CertificateVerifierF.h ../../include/Ice/InstanceF.h ../Ice/SslConnectionF.h ../../include/Ice/Properties.h ../Ice/SystemInternalF.h ../Ice/TraceLevelsF.h ../../include/Ice/LoggerF.h ../Ice/SslConnector.h ../Ice/TransceiverF.h ../Ice/Connector.h ../Ice/ConnectorF.h ../Ice/SslTransceiver.h ../Ice/Transceiver.h ../Ice/Instance.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/RecMutex.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../Ice/RouterInfoF.h ../Ice/ReferenceFactoryF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/ConnectionFactoryF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/SystemF.h ../Ice/TraceLevels.h ../../include/Ice/Logger.h ../Ice/Network.h ../../include/Ice/SslException.h -SslAcceptor.o: SslAcceptor.cpp ../Ice/SystemInternal.h ../../include/Ice/System.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/CertificateVerifierF.h ../../include/Ice/InstanceF.h ../Ice/SslConnectionF.h ../../include/Ice/Properties.h ../Ice/SystemInternalF.h ../Ice/TraceLevelsF.h ../../include/Ice/LoggerF.h ../Ice/SslAcceptor.h ../Ice/TransceiverF.h ../Ice/Acceptor.h ../Ice/AcceptorF.h ../Ice/SslTransceiver.h ../Ice/Transceiver.h ../Ice/Instance.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/RecMutex.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../Ice/RouterInfoF.h ../Ice/ReferenceFactoryF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/ConnectionFactoryF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/SystemF.h ../Ice/TraceLevels.h ../../include/Ice/Logger.h ../Ice/Network.h ../../include/Ice/SslException.h -SslTransceiver.o: SslTransceiver.cpp ../Ice/OpenSSL.h ../Ice/SslConnection.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/Ice/Buffer.h ../../include/Ice/Config.h ../Ice/TraceLevelsF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/LoggerF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/StreamF.h ../Ice/SslConnectionF.h ../../include/Ice/CertificateVerifierF.h ../Ice/SslTransceiver.h ../../include/Ice/InstanceF.h ../Ice/Transceiver.h ../Ice/TransceiverF.h ../Ice/Instance.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/RecMutex.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../Ice/RouterInfoF.h ../Ice/ReferenceFactoryF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/ConnectionFactoryF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/SystemF.h ../Ice/SystemInternalF.h ../Ice/TraceLevels.h ../../include/Ice/Logger.h ../Ice/Network.h -BaseCerts.o: BaseCerts.cpp ../Ice/BaseCerts.h ../Ice/CertificateDesc.h -CertificateAuthority.o: CertificateAuthority.cpp ../Ice/CertificateAuthority.h -CertificateDesc.o: CertificateDesc.cpp ../Ice/CertificateDesc.h -ConfigParser.o: ConfigParser.cpp ../Ice/OpenSSL.h ../../include/Ice/SslException.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../Ice/ConfigParserErrorReporter.h ../Ice/TraceLevelsF.h ../../include/Ice/LoggerF.h ../Ice/ConfigParser.h ../Ice/CertificateDesc.h ../Ice/GeneralConfig.h ../Ice/CertificateAuthority.h ../Ice/BaseCerts.h ../Ice/TempCerts.h -ConfigParserErrorReporter.o: ConfigParserErrorReporter.cpp ../Ice/ConfigParserErrorReporter.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../Ice/TraceLevelsF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/LoggerF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/StreamF.h ../Ice/TraceLevels.h ../../include/Ice/PropertiesF.h ../../include/Ice/Logger.h ../Ice/OpenSSL.h -SslConnection.o: SslConnection.cpp ../Ice/SslConnection.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/Ice/Buffer.h ../../include/Ice/Config.h ../Ice/TraceLevelsF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/LoggerF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/StreamF.h ../Ice/SslConnectionF.h ../../include/Ice/CertificateVerifierF.h -SslConnectionOpenSSLClient.o: SslConnectionOpenSSLClient.cpp ../Ice/OpenSSLUtils.h ../Ice/Network.h ../../include/Ice/Config.h ../../include/IceUtil/Config.h ../Ice/OpenSSL.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/Identity.h ../../include/Ice/SslException.h ../Ice/OpenSSLJanitors.h ../Ice/SslConnectionOpenSSLClient.h ../Ice/SslConnectionOpenSSL.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../Ice/SslConnection.h ../../include/Ice/Buffer.h ../Ice/TraceLevelsF.h ../../include/Ice/LoggerF.h ../Ice/SslConnectionF.h ../../include/Ice/CertificateVerifierF.h ../Ice/SystemInternalF.h ../Ice/SslConnectionOpenSSLF.h ../../include/Ice/CertificateVerifierOpenSSL.h ../../include/Ice/CertificateVerifier.h ../Ice/TraceLevels.h ../../include/Ice/PropertiesF.h ../../include/Ice/Logger.h -SslConnectionOpenSSL.o: SslConnectionOpenSSL.cpp ../Ice/Network.h ../../include/Ice/Config.h ../../include/IceUtil/Config.h ../Ice/OpenSSL.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/Identity.h ../../include/Ice/SslException.h ../Ice/SslFactory.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/InstanceF.h ../Ice/SystemInternalF.h ../../include/Ice/CertificateVerifierF.h ../Ice/SslConnection.h ../../include/Ice/Buffer.h ../Ice/TraceLevelsF.h ../../include/Ice/LoggerF.h ../Ice/SslConnectionF.h ../Ice/SslConnectionOpenSSL.h ../Ice/SslConnectionOpenSSLF.h ../../include/Ice/CertificateVerifierOpenSSL.h ../../include/Ice/CertificateVerifier.h ../Ice/SystemOpenSSL.h ../../include/IceUtil/RecMutex.h ../Ice/GeneralConfig.h ../Ice/CertificateDesc.h ../Ice/CertificateAuthority.h ../Ice/BaseCerts.h ../Ice/TempCerts.h ../Ice/ContextOpenSSLServer.h ../Ice/ContextOpenSSL.h ../../include/Ice/PropertiesF.h ../../include/Ice/BuiltinSequences.h ../Ice/ContextOpenSSLF.h ../../include/Ice/RSAPublicKey.h ../../include/Ice/RSAPublicKeyF.h ../Ice/ContextOpenSSLClient.h ../Ice/SystemInternal.h ../../include/Ice/System.h ../../include/Ice/Properties.h ../Ice/OpenSSLUtils.h ../../include/Ice/RSAPrivateKeyF.h ../Ice/DHParamsF.h ../Ice/TraceLevels.h ../../include/Ice/Logger.h -SslConnectionOpenSSLServer.o: SslConnectionOpenSSLServer.cpp ../Ice/OpenSSLUtils.h ../Ice/Network.h ../../include/Ice/Config.h ../../include/IceUtil/Config.h ../Ice/OpenSSL.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/Identity.h ../../include/Ice/SslException.h ../Ice/OpenSSLJanitors.h ../Ice/SslConnectionOpenSSLServer.h ../Ice/SslConnectionOpenSSL.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../Ice/SslConnection.h ../../include/Ice/Buffer.h ../Ice/TraceLevelsF.h ../../include/Ice/LoggerF.h ../Ice/SslConnectionF.h ../../include/Ice/CertificateVerifierF.h ../Ice/SystemInternalF.h ../Ice/SslConnectionOpenSSLF.h ../../include/Ice/CertificateVerifierOpenSSL.h ../../include/Ice/CertificateVerifier.h ../Ice/TraceLevels.h ../../include/Ice/PropertiesF.h ../../include/Ice/Logger.h -ContextOpenSSL.o: ContextOpenSSL.cpp ../Ice/Instance.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Lock.h ../../include/IceUtil/RecMutex.h ../../include/Ice/InstanceF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../Ice/RouterInfoF.h ../Ice/ReferenceFactoryF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/ConnectionFactoryF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/SystemF.h ../Ice/SystemInternalF.h ../../include/Ice/Properties.h ../../include/Ice/BuiltinSequences.h ../Ice/DefaultCertificateVerifier.h ../../include/Ice/Logger.h ../Ice/TraceLevels.h ../../include/Ice/CertificateVerifierOpenSSL.h ../../include/Ice/CertificateVerifier.h ../../include/Ice/SslException.h ../../include/Ice/RSAKeyPair.h ../../include/Ice/RSAKeyPairF.h ../../include/Ice/RSACertificateGenF.h ../../include/Ice/RSAPrivateKeyF.h ../../include/Ice/RSAPublicKeyF.h ../Ice/CertificateDesc.h ../Ice/SslConnectionOpenSSL.h ../Ice/SslConnection.h ../../include/Ice/Buffer.h ../Ice/SslConnectionF.h ../../include/Ice/CertificateVerifierF.h ../Ice/SslConnectionOpenSSLF.h ../Ice/ContextOpenSSL.h ../Ice/OpenSSL.h ../Ice/GeneralConfig.h ../Ice/CertificateAuthority.h ../Ice/BaseCerts.h ../Ice/TempCerts.h ../Ice/ContextOpenSSLF.h ../../include/Ice/RSAPublicKey.h ../Ice/OpenSSLJanitors.h ../Ice/OpenSSLUtils.h -ContextOpenSSLClient.o: ContextOpenSSLClient.cpp ../../include/Ice/SslException.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../Ice/SslConnectionOpenSSL.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../Ice/SslConnection.h ../../include/Ice/Buffer.h ../Ice/TraceLevelsF.h ../../include/Ice/LoggerF.h ../Ice/SslConnectionF.h ../../include/Ice/CertificateVerifierF.h ../Ice/SystemInternalF.h ../Ice/SslConnectionOpenSSLF.h ../../include/Ice/CertificateVerifierOpenSSL.h ../../include/Ice/CertificateVerifier.h ../Ice/ContextOpenSSLClient.h ../Ice/ContextOpenSSL.h ../../include/Ice/InstanceF.h ../../include/Ice/PropertiesF.h ../../include/Ice/BuiltinSequences.h ../Ice/OpenSSL.h ../Ice/GeneralConfig.h ../Ice/CertificateAuthority.h ../Ice/BaseCerts.h ../Ice/CertificateDesc.h ../Ice/TempCerts.h ../Ice/ContextOpenSSLF.h ../../include/Ice/RSAPublicKey.h ../../include/Ice/RSAPublicKeyF.h ../Ice/SslConnectionOpenSSLClient.h ../Ice/TraceLevels.h ../../include/Ice/Logger.h -ContextOpenSSLServer.o: ContextOpenSSLServer.cpp ../../include/Ice/SslException.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../Ice/SslConnectionOpenSSL.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../Ice/SslConnection.h ../../include/Ice/Buffer.h ../Ice/TraceLevelsF.h ../../include/Ice/LoggerF.h ../Ice/SslConnectionF.h ../../include/Ice/CertificateVerifierF.h ../Ice/SystemInternalF.h ../Ice/SslConnectionOpenSSLF.h ../../include/Ice/CertificateVerifierOpenSSL.h ../../include/Ice/CertificateVerifier.h ../Ice/ContextOpenSSLServer.h ../Ice/ContextOpenSSL.h ../../include/Ice/InstanceF.h ../../include/Ice/PropertiesF.h ../../include/Ice/BuiltinSequences.h ../Ice/OpenSSL.h ../Ice/GeneralConfig.h ../Ice/CertificateAuthority.h ../Ice/BaseCerts.h ../Ice/CertificateDesc.h ../Ice/TempCerts.h ../Ice/ContextOpenSSLF.h ../../include/Ice/RSAPublicKey.h ../../include/Ice/RSAPublicKeyF.h ../Ice/SslConnectionOpenSSLServer.h ../Ice/OpenSSLUtils.h ../Ice/TraceLevels.h ../../include/Ice/Logger.h -SslExtension.o: SslExtension.cpp ../../include/Ice/SslExtension.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/CertificateVerifierF.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Stream.h -SslExtensionInternal.o: SslExtensionInternal.cpp ../Ice/SslExtensionInternal.h ../../include/Ice/InstanceF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/SslExtension.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/CertificateVerifierF.h ../Ice/DefaultCertificateVerifier.h ../../include/Ice/Logger.h ../Ice/TraceLevels.h ../Ice/TraceLevelsF.h ../../include/Ice/PropertiesF.h ../Ice/Instance.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/RecMutex.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LoggerF.h ../Ice/RouterInfoF.h ../Ice/ReferenceFactoryF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/ConnectionFactoryF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/SystemF.h ../Ice/SystemInternalF.h ../../include/Ice/CertificateVerifierOpenSSL.h ../../include/Ice/CertificateVerifier.h ../Ice/SingleCertificateVerifier.h -SslFactory.o: SslFactory.cpp ../Ice/Instance.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Lock.h ../../include/IceUtil/RecMutex.h ../../include/Ice/InstanceF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../Ice/RouterInfoF.h ../Ice/ReferenceFactoryF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/ConnectionFactoryF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/SystemF.h ../Ice/SystemInternalF.h ../Ice/SslFactory.h ../../include/Ice/CertificateVerifierF.h ../Ice/SystemOpenSSL.h ../Ice/GeneralConfig.h ../Ice/OpenSSL.h ../Ice/CertificateDesc.h ../Ice/CertificateAuthority.h ../Ice/BaseCerts.h ../Ice/TempCerts.h ../Ice/ContextOpenSSLServer.h ../Ice/ContextOpenSSL.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/CertificateVerifierOpenSSL.h ../../include/Ice/CertificateVerifier.h ../Ice/SslConnectionF.h ../Ice/SslConnectionOpenSSLF.h ../Ice/ContextOpenSSLF.h ../../include/Ice/RSAPublicKey.h ../../include/Ice/RSAPublicKeyF.h ../Ice/ContextOpenSSLClient.h ../Ice/SslConnectionOpenSSL.h ../Ice/SslConnection.h ../../include/Ice/Buffer.h ../Ice/SystemInternal.h ../../include/Ice/System.h ../../include/Ice/Properties.h ../Ice/OpenSSLUtils.h ../../include/Ice/RSAPrivateKeyF.h ../Ice/DHParamsF.h -GeneralConfig.o: GeneralConfig.cpp ../Ice/GeneralConfig.h ../Ice/OpenSSL.h -System.o: System.cpp ../../include/Ice/System.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/CertificateVerifierF.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Stream.h -SystemInternal.o: SystemInternal.cpp ../Ice/Instance.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Lock.h ../../include/IceUtil/RecMutex.h ../../include/Ice/InstanceF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../Ice/RouterInfoF.h ../Ice/ReferenceFactoryF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/ConnectionFactoryF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/SystemF.h ../Ice/SystemInternalF.h ../Ice/SystemInternal.h ../../include/Ice/System.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/CertificateVerifierF.h ../Ice/SslConnectionF.h ../../include/Ice/Properties.h -SystemOpenSSL.o: SystemOpenSSL.cpp ../../include/IceUtil/Config.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Lock.h ../../include/IceUtil/RecMutex.h ../Ice/SslConnectionOpenSSL.h ../Ice/SslConnection.h ../../include/IceUtil/Shared.h ../../include/Ice/Buffer.h ../../include/Ice/Config.h ../Ice/TraceLevelsF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/LoggerF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/StreamF.h ../Ice/SslConnectionF.h ../../include/Ice/CertificateVerifierF.h ../Ice/SystemInternalF.h ../Ice/SslConnectionOpenSSLF.h ../../include/Ice/CertificateVerifierOpenSSL.h ../../include/Ice/CertificateVerifier.h ../Ice/SystemOpenSSL.h ../Ice/GeneralConfig.h ../Ice/OpenSSL.h ../Ice/CertificateDesc.h ../Ice/CertificateAuthority.h ../Ice/BaseCerts.h ../Ice/TempCerts.h ../Ice/ContextOpenSSLServer.h ../Ice/ContextOpenSSL.h ../../include/Ice/InstanceF.h ../../include/Ice/PropertiesF.h ../../include/Ice/BuiltinSequences.h ../Ice/ContextOpenSSLF.h ../../include/Ice/RSAPublicKey.h ../../include/Ice/RSAPublicKeyF.h ../Ice/ContextOpenSSLClient.h ../Ice/SystemInternal.h ../../include/Ice/System.h ../../include/Ice/Properties.h ../Ice/SslFactory.h ../Ice/OpenSSLUtils.h ../../include/Ice/RSAPrivateKeyF.h ../Ice/DHParamsF.h ../../include/Ice/SslException.h ../Ice/ConfigParser.h ../Ice/OpenSSLJanitors.h ../Ice/TraceLevels.h ../../include/Ice/Logger.h ../../include/Ice/RSAPrivateKey.h ../Ice/DHParams.h -TempCerts.o: TempCerts.cpp ../Ice/TempCerts.h ../Ice/CertificateDesc.h -CertificateVerifier.o: CertificateVerifier.cpp ../../include/Ice/CertificateVerifier.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Stream.h ../../include/Ice/BuiltinSequences.h -CertificateVerifierOpenSSL.o: CertificateVerifierOpenSSL.cpp ../../include/Ice/CertificateVerifierOpenSSL.h ../../include/Ice/CertificateVerifier.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h -OpenSSLJanitors.o: OpenSSLJanitors.cpp ../Ice/OpenSSLJanitors.h ../../include/IceUtil/Config.h -RSACertificateGen.o: RSACertificateGen.cpp ../../include/IceUtil/Config.h ../../include/Ice/RSACertificateGen.h ../../include/Ice/RSAKeyPairF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../Ice/OpenSSLJanitors.h ../../include/Ice/RSAKeyPair.h ../../include/IceUtil/Shared.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/StreamF.h ../../include/Ice/RSACertificateGenF.h ../../include/Ice/RSAPrivateKeyF.h ../../include/Ice/RSAPublicKeyF.h ../../include/Ice/RSAPrivateKey.h ../../include/Ice/RSAPublicKey.h ../../include/Ice/SslException.h ../Ice/OpenSSLUtils.h -SslIceUtils.o: SslIceUtils.cpp ../../include/IceUtil/Config.h ../Ice/SslIceUtils.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h -RSAPrivateKey.o: RSAPrivateKey.cpp ../../include/IceUtil/Config.h ../../include/IceUtil/Base64.h ../../include/Ice/RSAPrivateKey.h ../../include/IceUtil/Shared.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/StreamF.h ../../include/Ice/RSAPrivateKeyF.h ../Ice/SslIceUtils.h ../Ice/OpenSSLUtils.h ../../include/Ice/SslException.h -RSAPublicKey.o: RSAPublicKey.cpp ../../include/IceUtil/Config.h ../../include/IceUtil/Base64.h ../../include/Ice/RSAPublicKey.h ../../include/IceUtil/Shared.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/StreamF.h ../../include/Ice/RSAPublicKeyF.h ../Ice/SslIceUtils.h ../Ice/OpenSSLUtils.h ../../include/Ice/SslException.h -RSAKeyPair.o: RSAKeyPair.cpp ../../include/IceUtil/Config.h ../../include/IceUtil/Base64.h ../../include/Ice/RSAKeyPair.h ../../include/IceUtil/Shared.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/StreamF.h ../../include/Ice/RSAKeyPairF.h ../../include/Ice/RSACertificateGenF.h ../../include/Ice/RSAPrivateKeyF.h ../../include/Ice/RSAPublicKeyF.h ../../include/Ice/RSAPrivateKey.h ../../include/Ice/RSAPublicKey.h -DHParams.o: DHParams.cpp ../Ice/DHParams.h ../../include/IceUtil/Config.h ../../include/IceUtil/Shared.h ../Ice/DHParamsF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h -OpenSSLUtils.o: OpenSSLUtils.cpp ../Ice/OpenSSLUtils.h ../Ice/SystemInternalF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../Ice/SystemOpenSSL.h ../Ice/TraceLevelsF.h ../../include/Ice/LoggerF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/IceUtil/RecMutex.h ../../include/IceUtil/Lock.h ../Ice/GeneralConfig.h ../Ice/OpenSSL.h ../Ice/CertificateDesc.h ../Ice/CertificateAuthority.h ../Ice/BaseCerts.h ../Ice/TempCerts.h ../Ice/ContextOpenSSLServer.h ../Ice/ContextOpenSSL.h ../../include/Ice/InstanceF.h ../../include/Ice/PropertiesF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/CertificateVerifierOpenSSL.h ../../include/Ice/CertificateVerifier.h ../Ice/SslConnectionF.h ../Ice/SslConnectionOpenSSLF.h ../Ice/ContextOpenSSLF.h ../../include/Ice/RSAPublicKey.h ../../include/Ice/RSAPublicKeyF.h ../Ice/ContextOpenSSLClient.h ../Ice/SslConnectionOpenSSL.h ../../include/IceUtil/Mutex.h ../Ice/SslConnection.h ../../include/Ice/Buffer.h ../../include/Ice/CertificateVerifierF.h ../Ice/SystemInternal.h ../../include/Ice/System.h ../../include/Ice/Properties.h ../Ice/SslFactory.h ../../include/Ice/RSAPrivateKeyF.h ../Ice/DHParamsF.h -DefaultCertificateVerifier.o: DefaultCertificateVerifier.cpp ../Ice/OpenSSL.h ../Ice/DefaultCertificateVerifier.h ../../include/IceUtil/Config.h ../../include/Ice/Logger.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../Ice/TraceLevels.h ../Ice/TraceLevelsF.h ../../include/Ice/PropertiesF.h ../Ice/Instance.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/RecMutex.h ../../include/Ice/InstanceF.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LoggerF.h ../Ice/RouterInfoF.h ../Ice/ReferenceFactoryF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/ConnectionFactoryF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/SystemF.h ../Ice/SystemInternalF.h ../../include/Ice/CertificateVerifierOpenSSL.h ../../include/Ice/CertificateVerifier.h ../Ice/OpenSSLUtils.h -SingleCertificateVerifier.o: SingleCertificateVerifier.cpp ../Ice/SingleCertificateVerifier.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/CertificateVerifierOpenSSL.h ../../include/Ice/CertificateVerifier.h ../Ice/SslIceUtils.h -UdpTransceiver.o: UdpTransceiver.cpp ../Ice/UdpTransceiver.h ../../include/Ice/InstanceF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../Ice/TraceLevelsF.h ../../include/Ice/LoggerF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../Ice/Transceiver.h ../Ice/TransceiverF.h ../Ice/Instance.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/RecMutex.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../Ice/RouterInfoF.h ../Ice/ReferenceFactoryF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/ConnectionFactoryF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/SystemF.h ../Ice/SystemInternalF.h ../Ice/TraceLevels.h ../../include/Ice/LoggerUtil.h ../../include/Ice/Buffer.h ../Ice/Network.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h +TcpConnector.o: TcpConnector.cpp ../Ice/TcpConnector.h ../Ice/TransceiverF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/InstanceF.h ../Ice/TraceLevelsF.h ../../include/Ice/LoggerF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../Ice/Connector.h ../Ice/ConnectorF.h ../Ice/TcpTransceiver.h ../Ice/Transceiver.h ../Ice/Instance.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/RecMutex.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../Ice/RouterInfoF.h ../Ice/ReferenceFactoryF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/ConnectionFactoryF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/EndpointFactoryF.h ../../include/Ice/PluginF.h ../Ice/TraceLevels.h ../../include/Ice/LoggerUtil.h ../Ice/Network.h +TcpAcceptor.o: TcpAcceptor.cpp ../Ice/TcpAcceptor.h ../Ice/TransceiverF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/InstanceF.h ../Ice/TraceLevelsF.h ../../include/Ice/LoggerF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../Ice/Acceptor.h ../Ice/AcceptorF.h ../Ice/TcpTransceiver.h ../Ice/Transceiver.h ../Ice/Instance.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/RecMutex.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../Ice/RouterInfoF.h ../Ice/ReferenceFactoryF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/ConnectionFactoryF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/EndpointFactoryF.h ../../include/Ice/PluginF.h ../Ice/TraceLevels.h ../../include/Ice/LoggerUtil.h ../Ice/Network.h +TcpTransceiver.o: TcpTransceiver.cpp ../Ice/TcpTransceiver.h ../../include/Ice/InstanceF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../Ice/TraceLevelsF.h ../../include/Ice/LoggerF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../Ice/Transceiver.h ../Ice/TransceiverF.h ../Ice/Instance.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/RecMutex.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../Ice/RouterInfoF.h ../Ice/ReferenceFactoryF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/ConnectionFactoryF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/EndpointFactoryF.h ../../include/Ice/PluginF.h ../Ice/TraceLevels.h ../../include/Ice/LoggerUtil.h ../../include/Ice/Buffer.h ../Ice/Network.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h +UdpTransceiver.o: UdpTransceiver.cpp ../Ice/UdpTransceiver.h ../../include/Ice/InstanceF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../Ice/TraceLevelsF.h ../../include/Ice/LoggerF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../Ice/Transceiver.h ../Ice/TransceiverF.h ../Ice/Instance.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/RecMutex.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../Ice/RouterInfoF.h ../Ice/ReferenceFactoryF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/ConnectionFactoryF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/EndpointFactoryF.h ../../include/Ice/PluginF.h ../Ice/TraceLevels.h ../../include/Ice/LoggerUtil.h ../../include/Ice/Buffer.h ../Ice/Network.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h DynamicLibrary.o: DynamicLibrary.cpp ../../include/Ice/DynamicLibrary.h ../../include/Ice/DynamicLibraryF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/IceUtil/Shared.h +Plugin.o: Plugin.cpp ../../include/Ice/Plugin.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h +PluginManagerI.o: PluginManagerI.cpp ../Ice/PluginManagerI.h ../../include/Ice/Plugin.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/InstanceF.h ../../include/Ice/CommunicatorF.h ../../include/Ice/DynamicLibraryF.h ../../include/Ice/BuiltinSequences.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/DynamicLibrary.h ../../include/Ice/Properties.h ../Ice/Instance.h ../../include/IceUtil/RecMutex.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../Ice/RouterInfoF.h ../Ice/ReferenceFactoryF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/ConnectionFactoryF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/EndpointFactoryF.h ../../include/Ice/PluginF.h ../../include/Ice/LoggerUtil.h ../../include/Ice/Initialize.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h diff --git a/cpp/src/Ice/Application.cpp b/cpp/src/Ice/Application.cpp index 21c04187193..7d58a235725 100644 --- a/cpp/src/Ice/Application.cpp +++ b/cpp/src/Ice/Application.cpp @@ -44,8 +44,9 @@ Ice::Application::main(int argc, char* argv[], const char* configFile) { if (configFile) { - PropertiesPtr properties = createPropertiesFromFile(argc, argv, configFile); - _communicator = initializeWithProperties(properties); + PropertiesPtr properties = createProperties(argc, argv); + properties->load(configFile); + _communicator = initializeWithProperties(argc, argv, properties); } else { diff --git a/cpp/src/Ice/CommunicatorI.cpp b/cpp/src/Ice/CommunicatorI.cpp index 1c4acac56a0..644d09031a0 100644 --- a/cpp/src/Ice/CommunicatorI.cpp +++ b/cpp/src/Ice/CommunicatorI.cpp @@ -19,8 +19,6 @@ #include <Ice/ObjectAdapterFactory.h> #include <Ice/LoggerUtil.h> #include <Ice/LocalException.h> -#include <Ice/SslExtensionInternal.h> -#include <Ice/SystemInternal.h> using namespace std; using namespace Ice; @@ -230,24 +228,23 @@ Ice::CommunicatorI::setDefaultRouter(const RouterPrx& router) _instance->referenceFactory()->setDefaultRouter(router); } -::IceSSL::SslExtensionPtr -Ice::CommunicatorI::getSslExtension() +PluginManagerPtr +Ice::CommunicatorI::getPluginManager() { - return ::IceSSL::SslExtensionPtr(new ::IceSSL::SslExtensionInternal(_instance)); -} - -::IceSSL::SystemPtr -Ice::CommunicatorI::getSslSystem() -{ - return ::IceSSL::SystemPtr::dynamicCast(_instance->getSslSystem()); + RecMutex::Lock sync(*this); + if (!_instance) + { + throw CommunicatorDestroyedException(__FILE__, __LINE__); + } + return _instance->pluginManager(); } -Ice::CommunicatorI::CommunicatorI(const PropertiesPtr& properties) +Ice::CommunicatorI::CommunicatorI(int& argc, char* argv[], const PropertiesPtr& properties) { __setNoDelete(true); try { - _instance = new Instance(this, properties); + _instance = new Instance(this, argc, argv, properties); } catch(...) { @@ -271,3 +268,9 @@ Ice::CommunicatorI::~CommunicatorI() out << "communicator has not been destroyed"; } } + +void +Ice::CommunicatorI::finishSetup(int& argc, char* argv[]) +{ + _instance->finishSetup(argc, argv); +} diff --git a/cpp/src/Ice/CommunicatorI.h b/cpp/src/Ice/CommunicatorI.h index 6e1c19598a2..d0f0e7f10ab 100644 --- a/cpp/src/Ice/CommunicatorI.h +++ b/cpp/src/Ice/CommunicatorI.h @@ -16,9 +16,6 @@ #include <Ice/ThreadPoolF.h> #include <Ice/Initialize.h> #include <Ice/Communicator.h> -#include <Ice/SslExtensionF.h> -#include <Ice/SystemInternalF.h> -#include <Ice/SystemF.h> namespace Ice { @@ -53,16 +50,21 @@ public: virtual void setDefaultRouter(const RouterPrx&); - virtual ::IceSSL::SslExtensionPtr getSslExtension(); - virtual ::IceSSL::SystemPtr getSslSystem(); + virtual PluginManagerPtr getPluginManager(); private: - CommunicatorI(const PropertiesPtr&); + CommunicatorI(int&, char*[], const PropertiesPtr&); virtual ~CommunicatorI(); + // + // Certain initialization tasks need to be completed after the + // constructor. + // + void finishSetup(int&, char*[]); + friend ICE_API CommunicatorPtr initialize(int&, char*[], Int); - friend ICE_API CommunicatorPtr initializeWithProperties(const PropertiesPtr&, Int); + friend ICE_API CommunicatorPtr initializeWithProperties(int&, char*[], const PropertiesPtr&, Int); friend ICE_API ::IceInternal::InstancePtr IceInternal::getInstance(const ::Ice::CommunicatorPtr&); ::IceInternal::InstancePtr _instance; diff --git a/cpp/src/Ice/ConnectionFactory.cpp b/cpp/src/Ice/ConnectionFactory.cpp index 2ef631073db..015bed0ebc3 100644 --- a/cpp/src/Ice/ConnectionFactory.cpp +++ b/cpp/src/Ice/ConnectionFactory.cpp @@ -24,7 +24,6 @@ #include <Ice/RouterInfo.h> #include <Ice/LocalException.h> #include <Ice/Functional.h> -#include <Ice/SslException.h> // TODO: bandaid, see below. using namespace std; using namespace Ice; @@ -107,10 +106,6 @@ IceInternal::OutgoingConnectionFactory::create(const vector<EndpointPtr>& endpoi { exception = auto_ptr<LocalException>(dynamic_cast<LocalException*>(ex.ice_clone())); } - catch (const IceSSL::SslException& ex) // TODO: bandaid to make retry w/ ssl work. - { - exception = auto_ptr<LocalException>(dynamic_cast<LocalException*>(ex.ice_clone())); - } catch (const DNSException& ex) { exception = auto_ptr<LocalException>(dynamic_cast<LocalException*>(ex.ice_clone())); @@ -322,11 +317,6 @@ IceInternal::IncomingConnectionFactory::message(BasicStream&, const ThreadPoolPt connection->activate(); _connections.push_back(connection); } - catch (const IceSSL::SslException&) - { - // TODO: bandaid. Takes care of SSL Handshake problems during - // creation of a Transceiver. Ignore, nothing we can do here. - } catch (const SocketException&) { // TODO: bandaid. Takes care of SSL Handshake problems during diff --git a/cpp/src/Ice/Endpoint.cpp b/cpp/src/Ice/Endpoint.cpp index 313343280bf..86ff556a358 100644 --- a/cpp/src/Ice/Endpoint.cpp +++ b/cpp/src/Ice/Endpoint.cpp @@ -9,17 +9,6 @@ // ********************************************************************** #include <Ice/Endpoint.h> -#include <Ice/Network.h> -#include <Ice/TcpAcceptor.h> -#include <Ice/TcpConnector.h> -#include <Ice/TcpTransceiver.h> -#include <Ice/SslAcceptor.h> -#include <Ice/SslConnector.h> -#include <Ice/SslTransceiver.h> -#include <Ice/UdpTransceiver.h> -#include <Ice/BasicStream.h> -#include <Ice/LocalException.h> -#include <Ice/Instance.h> using namespace std; using namespace Ice; @@ -27,1238 +16,3 @@ using namespace IceInternal; void IceInternal::incRef(Endpoint* p) { p->__incRef(); } void IceInternal::decRef(Endpoint* p) { p->__decRef(); } - -EndpointPtr -IceInternal::Endpoint::endpointFromString(const InstancePtr& instance, const string& str) -{ - static const string delim = " \t\n\r"; - - string::size_type beg = str.find_first_not_of(delim); - if (beg == string::npos) - { - throw EndpointParseException(__FILE__, __LINE__); - } - - string::size_type end = str.find_first_of(delim, beg); - if (end == string::npos) - { - end = str.length(); - } - - string protocol = str.substr(beg, end - beg); - - if (protocol == "default") - { - protocol = instance->defaultProtocol(); - } - - if (protocol == "tcp") - { - return new TcpEndpoint(instance, str.substr(end)); - } - - if (protocol == "ssl") - { - return new SslEndpoint(instance, str.substr(end)); - } - - if (protocol == "udp") - { - return new UdpEndpoint(instance, str.substr(end)); - } - - throw EndpointParseException(__FILE__, __LINE__); -} - -void -IceInternal::Endpoint::streamRead(BasicStream* s, EndpointPtr& v) -{ - Short type; - s->read(type); - - switch (type) - { - case TcpEndpointType: - { - v = new TcpEndpoint(s); - break; - } - - case SslEndpointType: - { - v = new SslEndpoint(s); - break; - } - - case UdpEndpointType: - { - v = new UdpEndpoint(s); - break; - } - - default: - { - v = new UnknownEndpoint(type, s); - break; - } - } -} - -IceInternal::UnknownEndpoint::UnknownEndpoint(Short type, BasicStream* s) : - _instance(s->instance()), - _type(type) -{ - s->startReadEncaps(); - Int sz = s->getReadEncapsSize(); - s->readBlob(const_cast<vector<Byte>&>(_rawBytes), sz); - s->endReadEncaps(); -} - -void -IceInternal::UnknownEndpoint::streamWrite(BasicStream* s) const -{ - s->write(_type); - s->startWriteEncaps(); - s->writeBlob(_rawBytes); - s->endWriteEncaps(); -} - -string -IceInternal::UnknownEndpoint::toString() const -{ - return string(); -} - -Short -IceInternal::UnknownEndpoint::type() const -{ - return _type; -} - -Int -IceInternal::UnknownEndpoint::timeout() const -{ - return -1; -} - -EndpointPtr -IceInternal::UnknownEndpoint::timeout(Int) const -{ - return const_cast<UnknownEndpoint*>(this); -} - -bool -IceInternal::UnknownEndpoint::datagram() const -{ - return false; -} - -bool -IceInternal::UnknownEndpoint::secure() const -{ - return false; -} - -bool -IceInternal::UnknownEndpoint::unknown() const -{ - return true; -} - -TransceiverPtr -IceInternal::UnknownEndpoint::clientTransceiver() const -{ - return 0; -} - -TransceiverPtr -IceInternal::UnknownEndpoint::serverTransceiver(EndpointPtr& endp) const -{ - endp = const_cast<UnknownEndpoint*>(this); - return 0; -} - -ConnectorPtr -IceInternal::UnknownEndpoint::connector() const -{ - return 0; -} - -AcceptorPtr -IceInternal::UnknownEndpoint::acceptor(EndpointPtr& endp) const -{ - endp = const_cast<UnknownEndpoint*>(this); - return 0; -} - -bool -IceInternal::UnknownEndpoint::equivalent(const TransceiverPtr&) const -{ - return false; -} - -bool -IceInternal::UnknownEndpoint::equivalent(const AcceptorPtr&) const -{ - return false; -} - -bool -IceInternal::UnknownEndpoint::operator==(const Endpoint& r) const -{ - const UnknownEndpoint* p = dynamic_cast<const UnknownEndpoint*>(&r); - if (!p) - { - return false; - } - - if (this == p) - { - return true; - } - - if (_type != p->_type) - { - return false; - } - - if (_rawBytes != p->_rawBytes) - { - return false; - } - - return true; -} - -bool -IceInternal::UnknownEndpoint::operator!=(const Endpoint& r) const -{ - return !operator==(r); -} - -bool -IceInternal::UnknownEndpoint::operator<(const Endpoint& r) const -{ - const UnknownEndpoint* p = dynamic_cast<const UnknownEndpoint*>(&r); - if (!p) - { - return true; // unknown is "less than" every other protocol - } - - if (this == p) - { - return false; - } - - if (_type < p->_type) - { - return true; - } - else if (p->_type < _type) - { - return false; - } - - if (_rawBytes < p->_rawBytes) - { - return true; - } - else if (p->_rawBytes < _rawBytes) - { - return false; - } - - return false; -} - -IceInternal::TcpEndpoint::TcpEndpoint(const InstancePtr& instance, const string& ho, Int po, Int ti) : - _instance(instance), - _host(ho), - _port(po), - _timeout(ti) -{ -} - -IceInternal::TcpEndpoint::TcpEndpoint(const InstancePtr& instance, const string& str) : - _instance(instance), - _port(0), - _timeout(-1) -{ - static const string delim = " \t\n\r"; - - string::size_type beg; - string::size_type end = 0; - - while (true) - { - beg = str.find_first_not_of(delim, end); - if (beg == string::npos) - { - break; - } - - end = str.find_first_of(delim, beg); - if (end == string::npos) - { - end = str.length(); - } - - string option = str.substr(beg, end - beg); - if (option.length() != 2 || option[0] != '-') - { - throw EndpointParseException(__FILE__, __LINE__); - } - - string argument; - string::size_type argumentBeg = str.find_first_not_of(delim, end); - if (argumentBeg != string::npos && str[argumentBeg] != '-') - { - beg = argumentBeg; - end = str.find_first_of(delim, beg); - if (end == string::npos) - { - end = str.length(); - } - argument = str.substr(beg, end - beg); - } - - switch (option[1]) - { - case 'h': - { - if (argument.empty()) - { - throw EndpointParseException(__FILE__, __LINE__); - } - const_cast<string&>(_host) = argument; - break; - } - - case 'p': - { - if (argument.empty()) - { - throw EndpointParseException(__FILE__, __LINE__); - } - const_cast<Int&>(_port) = atoi(argument.c_str()); - break; - } - - case 't': - { - if (argument.empty()) - { - throw EndpointParseException(__FILE__, __LINE__); - } - const_cast<Int&>(_timeout) = atoi(argument.c_str()); - break; - } - - default: - { - throw EndpointParseException(__FILE__, __LINE__); - } - } - } - - if (_host.empty()) - { - const_cast<string&>(_host) = _instance->defaultHost(); - } -} - -IceInternal::TcpEndpoint::TcpEndpoint(BasicStream* s) : - _instance(s->instance()), - _port(0), - _timeout(-1) -{ - s->startReadEncaps(); - s->read(const_cast<string&>(_host)); - s->read(const_cast<Int&>(_port)); - s->read(const_cast<Int&>(_timeout)); - s->endReadEncaps(); -} - -void -IceInternal::TcpEndpoint::streamWrite(BasicStream* s) const -{ - s->write(TcpEndpointType); - s->startWriteEncaps(); - s->write(_host); - s->write(_port); - s->write(_timeout); - s->endWriteEncaps(); -} - -string -IceInternal::TcpEndpoint::toString() const -{ - ostringstream s; - s << "tcp -h " << _host << " -p " << _port; - if (_timeout != -1) - { - s << " -t " << _timeout; - } - return s.str(); -} - -Short -IceInternal::TcpEndpoint::type() const -{ - return TcpEndpointType; -} - -Int -IceInternal::TcpEndpoint::timeout() const -{ - return _timeout; -} - -EndpointPtr -IceInternal::TcpEndpoint::timeout(Int timeout) const -{ - if (timeout == _timeout) - { - return const_cast<TcpEndpoint*>(this); - } - else - { - return new TcpEndpoint(_instance, _host, _port, timeout); - } -} - -bool -IceInternal::TcpEndpoint::datagram() const -{ - return false; -} - -bool -IceInternal::TcpEndpoint::secure() const -{ - return false; -} - -bool -IceInternal::TcpEndpoint::unknown() const -{ - return false; -} - -TransceiverPtr -IceInternal::TcpEndpoint::clientTransceiver() const -{ - return 0; -} - -TransceiverPtr -IceInternal::TcpEndpoint::serverTransceiver(EndpointPtr& endp) const -{ - endp = const_cast<TcpEndpoint*>(this); - return 0; -} - -ConnectorPtr -IceInternal::TcpEndpoint::connector() const -{ - return new TcpConnector(_instance, _host, _port); -} - -AcceptorPtr -IceInternal::TcpEndpoint::acceptor(EndpointPtr& endp) const -{ - TcpAcceptor* p = new TcpAcceptor(_instance, _host, _port); - endp = new TcpEndpoint(_instance, _host, p->effectivePort(), _timeout); - return p; -} - -bool -IceInternal::TcpEndpoint::equivalent(const TransceiverPtr&) const -{ - return false; -} - -bool -IceInternal::TcpEndpoint::equivalent(const AcceptorPtr& acceptor) const -{ - const TcpAcceptor* tcpAcceptor = dynamic_cast<const TcpAcceptor*>(acceptor.get()); - if (!tcpAcceptor) - { - return false; - } - return tcpAcceptor->equivalent(_host, _port); -} - -bool -IceInternal::TcpEndpoint::operator==(const Endpoint& r) const -{ - const TcpEndpoint* p = dynamic_cast<const TcpEndpoint*>(&r); - if (!p) - { - return false; - } - - if (this == p) - { - return true; - } - - if (_port != p->_port) - { - return false; - } - - if (_timeout != p->_timeout) - { - return false; - } - - if (_host != p->_host) - { - // - // We do the most time-consuming part of the comparison last. - // - struct sockaddr_in laddr; - struct sockaddr_in raddr; - getAddress(_host, _port, laddr); - getAddress(p->_host, p->_port, raddr); - return compareAddress(laddr, raddr); - } - - return true; -} - -bool -IceInternal::TcpEndpoint::operator!=(const Endpoint& r) const -{ - return !operator==(r); -} - -bool -IceInternal::TcpEndpoint::operator<(const Endpoint& r) const -{ - const TcpEndpoint* p = dynamic_cast<const TcpEndpoint*>(&r); - if (!p) - { - if (dynamic_cast<const SslEndpoint*>(&r)) - { - return false; // tcp is not "less than" ssl - } - - if (dynamic_cast<const UdpEndpoint*>(&r)) - { - return false; // tcp is not "less than" udp - } - - if (dynamic_cast<const UnknownEndpoint*>(&r)) - { - return false; // tcp is not "less than" unknown - } - - assert(false); - } - - if (this == p) - { - return false; - } - - if (_port < p->_port) - { - return true; - } - else if (p->_port < _port) - { - return false; - } - - if (_timeout < p->_timeout) - { - return true; - } - else if (p->_timeout < _timeout) - { - return false; - } - - if (_host != p->_host) - { - // - // We do the most time-consuming part of the comparison last. - // - struct sockaddr_in laddr; - struct sockaddr_in raddr; - getAddress(_host, _port, laddr); - getAddress(p->_host, p->_port, raddr); - if (laddr.sin_addr.s_addr < raddr.sin_addr.s_addr) - { - return true; - } - else if (raddr.sin_addr.s_addr < laddr.sin_addr.s_addr) - { - return false; - } - } - - return false; -} - -IceInternal::SslEndpoint::SslEndpoint(const InstancePtr& instance, const string& ho, Int po, Int ti) : - _instance(instance), - _host(ho), - _port(po), - _timeout(ti) -{ -} - -IceInternal::SslEndpoint::SslEndpoint(const InstancePtr& instance, const string& str) : - _instance(instance), - _port(0), - _timeout(-1) -{ - static const string delim = " \t\n\r"; - - string::size_type beg; - string::size_type end = 0; - - while (true) - { - beg = str.find_first_not_of(delim, end); - if (beg == string::npos) - { - break; - } - - end = str.find_first_of(delim, beg); - if (end == string::npos) - { - end = str.length(); - } - - string option = str.substr(beg, end - beg); - if (option.length() != 2 || option[0] != '-') - { - throw EndpointParseException(__FILE__, __LINE__); - } - - string argument; - string::size_type argumentBeg = str.find_first_not_of(delim, end); - if (argumentBeg != string::npos && str[argumentBeg] != '-') - { - beg = argumentBeg; - end = str.find_first_of(delim, beg); - if (end == string::npos) - { - end = str.length(); - } - argument = str.substr(beg, end - beg); - } - - switch (option[1]) - { - case 'h': - { - if (argument.empty()) - { - throw EndpointParseException(__FILE__, __LINE__); - } - const_cast<string&>(_host) = argument; - break; - } - - case 'p': - { - if (argument.empty()) - { - throw EndpointParseException(__FILE__, __LINE__); - } - const_cast<Int&>(_port) = atoi(argument.c_str()); - break; - } - - case 't': - { - if (argument.empty()) - { - throw EndpointParseException(__FILE__, __LINE__); - } - const_cast<Int&>(_timeout) = atoi(argument.c_str()); - break; - } - - default: - { - throw EndpointParseException(__FILE__, __LINE__); - } - } - } - - if (_host.empty()) - { - const_cast<string&>(_host) = _instance->defaultHost(); - } -} - -IceInternal::SslEndpoint::SslEndpoint(BasicStream* s) : - _instance(s->instance()), - _port(0), - _timeout(-1) -{ - s->startReadEncaps(); - s->read(const_cast<string&>(_host)); - s->read(const_cast<Int&>(_port)); - s->read(const_cast<Int&>(_timeout)); - s->endReadEncaps(); -} - -void -IceInternal::SslEndpoint::streamWrite(BasicStream* s) const -{ - s->write(SslEndpointType); - s->startWriteEncaps(); - s->write(_host); - s->write(_port); - s->write(_timeout); - s->endWriteEncaps(); -} - -string -IceInternal::SslEndpoint::toString() const -{ - ostringstream s; - s << "ssl -h " << _host << " -p " << _port; - if (_timeout != -1) - { - s << " -t " << _timeout; - } - return s.str(); -} - -Short -IceInternal::SslEndpoint::type() const -{ - return SslEndpointType; -} - -Int -IceInternal::SslEndpoint::timeout() const -{ - return _timeout; -} - -EndpointPtr -IceInternal::SslEndpoint::timeout(Int timeout) const -{ - if (timeout == _timeout) - { - return const_cast<SslEndpoint*>(this); - } - else - { - return new SslEndpoint(_instance, _host, _port, timeout); - } -} - -bool -IceInternal::SslEndpoint::datagram() const -{ - return false; -} - -bool -IceInternal::SslEndpoint::secure() const -{ - return true; -} - -bool -IceInternal::SslEndpoint::unknown() const -{ - return false; -} - -TransceiverPtr -IceInternal::SslEndpoint::clientTransceiver() const -{ - return 0; -} - -TransceiverPtr -IceInternal::SslEndpoint::serverTransceiver(EndpointPtr& endp) const -{ - endp = const_cast<SslEndpoint*>(this); - return 0; -} - -ConnectorPtr -IceInternal::SslEndpoint::connector() const -{ - return new SslConnector(_instance, _host, _port); -} - -AcceptorPtr -IceInternal::SslEndpoint::acceptor(EndpointPtr& endp) const -{ - SslAcceptor* p = new SslAcceptor(_instance, _host, _port); - endp = new SslEndpoint(_instance, _host, p->effectivePort(), _timeout); - return p; -} - -bool -IceInternal::SslEndpoint::equivalent(const TransceiverPtr&) const -{ - return false; -} - -bool -IceInternal::SslEndpoint::equivalent(const AcceptorPtr& acceptor) const -{ - const SslAcceptor* sslAcceptor = dynamic_cast<const SslAcceptor*>(acceptor.get()); - if (!sslAcceptor) - { - return false; - } - return sslAcceptor->equivalent(_host, _port); -} - -bool -IceInternal::SslEndpoint::operator==(const Endpoint& r) const -{ - const SslEndpoint* p = dynamic_cast<const SslEndpoint*>(&r); - if (!p) - { - return false; - } - - if (this == p) - { - return true; - } - - if (_port != p->_port) - { - return false; - } - - if (_timeout != p->_timeout) - { - return false; - } - - if (_host != p->_host) - { - // - // We do the most time-consuming part of the comparison last. - // - struct sockaddr_in laddr; - struct sockaddr_in raddr; - getAddress(_host, _port, laddr); - getAddress(p->_host, p->_port, raddr); - return compareAddress(laddr, raddr); - } - - return true; -} - -bool -IceInternal::SslEndpoint::operator!=(const Endpoint& r) const -{ - return !operator==(r); -} - -bool -IceInternal::SslEndpoint::operator<(const Endpoint& r) const -{ - const SslEndpoint* p = dynamic_cast<const SslEndpoint*>(&r); - if (!p) - { - if (dynamic_cast<const TcpEndpoint*>(&r)) - { - return true; // ssl is "less than" tcp - } - - if (dynamic_cast<const UdpEndpoint*>(&r)) - { - return false; // ssl is not "less than" udp - } - - if (dynamic_cast<const UnknownEndpoint*>(&r)) - { - return false; // ssl is not "less than" unknown - } - - assert(false); - } - - if (this == p) - { - return false; - } - - if (_port < p->_port) - { - return true; - } - else if (p->_port < _port) - { - return false; - } - - if (_timeout < p->_timeout) - { - return true; - } - else if (p->_timeout < _timeout) - { - return false; - } - - if (_host != p->_host) - { - // - // We do the most time-consuming part of the comparison last. - // - struct sockaddr_in laddr; - struct sockaddr_in raddr; - getAddress(_host, _port, laddr); - getAddress(p->_host, p->_port, raddr); - if (laddr.sin_addr.s_addr < raddr.sin_addr.s_addr) - { - return true; - } - else if (raddr.sin_addr.s_addr < laddr.sin_addr.s_addr) - { - return false; - } - } - - return false; -} - -IceInternal::UdpEndpoint::UdpEndpoint(const InstancePtr& instance, const string& ho, Int po) : - _instance(instance), - _host(ho), - _port(po), - _connect(false) -{ -} - -IceInternal::UdpEndpoint::UdpEndpoint(const InstancePtr& instance, const string& str) : - _instance(instance), - _port(0), - _connect(false) -{ - static const string delim = " \t\n\r"; - - string::size_type beg; - string::size_type end = 0; - - while (true) - { - beg = str.find_first_not_of(delim, end); - if (beg == string::npos) - { - break; - } - - end = str.find_first_of(delim, beg); - if (end == string::npos) - { - end = str.length(); - } - - string option = str.substr(beg, end - beg); - if (option.length() != 2 || option[0] != '-') - { - throw EndpointParseException(__FILE__, __LINE__); - } - - string argument; - string::size_type argumentBeg = str.find_first_not_of(delim, end); - if (argumentBeg != string::npos && str[argumentBeg] != '-') - { - beg = argumentBeg; - end = str.find_first_of(delim + ":", beg); - if (end == string::npos) - { - end = str.length(); - } - argument = str.substr(beg, end - beg); - } - - switch (option[1]) - { - case 'h': - { - if (argument.empty()) - { - throw EndpointParseException(__FILE__, __LINE__); - } - const_cast<string&>(_host) = argument; - break; - } - - case 'p': - { - if (argument.empty()) - { - throw EndpointParseException(__FILE__, __LINE__); - } - const_cast<Int&>(_port) = atoi(argument.c_str()); - break; - } - - case 'c': - { - if (!argument.empty()) - { - throw EndpointParseException(__FILE__, __LINE__); - } - const_cast<bool&>(_connect) = true; - break; - } - - default: - { - throw EndpointParseException(__FILE__, __LINE__); - } - } - } - - if (_host.empty()) - { - const_cast<string&>(_host) = _instance->defaultHost(); - } -} - -IceInternal::UdpEndpoint::UdpEndpoint(BasicStream* s) : - _instance(s->instance()), - _port(0), - _connect(false) -{ - s->startReadEncaps(); - s->read(const_cast<string&>(_host)); - s->read(const_cast<Int&>(_port)); - // Not transmitted. - //s->read(const_cast<bool&>(_connect)); - s->endReadEncaps(); -} - -void -IceInternal::UdpEndpoint::streamWrite(BasicStream* s) const -{ - s->write(UdpEndpointType); - s->startWriteEncaps(); - s->write(_host); - s->write(_port); - // Not transmitted. - //s->write(_connect); - s->endWriteEncaps(); -} - -string -IceInternal::UdpEndpoint::toString() const -{ - ostringstream s; - s << "udp -h " << _host << " -p " << _port; - if (_connect) - { - s << " -c"; - } - return s.str(); -} - -Short -IceInternal::UdpEndpoint::type() const -{ - return UdpEndpointType; -} - -Int -IceInternal::UdpEndpoint::timeout() const -{ - return -1; -} - -EndpointPtr -IceInternal::UdpEndpoint::timeout(Int) const -{ - return const_cast<UdpEndpoint*>(this); -} - -bool -IceInternal::UdpEndpoint::datagram() const -{ - return true; -} - -bool -IceInternal::UdpEndpoint::secure() const -{ - return false; -} - -bool -IceInternal::UdpEndpoint::unknown() const -{ - return false; -} - -TransceiverPtr -IceInternal::UdpEndpoint::clientTransceiver() const -{ - return new UdpTransceiver(_instance, _host, _port); -} - -TransceiverPtr -IceInternal::UdpEndpoint::serverTransceiver(EndpointPtr& endp) const -{ - UdpTransceiver* p = new UdpTransceiver(_instance, _host, _port, _connect); - endp = new UdpEndpoint(_instance, _host, p->effectivePort()); - return p; -} - -ConnectorPtr -IceInternal::UdpEndpoint::connector() const -{ - return 0; -} - -AcceptorPtr -IceInternal::UdpEndpoint::acceptor(EndpointPtr& endp) const -{ - endp = const_cast<UdpEndpoint*>(this); - return 0; -} - -bool -IceInternal::UdpEndpoint::equivalent(const TransceiverPtr& transceiver) const -{ - const UdpTransceiver* udpTransceiver = dynamic_cast<const UdpTransceiver*>(transceiver.get()); - if (!udpTransceiver) - { - return false; - } - return udpTransceiver->equivalent(_host, _port); -} - -bool -IceInternal::UdpEndpoint::equivalent(const AcceptorPtr&) const -{ - return false; -} - -bool -IceInternal::UdpEndpoint::operator==(const Endpoint& r) const -{ - const UdpEndpoint* p = dynamic_cast<const UdpEndpoint*>(&r); - if (!p) - { - return false; - } - - if (this == p) - { - return true; - } - - if (_port != p->_port) - { - return false; - } - - if (_connect != p->_connect) - { - return false; - } - - if (_host != p->_host) - { - // - // We do the most time-consuming part of the comparison last. - // - struct sockaddr_in laddr; - struct sockaddr_in raddr; - getAddress(_host, _port, laddr); - getAddress(p->_host, p->_port, raddr); - return compareAddress(laddr, raddr); - } - - return true; -} - -bool -IceInternal::UdpEndpoint::operator!=(const Endpoint& r) const -{ - return !operator==(r); -} - -bool -IceInternal::UdpEndpoint::operator<(const Endpoint& r) const -{ - const UdpEndpoint* p = dynamic_cast<const UdpEndpoint*>(&r); - if (!p) - { - if (dynamic_cast<const SslEndpoint*>(&r)) - { - return true; // udp is "less than" ssl - } - - if (dynamic_cast<const TcpEndpoint*>(&r)) - { - return true; // udp is "less than" tcp - } - - if (dynamic_cast<const UnknownEndpoint*>(&r)) - { - return false; // udp is not "less than" unknown - } - - assert(false); - } - - if (this == p) - { - return false; - } - - if (_port < p->_port) - { - return true; - } - else if (p->_port < _port) - { - return false; - } - - if (!_connect && p->_connect) - { - return true; - } - else if (!p->_connect && _connect) - { - return false; - } - - if (_host != p->_host) - { - // - // We do the most time-consuming part of the comparison last. - // - struct sockaddr_in laddr; - struct sockaddr_in raddr; - getAddress(_host, _port, laddr); - getAddress(p->_host, p->_port, raddr); - if (laddr.sin_addr.s_addr < raddr.sin_addr.s_addr) - { - return true; - } - else if (raddr.sin_addr.s_addr < laddr.sin_addr.s_addr) - { - return false; - } - } - - return false; -} - diff --git a/cpp/src/Ice/Endpoint.h b/cpp/src/Ice/Endpoint.h index 426ec05ffe6..814794fd545 100644 --- a/cpp/src/Ice/Endpoint.h +++ b/cpp/src/Ice/Endpoint.h @@ -23,26 +23,11 @@ namespace IceInternal class BasicStream; -const ::Ice::Short UnknownEndpointType = 0; -const ::Ice::Short TcpEndpointType = 1; -const ::Ice::Short SslEndpointType = 2; -const ::Ice::Short UdpEndpointType = 3; - class Endpoint : public ::IceUtil::Shared { public: // - // Create an endpoint from a string - // - static EndpointPtr endpointFromString(const InstancePtr&, const std::string&); - - // - // Unmarshal an endpoint - // - static void streamRead(BasicStream*, EndpointPtr&); - - // // Marshal the endpoint // virtual void streamWrite(BasicStream*) const = 0; @@ -130,155 +115,6 @@ public: virtual bool operator<(const Endpoint&) const = 0; }; -class UnknownEndpoint : public Endpoint -{ -public: - - UnknownEndpoint(::Ice::Short, BasicStream*); - - virtual void streamWrite(BasicStream*) const; - virtual std::string toString() const; - virtual ::Ice::Short type() const; - virtual ::Ice::Int timeout() const; - virtual EndpointPtr timeout(::Ice::Int) const; - virtual bool datagram() const; - virtual bool secure() const; - virtual bool unknown() const; - virtual TransceiverPtr clientTransceiver() const; - virtual TransceiverPtr serverTransceiver(EndpointPtr&) const; - virtual ConnectorPtr connector() const; - virtual AcceptorPtr acceptor(EndpointPtr&) const; - virtual bool equivalent(const TransceiverPtr&) const; - virtual bool equivalent(const AcceptorPtr&) const; - - virtual bool operator==(const Endpoint&) const; - virtual bool operator!=(const Endpoint&) const; - virtual bool operator<(const Endpoint&) const; - -private: - - // - // All members are const, because endpoints are immutable. - // - const InstancePtr _instance; - ::Ice::Short _type; - const std::vector< ::Ice::Byte> _rawBytes; -}; - -class TcpEndpoint : public Endpoint -{ -public: - - TcpEndpoint(const InstancePtr&, const std::string&, ::Ice::Int, ::Ice::Int); - TcpEndpoint(const InstancePtr&, const std::string&); - TcpEndpoint(BasicStream*); - - virtual void streamWrite(BasicStream*) const; - virtual std::string toString() const; - virtual ::Ice::Short type() const; - virtual ::Ice::Int timeout() const; - virtual EndpointPtr timeout(::Ice::Int) const; - virtual bool datagram() const; - virtual bool secure() const; - virtual bool unknown() const; - virtual TransceiverPtr clientTransceiver() const; - virtual TransceiverPtr serverTransceiver(EndpointPtr&) const; - virtual ConnectorPtr connector() const; - virtual AcceptorPtr acceptor(EndpointPtr&) const; - virtual bool equivalent(const TransceiverPtr&) const; - virtual bool equivalent(const AcceptorPtr&) const; - - virtual bool operator==(const Endpoint&) const; - virtual bool operator!=(const Endpoint&) const; - virtual bool operator<(const Endpoint&) const; - -private: - - // - // All members are const, because endpoints are immutable. - // - const InstancePtr _instance; - const std::string _host; - const ::Ice::Int _port; - const ::Ice::Int _timeout; -}; - -class SslEndpoint : public Endpoint -{ -public: - - SslEndpoint(const InstancePtr&, const std::string&, ::Ice::Int, ::Ice::Int); - SslEndpoint(const InstancePtr&, const std::string&); - SslEndpoint(BasicStream*); - - virtual void streamWrite(BasicStream*) const; - virtual std::string toString() const; - virtual ::Ice::Short type() const; - virtual ::Ice::Int timeout() const; - virtual EndpointPtr timeout(::Ice::Int) const; - virtual bool datagram() const; - virtual bool secure() const; - virtual bool unknown() const; - virtual TransceiverPtr clientTransceiver() const; - virtual TransceiverPtr serverTransceiver(EndpointPtr&) const; - virtual ConnectorPtr connector() const; - virtual AcceptorPtr acceptor(EndpointPtr&) const; - virtual bool equivalent(const TransceiverPtr&) const; - virtual bool equivalent(const AcceptorPtr&) const; - - virtual bool operator==(const Endpoint&) const; - virtual bool operator!=(const Endpoint&) const; - virtual bool operator<(const Endpoint&) const; - -private: - - // - // All members are const, because endpoints are immutable. - // - const InstancePtr _instance; - const std::string _host; - const ::Ice::Int _port; - const ::Ice::Int _timeout; -}; - -class UdpEndpoint : public Endpoint -{ -public: - - UdpEndpoint(const InstancePtr&, const std::string&, ::Ice::Int); - UdpEndpoint(const InstancePtr&, const std::string&); - UdpEndpoint(BasicStream*); - - virtual void streamWrite(BasicStream*) const; - virtual std::string toString() const; - virtual ::Ice::Short type() const; - virtual ::Ice::Int timeout() const; - virtual EndpointPtr timeout(::Ice::Int) const; - virtual bool datagram() const; - virtual bool secure() const; - virtual bool unknown() const; - virtual TransceiverPtr clientTransceiver() const; - virtual TransceiverPtr serverTransceiver(EndpointPtr&) const; - virtual ConnectorPtr connector() const; - virtual AcceptorPtr acceptor(EndpointPtr&) const; - virtual bool equivalent(const TransceiverPtr&) const; - virtual bool equivalent(const AcceptorPtr&) const; - - virtual bool operator==(const Endpoint&) const; - virtual bool operator!=(const Endpoint&) const; - virtual bool operator<(const Endpoint&) const; - -private: - - // - // All members are const, because endpoints are immutable. - // - const InstancePtr _instance; - const std::string _host; - const ::Ice::Int _port; - const bool _connect; -}; - } #endif diff --git a/cpp/src/Ice/EndpointFactory.cpp b/cpp/src/Ice/EndpointFactory.cpp new file mode 100644 index 00000000000..364d0f13142 --- /dev/null +++ b/cpp/src/Ice/EndpointFactory.cpp @@ -0,0 +1,147 @@ +// ********************************************************************** +// +// Copyright (c) 2002 +// MutableRealms, Inc. +// Huntsville, AL, USA +// +// All Rights Reserved +// +// ********************************************************************** + +#include <Ice/EndpointFactory.h> +#include <Ice/Endpoint.h> +#include <Ice/UnknownEndpoint.h> +#include <Ice/Network.h> +#include <Ice/BasicStream.h> +#include <Ice/LocalException.h> +#include <Ice/Instance.h> + +using namespace std; +using namespace Ice; +using namespace IceInternal; + +void IceInternal::incRef(EndpointFactory* p) { p->__incRef(); } +void IceInternal::decRef(EndpointFactory* p) { p->__decRef(); } +void IceInternal::incRef(EndpointFactoryManager* p) { p->__incRef(); } +void IceInternal::decRef(EndpointFactoryManager* p) { p->__decRef(); } + +IceInternal::EndpointFactory::EndpointFactory() +{ +} + +IceInternal::EndpointFactory::~EndpointFactory() +{ +} + +IceInternal::EndpointFactoryManager::EndpointFactoryManager(const InstancePtr& instance) + : _instance(instance) +{ +} + +void +IceInternal::EndpointFactoryManager::add(const EndpointFactoryPtr& factory) +{ + IceUtil::Mutex::Lock sync(*this); // TODO: Necessary? + + // + // TODO: Optimize with a map? + // + for (vector<EndpointFactoryPtr>::size_type i = 0; i < _factories.size(); i++) + { + if (_factories[i]->type() == factory->type()) + { + assert(false); // TODO: Exception? + } + } + _factories.push_back(factory); +} + +EndpointFactoryPtr +IceInternal::EndpointFactoryManager::get(Short type) const +{ + IceUtil::Mutex::Lock sync(*this); // TODO: Necessary? + + // + // TODO: Optimize with a map? + // + for (vector<EndpointFactoryPtr>::size_type i = 0; i < _factories.size(); i++) + { + if (_factories[i]->type() == type) + { + return _factories[i]; + } + } + return 0; +} + +EndpointPtr +IceInternal::EndpointFactoryManager::create(const string& str) const +{ + IceUtil::Mutex::Lock sync(*this); // TODO: Necessary? + + static const string delim = " \t\n\r"; + + string::size_type beg = str.find_first_not_of(delim); + if (beg == string::npos) + { + throw EndpointParseException(__FILE__, __LINE__); + } + + string::size_type end = str.find_first_of(delim, beg); + if (end == string::npos) + { + end = str.length(); + } + + string protocol = str.substr(beg, end - beg); + + if (protocol == "default") + { + protocol = _instance->defaultProtocol(); + } + + // + // TODO: Optimize with a map? + // + for (vector<EndpointFactoryPtr>::size_type i = 0; i < _factories.size(); i++) + { + if (_factories[i]->protocol() == protocol) + { + return _factories[i]->create(str.substr(end)); + } + } + + throw EndpointParseException(__FILE__, __LINE__); +} + +EndpointPtr +IceInternal::EndpointFactoryManager::read(BasicStream* s) const +{ + IceUtil::Mutex::Lock sync(*this); // TODO: Necessary? + + Short type; + s->read(type); + + // + // TODO: Optimize with a map? + // + for (vector<EndpointFactoryPtr>::size_type i = 0; i < _factories.size(); i++) + { + if (_factories[i]->type() == type) + { + return _factories[i]->read(s); + } + } + + return new UnknownEndpoint(type, s); +} + +void +IceInternal::EndpointFactoryManager::destroy() +{ + for (vector<EndpointFactoryPtr>::size_type i = 0; i < _factories.size(); i++) + { + _factories[i]->destroy(); + } + _factories.clear(); +} diff --git a/cpp/src/Ice/EndpointFactory.h b/cpp/src/Ice/EndpointFactory.h new file mode 100644 index 00000000000..90c1c2cf2e1 --- /dev/null +++ b/cpp/src/Ice/EndpointFactory.h @@ -0,0 +1,63 @@ +// ********************************************************************** +// +// Copyright (c) 2002 +// MutableRealms, Inc. +// Huntsville, AL, USA +// +// All Rights Reserved +// +// ********************************************************************** + +#ifndef ICE_ENDPOINT_FACTORY_H +#define ICE_ENDPOINT_FACTORY_H + +#include <IceUtil/Shared.h> +#include <IceUtil/Mutex.h> +#include <Ice/InstanceF.h> +#include <Ice/EndpointF.h> +#include <Ice/EndpointFactoryF.h> + +namespace IceInternal +{ + +class BasicStream; + +class EndpointFactory : public ::IceUtil::Shared +{ +public: + + virtual ~EndpointFactory(); + + virtual ::Ice::Short type() const = 0; + virtual const ::std::string& protocol() const = 0; + virtual EndpointPtr create(const std::string&) const = 0; + virtual EndpointPtr read(BasicStream*) const = 0; + virtual void destroy() = 0; + +protected: + + EndpointFactory(); +}; + +class EndpointFactoryManager : public ::IceUtil::Shared, public ::IceUtil::Mutex +{ +public: + + void add(const EndpointFactoryPtr&); + EndpointFactoryPtr get(::Ice::Short) const; + EndpointPtr create(const std::string&) const; + EndpointPtr read(BasicStream*) const; + +private: + + EndpointFactoryManager(const InstancePtr&); + void destroy(); + friend class Instance; + + InstancePtr _instance; + std::vector<EndpointFactoryPtr> _factories; +}; + +} + +#endif diff --git a/cpp/src/Ice/Exception.cpp b/cpp/src/Ice/Exception.cpp index 738551e0d49..45e894fc92d 100644 --- a/cpp/src/Ice/Exception.cpp +++ b/cpp/src/Ice/Exception.cpp @@ -13,6 +13,7 @@ #include <Ice/Network.h> #include <Ice/Stream.h> #include <Ice/IdentityUtil.h> +#include <Ice/Plugin.h> using namespace std; using namespace Ice; @@ -297,3 +298,17 @@ Ice::IllegalMessageSizeException::ice_print(ostream& out) const Exception::ice_print(out); out << ":\nprotocol error: illegal message size"; } + +void +Ice::PluginExistsException::ice_print(ostream& out) const +{ + Exception::ice_print(out); + out << ":\nplugin already exists"; +} + +void +Ice::PluginNotFoundException::ice_print(ostream& out) const +{ + Exception::ice_print(out); + out << ":\nplugin not found"; +} diff --git a/cpp/src/Ice/Initialize.cpp b/cpp/src/Ice/Initialize.cpp index 970e29dad6a..6bff3fa51ec 100644 --- a/cpp/src/Ice/Initialize.cpp +++ b/cpp/src/Ice/Initialize.cpp @@ -27,11 +27,15 @@ Ice::initialize(int& argc, char* argv[], Int version) } #endif - return new CommunicatorI(getDefaultProperties(argc, argv)); + PropertiesPtr defaultProperties = getDefaultProperties(argc, argv); + CommunicatorI* communicatorI = new CommunicatorI(argc, argv, defaultProperties); + CommunicatorPtr result = communicatorI; // For exception safety. + communicatorI->finishSetup(argc, argv); + return result; } CommunicatorPtr -Ice::initializeWithProperties(const PropertiesPtr& properties, Int version) +Ice::initializeWithProperties(int& argc, char* argv[], const PropertiesPtr& properties, Int version) { #ifndef ICE_IGNORE_VERSION if (version != ICE_INT_VERSION) @@ -40,7 +44,10 @@ Ice::initializeWithProperties(const PropertiesPtr& properties, Int version) } #endif - return new CommunicatorI(properties); + CommunicatorI* communicatorI = new CommunicatorI(argc, argv, properties); + CommunicatorPtr result = communicatorI; // For exception safety. + communicatorI->finishSetup(argc, argv); + return result; } static PropertiesPtr defaultProperties; @@ -56,6 +63,16 @@ public: static DefaultPropertiesDestroyer defaultPropertiesDestroyer; PropertiesPtr +Ice::getDefaultProperties() +{ + if (!defaultProperties) + { + defaultProperties = createProperties(); + } + return defaultProperties; +} + +PropertiesPtr Ice::getDefaultProperties(int& argc, char* argv[]) { if (!defaultProperties) @@ -66,21 +83,51 @@ Ice::getDefaultProperties(int& argc, char* argv[]) } PropertiesPtr +Ice::createProperties() +{ + return new PropertiesI(); +} + +PropertiesPtr Ice::createProperties(int& argc, char* argv[]) { return new PropertiesI(argc, argv); } -PropertiesPtr -Ice::createPropertiesFromFile(int& argc, char* argv[], const string& file) +StringSeq +Ice::argsToStringSeq(int argc, char* argv[]) { - return new PropertiesI(argc, argv, file); + StringSeq result; + for (int i = 0; i < argc; i++) + { + result.push_back(argv[i]); + } + return result; } void -Ice::addArgumentPrefix(const std::string& prefix) +Ice::stringSeqToArgs(const StringSeq& args, int& argc, char* argv[]) { - PropertiesI::addArgumentPrefix(prefix); + // + // Shift all elements in argv which are present in args to the + // beginning of argv. + // + int i = 0; + while (i < argc) + { + if (find(args.begin(), args.end(), argv[i]) == args.end()) + { + for (int j = i; j < argc - 1; j++) + { + argv[j] = argv[j + 1]; + } + --argc; + } + else + { + ++i; + } + } } InstancePtr diff --git a/cpp/src/Ice/Instance.cpp b/cpp/src/Ice/Instance.cpp index 6e534c3f9f7..408dd4be948 100644 --- a/cpp/src/Ice/Instance.cpp +++ b/cpp/src/Ice/Instance.cpp @@ -23,8 +23,11 @@ #include <Ice/Properties.h> #include <Ice/LoggerI.h> #include <Ice/Network.h> -#include <Ice/SystemInternal.h> -#include <Ice/SslFactory.h> +#include <Ice/EndpointFactory.h> +#include <Ice/TcpEndpoint.h> +#include <Ice/UdpEndpoint.h> +#include <Ice/PluginManagerI.h> +#include <Ice/Initialize.h> #ifndef _WIN32 # include <Ice/SysLoggerI.h> @@ -117,12 +120,6 @@ IceInternal::Instance::defaultHost() return _defaultHost; } -::IceSSL::SystemInternalPtr -IceInternal::Instance::getSslSystem() -{ - return _sslSystem; -} - RouterManagerPtr IceInternal::Instance::routerManager() { @@ -204,13 +201,35 @@ IceInternal::Instance::serverThreadPool() return _serverThreadPool; } -IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const PropertiesPtr& properties) : +EndpointFactoryManagerPtr +IceInternal::Instance::endpointFactoryManager() +{ + IceUtil::RecMutex::Lock sync(*this); + return _endpointFactoryManager; +} + +PluginManagerPtr +IceInternal::Instance::pluginManager() +{ + IceUtil::RecMutex::Lock sync(*this); + return _pluginManager; +} + +IceInternal::Instance::Instance(const CommunicatorPtr& communicator, int& argc, char* argv[], + const PropertiesPtr& properties) : _communicator(communicator), _properties(properties) { IceUtil::Mutex::Lock sync(*_globalStateMutex); ++_globalStateCounter; + // + // Convert command-line options beginning with --Ice. to properties. + // + StringSeq args = argsToStringSeq(argc, argv); + args = properties->parseCommandLineOptions("Ice", args); + stringSeqToArgs(args, argc, argv); + try { __setNoDelete(true); @@ -303,6 +322,18 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const Prope _referenceFactory = new ReferenceFactory(this); _proxyFactory = new ProxyFactory(this); + + // + // Install TCP and UDP endpoint factories. + // + _endpointFactoryManager = new EndpointFactoryManager(this); + EndpointFactoryPtr tcpEndpointFactory = new TcpEndpointFactory(this); + _endpointFactoryManager->add(tcpEndpointFactory); + EndpointFactoryPtr udpEndpointFactory = new UdpEndpointFactory(this); + _endpointFactoryManager->add(udpEndpointFactory); + + _pluginManager = new PluginManagerI(this); + string router = _properties->getProperty("Ice.DefaultRouter"); if (!router.empty()) { @@ -316,53 +347,7 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const Prope _userExceptionFactoryManager = new UserExceptionFactoryManager(); _objectAdapterFactory = new ObjectAdapterFactory(this); - - _sslSystem = IceSSL::Factory::getSystem(this); - _sslSystem->configure(); - -#ifndef _WIN32 - // - // daemon() must be called after the SSL system has been - // configured, since SSL might want to read a passphrase from - // standard input. - // - if (_properties->getPropertyAsInt("Ice.Daemon") > 0) - { - int noclose = _properties->getPropertyAsInt("Ice.DaemonNoClose"); - int nochdir = _properties->getPropertyAsInt("Ice.DaemonNoChdir"); - - if (daemon(nochdir, noclose) == -1) - { - SystemException ex(__FILE__, __LINE__); - ex.error = getSystemErrno(); - throw ex; - } - } -#endif - - // - // Must be done after daemon() is called, since daemon() - // forks. Does not work together with Ice.Daemon if - // Ice.DaemonNoClose is not set. - // - if (_properties->getPropertyAsInt("Ice.PrintProcessId") > 0) - { -#ifdef _WIN32 - cout << _getpid() << endl; -#else - cout << getpid() << endl; -#endif - } - // - // Thread pool initializations must be done after daemon() is - // called, since daemon() forks. - // - - // - // Thread pool initialization is now lazy initialization in - // clientThreadPool() and serverThreadPool(). - // __setNoDelete(false); } catch(...) @@ -386,7 +371,8 @@ IceInternal::Instance::~Instance() assert(!_clientThreadPool); assert(!_serverThreadPool); assert(!_routerManager); - assert(!_sslSystem); + assert(!_endpointFactoryManager); + assert(!_pluginManager); if (_globalStateMutex != 0) { @@ -424,10 +410,66 @@ IceInternal::Instance::~Instance() } void +IceInternal::Instance::finishSetup(int& argc, char* argv[]) +{ + // + // Load plug-ins. + // + PluginManagerI* pluginManagerImpl = dynamic_cast<PluginManagerI*>(_pluginManager.get()); + assert(pluginManagerImpl); + pluginManagerImpl->loadPlugins(argc, argv); + +#ifndef _WIN32 + // + // daemon() must be called after any plug-ins have been + // installed. For example, an SSL plug-in might want to + // read a passphrase from standard input. + // + if (_properties->getPropertyAsInt("Ice.Daemon") > 0) + { + int noclose = _properties->getPropertyAsInt("Ice.DaemonNoClose"); + int nochdir = _properties->getPropertyAsInt("Ice.DaemonNoChdir"); + + if (daemon(nochdir, noclose) == -1) + { + SystemException ex(__FILE__, __LINE__); + ex.error = getSystemErrno(); + throw ex; + } + } +#endif + + // + // Must be done after daemon() is called, since daemon() + // forks. Does not work together with Ice.Daemon if + // Ice.DaemonNoClose is not set. + // + if (_properties->getPropertyAsInt("Ice.PrintProcessId") > 0) + { +#ifdef _WIN32 + cout << _getpid() << endl; +#else + cout << getpid() << endl; +#endif + } + + // + // Thread pool initializations must be done after daemon() is + // called, since daemon() forks. + // + + // + // Thread pool initialization is now lazy initialization in + // clientThreadPool() and serverThreadPool(). + // +} + +void IceInternal::Instance::destroy() { ThreadPoolPtr clientThreadPool; ThreadPoolPtr serverThreadPool; + PluginManagerPtr pluginManager; { IceUtil::RecMutex::Lock sync(*this); @@ -481,18 +523,18 @@ IceInternal::Instance::destroy() _outgoingConnectionFactory->destroy(); _outgoingConnectionFactory = 0; } - + if (_routerManager) { _routerManager->destroy(); _routerManager = 0; } - if (_sslSystem) - { - // No destroy method defined. - _sslSystem = 0; - } + if (_endpointFactoryManager) + { + _endpointFactoryManager->destroy(); + _endpointFactoryManager = 0; + } // // We destroy the thread pool outside the thread @@ -502,6 +544,12 @@ IceInternal::Instance::destroy() _clientThreadPool = 0; serverThreadPool = _serverThreadPool; _serverThreadPool = 0; + + // + // We destroy the plugin manager after the thread pools. + // + pluginManager = _pluginManager; + _pluginManager = 0; } if (clientThreadPool) @@ -517,4 +565,9 @@ IceInternal::Instance::destroy() serverThreadPool->destroy(); serverThreadPool->joinWithAllThreads(); } + + if (pluginManager) + { + pluginManager->destroy(); + } } diff --git a/cpp/src/Ice/Instance.h b/cpp/src/Ice/Instance.h index 7b8cd41c553..1adee3f83b0 100644 --- a/cpp/src/Ice/Instance.h +++ b/cpp/src/Ice/Instance.h @@ -27,8 +27,8 @@ #include <Ice/ObjectFactoryManagerF.h> #include <Ice/UserExceptionFactoryManagerF.h> #include <Ice/ObjectAdapterFactoryF.h> -#include <Ice/SystemF.h> -#include <Ice/SystemInternalF.h> +#include <Ice/EndpointFactoryF.h> +#include <Ice/PluginF.h> #include <list> namespace Ice @@ -61,12 +61,14 @@ public: ThreadPoolPtr serverThreadPool(); std::string defaultProtocol(); std::string defaultHost(); - ::IceSSL::SystemInternalPtr getSslSystem(); + EndpointFactoryManagerPtr endpointFactoryManager(); + ::Ice::PluginManagerPtr pluginManager(); private: - Instance(const ::Ice::CommunicatorPtr&, const ::Ice::PropertiesPtr&); + Instance(const ::Ice::CommunicatorPtr&, int&, char*[], const ::Ice::PropertiesPtr&); virtual ~Instance(); + void finishSetup(int&, char*[]); void destroy(); friend class ::Ice::CommunicatorI; @@ -85,7 +87,8 @@ private: ThreadPoolPtr _serverThreadPool; std::string _defaultProtocol; // Immutable, not reset by destroy(). std::string _defaultHost; // Immutable, not reset by destroy(). - ::IceSSL::SystemInternalPtr _sslSystem; + EndpointFactoryManagerPtr _endpointFactoryManager; + ::Ice::PluginManagerPtr _pluginManager; // // Global state management diff --git a/cpp/src/Ice/Makefile b/cpp/src/Ice/Makefile index cb655b08f97..a850e4fe142 100644 --- a/cpp/src/Ice/Makefile +++ b/cpp/src/Ice/Makefile @@ -45,6 +45,10 @@ OBJS = Initialize.o \ UserExceptionFactory.o \ UserExceptionFactoryManager.o \ Endpoint.o \ + EndpointFactory.o \ + TcpEndpoint.o \ + UdpEndpoint.o \ + UnknownEndpoint.o \ Reference.o \ ReferenceFactory.o \ Identity.o \ @@ -71,45 +75,10 @@ OBJS = Initialize.o \ TcpConnector.o \ TcpAcceptor.o \ TcpTransceiver.o \ - SslException.o \ - SslException2.o \ - SslConnector.o \ - SslAcceptor.o \ - SslTransceiver.o \ - BaseCerts.o \ - CertificateAuthority.o \ - CertificateDesc.o \ - ConfigParser.o \ - ConfigParserErrorReporter.o \ - SslConnection.o \ - SslConnectionOpenSSLClient.o \ - SslConnectionOpenSSL.o \ - SslConnectionOpenSSLServer.o \ - ContextOpenSSL.o \ - ContextOpenSSLClient.o \ - ContextOpenSSLServer.o \ - SslExtension.o \ - SslExtensionInternal.o \ - SslFactory.o \ - GeneralConfig.o \ - System.o \ - SystemInternal.o \ - SystemOpenSSL.o \ - TempCerts.o \ - CertificateVerifier.o \ - CertificateVerifierOpenSSL.o \ - OpenSSLJanitors.o \ - RSACertificateGen.o \ - SslIceUtils.o \ - RSAPrivateKey.o \ - RSAPublicKey.o \ - RSAKeyPair.o \ - DHParams.o \ - OpenSSLUtils.o \ - DefaultCertificateVerifier.o \ - SingleCertificateVerifier.o \ UdpTransceiver.o \ - DynamicLibrary.o + DynamicLibrary.o \ + Plugin.o \ + PluginManagerI.o SRCS = $(OBJS:.o=.cpp) @@ -119,7 +88,7 @@ SLICECMD = $(SLICE2CPP) --include-dir Ice --dll-export ICE_API -I$(slicedir) include $(top_srcdir)/config/Make.rules -CPPFLAGS := -I.. $(CPPFLAGS) -I$(OPENSSL_HOME)/include -I$(XERCESC_HOME)/include/xercesc +CPPFLAGS := -I.. $(CPPFLAGS) $(VERSIONED_NAME): $(OBJS) rm -f $@ @@ -137,14 +106,6 @@ $(HDIR)/LocalException.h LocalException.cpp: $(SDIR)/LocalException.ice $(SLICE2 clean:: rm -f $(HDIR)/LocalException.h LocalException.cpp -$(HDIR)/SslException.h SslException.cpp: $(SDIR)/SslException.ice $(SLICE2CPP) - rm -f $(HDIR)/SslException.h SslException.cpp - $(SLICECMD) $(SDIR)/SslException.ice - mv SslException.h $(HDIR) - -clean:: - rm -f $(HDIR)/SslException.h SslException.cpp - $(HDIR)/Communicator.h Communicator.cpp: $(SDIR)/Communicator.ice $(SLICE2CPP) rm -f $(HDIR)/Communicator.h Communicator.cpp $(SLICECMD) -DICE_CPP $(SDIR)/Communicator.ice @@ -221,57 +182,6 @@ $(HDIR)/ObjectAdapterF.h: $(SDIR)/ObjectAdapterF.ice $(SLICE2CPP) clean:: rm -f $(HDIR)/ObjectAdapterF.h -$(HDIR)/CertificateVerifier.h CertificateVerifier.cpp: $(SDIR)/CertificateVerifier.ice $(SLICE2CPP) - rm -f $(HDIR)/CertificateVerifier.h CertificateVerifier.cpp - $(SLICECMD) $(SDIR)/CertificateVerifier.ice - mv CertificateVerifier.h $(HDIR) - -clean:: - rm -f $(HDIR)/CertificateVerifier.h CertificateVerifier.cpp - -$(HDIR)/CertificateVerifierF.h: $(SDIR)/CertificateVerifierF.ice $(SLICE2CPP) - rm -f $(HDIR)/CertificateVerifierF.h CertificateVerifierF.cpp - $(SLICECMD) $(SDIR)/CertificateVerifierF.ice - mv CertificateVerifierF.h $(HDIR) - rm -f CertificateVerifierF.cpp - -clean:: - rm -f $(HDIR)/CertificateVerifierF.h - -$(HDIR)/System.h System.cpp: $(SDIR)/System.ice $(SLICE2CPP) - rm -f $(HDIR)/System.h System.cpp - $(SLICECMD) $(SDIR)/System.ice - mv System.h $(HDIR) - -clean:: - rm -f $(HDIR)/System.h System.cpp - -$(HDIR)/SystemF.h: $(SDIR)/SystemF.ice $(SLICE2CPP) - rm -f $(HDIR)/SystemF.h SystemF.cpp - $(SLICECMD) $(SDIR)/SystemF.ice - mv SystemF.h $(HDIR) - rm -f SystemF.cpp - -clean:: - rm -f $(HDIR)/SystemF.h - -$(HDIR)/SslExtension.h SslExtension.cpp: $(SDIR)/SslExtension.ice $(SLICE2CPP) - rm -f $(HDIR)/SslExtension.h SslExtension.cpp - $(SLICECMD) $(SDIR)/SslExtension.ice - mv SslExtension.h $(HDIR) - -clean:: - rm -f $(HDIR)/SslExtension.h SslExtension.cpp - -$(HDIR)/SslExtensionF.h: $(SDIR)/SslExtensionF.ice $(SLICE2CPP) - rm -f $(HDIR)/SslExtensionF.h SslExtensionF.cpp - $(SLICECMD) $(SDIR)/SslExtensionF.ice - mv SslExtensionF.h $(HDIR) - rm -f SslExtensionF.cpp - -clean:: - rm -f $(HDIR)/SslExtensionF.h - $(HDIR)/ServantLocator.h ServantLocator.cpp: $(SDIR)/ServantLocator.ice $(SLICE2CPP) rm -f $(HDIR)/ServantLocator.h ServantLocator.cpp $(SLICECMD) $(SDIR)/ServantLocator.ice @@ -370,7 +280,21 @@ $(HDIR)/RouterF.h: $(SDIR)/RouterF.ice $(SLICE2CPP) mv RouterF.h $(HDIR) rm -f RouterF.cpp +$(HDIR)/Plugin.h Plugin.cpp: $(SDIR)/Plugin.ice $(SLICE2CPP) + rm -f $(HDIR)/Plugin.h Plugin.cpp + $(SLICECMD) $(SDIR)/Plugin.ice + mv Plugin.h $(HDIR) + +clean:: + rm -f $(HDIR)/Plugin.h Plugin.cpp + +$(HDIR)/PluginF.h: $(SDIR)/PluginF.ice $(SLICE2CPP) + rm -f $(HDIR)/PluginF.h PluginF.cpp + $(SLICECMD) $(SDIR)/PluginF.ice + mv PluginF.h $(HDIR) + rm -f PluginF.cpp + clean:: - rm -f $(HDIR)/RouterF.h + rm -f $(HDIR)/PluginF.h include .depend diff --git a/cpp/src/Ice/Network.cpp b/cpp/src/Ice/Network.cpp index 80b81509af6..4c8007df1f5 100644 --- a/cpp/src/Ice/Network.cpp +++ b/cpp/src/Ice/Network.cpp @@ -630,7 +630,7 @@ IceInternal::getLocalHost(bool numeric) { entry = gethostbyname(host); } -#ifdef WIN32 +#ifdef _WIN32 while (!entry && WSAGetLastError() == WSATRY_AGAIN && --retry >= 0); #else while (!entry && h_errno == TRY_AGAIN && --retry >= 0); diff --git a/cpp/src/Ice/ObjectAdapterI.cpp b/cpp/src/Ice/ObjectAdapterI.cpp index 26f573cb906..632f71bb8d2 100644 --- a/cpp/src/Ice/ObjectAdapterI.cpp +++ b/cpp/src/Ice/ObjectAdapterI.cpp @@ -16,6 +16,7 @@ #include <Ice/ProxyFactory.h> #include <Ice/ReferenceFactory.h> #include <Ice/Endpoint.h> +#include <Ice/EndpointFactory.h> #include <Ice/ConnectionFactory.h> #include <Ice/RouterInfo.h> #include <Ice/LocalException.h> @@ -415,7 +416,7 @@ Ice::ObjectAdapterI::ObjectAdapterI(const InstancePtr& instance, const string& n // might change it, for example, to fill in the real port // number if a zero port number is given. // - EndpointPtr endp = Endpoint::endpointFromString(instance, es); + EndpointPtr endp = _instance->endpointFactoryManager()->create(es); _incomingConnectionFactories.push_back(new IncomingConnectionFactory(instance, endp, this)); end = end + 1; diff --git a/cpp/src/Ice/PluginManagerI.cpp b/cpp/src/Ice/PluginManagerI.cpp new file mode 100644 index 00000000000..7aac61e758d --- /dev/null +++ b/cpp/src/Ice/PluginManagerI.cpp @@ -0,0 +1,262 @@ +// ********************************************************************** +// +// Copyright (c) 2002 +// MutableRealms, Inc. +// Huntsville, AL, USA +// +// All Rights Reserved +// +// ********************************************************************** + +#include <Ice/PluginManagerI.h> +#include <Ice/DynamicLibrary.h> +#include <Ice/Properties.h> +#include <Ice/Instance.h> +#include <Ice/LoggerUtil.h> +#include <Ice/Initialize.h> +#include <Ice/LocalException.h> + +using namespace std; +using namespace Ice; +using namespace IceInternal; + +typedef Ice::Plugin* (*PLUGIN_FACTORY)(const CommunicatorPtr&, const string&, const StringSeq&); + +Ice::PluginManagerI::PluginManagerI(const InstancePtr& instance) + : _instance(instance) +{ +} + +PluginPtr +Ice::PluginManagerI::getPlugin(const string& name) +{ + IceUtil::Mutex::Lock sync(*this); + + map<string, PluginInfo>::const_iterator r = _plugins.find(name); + if (r != _plugins.end()) + { + return (*r).second.plugin; + } + throw PluginNotFoundException(__FILE__, __LINE__); +} + +void +Ice::PluginManagerI::addPlugin(const string& name, const PluginPtr& plugin) +{ + IceUtil::Mutex::Lock sync(*this); + + map<string, PluginInfo>::const_iterator r = _plugins.find(name); + if (r != _plugins.end()) + { + throw PluginExistsException(__FILE__, __LINE__); + } + PluginInfo info; + info.plugin = plugin; + _plugins[name] = info; +} + +void +Ice::PluginManagerI::destroy() +{ + IceUtil::Mutex::Lock sync(*this); + + map<string, PluginInfo>::iterator r; + for (r = _plugins.begin(); r != _plugins.end(); ++r) + { + (*r).second.plugin->destroy(); + (*r).second.plugin = 0; + (*r).second.library = 0; + } +} + +void +Ice::PluginManagerI::loadPlugins(int& argc, char* argv[]) +{ + StringSeq cmdArgs = argsToStringSeq(argc, argv); + + // + // Load and initialize the plug-ins defined in the property set + // with the prefix "Ice.Plugin.". These properties should + // have the following format: + // + // Ice.Plugin.name=entry_point [args] + // + const string prefix = "Ice.Plugin."; + PropertiesPtr properties = _instance->properties(); + StringSeq plugins = properties->getProperties(prefix); + for (StringSeq::size_type i = 0; i < plugins.size(); i += 2) + { + string name = plugins[i].substr(prefix.size()); + string value = plugins[i + 1]; + + // + // Separate the entry point from the arguments. + // + string entryPoint; + StringSeq args; + string::size_type pos = value.find_first_of(" \t\n"); + if (pos == string::npos) + { + entryPoint = value; + } + else + { + entryPoint = value.substr(0, pos); + string::size_type beg = value.find_first_not_of(" \t\n", pos); + while (beg != string::npos) + { + string::size_type end = value.find_first_of(" \t\n", beg); + if (end == string::npos) + { + args.push_back(value.substr(beg)); + beg = end; + } + else + { + args.push_back(value.substr(beg, end - beg)); + beg = value.find_first_not_of(" \t\n", end); + } + } + } + + // + // Convert command-line options into properties. First we + // convert the options from the plug-in configuration, then + // we convert the options from the application command-line. + // + args = properties->parseCommandLineOptions(name, args); + cmdArgs = properties->parseCommandLineOptions(name, cmdArgs); + + loadPlugin(name, entryPoint, args); + } + + stringSeqToArgs(cmdArgs, argc, argv); +} + +void +Ice::PluginManagerI::loadPlugin(const string& name, const string& entryPoint, const StringSeq& args) +{ + // + // Parse the entry point. An entry point has the following format: + // + // name[,version]:function + // + // The name of the shared library/DLL is constructed from the + // given information. If no version is supplied, the Ice version + // is used. For example, consider the following entry point: + // + // foo:create + // + // This would result in libfoo.so.0.0.1 (Unix) and foo001.dll (Windows), + // where the Ice version is 0.0.1. + // + // Now consider this entry point: + // + // foo,1.1:create + // + // The library names in this case are libfoo.so.1.1 (Unix) and + // foo11.dll (Windows). + // + // On Windows platforms, a 'd' is appended to the version for debug + // builds. + // + string::size_type colon = entryPoint.rfind(':'); + string::size_type comma = entryPoint.find(','); + if (colon == string::npos || colon == entryPoint.size() - 1 || + (comma != string::npos && (comma > colon || comma == colon - 1))) + { + Error out(_instance->logger()); + out << "PluginManager: invalid entry point format `" << entryPoint << "'"; + SystemException ex(__FILE__, __LINE__); + ex.error = 0; + throw ex; + } + string libSpec = entryPoint.substr(0, colon); + string funcName = entryPoint.substr(colon + 1); + string libName, version, debug; + if (comma == string::npos) + { + libName = libSpec; + version = ICE_STRING_VERSION; + } + else + { + libName = libSpec.substr(0, comma); + version = libSpec.substr(comma + 1); + } + + string lib; + +#ifdef _WIN32 + lib = libName; + for (string::size_type n = 0; n < version.size(); n++) + { + if (version[n] != '.') // Remove periods + { + lib += version[n]; + } + } +# ifdef _DEBUG + lib += 'd'; +# endif + lib += ".dll"; +#else + lib = "lib" + libName + ".so." + version; +#endif + + // + // Load the dynamic library. + // + PluginInfo info; + info.library = new DynamicLibrary(); + if (!info.library->load(lib)) + { + Error out(_instance->logger()); + string msg = info.library->getErrorMessage(); + out << "PluginManager: unable to load library `" << lib << "'"; + if (!msg.empty()) + { + out << ": " + msg; + } + SystemException ex(__FILE__, __LINE__); + ex.error = getSystemErrno(); + throw ex; + } + + // + // Lookup the factory function. + // + DynamicLibrary::symbol_type sym = info.library->getSymbol(funcName); + if (sym == 0) + { + Error out(_instance->logger()); + string msg = info.library->getErrorMessage(); + out << "PluginManager: unable to find function `" << funcName << "' in library `" << lib << "'"; + if (!msg.empty()) + { + out << ": " + msg; + } + SystemException ex(__FILE__, __LINE__); + ex.error = getSystemErrno(); + throw ex; + } + + // + // Invoke the factory function. + // + PLUGIN_FACTORY factory = (PLUGIN_FACTORY)sym; + try + { + info.plugin = factory(_instance->communicator(), name, args); + } + catch (const Exception& ex) + { + Error out(_instance->logger()); + out << "PluginManager: exception in factory function `" << funcName << "': " << ex.ice_name(); + SystemException ex(__FILE__, __LINE__); + ex.error = 0; + throw ex; + } + + _plugins[name] = info; +} diff --git a/cpp/src/Ice/PluginManagerI.h b/cpp/src/Ice/PluginManagerI.h new file mode 100644 index 00000000000..60663ffdc38 --- /dev/null +++ b/cpp/src/Ice/PluginManagerI.h @@ -0,0 +1,55 @@ +// ********************************************************************** +// +// Copyright (c) 2002 +// MutableRealms, Inc. +// Huntsville, AL, USA +// +// All Rights Reserved +// +// ********************************************************************** + +#ifndef ICE_PLUGIN_MANAGER_I_H +#define ICE_PLUGIN_MANAGER_I_H + +#include <Ice/Plugin.h> +#include <Ice/InstanceF.h> +#include <Ice/CommunicatorF.h> +#include <Ice/DynamicLibraryF.h> +#include <Ice/BuiltinSequences.h> +#include <IceUtil/Mutex.h> +#include <map> + +namespace Ice +{ + +class PluginManagerI : public PluginManager, public IceUtil::Mutex +{ +public: + + virtual PluginPtr getPlugin(const std::string&); + + virtual void addPlugin(const std::string&, const PluginPtr&); + + virtual void destroy(); + + struct PluginInfo + { + PluginPtr plugin; + IceInternal::DynamicLibraryPtr library; + }; + +private: + + PluginManagerI(const IceInternal::InstancePtr&); + void loadPlugins(int&, char*[]); + friend class IceInternal::Instance; + + void loadPlugin(const std::string&, const std::string&, const StringSeq&); + + IceInternal::InstancePtr _instance; + std::map<std::string, PluginInfo> _plugins; +}; + +} + +#endif diff --git a/cpp/src/Ice/PropertiesI.cpp b/cpp/src/Ice/PropertiesI.cpp index 10f2c8948a6..815c326d082 100644 --- a/cpp/src/Ice/PropertiesI.cpp +++ b/cpp/src/Ice/PropertiesI.cpp @@ -16,8 +16,6 @@ using namespace std; using namespace Ice; using namespace IceInternal; -std::set<string> Ice::PropertiesI::_argumentPrefixes; - string Ice::PropertiesI::getProperty(const string& key) { @@ -114,27 +112,122 @@ Ice::PropertiesI::getCommandLineOptions() return result; } +StringSeq +Ice::PropertiesI::parseCommandLineOptions(const string& prefix, const StringSeq& options) +{ + StringSeq result; + StringSeq::size_type i; + for (i = 0; i < options.size(); i++) + { + string opt = options[i]; + if (opt.find("--" + prefix + ".") == 0) + { + if (opt.find('=') == string::npos) + { + opt += "=1"; + } + + parseLine(opt.substr(2)); + } + else + { + result.push_back(opt); + } + } + return result; +} + +void +Ice::PropertiesI::load(const std::string& file) +{ + ifstream in(file.c_str()); + if (!in) + { + SystemException ex(__FILE__, __LINE__); + ex.error = getSystemErrno(); + throw ex; + } + + char line[1024]; + while (in.getline(line, 1024)) + { + parseLine(line); + } +} + PropertiesPtr Ice::PropertiesI::clone() { IceUtil::Mutex::Lock sync(*this); - int dummy = 0; - PropertiesI* p = new PropertiesI(dummy, 0); + PropertiesI* p = new PropertiesI(); p->_properties = _properties; return p; } -void -Ice::PropertiesI::addArgumentPrefix(const std::string& prefix) +Ice::PropertiesI::PropertiesI() { - _argumentPrefixes.insert(prefix); + const char* s = getenv("ICE_CONFIG"); + if (s && *s != '\0') + { + load(s); + setProperty("Ice.Config", s); + } } Ice::PropertiesI::PropertiesI(int& argc, char* argv[]) { for (int i = 1; i < argc; ++i) { + if (strncmp(argv[i], "--Ice.Config", 12) == 0) + { + string line = argv[i]; + if (line.find('=') == string::npos) + { + line += "=1"; + } + parseLine(line.substr(2)); + for (int j = i; j + 1 < argc; ++j) + { + argv[j] = argv[j + 1]; + } + --argc; + } + } + + string file = getProperty("Ice.Config"); + + if (file.empty() || file == "1") + { + const char* s = getenv("ICE_CONFIG"); + if (s && *s != '\0') + { + file = s; + } + } + + if (!file.empty()) + { + load(file); + } + + setProperty("Ice.Config", file); + + if (argc > 0) + { + string name = getProperty("Ice.ProgramName"); + if (name.empty()) + { + setProperty("Ice.ProgramName", argv[0]); + } + } +} + +#if 0 +Ice::PropertiesI::PropertiesI(int& argc, char* argv[]) +{ + for (int i = 1; i < argc; ++i) + { if (strncmp(argv[i], "--Ice.Config", 12) == 0) { string line = argv[i]; @@ -245,19 +338,6 @@ Ice::PropertiesI::parseArgs(int& argc, char* argv[]) } void -Ice::PropertiesI::load(const std::string& file) -{ - ifstream in(file.c_str()); - if (!in) - { - SystemException ex(__FILE__, __LINE__); - ex.error = getSystemErrno(); - throw ex; - } - parse(in); -} - -void Ice::PropertiesI::parse(istream& in) { char line[1024]; @@ -266,6 +346,7 @@ Ice::PropertiesI::parse(istream& in) parseLine(line); } } +#endif void Ice::PropertiesI::parseLine(const string& line) diff --git a/cpp/src/Ice/PropertiesI.h b/cpp/src/Ice/PropertiesI.h index d23457d59c5..5c1ea0656a2 100644 --- a/cpp/src/Ice/PropertiesI.h +++ b/cpp/src/Ice/PropertiesI.h @@ -29,23 +29,20 @@ public: virtual StringSeq getProperties(const std::string&); virtual void setProperty(const std::string&, const std::string&); virtual StringSeq getCommandLineOptions(); + virtual StringSeq parseCommandLineOptions(const std::string&, const StringSeq&); + virtual void load(const std::string&); virtual PropertiesPtr clone(); - static void addArgumentPrefix(const std::string&); private: + PropertiesI(); PropertiesI(int&, char*[]); - PropertiesI(int&, char*[], const std::string& file); + friend ICE_API PropertiesPtr createProperties(); friend ICE_API PropertiesPtr createProperties(int&, char*[]); - friend ICE_API PropertiesPtr createPropertiesFromFile(int&, char*[], const std::string&); - void parseArgs(int&, char*[]); - void load(const std::string&); - void parse(std::istream&); void parseLine(const std::string&); std::map<std::string, std::string> _properties; - static std::set<std::string> _argumentPrefixes; }; } diff --git a/cpp/src/Ice/Proxy.cpp b/cpp/src/Ice/Proxy.cpp index a3527031d87..9a2ad59c61b 100644 --- a/cpp/src/Ice/Proxy.cpp +++ b/cpp/src/Ice/Proxy.cpp @@ -26,7 +26,6 @@ #include <Ice/BasicStream.h> #include <Ice/LocalException.h> #include <Ice/Functional.h> -#include <Ice/SslException.h> // TODO: bandaid, see below. using namespace std; using namespace Ice; @@ -535,10 +534,6 @@ IceProxy::Ice::Object::__handleException(const LocalException& ex, int& cnt) { ++cnt; } - catch (const IceSSL::SslException&) // TODO: bandaid to make retry w/ ssl work. - { - ++cnt; - } catch (const DNSException&) { ++cnt; diff --git a/cpp/src/Ice/ReferenceFactory.cpp b/cpp/src/Ice/ReferenceFactory.cpp index 91895e79007..d357c49e2ce 100644 --- a/cpp/src/Ice/ReferenceFactory.cpp +++ b/cpp/src/Ice/ReferenceFactory.cpp @@ -14,6 +14,7 @@ #include <Ice/Instance.h> #include <Ice/IdentityUtil.h> #include <Ice/Endpoint.h> +#include <Ice/EndpointFactory.h> #include <Ice/RouterInfo.h> using namespace std; @@ -284,7 +285,7 @@ IceInternal::ReferenceFactory::create(const string& str) } string es = s.substr(beg, end - beg); - EndpointPtr endp = Endpoint::endpointFromString(_instance, es); + EndpointPtr endp = _instance->endpointFactoryManager()->create(es); if (orig) { @@ -340,8 +341,7 @@ IceInternal::ReferenceFactory::create(const Identity& ident, BasicStream* s) origEndpoints.reserve(sz); while (sz--) { - EndpointPtr endpoint; - Endpoint::streamRead(s, endpoint); + EndpointPtr endpoint = _instance->endpointFactoryManager()->read(s); origEndpoints.push_back(endpoint); } @@ -357,9 +357,8 @@ IceInternal::ReferenceFactory::create(const Identity& ident, BasicStream* s) endpoints.reserve(sz); while (sz--) { - EndpointPtr endpoint; - Endpoint::streamRead(s, endpoint); - origEndpoints.push_back(endpoint); + EndpointPtr endpoint = _instance->endpointFactoryManager()->read(s); + endpoints.push_back(endpoint); } } diff --git a/cpp/src/Ice/SslExtensionInternal.cpp b/cpp/src/Ice/SslExtensionInternal.cpp deleted file mode 100644 index 328649abd51..00000000000 --- a/cpp/src/Ice/SslExtensionInternal.cpp +++ /dev/null @@ -1,36 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2002 -// MutableRealms, Inc. -// Huntsville, AL, USA -// -// All Rights Reserved -// -// ********************************************************************** - -#include <Ice/SslExtensionInternal.h> -#include <Ice/DefaultCertificateVerifier.h> -#include <Ice/SingleCertificateVerifier.h> -#include <Ice/BuiltinSequences.h> - -IceSSL::SslExtensionInternal::SslExtensionInternal(const IceInternal::InstancePtr& instance) : - _instance(instance) -{ -} - -IceSSL::SslExtensionInternal::~SslExtensionInternal() -{ -} - -::IceSSL::CertificateVerifierPtr -IceSSL::SslExtensionInternal::getDefaultCertVerifier() -{ - return ::IceSSL::CertificateVerifierPtr(new IceSSL::OpenSSL::DefaultCertificateVerifier(_instance)); -} - -::IceSSL::CertificateVerifierPtr -IceSSL::SslExtensionInternal::getSingleCertVerifier(const ::Ice::ByteSeq& certSeq) -{ - return ::IceSSL::CertificateVerifierPtr(new IceSSL::OpenSSL::SingleCertificateVerifier(certSeq)); -} - diff --git a/cpp/src/Ice/SslExtensionInternal.h b/cpp/src/Ice/SslExtensionInternal.h deleted file mode 100644 index f1e8ec65ce5..00000000000 --- a/cpp/src/Ice/SslExtensionInternal.h +++ /dev/null @@ -1,39 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2002 -// MutableRealms, Inc. -// Huntsville, AL, USA -// -// All Rights Reserved -// -// ********************************************************************** - -#ifndef ICE_SSL_EXTENSION_INTERNAL_H -#define ICE_SSL_EXTENSION_INTERNAL_H - -#include <Ice/InstanceF.h> -#include <Ice/SslExtension.h> -#include <Ice/CertificateVerifierF.h> - -namespace IceSSL -{ - -class SslExtensionInternal : public SslExtension -{ -public: - - SslExtensionInternal(const IceInternal::InstancePtr&); - virtual ~SslExtensionInternal(); - - virtual ::IceSSL::CertificateVerifierPtr getDefaultCertVerifier(); - - virtual ::IceSSL::CertificateVerifierPtr getSingleCertVerifier(const ::Ice::ByteSeq&); - -protected: - - IceInternal::InstancePtr _instance; -}; - -} - -#endif diff --git a/cpp/src/Ice/SslFactory.cpp b/cpp/src/Ice/SslFactory.cpp deleted file mode 100644 index 4c1f7fde446..00000000000 --- a/cpp/src/Ice/SslFactory.cpp +++ /dev/null @@ -1,123 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2001 -// MutableRealms, Inc. -// Huntsville, AL, USA -// -// All Rights Reserved -// -// ********************************************************************** - -// Note: This pragma is used to disable spurious warning messages having -// to do with the length of debug symbols exceeding 255 characters. -// This is due to STL template identifiers expansion. -// The MSDN Library recommends that you put this pragma directive -// in place to avoid the warnings. -#ifdef _WIN32 -#pragma warning(disable:4786) -#endif - -#include <Ice/Instance.h> -#include <Ice/SslFactory.h> -#include <Ice/SystemOpenSSL.h> -#include <Ice/OpenSSL.h> - -#define OPENSSL_THREAD_DEFINES -#include <openssl/opensslconf.h> -#if defined(THREADS) -#else -#error "Thread support not enabled" -#endif - -namespace IceSSL -{ - -// Static member instantiations. -IceUtil::Mutex Factory::_systemRepositoryMutex; -SslHandleSystemMap Factory::_sslHandleSystemRepository; - -extern "C" -{ - void lockingCallback(int, int, const char*, int); -} - -class SslLockKeeper -{ -public: - - SslLockKeeper(); - ~SslLockKeeper(); - - IceUtil::Mutex sslLocks[CRYPTO_NUM_LOCKS]; - -}; - -SslLockKeeper lockKeeper; - -} - -void IceSSL::lockingCallback(int mode, int type, const char *file, int line) -{ - if (mode & CRYPTO_LOCK) - { - lockKeeper.sslLocks[type].lock(); - } - else - { - lockKeeper.sslLocks[type].unlock(); - } -} - -IceSSL::SslLockKeeper::SslLockKeeper() -{ - CRYPTO_set_locking_callback((void (*)(int, int, const char*, int))IceSSL::lockingCallback); -} - -IceSSL::SslLockKeeper::~SslLockKeeper() -{ - CRYPTO_set_locking_callback(NULL); -} - -IceSSL::SystemInternalPtr -IceSSL::Factory::getSystem(const IceInternal::InstancePtr& instance) -{ - SystemInternalPtr system = new OpenSSL::System(instance); - - assert(system != 0); - - return system; -} - -void -IceSSL::Factory::addSystemHandle(void* sslHandle, const SystemInternalPtr& system) -{ - IceUtil::Mutex::Lock sync(_systemRepositoryMutex); - - assert(system != 0); - assert(sslHandle != 0); - _sslHandleSystemRepository[sslHandle] = system; -} - -void -IceSSL::Factory::removeSystemHandle(void* sslHandle) -{ - IceUtil::Mutex::Lock sync(_systemRepositoryMutex); - - assert(sslHandle != 0); - _sslHandleSystemRepository.erase(sslHandle); -} - -IceSSL::SystemInternalPtr -IceSSL::Factory::getSystemFromHandle(void* sslHandle) -{ - IceUtil::Mutex::Lock sync(_systemRepositoryMutex); - - assert(sslHandle != 0); - - SystemInternalPtr& system = _sslHandleSystemRepository[sslHandle]; - - assert(system != 0); - - return system; -} - diff --git a/cpp/src/Ice/SslFactory.h b/cpp/src/Ice/SslFactory.h deleted file mode 100644 index ec84b840cba..00000000000 --- a/cpp/src/Ice/SslFactory.h +++ /dev/null @@ -1,52 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2001 -// MutableRealms, Inc. -// Huntsville, AL, USA -// -// All Rights Reserved -// -// ********************************************************************** - -#ifndef ICE_SSL_FACTORY_H -#define ICE_SSL_FACTORY_H - -#include <IceUtil/Mutex.h> -#include <Ice/InstanceF.h> -#include <Ice/SystemInternalF.h> -#include <Ice/CertificateVerifierF.h> - -#include <string> -#include <map> - -namespace IceSSL -{ - -typedef std::map<void*, SystemInternalPtr> SslHandleSystemMap; - -// This is defined as a class so as to ensure encapsulation. We don't -// want just anybody creating System instances - when all this is moved -// out to a DLL/SO, we want to ensure that this vanilla interface is used -// to get whatever flavor of System the DLL/SO is designed to hand out. As -// a result, different flavors of the Security Extension DLL/SO will have -// different definitions for getSystem(). -class Factory -{ -public: - - static SystemInternalPtr getSystem(const IceInternal::InstancePtr&); - - // System Handle related methods - static void addSystemHandle(void*, const SystemInternalPtr&); - static void removeSystemHandle(void*); - static SystemInternalPtr getSystemFromHandle(void*); - -private: - - static SslHandleSystemMap _sslHandleSystemRepository; - static ::IceUtil::Mutex _systemRepositoryMutex; -}; - -} - -#endif diff --git a/cpp/src/Ice/SystemInternal.cpp b/cpp/src/Ice/SystemInternal.cpp deleted file mode 100644 index e0a8b14460c..00000000000 --- a/cpp/src/Ice/SystemInternal.cpp +++ /dev/null @@ -1,40 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2001 -// MutableRealms, Inc. -// Huntsville, AL, USA -// -// All Rights Reserved -// -// ********************************************************************** - -#include <Ice/Instance.h> -#include <Ice/SystemInternal.h> -#include <string> - -using namespace std; -using IceSSL::CertificateVerifierPtr; -using Ice::LoggerPtr; -using Ice::PropertiesPtr; -using IceInternal::TraceLevelsPtr; - -void ::IceInternal::incRef(::IceSSL::SystemInternal* p) { p->__incRef(); } -void ::IceInternal::decRef(::IceSSL::SystemInternal* p) { p->__decRef(); } - -// -// Protected Methods -// - -IceSSL::SystemInternal::SystemInternal(const IceInternal::InstancePtr& instance) : - _traceLevels(instance->traceLevels()), - _logger(instance->logger()), - _properties(instance->properties()) -{ - assert(_traceLevels != 0); - assert(_logger != 0); - assert(_properties != 0); -} - -IceSSL::SystemInternal::~SystemInternal() -{ -} diff --git a/cpp/src/Ice/TcpEndpoint.cpp b/cpp/src/Ice/TcpEndpoint.cpp new file mode 100644 index 00000000000..237fec807b8 --- /dev/null +++ b/cpp/src/Ice/TcpEndpoint.cpp @@ -0,0 +1,379 @@ +// ********************************************************************** +// +// Copyright (c) 2002 +// MutableRealms, Inc. +// Huntsville, AL, USA +// +// All Rights Reserved +// +// ********************************************************************** + +#include <Ice/TcpEndpoint.h> +#include <Ice/Network.h> +#include <Ice/TcpAcceptor.h> +#include <Ice/TcpConnector.h> +#include <Ice/TcpTransceiver.h> +#include <Ice/BasicStream.h> +#include <Ice/LocalException.h> +#include <Ice/Instance.h> + +using namespace std; +using namespace Ice; +using namespace IceInternal; + +IceInternal::TcpEndpoint::TcpEndpoint(const InstancePtr& instance, const string& ho, Int po, Int ti) : + _instance(instance), + _host(ho), + _port(po), + _timeout(ti) +{ +} + +IceInternal::TcpEndpoint::TcpEndpoint(const InstancePtr& instance, const string& str) : + _instance(instance), + _port(0), + _timeout(-1) +{ + static const string delim = " \t\n\r"; + + string::size_type beg; + string::size_type end = 0; + + while (true) + { + beg = str.find_first_not_of(delim, end); + if (beg == string::npos) + { + break; + } + + end = str.find_first_of(delim, beg); + if (end == string::npos) + { + end = str.length(); + } + + string option = str.substr(beg, end - beg); + if (option.length() != 2 || option[0] != '-') + { + throw EndpointParseException(__FILE__, __LINE__); + } + + string argument; + string::size_type argumentBeg = str.find_first_not_of(delim, end); + if (argumentBeg != string::npos && str[argumentBeg] != '-') + { + beg = argumentBeg; + end = str.find_first_of(delim, beg); + if (end == string::npos) + { + end = str.length(); + } + argument = str.substr(beg, end - beg); + } + + switch (option[1]) + { + case 'h': + { + if (argument.empty()) + { + throw EndpointParseException(__FILE__, __LINE__); + } + const_cast<string&>(_host) = argument; + break; + } + + case 'p': + { + if (argument.empty()) + { + throw EndpointParseException(__FILE__, __LINE__); + } + const_cast<Int&>(_port) = atoi(argument.c_str()); + break; + } + + case 't': + { + if (argument.empty()) + { + throw EndpointParseException(__FILE__, __LINE__); + } + const_cast<Int&>(_timeout) = atoi(argument.c_str()); + break; + } + + default: + { + throw EndpointParseException(__FILE__, __LINE__); + } + } + } + + if (_host.empty()) + { + const_cast<string&>(_host) = _instance->defaultHost(); + } +} + +IceInternal::TcpEndpoint::TcpEndpoint(BasicStream* s) : + _instance(s->instance()), + _port(0), + _timeout(-1) +{ + s->startReadEncaps(); + s->read(const_cast<string&>(_host)); + s->read(const_cast<Int&>(_port)); + s->read(const_cast<Int&>(_timeout)); + s->endReadEncaps(); +} + +void +IceInternal::TcpEndpoint::streamWrite(BasicStream* s) const +{ + s->write(TcpEndpointType); + s->startWriteEncaps(); + s->write(_host); + s->write(_port); + s->write(_timeout); + s->endWriteEncaps(); +} + +string +IceInternal::TcpEndpoint::toString() const +{ + ostringstream s; + s << "tcp -h " << _host << " -p " << _port; + if (_timeout != -1) + { + s << " -t " << _timeout; + } + return s.str(); +} + +Short +IceInternal::TcpEndpoint::type() const +{ + return TcpEndpointType; +} + +Int +IceInternal::TcpEndpoint::timeout() const +{ + return _timeout; +} + +EndpointPtr +IceInternal::TcpEndpoint::timeout(Int timeout) const +{ + if (timeout == _timeout) + { + return const_cast<TcpEndpoint*>(this); + } + else + { + return new TcpEndpoint(_instance, _host, _port, timeout); + } +} + +bool +IceInternal::TcpEndpoint::datagram() const +{ + return false; +} + +bool +IceInternal::TcpEndpoint::secure() const +{ + return false; +} + +bool +IceInternal::TcpEndpoint::unknown() const +{ + return false; +} + +TransceiverPtr +IceInternal::TcpEndpoint::clientTransceiver() const +{ + return 0; +} + +TransceiverPtr +IceInternal::TcpEndpoint::serverTransceiver(EndpointPtr& endp) const +{ + endp = const_cast<TcpEndpoint*>(this); + return 0; +} + +ConnectorPtr +IceInternal::TcpEndpoint::connector() const +{ + return new TcpConnector(_instance, _host, _port); +} + +AcceptorPtr +IceInternal::TcpEndpoint::acceptor(EndpointPtr& endp) const +{ + TcpAcceptor* p = new TcpAcceptor(_instance, _host, _port); + endp = new TcpEndpoint(_instance, _host, p->effectivePort(), _timeout); + return p; +} + +bool +IceInternal::TcpEndpoint::equivalent(const TransceiverPtr&) const +{ + return false; +} + +bool +IceInternal::TcpEndpoint::equivalent(const AcceptorPtr& acceptor) const +{ + const TcpAcceptor* tcpAcceptor = dynamic_cast<const TcpAcceptor*>(acceptor.get()); + if (!tcpAcceptor) + { + return false; + } + return tcpAcceptor->equivalent(_host, _port); +} + +bool +IceInternal::TcpEndpoint::operator==(const Endpoint& r) const +{ + const TcpEndpoint* p = dynamic_cast<const TcpEndpoint*>(&r); + if (!p) + { + return false; + } + + if (this == p) + { + return true; + } + + if (_port != p->_port) + { + return false; + } + + if (_timeout != p->_timeout) + { + return false; + } + + if (_host != p->_host) + { + // + // We do the most time-consuming part of the comparison last. + // + struct sockaddr_in laddr; + struct sockaddr_in raddr; + getAddress(_host, _port, laddr); + getAddress(p->_host, p->_port, raddr); + return compareAddress(laddr, raddr); + } + + return true; +} + +bool +IceInternal::TcpEndpoint::operator!=(const Endpoint& r) const +{ + return !operator==(r); +} + +bool +IceInternal::TcpEndpoint::operator<(const Endpoint& r) const +{ + const TcpEndpoint* p = dynamic_cast<const TcpEndpoint*>(&r); + if (!p) + { + return type() < r.type(); + } + + if (this == p) + { + return false; + } + + if (_port < p->_port) + { + return true; + } + else if (p->_port < _port) + { + return false; + } + + if (_timeout < p->_timeout) + { + return true; + } + else if (p->_timeout < _timeout) + { + return false; + } + + if (_host != p->_host) + { + // + // We do the most time-consuming part of the comparison last. + // + struct sockaddr_in laddr; + struct sockaddr_in raddr; + getAddress(_host, _port, laddr); + getAddress(p->_host, p->_port, raddr); + if (laddr.sin_addr.s_addr < raddr.sin_addr.s_addr) + { + return true; + } + else if (raddr.sin_addr.s_addr < laddr.sin_addr.s_addr) + { + return false; + } + } + + return false; +} + +IceInternal::TcpEndpointFactory::TcpEndpointFactory(const InstancePtr& instance) + : _instance(instance) +{ +} + +IceInternal::TcpEndpointFactory::~TcpEndpointFactory() +{ +} + +Short +IceInternal::TcpEndpointFactory::type() const +{ + return TcpEndpointType; +} + +const string& +IceInternal::TcpEndpointFactory::protocol() const +{ + const static string result = "tcp"; + return result; +} + +EndpointPtr +IceInternal::TcpEndpointFactory::create(const std::string& str) const +{ + return new TcpEndpoint(_instance, str); +} + +EndpointPtr +IceInternal::TcpEndpointFactory::read(BasicStream* s) const +{ + return new TcpEndpoint(s); +} + +void +IceInternal::TcpEndpointFactory::destroy() +{ + _instance = 0; +} diff --git a/cpp/src/Ice/TcpEndpoint.h b/cpp/src/Ice/TcpEndpoint.h new file mode 100644 index 00000000000..55c7b371132 --- /dev/null +++ b/cpp/src/Ice/TcpEndpoint.h @@ -0,0 +1,82 @@ +// ********************************************************************** +// +// Copyright (c) 2002 +// MutableRealms, Inc. +// Huntsville, AL, USA +// +// All Rights Reserved +// +// ********************************************************************** + +#ifndef ICE_TCP_ENDPOINT_H +#define ICE_TCP_ENDPOINT_H + +#include <Ice/Endpoint.h> +#include <Ice/EndpointFactory.h> + +namespace IceInternal +{ + +const ::Ice::Short TcpEndpointType = 1; + +class TcpEndpoint : public Endpoint +{ +public: + + TcpEndpoint(const InstancePtr&, const std::string&, ::Ice::Int, ::Ice::Int); + TcpEndpoint(const InstancePtr&, const std::string&); + TcpEndpoint(BasicStream*); + + virtual void streamWrite(BasicStream*) const; + virtual std::string toString() const; + virtual ::Ice::Short type() const; + virtual ::Ice::Int timeout() const; + virtual EndpointPtr timeout(::Ice::Int) const; + virtual bool datagram() const; + virtual bool secure() const; + virtual bool unknown() const; + virtual TransceiverPtr clientTransceiver() const; + virtual TransceiverPtr serverTransceiver(EndpointPtr&) const; + virtual ConnectorPtr connector() const; + virtual AcceptorPtr acceptor(EndpointPtr&) const; + virtual bool equivalent(const TransceiverPtr&) const; + virtual bool equivalent(const AcceptorPtr&) const; + + virtual bool operator==(const Endpoint&) const; + virtual bool operator!=(const Endpoint&) const; + virtual bool operator<(const Endpoint&) const; + +private: + + // + // All members are const, because endpoints are immutable. + // + const InstancePtr _instance; + const std::string _host; + const ::Ice::Int _port; + const ::Ice::Int _timeout; +}; + +class TcpEndpointFactory : public EndpointFactory +{ +public: + + virtual ~TcpEndpointFactory(); + + virtual ::Ice::Short type() const; + virtual const ::std::string& protocol() const; + virtual EndpointPtr create(const std::string&) const; + virtual EndpointPtr read(BasicStream*) const; + virtual void destroy(); + +private: + + TcpEndpointFactory(const InstancePtr&); + friend class Instance; + + InstancePtr _instance; +}; + +} + +#endif diff --git a/cpp/src/Ice/TraceUtil.cpp b/cpp/src/Ice/TraceUtil.cpp index 537e9903d83..260a266f9c3 100644 --- a/cpp/src/Ice/TraceUtil.cpp +++ b/cpp/src/Ice/TraceUtil.cpp @@ -98,6 +98,67 @@ printRequestHeader(ostream& s, BasicStream& stream) } } +#if 0 +static void +dumpOctets(const string& cat, const BasicStream& stream, const ::Ice::LoggerPtr& logger) +{ + ostringstream s; + s << endl; + + const BasicStream::Container::size_type inc = 8; + + for (BasicStream::Container::size_type i = 0; i < stream.b.size(); i += inc) + { + for (BasicStream::Container::size_type j = i; j - i < inc; j++) + { + if (j < stream.b.size()) + { + int n = stream.b[j]; + if (n < 0) + { + n += 256; + } + if (n < 10) + { + s << " " << n; + } + else if (n < 100) + { + s << " " << n; + } + else + { + s << n; + } + s << " "; + } + else + { + s << " "; + } + } + + s << '"'; + + for (BasicStream::Container::size_type j = i; j < stream.b.size() && j - i < inc; j++) + { + if (stream.b[j] >= 32 && stream.b[j] < 127) + { + s << (char)stream.b[j]; + } + else + { + s << '.'; + } + } + + s << '"' << endl; + } + + logger->trace(cat, s.str()); +} +#endif + void IceInternal::traceHeader(const char* heading, const BasicStream& str, const ::Ice::LoggerPtr& logger, const TraceLevelsPtr& tl) diff --git a/cpp/src/Ice/UdpEndpoint.cpp b/cpp/src/Ice/UdpEndpoint.cpp new file mode 100644 index 00000000000..ad60651d8c8 --- /dev/null +++ b/cpp/src/Ice/UdpEndpoint.cpp @@ -0,0 +1,372 @@ +// ********************************************************************** +// +// Copyright (c) 2001 +// MutableRealms, Inc. +// Huntsville, AL, USA +// +// All Rights Reserved +// +// ********************************************************************** + +#include <Ice/UdpEndpoint.h> +#include <Ice/Network.h> +#include <Ice/UdpTransceiver.h> +#include <Ice/BasicStream.h> +#include <Ice/LocalException.h> +#include <Ice/Instance.h> + +using namespace std; +using namespace Ice; +using namespace IceInternal; + +IceInternal::UdpEndpoint::UdpEndpoint(const InstancePtr& instance, const string& ho, Int po) : + _instance(instance), + _host(ho), + _port(po), + _connect(false) +{ +} + +IceInternal::UdpEndpoint::UdpEndpoint(const InstancePtr& instance, const string& str) : + _instance(instance), + _port(0), + _connect(false) +{ + static const string delim = " \t\n\r"; + + string::size_type beg; + string::size_type end = 0; + + while (true) + { + beg = str.find_first_not_of(delim, end); + if (beg == string::npos) + { + break; + } + + end = str.find_first_of(delim, beg); + if (end == string::npos) + { + end = str.length(); + } + + string option = str.substr(beg, end - beg); + if (option.length() != 2 || option[0] != '-') + { + throw EndpointParseException(__FILE__, __LINE__); + } + + string argument; + string::size_type argumentBeg = str.find_first_not_of(delim, end); + if (argumentBeg != string::npos && str[argumentBeg] != '-') + { + beg = argumentBeg; + end = str.find_first_of(delim + ":", beg); + if (end == string::npos) + { + end = str.length(); + } + argument = str.substr(beg, end - beg); + } + + switch (option[1]) + { + case 'h': + { + if (argument.empty()) + { + throw EndpointParseException(__FILE__, __LINE__); + } + const_cast<string&>(_host) = argument; + break; + } + + case 'p': + { + if (argument.empty()) + { + throw EndpointParseException(__FILE__, __LINE__); + } + const_cast<Int&>(_port) = atoi(argument.c_str()); + break; + } + + case 'c': + { + if (!argument.empty()) + { + throw EndpointParseException(__FILE__, __LINE__); + } + const_cast<bool&>(_connect) = true; + break; + } + + default: + { + throw EndpointParseException(__FILE__, __LINE__); + } + } + } + + if (_host.empty()) + { + const_cast<string&>(_host) = _instance->defaultHost(); + } +} + +IceInternal::UdpEndpoint::UdpEndpoint(BasicStream* s) : + _instance(s->instance()), + _port(0), + _connect(false) +{ + s->startReadEncaps(); + s->read(const_cast<string&>(_host)); + s->read(const_cast<Int&>(_port)); + // Not transmitted. + //s->read(const_cast<bool&>(_connect)); + s->endReadEncaps(); +} + +void +IceInternal::UdpEndpoint::streamWrite(BasicStream* s) const +{ + s->write(UdpEndpointType); + s->startWriteEncaps(); + s->write(_host); + s->write(_port); + // Not transmitted. + //s->write(_connect); + s->endWriteEncaps(); +} + +string +IceInternal::UdpEndpoint::toString() const +{ + ostringstream s; + s << "udp -h " << _host << " -p " << _port; + if (_connect) + { + s << " -c"; + } + return s.str(); +} + +Short +IceInternal::UdpEndpoint::type() const +{ + return UdpEndpointType; +} + +Int +IceInternal::UdpEndpoint::timeout() const +{ + return -1; +} + +EndpointPtr +IceInternal::UdpEndpoint::timeout(Int) const +{ + return const_cast<UdpEndpoint*>(this); +} + +bool +IceInternal::UdpEndpoint::datagram() const +{ + return true; +} + +bool +IceInternal::UdpEndpoint::secure() const +{ + return false; +} + +bool +IceInternal::UdpEndpoint::unknown() const +{ + return false; +} + +TransceiverPtr +IceInternal::UdpEndpoint::clientTransceiver() const +{ + return new UdpTransceiver(_instance, _host, _port); +} + +TransceiverPtr +IceInternal::UdpEndpoint::serverTransceiver(EndpointPtr& endp) const +{ + UdpTransceiver* p = new UdpTransceiver(_instance, _host, _port, _connect); + endp = new UdpEndpoint(_instance, _host, p->effectivePort()); + return p; +} + +ConnectorPtr +IceInternal::UdpEndpoint::connector() const +{ + return 0; +} + +AcceptorPtr +IceInternal::UdpEndpoint::acceptor(EndpointPtr& endp) const +{ + endp = const_cast<UdpEndpoint*>(this); + return 0; +} + +bool +IceInternal::UdpEndpoint::equivalent(const TransceiverPtr& transceiver) const +{ + const UdpTransceiver* udpTransceiver = dynamic_cast<const UdpTransceiver*>(transceiver.get()); + if (!udpTransceiver) + { + return false; + } + return udpTransceiver->equivalent(_host, _port); +} + +bool +IceInternal::UdpEndpoint::equivalent(const AcceptorPtr&) const +{ + return false; +} + +bool +IceInternal::UdpEndpoint::operator==(const Endpoint& r) const +{ + const UdpEndpoint* p = dynamic_cast<const UdpEndpoint*>(&r); + if (!p) + { + return false; + } + + if (this == p) + { + return true; + } + + if (_port != p->_port) + { + return false; + } + + if (_connect != p->_connect) + { + return false; + } + + if (_host != p->_host) + { + // + // We do the most time-consuming part of the comparison last. + // + struct sockaddr_in laddr; + struct sockaddr_in raddr; + getAddress(_host, _port, laddr); + getAddress(p->_host, p->_port, raddr); + return compareAddress(laddr, raddr); + } + + return true; +} + +bool +IceInternal::UdpEndpoint::operator!=(const Endpoint& r) const +{ + return !operator==(r); +} + +bool +IceInternal::UdpEndpoint::operator<(const Endpoint& r) const +{ + const UdpEndpoint* p = dynamic_cast<const UdpEndpoint*>(&r); + if (!p) + { + return type() < r.type(); + } + + if (this == p) + { + return false; + } + + if (_port < p->_port) + { + return true; + } + else if (p->_port < _port) + { + return false; + } + + if (!_connect && p->_connect) + { + return true; + } + else if (!p->_connect && _connect) + { + return false; + } + + if (_host != p->_host) + { + // + // We do the most time-consuming part of the comparison last. + // + struct sockaddr_in laddr; + struct sockaddr_in raddr; + getAddress(_host, _port, laddr); + getAddress(p->_host, p->_port, raddr); + if (laddr.sin_addr.s_addr < raddr.sin_addr.s_addr) + { + return true; + } + else if (raddr.sin_addr.s_addr < laddr.sin_addr.s_addr) + { + return false; + } + } + + return false; +} + +IceInternal::UdpEndpointFactory::UdpEndpointFactory(const InstancePtr& instance) + : _instance(instance) +{ +} + +IceInternal::UdpEndpointFactory::~UdpEndpointFactory() +{ +} + +Short +IceInternal::UdpEndpointFactory::type() const +{ + return UdpEndpointType; +} + +const string& +IceInternal::UdpEndpointFactory::protocol() const +{ + const static string result = "udp"; + return result; +} + +EndpointPtr +IceInternal::UdpEndpointFactory::create(const std::string& str) const +{ + return new UdpEndpoint(_instance, str); +} + +EndpointPtr +IceInternal::UdpEndpointFactory::read(BasicStream* s) const +{ + return new UdpEndpoint(s); +} + +void +IceInternal::UdpEndpointFactory::destroy() +{ + _instance = 0; +} diff --git a/cpp/src/Ice/UdpEndpoint.h b/cpp/src/Ice/UdpEndpoint.h new file mode 100644 index 00000000000..321b9214f9e --- /dev/null +++ b/cpp/src/Ice/UdpEndpoint.h @@ -0,0 +1,82 @@ +// ********************************************************************** +// +// Copyright (c) 2002 +// MutableRealms, Inc. +// Huntsville, AL, USA +// +// All Rights Reserved +// +// ********************************************************************** + +#ifndef ICE_UDP_ENDPOINT_H +#define ICE_UDP_ENDPOINT_H + +#include <Ice/Endpoint.h> +#include <Ice/EndpointFactory.h> + +namespace IceInternal +{ + +const ::Ice::Short UdpEndpointType = 3; + +class UdpEndpoint : public Endpoint +{ +public: + + UdpEndpoint(const InstancePtr&, const std::string&, ::Ice::Int); + UdpEndpoint(const InstancePtr&, const std::string&); + UdpEndpoint(BasicStream*); + + virtual void streamWrite(BasicStream*) const; + virtual std::string toString() const; + virtual ::Ice::Short type() const; + virtual ::Ice::Int timeout() const; + virtual EndpointPtr timeout(::Ice::Int) const; + virtual bool datagram() const; + virtual bool secure() const; + virtual bool unknown() const; + virtual TransceiverPtr clientTransceiver() const; + virtual TransceiverPtr serverTransceiver(EndpointPtr&) const; + virtual ConnectorPtr connector() const; + virtual AcceptorPtr acceptor(EndpointPtr&) const; + virtual bool equivalent(const TransceiverPtr&) const; + virtual bool equivalent(const AcceptorPtr&) const; + + virtual bool operator==(const Endpoint&) const; + virtual bool operator!=(const Endpoint&) const; + virtual bool operator<(const Endpoint&) const; + +private: + + // + // All members are const, because endpoints are immutable. + // + const InstancePtr _instance; + const std::string _host; + const ::Ice::Int _port; + const bool _connect; +}; + +class UdpEndpointFactory : public EndpointFactory +{ +public: + + virtual ~UdpEndpointFactory(); + + virtual ::Ice::Short type() const; + virtual const ::std::string& protocol() const; + virtual EndpointPtr create(const std::string&) const; + virtual EndpointPtr read(BasicStream*) const; + virtual void destroy(); + +private: + + UdpEndpointFactory(const InstancePtr&); + friend class Instance; + + InstancePtr _instance; +}; + +} + +#endif diff --git a/cpp/src/Ice/UnknownEndpoint.cpp b/cpp/src/Ice/UnknownEndpoint.cpp new file mode 100644 index 00000000000..76c4cc3c690 --- /dev/null +++ b/cpp/src/Ice/UnknownEndpoint.cpp @@ -0,0 +1,185 @@ +// ********************************************************************** +// +// Copyright (c) 2001 +// MutableRealms, Inc. +// Huntsville, AL, USA +// +// All Rights Reserved +// +// ********************************************************************** + +#include <Ice/UnknownEndpoint.h> +#include <Ice/BasicStream.h> +#include <Ice/Exception.h> +#include <Ice/Instance.h> + +using namespace std; +using namespace Ice; +using namespace IceInternal; + +IceInternal::UnknownEndpoint::UnknownEndpoint(Short type, BasicStream* s) : + _instance(s->instance()), + _type(type) +{ + s->startReadEncaps(); + Int sz = s->getReadEncapsSize(); + s->readBlob(const_cast<vector<Byte>&>(_rawBytes), sz); + s->endReadEncaps(); +} + +void +IceInternal::UnknownEndpoint::streamWrite(BasicStream* s) const +{ + s->write(_type); + s->startWriteEncaps(); + s->writeBlob(_rawBytes); + s->endWriteEncaps(); +} + +string +IceInternal::UnknownEndpoint::toString() const +{ + return string(); +} + +Short +IceInternal::UnknownEndpoint::type() const +{ + return _type; +} + +Int +IceInternal::UnknownEndpoint::timeout() const +{ + return -1; +} + +EndpointPtr +IceInternal::UnknownEndpoint::timeout(Int) const +{ + return const_cast<UnknownEndpoint*>(this); +} + +bool +IceInternal::UnknownEndpoint::datagram() const +{ + return false; +} + +bool +IceInternal::UnknownEndpoint::secure() const +{ + return false; +} + +bool +IceInternal::UnknownEndpoint::unknown() const +{ + return true; +} + +TransceiverPtr +IceInternal::UnknownEndpoint::clientTransceiver() const +{ + return 0; +} + +TransceiverPtr +IceInternal::UnknownEndpoint::serverTransceiver(EndpointPtr& endp) const +{ + endp = const_cast<UnknownEndpoint*>(this); + return 0; +} + +ConnectorPtr +IceInternal::UnknownEndpoint::connector() const +{ + return 0; +} + +AcceptorPtr +IceInternal::UnknownEndpoint::acceptor(EndpointPtr& endp) const +{ + endp = const_cast<UnknownEndpoint*>(this); + return 0; +} + +bool +IceInternal::UnknownEndpoint::equivalent(const TransceiverPtr&) const +{ + return false; +} + +bool +IceInternal::UnknownEndpoint::equivalent(const AcceptorPtr&) const +{ + return false; +} + +bool +IceInternal::UnknownEndpoint::operator==(const Endpoint& r) const +{ + const UnknownEndpoint* p = dynamic_cast<const UnknownEndpoint*>(&r); + if (!p) + { + return false; + } + + if (this == p) + { + return true; + } + + if (_type != p->_type) + { + return false; + } + + if (_rawBytes != p->_rawBytes) + { + return false; + } + + return true; +} + +bool +IceInternal::UnknownEndpoint::operator!=(const Endpoint& r) const +{ + return !operator==(r); +} + +bool +IceInternal::UnknownEndpoint::operator<(const Endpoint& r) const +{ + const UnknownEndpoint* p = dynamic_cast<const UnknownEndpoint*>(&r); + if (!p) + { + return type() < r.type(); + } + + if (this == p) + { + return false; + } + + if (_type < p->_type) + { + return true; + } + else if (p->_type < _type) + { + return false; + } + + if (_rawBytes < p->_rawBytes) + { + return true; + } + else if (p->_rawBytes < _rawBytes) + { + return false; + } + + return false; +} diff --git a/cpp/src/Ice/UnknownEndpoint.h b/cpp/src/Ice/UnknownEndpoint.h new file mode 100644 index 00000000000..17ea13a7320 --- /dev/null +++ b/cpp/src/Ice/UnknownEndpoint.h @@ -0,0 +1,59 @@ +// ********************************************************************** +// +// Copyright (c) 2002 +// MutableRealms, Inc. +// Huntsville, AL, USA +// +// All Rights Reserved +// +// ********************************************************************** + +#ifndef ICE_UNKNOWN_ENDPOINT_H +#define ICE_UNKNOWN_ENDPOINT_H + +#include <Ice/Endpoint.h> +#include <Ice/EndpointFactory.h> + +namespace IceInternal +{ + +const ::Ice::Short UnknownEndpointType = 0; + +class UnknownEndpoint : public Endpoint +{ +public: + + UnknownEndpoint(::Ice::Short, BasicStream*); + + virtual void streamWrite(BasicStream*) const; + virtual std::string toString() const; + virtual ::Ice::Short type() const; + virtual ::Ice::Int timeout() const; + virtual EndpointPtr timeout(::Ice::Int) const; + virtual bool datagram() const; + virtual bool secure() const; + virtual bool unknown() const; + virtual TransceiverPtr clientTransceiver() const; + virtual TransceiverPtr serverTransceiver(EndpointPtr&) const; + virtual ConnectorPtr connector() const; + virtual AcceptorPtr acceptor(EndpointPtr&) const; + virtual bool equivalent(const TransceiverPtr&) const; + virtual bool equivalent(const AcceptorPtr&) const; + + virtual bool operator==(const Endpoint&) const; + virtual bool operator!=(const Endpoint&) const; + virtual bool operator<(const Endpoint&) const; + +private: + + // + // All members are const, because endpoints are immutable. + // + const InstancePtr _instance; + ::Ice::Short _type; + const std::vector< ::Ice::Byte> _rawBytes; +}; + +} + +#endif diff --git a/cpp/src/IceBox/.depend b/cpp/src/IceBox/.depend index 809b5e8414c..22ee27df9ab 100644 --- a/cpp/src/IceBox/.depend +++ b/cpp/src/IceBox/.depend @@ -1,4 +1,4 @@ IceBox.o: IceBox.cpp ../../include/IceBox/IceBox.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../../include/Ice/LocalException.h ../../include/Ice/ObjectFactory.h ../../include/Ice/Stream.h -ServiceManagerI.o: ServiceManagerI.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h ../../include/Ice/Properties.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Communicator.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/SystemF.h ../../include/Ice/SslExtensionF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/DynamicLibrary.h ../../include/Ice/DynamicLibraryF.h ../IceBox/ServiceManagerI.h ../../include/IceBox/IceBox.h -Server.o: Server.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h ../../include/Ice/Properties.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Communicator.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/SystemF.h ../../include/Ice/SslExtensionF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../IceBox/ServiceManagerI.h ../../include/IceBox/IceBox.h ../../include/Ice/DynamicLibraryF.h -Admin.o: Admin.cpp ../../include/Ice/Application.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h ../../include/Ice/Properties.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Communicator.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/SystemF.h ../../include/Ice/SslExtensionF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/IceBox/IceBox.h +ServiceManagerI.o: ServiceManagerI.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Communicator.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/DynamicLibrary.h ../../include/Ice/DynamicLibraryF.h ../IceBox/ServiceManagerI.h ../../include/IceBox/IceBox.h +Server.o: Server.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Communicator.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../IceBox/ServiceManagerI.h ../../include/IceBox/IceBox.h ../../include/Ice/DynamicLibraryF.h +Admin.o: Admin.cpp ../../include/Ice/Application.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Communicator.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/IceBox/IceBox.h diff --git a/cpp/src/IceBox/Admin.cpp b/cpp/src/IceBox/Admin.cpp index 657f881a5a2..6269444b63b 100644 --- a/cpp/src/IceBox/Admin.cpp +++ b/cpp/src/IceBox/Admin.cpp @@ -25,8 +25,6 @@ public: int main(int argc, char* argv[]) { - addArgumentPrefix("IceBox"); - Client app; int rc = app.main(argc, argv); @@ -50,6 +48,12 @@ Client::usage() int Client::run(int argc, char* argv[]) { + PropertiesPtr properties = communicator()->getProperties(); + + StringSeq args = argsToStringSeq(argc, argv); + args = properties->parseCommandLineOptions("IceBox", args); + stringSeqToArgs(args, argc, argv); + vector<string> commands; int idx = 1; @@ -84,7 +88,6 @@ Client::run(int argc, char* argv[]) return EXIT_SUCCESS; } - PropertiesPtr properties = communicator()->getProperties(); const char* managerEndpointsProperty = "IceBox.ServiceManager.Endpoints"; string managerEndpoints = properties->getProperty(managerEndpointsProperty); if (managerEndpoints.empty()) diff --git a/cpp/src/IceBox/Server.cpp b/cpp/src/IceBox/Server.cpp index edb4ad5d01a..56b3b58680e 100644 --- a/cpp/src/IceBox/Server.cpp +++ b/cpp/src/IceBox/Server.cpp @@ -22,11 +22,15 @@ main(int argc, char* argv[]) ServiceManagerPtr serviceManager; int status; - addArgumentPrefix("IceBox"); - try { communicator = initialize(argc, argv); + + PropertiesPtr properties = communicator->getProperties(); + StringSeq args = argsToStringSeq(argc, argv); + args = properties->parseCommandLineOptions("IceBox", args); + stringSeqToArgs(args, argc, argv); + ServiceManagerI* serviceManagerImpl = new ServiceManagerI(communicator, argc, argv); serviceManager = serviceManagerImpl; status = serviceManagerImpl->run(); diff --git a/cpp/src/IceBox/ServiceManagerI.cpp b/cpp/src/IceBox/ServiceManagerI.cpp index 49e5c4eef34..28c6c47dd1c 100644 --- a/cpp/src/IceBox/ServiceManagerI.cpp +++ b/cpp/src/IceBox/ServiceManagerI.cpp @@ -196,46 +196,33 @@ IceBox::ServiceManagerI::init(const string& service, const string& exec, const S // // We'll compose an array of arguments in the above order. // - vector<string> l; + StringSeq serviceArgs; StringSeq::size_type j; for (j = 0; j < _options.size(); j++) { if (_options[j].find("--" + service + ".") == 0) { - l.push_back(_options[j]); + serviceArgs.push_back(_options[j]); } } for (j = 0; j < args.size(); j++) { - l.push_back(args[j]); + serviceArgs.push_back(args[j]); } for (j = 0; j < _argv.size(); j++) { if (_argv[j].find("--" + service + ".") == 0) { - l.push_back(_argv[j]); + serviceArgs.push_back(_argv[j]); } } // // Create the service property set. // - addArgumentPrefix(service); - int serviceArgc = static_cast<int>(l.size() + 1); - char** serviceArgv = new char*[serviceArgc + 1]; - serviceArgv[0] = const_cast<char*>(_progName.c_str()); - int k; - for (k = 1; k < serviceArgc; k++) - { - serviceArgv[k] = const_cast<char*>(l[k - 1].c_str()); - } - PropertiesPtr serviceProperties = createProperties(serviceArgc, serviceArgv); - StringSeq serviceArgs; - for (k = 1; k < serviceArgc; k++) - { - serviceArgs.push_back(serviceArgv[k]); - } - delete[] serviceArgv; + PropertiesPtr serviceProperties = createProperties(); + serviceArgs = serviceProperties->parseCommandLineOptions("Ice", serviceArgs); + serviceArgs = serviceProperties->parseCommandLineOptions(service, serviceArgs); // // Load the dynamic library. diff --git a/cpp/src/IcePack/.depend b/cpp/src/IcePack/.depend index a67c777aa63..f17f1090023 100644 --- a/cpp/src/IcePack/.depend +++ b/cpp/src/IcePack/.depend @@ -1,9 +1,9 @@ Admin.o: Admin.cpp ../../include/IcePack/Admin.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/LocalException.h ../../include/Ice/ObjectFactory.h ../../include/Ice/Stream.h ../../include/Ice/BuiltinSequences.h -Grammar.o: Grammar.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h ../../include/Ice/Properties.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Communicator.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/SystemF.h ../../include/Ice/SslExtensionF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../IcePack/Parser.h ../../include/IcePack/Admin.h -Scanner.o: Scanner.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h ../../include/Ice/Properties.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Communicator.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/SystemF.h ../../include/Ice/SslExtensionF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../IcePack/Parser.h ../../include/IcePack/Admin.h ../IcePack/Grammar.h -Parser.o: Parser.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h ../../include/Ice/Properties.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Communicator.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/SystemF.h ../../include/Ice/SslExtensionF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../IcePack/Parser.h ../../include/IcePack/Admin.h -Client.o: Client.cpp ../../include/Ice/Application.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h ../../include/Ice/Properties.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Communicator.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/SystemF.h ../../include/Ice/SslExtensionF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../IcePack/Parser.h ../../include/IcePack/Admin.h -Server.o: Server.cpp ../../include/Ice/Application.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h ../../include/Ice/Properties.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Communicator.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/SystemF.h ../../include/Ice/SslExtensionF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../IcePack/AdminI.h ../../include/IcePack/Admin.h ../IcePack/Forward.h ../../include/IcePack/AdminF.h ../IcePack/Activator.h ../../include/IceUtil/Thread.h -Forward.o: Forward.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h ../../include/Ice/Properties.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Communicator.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/SystemF.h ../../include/Ice/SslExtensionF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../IcePack/Forward.h ../../include/IcePack/AdminF.h ../IcePack/Activator.h ../../include/IceUtil/Thread.h ../../include/IcePack/Admin.h -AdminI.o: AdminI.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h ../../include/Ice/Properties.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Communicator.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/SystemF.h ../../include/Ice/SslExtensionF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../IcePack/AdminI.h ../../include/IcePack/Admin.h -Activator.o: Activator.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h ../../include/Ice/Properties.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Communicator.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/SystemF.h ../../include/Ice/SslExtensionF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../IcePack/Activator.h ../../include/IceUtil/Thread.h ../../include/IcePack/Admin.h +Grammar.o: Grammar.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Communicator.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../IcePack/Parser.h ../../include/IcePack/Admin.h +Scanner.o: Scanner.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Communicator.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../IcePack/Parser.h ../../include/IcePack/Admin.h ../IcePack/Grammar.h +Parser.o: Parser.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Communicator.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../IcePack/Parser.h ../../include/IcePack/Admin.h +Client.o: Client.cpp ../../include/Ice/Application.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Communicator.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../IcePack/Parser.h ../../include/IcePack/Admin.h +Server.o: Server.cpp ../../include/Ice/Application.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Communicator.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../IcePack/AdminI.h ../../include/IcePack/Admin.h ../IcePack/Forward.h ../../include/IcePack/AdminF.h ../IcePack/Activator.h ../../include/IceUtil/Thread.h +Forward.o: Forward.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Communicator.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../IcePack/Forward.h ../../include/IcePack/AdminF.h ../IcePack/Activator.h ../../include/IceUtil/Thread.h ../../include/IcePack/Admin.h +AdminI.o: AdminI.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Communicator.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../IcePack/AdminI.h ../../include/IcePack/Admin.h +Activator.o: Activator.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Communicator.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../IcePack/Activator.h ../../include/IceUtil/Thread.h ../../include/IcePack/Admin.h diff --git a/cpp/src/IcePack/Client.cpp b/cpp/src/IcePack/Client.cpp index 7a611c15a3f..0d468109d10 100644 --- a/cpp/src/IcePack/Client.cpp +++ b/cpp/src/IcePack/Client.cpp @@ -27,7 +27,6 @@ public: int main(int argc, char* argv[]) { - addArgumentPrefix("IcePack"); Client app; return app.main(argc, argv); } @@ -56,6 +55,12 @@ Client::run(int argc, char* argv[]) string commands; bool debug = false; + PropertiesPtr properties = communicator()->getProperties(); + + StringSeq args = argsToStringSeq(argc, argv); + args = properties->parseCommandLineOptions("IcePack", args); + stringSeqToArgs(args, argc, argv); + int idx = 1; while (idx < argc) { @@ -137,7 +142,6 @@ Client::run(int argc, char* argv[]) return EXIT_FAILURE; } - PropertiesPtr properties = communicator()->getProperties(); const char* adminEndpointsProperty = "IcePack.Admin.Endpoints"; string adminEndpoints = properties->getProperty(adminEndpointsProperty); if (adminEndpoints.empty()) diff --git a/cpp/src/IcePack/Server.cpp b/cpp/src/IcePack/Server.cpp index 703138f8dd8..3697d74b263 100644 --- a/cpp/src/IcePack/Server.cpp +++ b/cpp/src/IcePack/Server.cpp @@ -52,7 +52,6 @@ main(int argc, char* argv[]) sigaction(SIGCHLD, &action, 0); #endif - addArgumentPrefix("IcePack"); Server app; return app.main(argc, argv); } @@ -72,6 +71,12 @@ Server::usage() int Server::run(int argc, char* argv[]) { + PropertiesPtr properties = communicator()->getProperties(); + + StringSeq args = argsToStringSeq(argc, argv); + args = properties->parseCommandLineOptions("IcePack", args); + stringSeqToArgs(args, argc, argv); + bool nowarn = false; for (int i = 1; i < argc; ++i) { @@ -97,8 +102,6 @@ Server::run(int argc, char* argv[]) } } - PropertiesPtr properties = communicator()->getProperties(); - const char* adminEndpointsProperty = "IcePack.Admin.Endpoints"; string adminEndpoints = properties->getProperty(adminEndpointsProperty); if (!adminEndpoints.empty() && !nowarn) diff --git a/cpp/src/IcePatch/.depend b/cpp/src/IcePatch/.depend index cf6d964eed5..4304c595f53 100644 --- a/cpp/src/IcePatch/.depend +++ b/cpp/src/IcePatch/.depend @@ -1,10 +1,10 @@ IcePatch.o: IcePatch.cpp ../../include/IcePatch/IcePatch.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/LocalException.h ../../include/Ice/ObjectFactory.h ../../include/Ice/Stream.h -FileDescFactory.o: FileDescFactory.cpp ../../include/IcePatch/FileDescFactory.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h ../../include/Ice/Properties.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Communicator.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/SystemF.h ../../include/Ice/SslExtensionF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/IcePatch/IcePatch.h -Util.o: Util.cpp ../../include/IcePatch/Util.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h ../../include/Ice/Properties.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Communicator.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/SystemF.h ../../include/Ice/SslExtensionF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/IcePatch/IcePatch.h -Client.o: Client.cpp ../../include/Ice/Application.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h ../../include/Ice/Properties.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Communicator.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/SystemF.h ../../include/Ice/SslExtensionF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/IcePatch/FileDescFactory.h ../../include/IcePatch/IcePatch.h ../../include/IcePatch/Util.h ../../include/Glacier/Glacier.h ../../include/Glacier/Starter.h ../../include/Glacier/Router.h ../../include/Ice/Router.h ../../include/Glacier/SessionF.h ../../include/Glacier/Session.h ../../include/Glacier/SessionManager.h ../../include/IceUtil/Base64.h ../../include/Ice/System.h ../../include/Ice/CertificateVerifierF.h ../../include/Ice/SslExtension.h -Server.o: Server.cpp ../../include/IceUtil/IceUtil.h ../../include/IceUtil/Functional.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Unicode.h ../../include/IceUtil/UUID.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/RecMutex.h ../../include/IceUtil/RWRecMutex.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/IceUtil/Thread.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Base64.h ../../include/Ice/Application.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h ../../include/Ice/Properties.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Communicator.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/SystemF.h ../../include/Ice/SslExtensionF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../IcePatch/FileLocator.h ../../include/IcePatch/IcePatch.h ../../include/IcePatch/Util.h -IcePatchI.o: IcePatchI.cpp ../IcePatch/IcePatchI.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h ../../include/Ice/Properties.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Communicator.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/SystemF.h ../../include/Ice/SslExtensionF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/IceUtil/RWRecMutex.h ../../include/IceUtil/Thread.h ../../include/IcePatch/IcePatch.h ../../include/IcePatch/Util.h -FileLocator.o: FileLocator.cpp ../IcePatch/FileLocator.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h ../../include/Ice/Properties.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Communicator.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/SystemF.h ../../include/Ice/SslExtensionF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/IcePatch/IcePatch.h ../../include/IcePatch/Util.h ../IcePatch/IcePatchI.h ../../include/IceUtil/RWRecMutex.h ../../include/IceUtil/Thread.h +FileDescFactory.o: FileDescFactory.cpp ../../include/IcePatch/FileDescFactory.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Communicator.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/IcePatch/IcePatch.h +Util.o: Util.cpp ../../include/IcePatch/Util.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Communicator.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/IcePatch/IcePatch.h +Client.o: Client.cpp ../../include/Ice/Application.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Communicator.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/IcePatch/FileDescFactory.h ../../include/IcePatch/IcePatch.h ../../include/IcePatch/Util.h ../../include/Glacier/Glacier.h ../../include/Glacier/Starter.h ../../include/Glacier/Router.h ../../include/Ice/Router.h ../../include/Glacier/SessionF.h ../../include/Glacier/Session.h ../../include/Glacier/SessionManager.h ../../include/IceUtil/Base64.h ../../include/IceSSL/Plugin.h ../../include/Ice/Plugin.h ../../include/IceSSL/CertificateVerifierF.h +Server.o: Server.cpp ../../include/IceUtil/IceUtil.h ../../include/IceUtil/Functional.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Unicode.h ../../include/IceUtil/UUID.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/RecMutex.h ../../include/IceUtil/RWRecMutex.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/IceUtil/Thread.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Base64.h ../../include/Ice/Application.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Communicator.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../IcePatch/FileLocator.h ../../include/IcePatch/IcePatch.h ../../include/IcePatch/Util.h +IcePatchI.o: IcePatchI.cpp ../IcePatch/IcePatchI.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Communicator.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/IceUtil/RWRecMutex.h ../../include/IceUtil/Thread.h ../../include/IcePatch/IcePatch.h ../../include/IcePatch/Util.h +FileLocator.o: FileLocator.cpp ../IcePatch/FileLocator.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Communicator.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/IcePatch/IcePatch.h ../../include/IcePatch/Util.h ../IcePatch/IcePatchI.h ../../include/IceUtil/RWRecMutex.h ../../include/IceUtil/Thread.h blocksort.o: blocksort.c bzlib_private.h bzlib.h huffman.o: huffman.c bzlib_private.h bzlib.h crctable.o: crctable.c bzlib_private.h bzlib.h diff --git a/cpp/src/IcePatch/Client.cpp b/cpp/src/IcePatch/Client.cpp index 3e08de9dee6..d238528e654 100644 --- a/cpp/src/IcePatch/Client.cpp +++ b/cpp/src/IcePatch/Client.cpp @@ -13,8 +13,7 @@ #include <IcePatch/Util.h> #include <Glacier/Glacier.h> #include <IceUtil/Base64.h> -#include <Ice/System.h> -#include <Ice/SslExtension.h> +#include <IceSSL/Plugin.h> #include <iomanip> #ifdef _WIN32 # include <direct.h> @@ -125,19 +124,21 @@ IcePatch::Client::run(int argc, char* argv[]) } } - string clientConfig = properties->getProperty("Ice.SSL.Client.Config"); + string clientConfig = properties->getProperty("IceSSL.Client.Config"); if (!clientConfig.empty()) { string privateKeyBase64 = IceUtil::Base64::encode(privateKey); string publicKeyBase64 = IceUtil::Base64::encode(publicKey); string routerCertString = IceUtil::Base64::encode(routerCert); - - IceSSL::SystemPtr sslSystem = communicator()->getSslSystem(); - IceSSL::SslExtensionPtr sslExtension = communicator()->getSslExtension(); - sslSystem->setCertificateVerifier(IceSSL::Client, sslExtension->getSingleCertVerifier(routerCert)); - sslSystem->setRSAKeysBase64(IceSSL::Client, privateKeyBase64, publicKeyBase64); - sslSystem->addTrustedCertificateBase64(IceSSL::Client, routerCertString); + PluginManagerPtr pluginManager = communicator()->getPluginManager(); + PluginPtr plugin = pluginManager->getPlugin("IceSSL"); + IceSSL::PluginPtr sslPlugin = IceSSL::PluginPtr::dynamicCast(plugin); + assert(sslPlugin); + + sslPlugin->setCertificateVerifier(IceSSL::Client, sslPlugin->getSingleCertVerifier(routerCert)); + sslPlugin->setRSAKeysBase64(IceSSL::Client, privateKeyBase64, publicKeyBase64); + sslPlugin->addTrustedCertificateBase64(IceSSL::Client, routerCertString); } communicator()->setDefaultRouter(router); @@ -409,8 +410,21 @@ IcePatch::Client::patch(const FileDescSeq& fileDescSeq, const string& indent) int main(int argc, char* argv[]) { - addArgumentPrefix("IcePatch"); - addArgumentPrefix("Glacier"); + PropertiesPtr defaultProperties; + try + { + defaultProperties = getDefaultProperties(argc, argv); + StringSeq args = argsToStringSeq(argc, argv); + args = defaultProperties->parseCommandLineOptions("IcePatch", args); + args = defaultProperties->parseCommandLineOptions("Glacier", args); + stringSeqToArgs(args, argc, argv); + } + catch(const Exception& ex) + { + cerr << argv[0] << ": " << ex << endl; + return EXIT_FAILURE; + } + Client app; return app.main(argc, argv); } diff --git a/cpp/src/IcePatch/Makefile b/cpp/src/IcePatch/Makefile index ff396e9397b..7e9bd4aaeb4 100644 --- a/cpp/src/IcePatch/Makefile +++ b/cpp/src/IcePatch/Makefile @@ -62,11 +62,11 @@ $(NAME): $(VERSIONED_NAME) $(CLIENT): $(COBJS) rm -f $@ - $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(COBJS) -lIcePatch -lGlacier $(LIBS) + $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(COBJS) -lIcePatch -lGlacier $(SSL_LIBS) $(LIBS) $(SERVER): $(SOBJS) rm -f $@ - $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(SOBJS) -lIcePatch $(LIBS) + $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(SOBJS) -lIcePatch $(OPENSSL_LIBS) $(LIBS) $(HDIR)/IcePatch.h IcePatch.cpp: $(SDIR)/IcePatch.ice $(SLICE2CPP) rm -f $(HDIR)/IcePatch.h IcePatch.cpp diff --git a/cpp/src/IcePatch/Server.cpp b/cpp/src/IcePatch/Server.cpp index 37f077a93d0..5ced21f7d3b 100644 --- a/cpp/src/IcePatch/Server.cpp +++ b/cpp/src/IcePatch/Server.cpp @@ -256,7 +256,20 @@ IcePatch::Updater::cleanup(const FileDescSeq& fileDescSeq) int main(int argc, char* argv[]) { - addArgumentPrefix("IcePatch"); + PropertiesPtr defaultProperties; + try + { + defaultProperties = getDefaultProperties(argc, argv); + StringSeq args = argsToStringSeq(argc, argv); + args = defaultProperties->parseCommandLineOptions("IcePatch", args); + stringSeqToArgs(args, argc, argv); + } + catch(const Exception& ex) + { + cerr << argv[0] << ": " << ex << endl; + return EXIT_FAILURE; + } + Server app; return app.main(argc, argv); } diff --git a/cpp/src/IceSSL/.depend b/cpp/src/IceSSL/.depend new file mode 100644 index 00000000000..4cc0b765873 --- /dev/null +++ b/cpp/src/IceSSL/.depend @@ -0,0 +1,35 @@ +Plugin.o: Plugin.cpp ../../include/IceSSL/Plugin.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Plugin.h ../../include/IceSSL/CertificateVerifierF.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Stream.h +Exception.o: Exception.cpp ../../include/IceSSL/Exception.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h +PluginBaseI.o: PluginBaseI.cpp ../Ice/Instance.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Lock.h ../../include/IceUtil/RecMutex.h ../../include/Ice/InstanceF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../Ice/RouterInfoF.h ../Ice/ReferenceFactoryF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/ConnectionFactoryF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/EndpointFactoryF.h ../../include/Ice/PluginF.h ../IceSSL/PluginBaseI.h ../../include/Ice/Properties.h ../../include/Ice/BuiltinSequences.h ../../include/IceSSL/Plugin.h ../../include/Ice/Plugin.h ../../include/IceSSL/CertificateVerifierF.h ../IceSSL/PluginBaseIF.h ../IceSSL/SslConnectionF.h +OpenSSLPluginI.o: OpenSSLPluginI.cpp ../../include/IceUtil/Config.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Lock.h ../../include/IceUtil/RecMutex.h ../Ice/TraceLevels.h ../../include/IceUtil/Shared.h ../Ice/TraceLevelsF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/PropertiesF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/StreamF.h ../../include/Ice/Logger.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Communicator.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/LoggerF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/PluginF.h ../Ice/EndpointFactory.h ../../include/Ice/EndpointFactoryF.h ../IceSSL/OpenSSLPluginI.h ../IceSSL/PluginBaseI.h ../../include/Ice/Properties.h ../../include/IceSSL/Plugin.h ../../include/Ice/Plugin.h ../../include/IceSSL/CertificateVerifierF.h ../IceSSL/PluginBaseIF.h ../IceSSL/SslConnectionF.h ../IceSSL/CertificateDesc.h ../IceSSL/CertificateAuthority.h ../IceSSL/BaseCerts.h ../IceSSL/TempCerts.h ../IceSSL/ContextOpenSSLServer.h ../IceSSL/ContextOpenSSL.h ../IceSSL/OpenSSL.h ../../include/IceSSL/CertificateVerifierOpenSSL.h ../../include/IceSSL/CertificateVerifier.h ../IceSSL/GeneralConfig.h ../IceSSL/SslConnectionOpenSSLF.h ../IceSSL/ContextOpenSSLF.h ../../include/IceSSL/RSAPublicKey.h ../../include/IceSSL/RSAPublicKeyF.h ../../include/IceSSL/RSAKeyPairF.h ../IceSSL/ContextOpenSSLClient.h ../../include/IceSSL/RSAPrivateKeyF.h ../IceSSL/DHParamsF.h ../../include/IceSSL/Exception.h ../IceSSL/ConfigParser.h ../IceSSL/OpenSSLJanitors.h ../IceSSL/OpenSSLUtils.h ../IceSSL/SslConnectionOpenSSL.h ../IceSSL/SslConnection.h ../IceSSL/DefaultCertificateVerifier.h ../Ice/Instance.h ../Ice/RouterInfoF.h ../Ice/ReferenceFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/ConnectionFactoryF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../IceSSL/SingleCertificateVerifier.h ../IceSSL/SslEndpoint.h ../Ice/Endpoint.h ../Ice/TransceiverF.h ../Ice/ConnectorF.h ../Ice/AcceptorF.h ../../include/IceSSL/RSAPrivateKey.h ../IceSSL/DHParams.h +SslEndpoint.o: SslEndpoint.cpp ../Ice/Network.h ../../include/Ice/Config.h ../../include/IceUtil/Config.h ../IceSSL/SslEndpoint.h ../Ice/Endpoint.h ../../include/IceUtil/Shared.h ../../include/Ice/EndpointF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/InstanceF.h ../Ice/TransceiverF.h ../Ice/ConnectorF.h ../Ice/AcceptorF.h ../Ice/EndpointFactory.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/EndpointFactoryF.h ../IceSSL/SslAcceptor.h ../Ice/TraceLevelsF.h ../../include/Ice/LoggerF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/StreamF.h ../Ice/Acceptor.h ../IceSSL/SslConnector.h ../Ice/Connector.h ../IceSSL/SslTransceiver.h ../IceSSL/SslConnectionF.h ../Ice/Transceiver.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h ../Ice/Instance.h ../../include/IceUtil/RecMutex.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../Ice/RouterInfoF.h ../Ice/ReferenceFactoryF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/ConnectionFactoryF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/PluginF.h +SslException.o: SslException.cpp ../../include/Ice/LocalException.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/Identity.h ../../include/IceSSL/Exception.h +SslConnector.o: SslConnector.cpp ../Ice/Instance.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Lock.h ../../include/IceUtil/RecMutex.h ../../include/Ice/InstanceF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../Ice/RouterInfoF.h ../Ice/ReferenceFactoryF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/ConnectionFactoryF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/EndpointFactoryF.h ../../include/Ice/PluginF.h ../Ice/TraceLevels.h ../../include/Ice/Logger.h ../Ice/Network.h ../../include/Ice/Properties.h ../../include/Ice/BuiltinSequences.h ../IceSSL/PluginBaseI.h ../../include/IceSSL/Plugin.h ../../include/Ice/Plugin.h ../../include/IceSSL/CertificateVerifierF.h ../IceSSL/PluginBaseIF.h ../IceSSL/SslConnectionF.h ../IceSSL/SslConnector.h ../Ice/TransceiverF.h ../Ice/Connector.h ../Ice/ConnectorF.h ../IceSSL/SslTransceiver.h ../Ice/Transceiver.h ../../include/IceSSL/Exception.h +SslAcceptor.o: SslAcceptor.cpp ../Ice/Instance.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Lock.h ../../include/IceUtil/RecMutex.h ../../include/Ice/InstanceF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../Ice/RouterInfoF.h ../Ice/ReferenceFactoryF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/ConnectionFactoryF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/EndpointFactoryF.h ../../include/Ice/PluginF.h ../Ice/TraceLevels.h ../../include/Ice/Logger.h ../Ice/Network.h ../../include/Ice/Properties.h ../../include/Ice/BuiltinSequences.h ../IceSSL/PluginBaseI.h ../../include/IceSSL/Plugin.h ../../include/Ice/Plugin.h ../../include/IceSSL/CertificateVerifierF.h ../IceSSL/PluginBaseIF.h ../IceSSL/SslConnectionF.h ../IceSSL/SslAcceptor.h ../Ice/TransceiverF.h ../Ice/Acceptor.h ../Ice/AcceptorF.h ../IceSSL/SslTransceiver.h ../Ice/Transceiver.h ../../include/IceSSL/Exception.h +SslTransceiver.o: SslTransceiver.cpp ../IceSSL/OpenSSL.h ../IceSSL/SslConnection.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/Ice/Buffer.h ../../include/Ice/Config.h ../Ice/TraceLevelsF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/LoggerF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/StreamF.h ../IceSSL/SslConnectionF.h ../../include/IceSSL/CertificateVerifierF.h ../IceSSL/SslTransceiver.h ../../include/Ice/InstanceF.h ../Ice/Transceiver.h ../Ice/TransceiverF.h ../Ice/Instance.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/RecMutex.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../Ice/RouterInfoF.h ../Ice/ReferenceFactoryF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/ConnectionFactoryF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/EndpointFactoryF.h ../../include/Ice/PluginF.h ../Ice/TraceLevels.h ../../include/Ice/Logger.h ../Ice/Network.h +BaseCerts.o: BaseCerts.cpp ../IceSSL/BaseCerts.h ../IceSSL/CertificateDesc.h +CertificateAuthority.o: CertificateAuthority.cpp ../IceSSL/CertificateAuthority.h +CertificateDesc.o: CertificateDesc.cpp ../IceSSL/CertificateDesc.h +ConfigParser.o: ConfigParser.cpp ../IceSSL/OpenSSL.h ../../include/IceSSL/Exception.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../IceSSL/ConfigParserErrorReporter.h ../Ice/TraceLevelsF.h ../../include/Ice/LoggerF.h ../IceSSL/ConfigParser.h ../IceSSL/CertificateDesc.h ../IceSSL/GeneralConfig.h ../IceSSL/CertificateAuthority.h ../IceSSL/BaseCerts.h ../IceSSL/TempCerts.h +ConfigParserErrorReporter.o: ConfigParserErrorReporter.cpp ../Ice/TraceLevels.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../Ice/TraceLevelsF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/PropertiesF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/StreamF.h ../../include/Ice/Logger.h ../IceSSL/ConfigParserErrorReporter.h ../../include/Ice/LoggerF.h ../IceSSL/OpenSSL.h +SslConnection.o: SslConnection.cpp ../IceSSL/SslConnection.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/Ice/Buffer.h ../../include/Ice/Config.h ../Ice/TraceLevelsF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/LoggerF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/StreamF.h ../IceSSL/SslConnectionF.h ../../include/IceSSL/CertificateVerifierF.h +SslConnectionOpenSSLClient.o: SslConnectionOpenSSLClient.cpp ../Ice/Network.h ../../include/Ice/Config.h ../../include/IceUtil/Config.h ../Ice/TraceLevels.h ../../include/IceUtil/Shared.h ../Ice/TraceLevelsF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/PropertiesF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/StreamF.h ../../include/Ice/Logger.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h ../IceSSL/OpenSSLUtils.h ../IceSSL/OpenSSL.h ../../include/IceSSL/Exception.h ../IceSSL/OpenSSLJanitors.h ../IceSSL/SslConnectionOpenSSLClient.h ../IceSSL/SslConnectionOpenSSL.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../IceSSL/SslConnection.h ../../include/Ice/Buffer.h ../../include/Ice/LoggerF.h ../IceSSL/SslConnectionF.h ../../include/IceSSL/CertificateVerifierF.h ../IceSSL/PluginBaseIF.h ../IceSSL/SslConnectionOpenSSLF.h ../../include/IceSSL/CertificateVerifierOpenSSL.h ../../include/IceSSL/CertificateVerifier.h +SslConnectionOpenSSL.o: SslConnectionOpenSSL.cpp ../Ice/Network.h ../../include/Ice/Config.h ../../include/IceUtil/Config.h ../Ice/TraceLevels.h ../../include/IceUtil/Shared.h ../Ice/TraceLevelsF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/PropertiesF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/StreamF.h ../../include/Ice/Logger.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h ../IceSSL/OpenSSL.h ../../include/IceSSL/Exception.h ../IceSSL/SslConnection.h ../../include/Ice/Buffer.h ../../include/Ice/LoggerF.h ../IceSSL/SslConnectionF.h ../../include/IceSSL/CertificateVerifierF.h ../IceSSL/SslConnectionOpenSSL.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../IceSSL/PluginBaseIF.h ../IceSSL/SslConnectionOpenSSLF.h ../../include/IceSSL/CertificateVerifierOpenSSL.h ../../include/IceSSL/CertificateVerifier.h ../IceSSL/OpenSSLPluginI.h ../../include/IceUtil/RecMutex.h ../IceSSL/PluginBaseI.h ../../include/Ice/InstanceF.h ../../include/Ice/Properties.h ../../include/Ice/BuiltinSequences.h ../../include/IceSSL/Plugin.h ../../include/Ice/Plugin.h ../IceSSL/CertificateDesc.h ../IceSSL/CertificateAuthority.h ../IceSSL/BaseCerts.h ../IceSSL/TempCerts.h ../IceSSL/ContextOpenSSLServer.h ../IceSSL/ContextOpenSSL.h ../IceSSL/GeneralConfig.h ../IceSSL/ContextOpenSSLF.h ../../include/IceSSL/RSAPublicKey.h ../../include/IceSSL/RSAPublicKeyF.h ../../include/IceSSL/RSAKeyPairF.h ../IceSSL/ContextOpenSSLClient.h ../../include/IceSSL/RSAPrivateKeyF.h ../IceSSL/DHParamsF.h ../IceSSL/OpenSSLUtils.h +SslConnectionOpenSSLServer.o: SslConnectionOpenSSLServer.cpp ../Ice/Network.h ../../include/Ice/Config.h ../../include/IceUtil/Config.h ../Ice/TraceLevels.h ../../include/IceUtil/Shared.h ../Ice/TraceLevelsF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/PropertiesF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/StreamF.h ../../include/Ice/Logger.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h ../IceSSL/OpenSSLUtils.h ../IceSSL/OpenSSL.h ../../include/IceSSL/Exception.h ../IceSSL/OpenSSLJanitors.h ../IceSSL/SslConnectionOpenSSLServer.h ../IceSSL/SslConnectionOpenSSL.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../IceSSL/SslConnection.h ../../include/Ice/Buffer.h ../../include/Ice/LoggerF.h ../IceSSL/SslConnectionF.h ../../include/IceSSL/CertificateVerifierF.h ../IceSSL/PluginBaseIF.h ../IceSSL/SslConnectionOpenSSLF.h ../../include/IceSSL/CertificateVerifierOpenSSL.h ../../include/IceSSL/CertificateVerifier.h +ContextOpenSSL.o: ContextOpenSSL.cpp ../Ice/Instance.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Lock.h ../../include/IceUtil/RecMutex.h ../../include/Ice/InstanceF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../Ice/RouterInfoF.h ../Ice/ReferenceFactoryF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/ConnectionFactoryF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/EndpointFactoryF.h ../../include/Ice/PluginF.h ../../include/Ice/Properties.h ../../include/Ice/BuiltinSequences.h ../IceSSL/DefaultCertificateVerifier.h ../../include/Ice/Logger.h ../Ice/TraceLevels.h ../../include/IceSSL/CertificateVerifierOpenSSL.h ../../include/IceSSL/CertificateVerifier.h ../../include/IceSSL/Exception.h ../../include/IceSSL/RSAKeyPair.h ../../include/IceSSL/RSAKeyPairF.h ../../include/IceSSL/RSACertificateGenF.h ../../include/IceSSL/RSAPrivateKeyF.h ../../include/IceSSL/RSAPublicKeyF.h ../IceSSL/CertificateDesc.h ../IceSSL/SslConnectionOpenSSL.h ../IceSSL/SslConnection.h ../../include/Ice/Buffer.h ../IceSSL/SslConnectionF.h ../../include/IceSSL/CertificateVerifierF.h ../IceSSL/PluginBaseIF.h ../IceSSL/SslConnectionOpenSSLF.h ../IceSSL/ContextOpenSSL.h ../IceSSL/OpenSSL.h ../IceSSL/GeneralConfig.h ../IceSSL/CertificateAuthority.h ../IceSSL/BaseCerts.h ../IceSSL/TempCerts.h ../IceSSL/ContextOpenSSLF.h ../../include/IceSSL/RSAPublicKey.h ../IceSSL/OpenSSLJanitors.h ../IceSSL/OpenSSLUtils.h +ContextOpenSSLClient.o: ContextOpenSSLClient.cpp ../Ice/TraceLevels.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../Ice/TraceLevelsF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/PropertiesF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/StreamF.h ../../include/Ice/Logger.h ../../include/IceSSL/Exception.h ../IceSSL/SslConnectionOpenSSL.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../IceSSL/SslConnection.h ../../include/Ice/Buffer.h ../../include/Ice/LoggerF.h ../IceSSL/SslConnectionF.h ../../include/IceSSL/CertificateVerifierF.h ../IceSSL/PluginBaseIF.h ../IceSSL/SslConnectionOpenSSLF.h ../../include/IceSSL/CertificateVerifierOpenSSL.h ../../include/IceSSL/CertificateVerifier.h ../IceSSL/ContextOpenSSLClient.h ../IceSSL/ContextOpenSSL.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../IceSSL/OpenSSL.h ../IceSSL/GeneralConfig.h ../IceSSL/CertificateAuthority.h ../IceSSL/BaseCerts.h ../IceSSL/CertificateDesc.h ../IceSSL/TempCerts.h ../IceSSL/ContextOpenSSLF.h ../../include/IceSSL/RSAPublicKey.h ../../include/IceSSL/RSAPublicKeyF.h ../../include/IceSSL/RSAKeyPairF.h ../IceSSL/SslConnectionOpenSSLClient.h +ContextOpenSSLServer.o: ContextOpenSSLServer.cpp ../Ice/TraceLevels.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../Ice/TraceLevelsF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/PropertiesF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/StreamF.h ../../include/Ice/Logger.h ../../include/IceSSL/Exception.h ../IceSSL/SslConnectionOpenSSL.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../IceSSL/SslConnection.h ../../include/Ice/Buffer.h ../../include/Ice/LoggerF.h ../IceSSL/SslConnectionF.h ../../include/IceSSL/CertificateVerifierF.h ../IceSSL/PluginBaseIF.h ../IceSSL/SslConnectionOpenSSLF.h ../../include/IceSSL/CertificateVerifierOpenSSL.h ../../include/IceSSL/CertificateVerifier.h ../IceSSL/ContextOpenSSLServer.h ../IceSSL/ContextOpenSSL.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../IceSSL/OpenSSL.h ../IceSSL/GeneralConfig.h ../IceSSL/CertificateAuthority.h ../IceSSL/BaseCerts.h ../IceSSL/CertificateDesc.h ../IceSSL/TempCerts.h ../IceSSL/ContextOpenSSLF.h ../../include/IceSSL/RSAPublicKey.h ../../include/IceSSL/RSAPublicKeyF.h ../../include/IceSSL/RSAKeyPairF.h ../IceSSL/SslConnectionOpenSSLServer.h ../IceSSL/OpenSSLUtils.h +GeneralConfig.o: GeneralConfig.cpp ../IceSSL/GeneralConfig.h ../IceSSL/OpenSSL.h +TempCerts.o: TempCerts.cpp ../IceSSL/TempCerts.h ../IceSSL/CertificateDesc.h +CertificateVerifier.o: CertificateVerifier.cpp ../../include/IceSSL/CertificateVerifier.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h +CertificateVerifierOpenSSL.o: CertificateVerifierOpenSSL.cpp ../../include/IceSSL/CertificateVerifierOpenSSL.h ../../include/IceSSL/CertificateVerifier.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h +OpenSSLJanitors.o: OpenSSLJanitors.cpp ../IceSSL/OpenSSLJanitors.h ../../include/IceUtil/Config.h +RSACertificateGen.o: RSACertificateGen.cpp ../../include/IceUtil/Config.h ../../include/IceSSL/RSACertificateGen.h ../../include/IceSSL/RSAKeyPairF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../IceSSL/OpenSSLJanitors.h ../../include/IceSSL/RSAKeyPair.h ../../include/IceUtil/Shared.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/StreamF.h ../../include/IceSSL/RSACertificateGenF.h ../../include/IceSSL/RSAPrivateKeyF.h ../../include/IceSSL/RSAPublicKeyF.h ../../include/IceSSL/RSAPrivateKey.h ../../include/IceSSL/RSAPublicKey.h ../../include/IceSSL/Exception.h ../IceSSL/OpenSSLUtils.h +Convert.o: Convert.cpp ../../include/IceUtil/Config.h ../IceSSL/Convert.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h +RSAPrivateKey.o: RSAPrivateKey.cpp ../../include/IceUtil/Config.h ../../include/IceUtil/Base64.h ../../include/IceSSL/RSAPrivateKey.h ../../include/IceUtil/Shared.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/StreamF.h ../../include/IceSSL/RSAPrivateKeyF.h ../IceSSL/Convert.h ../IceSSL/OpenSSLUtils.h ../../include/IceSSL/Exception.h +RSAPublicKey.o: RSAPublicKey.cpp ../../include/IceUtil/Config.h ../../include/IceUtil/Base64.h ../../include/IceSSL/RSAPublicKey.h ../../include/IceUtil/Shared.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/StreamF.h ../../include/IceSSL/RSAPublicKeyF.h ../IceSSL/Convert.h ../IceSSL/OpenSSLUtils.h ../../include/IceSSL/Exception.h +RSAKeyPair.o: RSAKeyPair.cpp ../../include/IceUtil/Config.h ../../include/IceUtil/Base64.h ../../include/IceSSL/RSAKeyPair.h ../../include/IceUtil/Shared.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/StreamF.h ../../include/IceSSL/RSAKeyPairF.h ../../include/IceSSL/RSACertificateGenF.h ../../include/IceSSL/RSAPrivateKeyF.h ../../include/IceSSL/RSAPublicKeyF.h ../../include/IceSSL/RSAPrivateKey.h ../../include/IceSSL/RSAPublicKey.h +DHParams.o: DHParams.cpp ../IceSSL/DHParams.h ../../include/IceUtil/Config.h ../../include/IceUtil/Shared.h ../IceSSL/DHParamsF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h +OpenSSLUtils.o: OpenSSLUtils.cpp ../../include/IceUtil/Mutex.h ../../include/IceUtil/Config.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Lock.h ../IceSSL/OpenSSLUtils.h ../IceSSL/OpenSSLPluginI.h ../../include/IceUtil/RecMutex.h ../Ice/TraceLevelsF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/LoggerF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../IceSSL/PluginBaseI.h ../../include/Ice/InstanceF.h ../../include/Ice/Properties.h ../../include/Ice/BuiltinSequences.h ../../include/IceSSL/Plugin.h ../../include/Ice/Plugin.h ../../include/IceSSL/CertificateVerifierF.h ../IceSSL/PluginBaseIF.h ../IceSSL/SslConnectionF.h ../IceSSL/CertificateDesc.h ../IceSSL/CertificateAuthority.h ../IceSSL/BaseCerts.h ../IceSSL/TempCerts.h ../IceSSL/ContextOpenSSLServer.h ../IceSSL/ContextOpenSSL.h ../../include/Ice/PropertiesF.h ../IceSSL/OpenSSL.h ../../include/IceSSL/CertificateVerifierOpenSSL.h ../../include/IceSSL/CertificateVerifier.h ../IceSSL/GeneralConfig.h ../IceSSL/SslConnectionOpenSSLF.h ../IceSSL/ContextOpenSSLF.h ../../include/IceSSL/RSAPublicKey.h ../../include/IceSSL/RSAPublicKeyF.h ../../include/IceSSL/RSAKeyPairF.h ../IceSSL/ContextOpenSSLClient.h ../../include/IceSSL/RSAPrivateKeyF.h ../IceSSL/DHParamsF.h ../IceSSL/SslConnectionOpenSSL.h ../IceSSL/SslConnection.h ../../include/Ice/Buffer.h +DefaultCertificateVerifier.o: DefaultCertificateVerifier.cpp ../IceSSL/OpenSSL.h ../IceSSL/DefaultCertificateVerifier.h ../../include/IceUtil/Config.h ../../include/Ice/Logger.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../Ice/TraceLevels.h ../Ice/TraceLevelsF.h ../../include/Ice/PropertiesF.h ../Ice/Instance.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/RecMutex.h ../../include/Ice/InstanceF.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LoggerF.h ../Ice/RouterInfoF.h ../Ice/ReferenceFactoryF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/ConnectionFactoryF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../../include/Ice/EndpointFactoryF.h ../../include/Ice/PluginF.h ../../include/IceSSL/CertificateVerifierOpenSSL.h ../../include/IceSSL/CertificateVerifier.h ../IceSSL/OpenSSLUtils.h +SingleCertificateVerifier.o: SingleCertificateVerifier.cpp ../IceSSL/SingleCertificateVerifier.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/IceSSL/CertificateVerifierOpenSSL.h ../../include/IceSSL/CertificateVerifier.h ../IceSSL/Convert.h diff --git a/cpp/src/Ice/BaseCerts.cpp b/cpp/src/IceSSL/BaseCerts.cpp index 287dd9723d3..f7798d6127f 100644 --- a/cpp/src/Ice/BaseCerts.cpp +++ b/cpp/src/IceSSL/BaseCerts.cpp @@ -8,7 +8,7 @@ // // ********************************************************************** -#include <Ice/BaseCerts.h> +#include <IceSSL/BaseCerts.h> using namespace IceSSL; @@ -49,4 +49,3 @@ IceSSL::BaseCertificates::getDHParams() const { return _dhParams; } - diff --git a/cpp/src/Ice/BaseCerts.h b/cpp/src/IceSSL/BaseCerts.h index 8964ba7627e..3841d59df50 100644 --- a/cpp/src/Ice/BaseCerts.h +++ b/cpp/src/IceSSL/BaseCerts.h @@ -11,7 +11,7 @@ #ifndef ICE_SSL_BASE_CERTS_H #define ICE_SSL_BASE_CERTS_H -#include <Ice/CertificateDesc.h> +#include <IceSSL/CertificateDesc.h> #include <ostream> namespace IceSSL diff --git a/cpp/src/Ice/CertificateAuthority.cpp b/cpp/src/IceSSL/CertificateAuthority.cpp index 1e78f190763..9e5a4a2a9f7 100644 --- a/cpp/src/Ice/CertificateAuthority.cpp +++ b/cpp/src/IceSSL/CertificateAuthority.cpp @@ -8,7 +8,7 @@ // // ********************************************************************** -#include <Ice/CertificateAuthority.h> +#include <IceSSL/CertificateAuthority.h> using namespace std; diff --git a/cpp/src/Ice/CertificateAuthority.h b/cpp/src/IceSSL/CertificateAuthority.h index 99b723ae182..99b723ae182 100644 --- a/cpp/src/Ice/CertificateAuthority.h +++ b/cpp/src/IceSSL/CertificateAuthority.h diff --git a/cpp/src/Ice/CertificateDesc.cpp b/cpp/src/IceSSL/CertificateDesc.cpp index eef53fb0af9..d13836b52b8 100644 --- a/cpp/src/Ice/CertificateDesc.cpp +++ b/cpp/src/IceSSL/CertificateDesc.cpp @@ -17,7 +17,7 @@ #pragma warning(disable:4786) #endif -#include <Ice/CertificateDesc.h> +#include <IceSSL/CertificateDesc.h> using namespace std; using namespace IceSSL; @@ -130,4 +130,3 @@ IceSSL::CertificateDesc::getPrivate() const { return _private; } - diff --git a/cpp/src/Ice/CertificateDesc.h b/cpp/src/IceSSL/CertificateDesc.h index 5b92a0fbc51..d2361669272 100644 --- a/cpp/src/Ice/CertificateDesc.h +++ b/cpp/src/IceSSL/CertificateDesc.h @@ -7,14 +7,16 @@ // All Rights Reserved // // ********************************************************************** + +#ifndef ICE_SSL_CERTIFICATE_DESC_H +#define ICE_SSL_CERTIFICATE_DESC_H + #ifdef _WIN32 #pragma warning(disable:4786) #endif -#ifndef ICE_SSL_CERTIFICATE_DESC_H -#define ICE_SSL_CERTIFICATE_DESC_H +#include <openssl/ssl.h> -#include <string> #include <vector> #include <ostream> diff --git a/cpp/src/Ice/CertificateVerifierOpenSSL.cpp b/cpp/src/IceSSL/CertificateVerifierOpenSSL.cpp index 1ddd5554af1..6e0a38602bb 100644 --- a/cpp/src/Ice/CertificateVerifierOpenSSL.cpp +++ b/cpp/src/IceSSL/CertificateVerifierOpenSSL.cpp @@ -8,7 +8,7 @@ // // ********************************************************************** -#include <Ice/CertificateVerifierOpenSSL.h> +#include <IceSSL/CertificateVerifierOpenSSL.h> IceSSL::OpenSSL::CertificateVerifier::~CertificateVerifier() { diff --git a/cpp/src/Ice/ConfigParser.cpp b/cpp/src/IceSSL/ConfigParser.cpp index 2f00b7afc51..48557ac2ada 100644 --- a/cpp/src/Ice/ConfigParser.cpp +++ b/cpp/src/IceSSL/ConfigParser.cpp @@ -25,10 +25,10 @@ #include <framework/LocalFileInputSource.hpp> #include <util/Janitor.hpp> -#include <Ice/OpenSSL.h> -#include <Ice/SslException.h> -#include <Ice/ConfigParserErrorReporter.h> -#include <Ice/ConfigParser.h> +#include <IceSSL/OpenSSL.h> +#include <IceSSL/Exception.h> +#include <IceSSL/ConfigParserErrorReporter.h> +#include <IceSSL/ConfigParser.h> #include <algorithm> diff --git a/cpp/src/Ice/ConfigParser.h b/cpp/src/IceSSL/ConfigParser.h index 10d2ffb5335..eef74f93e8d 100644 --- a/cpp/src/Ice/ConfigParser.h +++ b/cpp/src/IceSSL/ConfigParser.h @@ -14,11 +14,11 @@ #include <dom/DOM.hpp> #include <Ice/TraceLevelsF.h> #include <Ice/LoggerF.h> -#include <Ice/CertificateDesc.h> -#include <Ice/GeneralConfig.h> -#include <Ice/CertificateAuthority.h> -#include <Ice/BaseCerts.h> -#include <Ice/TempCerts.h> +#include <IceSSL/CertificateDesc.h> +#include <IceSSL/GeneralConfig.h> +#include <IceSSL/CertificateAuthority.h> +#include <IceSSL/BaseCerts.h> +#include <IceSSL/TempCerts.h> #include <string> namespace IceSSL diff --git a/cpp/src/Ice/ConfigParserErrorReporter.cpp b/cpp/src/IceSSL/ConfigParserErrorReporter.cpp index 44992289608..99f0ffd7630 100644 --- a/cpp/src/Ice/ConfigParserErrorReporter.cpp +++ b/cpp/src/IceSSL/ConfigParserErrorReporter.cpp @@ -8,16 +8,14 @@ // // ********************************************************************** -#include <iostream> -#include <sstream> - -#include <sax/SAXParseException.hpp> -#include <Ice/ConfigParserErrorReporter.h> -#include <stdlib.h> -#include <string.h> #include <Ice/TraceLevels.h> #include <Ice/Logger.h> -#include <Ice/OpenSSL.h> +#include <IceSSL/ConfigParserErrorReporter.h> +#include <IceSSL/OpenSSL.h> + +#include <sax/SAXParseException.hpp> + +#include <sstream> using namespace std; diff --git a/cpp/src/Ice/ConfigParserErrorReporter.h b/cpp/src/IceSSL/ConfigParserErrorReporter.h index 6a54e3d7876..6a54e3d7876 100644 --- a/cpp/src/Ice/ConfigParserErrorReporter.h +++ b/cpp/src/IceSSL/ConfigParserErrorReporter.h diff --git a/cpp/src/Ice/ContextOpenSSL.cpp b/cpp/src/IceSSL/ContextOpenSSL.cpp index 7c9565ba103..bfeede42e02 100644 --- a/cpp/src/Ice/ContextOpenSSL.cpp +++ b/cpp/src/IceSSL/ContextOpenSSL.cpp @@ -11,15 +11,15 @@ #include <Ice/Instance.h> #include <Ice/Properties.h> -#include <Ice/DefaultCertificateVerifier.h> -#include <Ice/SslException.h> -#include <Ice/RSAKeyPair.h> -#include <Ice/CertificateDesc.h> -#include <Ice/SslConnectionOpenSSL.h> -#include <Ice/ContextOpenSSL.h> - -#include <Ice/OpenSSLJanitors.h> -#include <Ice/OpenSSLUtils.h> +#include <IceSSL/DefaultCertificateVerifier.h> +#include <IceSSL/Exception.h> +#include <IceSSL/RSAKeyPair.h> +#include <IceSSL/CertificateDesc.h> +#include <IceSSL/SslConnectionOpenSSL.h> +#include <IceSSL/ContextOpenSSL.h> + +#include <IceSSL/OpenSSLJanitors.h> +#include <IceSSL/OpenSSLUtils.h> #include <openssl/err.h> using IceSSL::ConnectionPtr; @@ -138,9 +138,9 @@ IceSSL::OpenSSL::Context::configure(const GeneralConfig& generalConfig, // IceSSL::OpenSSL::Context::Context(const IceInternal::InstancePtr& instance) : - _traceLevels(instance->traceLevels()), - _logger(instance->logger()), - _properties(instance->properties()) + _traceLevels(instance->traceLevels()), + _logger(instance->logger()), + _properties(instance->properties()) { assert(_traceLevels != 0); assert(_logger != 0); @@ -215,7 +215,7 @@ IceSSL::OpenSSL::Context::createContext(SslProtocol sslProtocol) if (_sslContext == 0) { - IceSSL::OpenSSL::ContextInitializationException contextInitEx(__FILE__, __LINE__); + ContextInitializationException contextInitEx(__FILE__, __LINE__); contextInitEx._message = "unable to create ssl context\n" + sslGetErrors(); @@ -321,7 +321,7 @@ IceSSL::OpenSSL::Context::checkKeyCert() // set against the SSL context match up. if (!SSL_CTX_check_private_key(_sslContext)) { - IceSSL::OpenSSL::CertificateKeyMatchException certKeyMatchEx(__FILE__, __LINE__); + CertificateKeyMatchException certKeyMatchEx(__FILE__, __LINE__); certKeyMatchEx._message = "private key does not match the certificate public key"; std::string sslError = sslGetErrors(); @@ -341,7 +341,7 @@ IceSSL::OpenSSL::Context::addTrustedCertificate(const RSAPublicKey& trustedCerti { if (_sslContext == 0) { - IceSSL::OpenSSL::ContextNotConfiguredException contextConfigEx(__FILE__, __LINE__); + ContextNotConfiguredException contextConfigEx(__FILE__, __LINE__); contextConfigEx._message = "ssl context not configured"; @@ -354,7 +354,7 @@ IceSSL::OpenSSL::Context::addTrustedCertificate(const RSAPublicKey& trustedCerti if (X509_STORE_add_cert(certStore, trustedCertificate.getX509PublicKey()) == 0) { - IceSSL::OpenSSL::TrustedCertificateAddException trustEx(__FILE__, __LINE__); + TrustedCertificateAddException trustEx(__FILE__, __LINE__); trustEx._message = sslGetErrors(); @@ -380,7 +380,7 @@ IceSSL::OpenSSL::Context::addKeyCert(const CertificateFile& privateKey, const Ce // Set which Public Key file to use. if (SSL_CTX_use_certificate_file(_sslContext, publicFile, publicEncoding) <= 0) { - IceSSL::OpenSSL::CertificateLoadException certLoadEx(__FILE__, __LINE__); + CertificateLoadException certLoadEx(__FILE__, __LINE__); certLoadEx._message = "unable to load certificate from '"; certLoadEx._message += publicFile; @@ -445,7 +445,7 @@ IceSSL::OpenSSL::Context::addKeyCert(const CertificateFile& privateKey, const Ce // key matches the private key when calling SSL_CTX_use_PrivateKey_file(). if (errCode == X509_R_KEY_VALUES_MISMATCH || errCode == X509_R_KEY_TYPE_MISMATCH) { - IceSSL::OpenSSL::CertificateKeyMatchException certKeyMatchEx(__FILE__, __LINE__); + CertificateKeyMatchException certKeyMatchEx(__FILE__, __LINE__); certKeyMatchEx._message = "private key does not match the certificate public key"; std::string sslError = sslGetErrors(); @@ -460,7 +460,7 @@ IceSSL::OpenSSL::Context::addKeyCert(const CertificateFile& privateKey, const Ce } else { - IceSSL::OpenSSL::PrivateKeyLoadException pklEx(__FILE__, __LINE__); + PrivateKeyLoadException pklEx(__FILE__, __LINE__); pklEx._message = "unable to load private key from '"; pklEx._message += privKeyFile; @@ -480,7 +480,7 @@ IceSSL::OpenSSL::Context::addKeyCert(const RSAKeyPair& keyPair) { if (_sslContext == 0) { - IceSSL::OpenSSL::ContextNotConfiguredException contextConfigEx(__FILE__, __LINE__); + ContextNotConfiguredException contextConfigEx(__FILE__, __LINE__); contextConfigEx._message = "ssl context not configured"; @@ -495,7 +495,7 @@ IceSSL::OpenSSL::Context::addKeyCert(const RSAKeyPair& keyPair) // Set which Public Key file to use. if (SSL_CTX_use_certificate(_sslContext, keyPair.getX509PublicKey()) <= 0) { - IceSSL::OpenSSL::CertificateLoadException certLoadEx(__FILE__, __LINE__); + CertificateLoadException certLoadEx(__FILE__, __LINE__); certLoadEx._message = "unable to set certificate from memory"; std::string sslError = sslGetErrors(); @@ -518,7 +518,7 @@ IceSSL::OpenSSL::Context::addKeyCert(const RSAKeyPair& keyPair) // key matches the private key when calling SSL_CTX_use_PrivateKey_file(). if (errCode == X509_R_KEY_VALUES_MISMATCH || errCode == X509_R_KEY_TYPE_MISMATCH) { - IceSSL::OpenSSL::CertificateKeyMatchException certKeyMatchEx(__FILE__, __LINE__); + CertificateKeyMatchException certKeyMatchEx(__FILE__, __LINE__); certKeyMatchEx._message = "private key does not match the certificate public key"; std::string sslError = sslGetErrors(); @@ -533,7 +533,7 @@ IceSSL::OpenSSL::Context::addKeyCert(const RSAKeyPair& keyPair) } else { - IceSSL::OpenSSL::PrivateKeyLoadException pklEx(__FILE__, __LINE__); + PrivateKeyLoadException pklEx(__FILE__, __LINE__); pklEx._message = "unable to set private key from memory"; std::string sslError = sslGetErrors(); @@ -659,4 +659,3 @@ IceSSL::OpenSSL::Context::setDHParams(const BaseCertificates& baseCerts) DH_free(dh); } } - diff --git a/cpp/src/Ice/ContextOpenSSL.h b/cpp/src/IceSSL/ContextOpenSSL.h index c5c4d61d30e..f0644280c62 100644 --- a/cpp/src/Ice/ContextOpenSSL.h +++ b/cpp/src/IceSSL/ContextOpenSSL.h @@ -11,27 +11,26 @@ #ifndef ICE_SSL_CONTEXT_OPENSSL_H #define ICE_SSL_CONTEXT_OPENSSL_H -#include <IceUtil/Config.h> -#include <IceUtil/Shared.h> #include <Ice/InstanceF.h> #include <Ice/TraceLevelsF.h> #include <Ice/LoggerF.h> #include <Ice/PropertiesF.h> #include <Ice/BuiltinSequences.h> -#include <Ice/OpenSSL.h> +#include <IceSSL/OpenSSL.h> -#include <Ice/CertificateVerifierOpenSSL.h> +#include <IceSSL/CertificateVerifierOpenSSL.h> -#include <Ice/GeneralConfig.h> -#include <Ice/CertificateAuthority.h> -#include <Ice/BaseCerts.h> -#include <Ice/TempCerts.h> +#include <IceSSL/GeneralConfig.h> +#include <IceSSL/CertificateAuthority.h> +#include <IceSSL/BaseCerts.h> +#include <IceSSL/TempCerts.h> -#include <Ice/SslConnectionF.h> -#include <Ice/SslConnectionOpenSSLF.h> -#include <Ice/ContextOpenSSLF.h> -#include <Ice/RSAPublicKey.h> +#include <IceSSL/SslConnectionF.h> +#include <IceSSL/SslConnectionOpenSSLF.h> +#include <IceSSL/ContextOpenSSLF.h> +#include <IceSSL/RSAPublicKey.h> +#include <IceSSL/RSAKeyPairF.h> namespace IceSSL { @@ -39,8 +38,7 @@ namespace IceSSL namespace OpenSSL { -class System; -class RSAKeyPair; +class PluginI; class Context : public IceUtil::Shared { @@ -65,7 +63,7 @@ public: const IceSSL::BaseCertificates&); // Takes a socket fd as the first parameter. - virtual ::IceSSL::ConnectionPtr createConnection(int, const IceSSL::SystemInternalPtr&) = 0; + virtual ::IceSSL::ConnectionPtr createConnection(int, const IceSSL::PluginBaseIPtr&) = 0; protected: Context(const IceInternal::InstancePtr&); @@ -116,7 +114,7 @@ protected: int _maxPassphraseTries; - friend class IceSSL::OpenSSL::System; + friend class IceSSL::OpenSSL::PluginI; }; } diff --git a/cpp/src/Ice/ContextOpenSSLClient.cpp b/cpp/src/IceSSL/ContextOpenSSLClient.cpp index 87fee400687..dfc204684e7 100644 --- a/cpp/src/Ice/ContextOpenSSLClient.cpp +++ b/cpp/src/IceSSL/ContextOpenSSLClient.cpp @@ -8,18 +8,17 @@ // // ********************************************************************** -#include <Ice/SslException.h> -#include <Ice/SslConnectionOpenSSL.h> -#include <Ice/ContextOpenSSLClient.h> -#include <Ice/SslConnectionOpenSSLClient.h> - #include <Ice/TraceLevels.h> #include <Ice/Logger.h> -#include <iostream> +#include <IceSSL/Exception.h> +#include <IceSSL/SslConnectionOpenSSL.h> +#include <IceSSL/ContextOpenSSLClient.h> +#include <IceSSL/SslConnectionOpenSSLClient.h> + +using namespace std; using IceSSL::ConnectionPtr; -using IceSSL::SystemInternalPtr; void IceSSL::OpenSSL::ClientContext::configure(const GeneralConfig& generalConfig, @@ -32,28 +31,28 @@ IceSSL::OpenSSL::ClientContext::configure(const GeneralConfig& generalConfig, if (_traceLevels->security >= IceSSL::SECURITY_PROTOCOL) { - std::ostringstream s; + ostringstream s; - s << std::endl; - s << "general configuration (client)" << std::endl; - s << "------------------------------" << std::endl; - s << generalConfig << std::endl << std::endl; + s << endl; + s << "general configuration (client)" << endl; + s << "------------------------------" << endl; + s << generalConfig << endl << endl; - s << "certificate authority (client)" << std::endl; - s << "------------------------------" << std::endl; - s << "file: " << certificateAuthority.getCAFileName() << std::endl; - s << "path: " << certificateAuthority.getCAPath() << std::endl; + s << "certificate authority (client)" << endl; + s << "------------------------------" << endl; + s << "file: " << certificateAuthority.getCAFileName() << endl; + s << "path: " << certificateAuthority.getCAPath() << endl; - s << "base certificates (client)" << std::endl; - s << "--------------------------" << std::endl; - s << baseCertificates << std::endl; + s << "base certificates (client)" << endl; + s << "--------------------------" << endl; + s << baseCertificates << endl; _logger->trace(_traceLevels->securityCat, s.str()); } } IceSSL::ConnectionPtr -IceSSL::OpenSSL::ClientContext::createConnection(int socket, const SystemInternalPtr& system) +IceSSL::OpenSSL::ClientContext::createConnection(int socket, const PluginBaseIPtr& plugin) { if (_sslContext == 0) { @@ -66,7 +65,7 @@ IceSSL::OpenSSL::ClientContext::createConnection(int socket, const SystemInterna _logger, _certificateVerifier, createSSLConnection(socket), - system); + plugin); connectionSetup(connection); @@ -74,14 +73,13 @@ IceSSL::OpenSSL::ClientContext::createConnection(int socket, const SystemInterna } IceSSL::OpenSSL::ClientContext::ClientContext(const IceInternal::InstancePtr& instance) : - Context(instance) + Context(instance) { - _rsaPrivateKeyProperty = "Ice.SSL.Client.Overrides.RSA.PrivateKey"; - _rsaPublicKeyProperty = "Ice.SSL.Client.Overrides.RSA.Certificate"; - _dsaPrivateKeyProperty = "Ice.SSL.Client.Overrides.DSA.PrivateKey"; - _dsaPublicKeyProperty = "Ice.SSL.Client.Overrides.DSA.Certificate"; - _caCertificateProperty = "Ice.SSL.Client.Overrides.CACertificate"; - _handshakeTimeoutProperty = "Ice.SSL.Client.Handshake.ReadTimeout"; - _passphraseRetriesProperty = "Ice.SSL.Client.Passphrase.Retries"; + _rsaPrivateKeyProperty = "IceSSL.Client.Overrides.RSA.PrivateKey"; + _rsaPublicKeyProperty = "IceSSL.Client.Overrides.RSA.Certificate"; + _dsaPrivateKeyProperty = "IceSSL.Client.Overrides.DSA.PrivateKey"; + _dsaPublicKeyProperty = "IceSSL.Client.Overrides.DSA.Certificate"; + _caCertificateProperty = "IceSSL.Client.Overrides.CACertificate"; + _handshakeTimeoutProperty = "IceSSL.Client.Handshake.ReadTimeout"; + _passphraseRetriesProperty = "IceSSL.Client.Passphrase.Retries"; } - diff --git a/cpp/src/Ice/ContextOpenSSLClient.h b/cpp/src/IceSSL/ContextOpenSSLClient.h index 0a848eb5d78..3965b3f3e4a 100644 --- a/cpp/src/Ice/ContextOpenSSLClient.h +++ b/cpp/src/IceSSL/ContextOpenSSLClient.h @@ -11,7 +11,7 @@ #ifndef ICE_SSL_CONTEXT_OPENSSL_CLIENT_H #define ICE_SSL_CONTEXT_OPENSSL_CLIENT_H -#include <Ice/ContextOpenSSL.h> +#include <IceSSL/ContextOpenSSL.h> namespace IceSSL { @@ -28,13 +28,13 @@ public: const IceSSL::BaseCertificates&); // Takes a socket fd as the first parameter. - virtual IceSSL::ConnectionPtr createConnection(int, const IceSSL::SystemInternalPtr&); + virtual IceSSL::ConnectionPtr createConnection(int, const IceSSL::PluginBaseIPtr&); protected: ClientContext(const IceInternal::InstancePtr&); - friend class IceSSL::OpenSSL::System; + friend class IceSSL::OpenSSL::PluginI; }; } diff --git a/cpp/src/Ice/ContextOpenSSLF.h b/cpp/src/IceSSL/ContextOpenSSLF.h index fd338e10a58..fd338e10a58 100644 --- a/cpp/src/Ice/ContextOpenSSLF.h +++ b/cpp/src/IceSSL/ContextOpenSSLF.h diff --git a/cpp/src/Ice/ContextOpenSSLServer.cpp b/cpp/src/IceSSL/ContextOpenSSLServer.cpp index bc198cecea2..d2d9752a53e 100644 --- a/cpp/src/Ice/ContextOpenSSLServer.cpp +++ b/cpp/src/IceSSL/ContextOpenSSLServer.cpp @@ -8,19 +8,16 @@ // // ********************************************************************** -#include <Ice/SslException.h> -#include <Ice/SslConnectionOpenSSL.h> -#include <Ice/ContextOpenSSLServer.h> -#include <Ice/SslConnectionOpenSSLServer.h> -#include <Ice/OpenSSLUtils.h> - #include <Ice/TraceLevels.h> #include <Ice/Logger.h> -#include <iostream.h> +#include <IceSSL/Exception.h> +#include <IceSSL/SslConnectionOpenSSL.h> +#include <IceSSL/ContextOpenSSLServer.h> +#include <IceSSL/SslConnectionOpenSSLServer.h> +#include <IceSSL/OpenSSLUtils.h> -using IceSSL::ConnectionPtr; -using IceSSL::SystemInternalPtr; +using namespace std; void IceSSL::OpenSSL::ServerContext::configure(const GeneralConfig& generalConfig, @@ -48,37 +45,37 @@ IceSSL::OpenSSL::ServerContext::configure(const GeneralConfig& generalConfig, loadCertificateAuthority(certificateAuthority); // Set the session context for the SSL system [SERVER ONLY]. - std::string connectionContext = generalConfig.getContext(); + string connectionContext = generalConfig.getContext(); SSL_CTX_set_session_id_context(_sslContext, reinterpret_cast<const unsigned char *>(connectionContext.c_str()), connectionContext.size()); if (_traceLevels->security >= IceSSL::SECURITY_PROTOCOL) { - std::ostringstream s; + ostringstream s; - s << std::endl; - s << "general configuration (server)" << std::endl; - s << "------------------------------" << std::endl; - s << generalConfig << std::endl << std::endl; + s << endl; + s << "general configuration (server)" << endl; + s << "------------------------------" << endl; + s << generalConfig << endl << endl; - s << "CA file: " << certificateAuthority.getCAFileName() << std::endl; - s << "CA path: " << certificateAuthority.getCAPath() << std::endl; + s << "CA file: " << certificateAuthority.getCAFileName() << endl; + s << "CA path: " << certificateAuthority.getCAPath() << endl; - s << "base certificates (server)" << std::endl; - s << "--------------------------" << std::endl; - s << baseCertificates << std::endl << std::endl; + s << "base certificates (server)" << endl; + s << "--------------------------" << endl; + s << baseCertificates << endl << endl; _logger->trace(_traceLevels->securityCat, s.str()); } } IceSSL::ConnectionPtr -IceSSL::OpenSSL::ServerContext::createConnection(int socket, const SystemInternalPtr& system) +IceSSL::OpenSSL::ServerContext::createConnection(int socket, const PluginBaseIPtr& plugin) { if (_sslContext == 0) { - IceSSL::OpenSSL::ContextNotConfiguredException contextEx(__FILE__, __LINE__); + ContextNotConfiguredException contextEx(__FILE__, __LINE__); throw contextEx; } @@ -87,7 +84,7 @@ IceSSL::OpenSSL::ServerContext::createConnection(int socket, const SystemInterna _logger, _certificateVerifier, createSSLConnection(socket), - system); + plugin); connectionSetup(connection); @@ -99,15 +96,15 @@ IceSSL::OpenSSL::ServerContext::createConnection(int socket, const SystemInterna // IceSSL::OpenSSL::ServerContext::ServerContext(const IceInternal::InstancePtr& instance) : - Context(instance) + Context(instance) { - _rsaPrivateKeyProperty = "Ice.SSL.Server.Overrides.RSA.PrivateKey"; - _rsaPublicKeyProperty = "Ice.SSL.Server.Overrides.RSA.Certificate"; - _dsaPrivateKeyProperty = "Ice.SSL.Server.Overrides.DSA.PrivateKey"; - _dsaPublicKeyProperty = "Ice.SSL.Server.Overrides.DSA.Certificate"; - _caCertificateProperty = "Ice.SSL.Server.Overrides.CACertificate"; - _handshakeTimeoutProperty = "Ice.SSL.Server.Handshake.ReadTimeout"; - _passphraseRetriesProperty = "Ice.SSL.Server.Passphrase.Retries"; + _rsaPrivateKeyProperty = "IceSSL.Server.Overrides.RSA.PrivateKey"; + _rsaPublicKeyProperty = "IceSSL.Server.Overrides.RSA.Certificate"; + _dsaPrivateKeyProperty = "IceSSL.Server.Overrides.DSA.PrivateKey"; + _dsaPublicKeyProperty = "IceSSL.Server.Overrides.DSA.Certificate"; + _caCertificateProperty = "IceSSL.Server.Overrides.CACertificate"; + _handshakeTimeoutProperty = "IceSSL.Server.Handshake.ReadTimeout"; + _passphraseRetriesProperty = "IceSSL.Client.Passphrase.Retries"; } void @@ -117,7 +114,7 @@ IceSSL::OpenSSL::ServerContext::loadCertificateAuthority(const CertificateAuthor Context::loadCertificateAuthority(certAuth); - std::string caFile = certAuth.getCAFileName(); + string caFile = certAuth.getCAFileName(); if (caFile.empty()) { @@ -130,7 +127,7 @@ IceSSL::OpenSSL::ServerContext::loadCertificateAuthority(const CertificateAuthor { if (_traceLevels->security >= IceSSL::SECURITY_WARNINGS) { - std::string errorString = "unable to load certificate authorities certificate names from " + caFile + "\n"; + string errorString = "unable to load certificate authorities certificate names from " + caFile + "\n"; errorString += sslGetErrors(); _logger->trace(_traceLevels->securityCat, "WRN " + errorString); } @@ -140,4 +137,3 @@ IceSSL::OpenSSL::ServerContext::loadCertificateAuthority(const CertificateAuthor SSL_CTX_set_client_CA_list(_sslContext, certNames); } } - diff --git a/cpp/src/Ice/ContextOpenSSLServer.h b/cpp/src/IceSSL/ContextOpenSSLServer.h index da5e094a367..a94f9e90a4b 100644 --- a/cpp/src/Ice/ContextOpenSSLServer.h +++ b/cpp/src/IceSSL/ContextOpenSSLServer.h @@ -11,7 +11,7 @@ #ifndef ICE_SSL_CONTEXT_OPENSSL_SERVER_H #define ICE_SSL_CONTEXT_OPENSSL_SERVER_H -#include <Ice/ContextOpenSSL.h> +#include <IceSSL/ContextOpenSSL.h> namespace IceSSL { @@ -28,7 +28,7 @@ public: const IceSSL::BaseCertificates&); // Takes a socket fd as the first parameter. - virtual IceSSL::ConnectionPtr createConnection(int, const IceSSL::SystemInternalPtr&); + virtual IceSSL::ConnectionPtr createConnection(int, const IceSSL::PluginBaseIPtr&); protected: @@ -36,7 +36,7 @@ protected: virtual void loadCertificateAuthority(const IceSSL::CertificateAuthority& certAuth); - friend class IceSSL::OpenSSL::System; + friend class IceSSL::OpenSSL::PluginI; }; } diff --git a/cpp/src/Ice/SslIceUtils.cpp b/cpp/src/IceSSL/Convert.cpp index 92f8cd35c5f..54b64fcc4b3 100644 --- a/cpp/src/Ice/SslIceUtils.cpp +++ b/cpp/src/IceSSL/Convert.cpp @@ -9,7 +9,7 @@ // ********************************************************************** #include <IceUtil/Config.h> -#include <Ice/SslIceUtils.h> +#include <IceSSL/Convert.h> #include <iterator> void diff --git a/cpp/src/Ice/SslIceUtils.h b/cpp/src/IceSSL/Convert.h index e30626469d3..9687b4a0192 100644 --- a/cpp/src/Ice/SslIceUtils.h +++ b/cpp/src/IceSSL/Convert.h @@ -8,8 +8,8 @@ // // ********************************************************************** -#ifndef ICE_SSL_ICE_UTILS_H -#define ICE_SSL_ICE_UTILS_H +#ifndef ICE_SSL_CONVERT_H +#define ICE_SSL_CONVERT_H #include <IceUtil/Config.h> #include <Ice/BuiltinSequences.h> diff --git a/cpp/src/Ice/DHParams.cpp b/cpp/src/IceSSL/DHParams.cpp index 232923a213c..bde584bf7ff 100644 --- a/cpp/src/Ice/DHParams.cpp +++ b/cpp/src/IceSSL/DHParams.cpp @@ -8,7 +8,7 @@ // // ********************************************************************** -#include <Ice/DHParams.h> +#include <IceSSL/DHParams.h> void ::IceInternal::incRef(::IceSSL::OpenSSL::DHParams* p) { p->__incRef(); } void ::IceInternal::decRef(::IceSSL::OpenSSL::DHParams* p) { p->__decRef(); } diff --git a/cpp/src/Ice/DHParams.h b/cpp/src/IceSSL/DHParams.h index 922a82da230..d957f5f31c0 100644 --- a/cpp/src/Ice/DHParams.h +++ b/cpp/src/IceSSL/DHParams.h @@ -14,7 +14,7 @@ #include <IceUtil/Config.h> #include <IceUtil/Shared.h> #include <openssl/ssl.h> -#include <Ice/DHParamsF.h> +#include <IceSSL/DHParamsF.h> namespace IceSSL { diff --git a/cpp/src/Ice/DHParamsF.h b/cpp/src/IceSSL/DHParamsF.h index abe97b9f4e6..abe97b9f4e6 100644 --- a/cpp/src/Ice/DHParamsF.h +++ b/cpp/src/IceSSL/DHParamsF.h diff --git a/cpp/src/Ice/DefaultCertificateVerifier.cpp b/cpp/src/IceSSL/DefaultCertificateVerifier.cpp index ef68e432374..395a7f32d7e 100644 --- a/cpp/src/Ice/DefaultCertificateVerifier.cpp +++ b/cpp/src/IceSSL/DefaultCertificateVerifier.cpp @@ -8,9 +8,9 @@ // // ********************************************************************** -#include <Ice/OpenSSL.h> -#include <Ice/DefaultCertificateVerifier.h> -#include <Ice/OpenSSLUtils.h> +#include <IceSSL/OpenSSL.h> +#include <IceSSL/DefaultCertificateVerifier.h> +#include <IceSSL/OpenSSLUtils.h> #include <ostream> using namespace std; diff --git a/cpp/src/Ice/DefaultCertificateVerifier.h b/cpp/src/IceSSL/DefaultCertificateVerifier.h index 7731f17d2f5..58f1889441c 100644 --- a/cpp/src/Ice/DefaultCertificateVerifier.h +++ b/cpp/src/IceSSL/DefaultCertificateVerifier.h @@ -15,7 +15,7 @@ #include <Ice/Logger.h> #include <Ice/TraceLevels.h> #include <Ice/Instance.h> -#include <Ice/CertificateVerifierOpenSSL.h> +#include <IceSSL/CertificateVerifierOpenSSL.h> namespace IceSSL { diff --git a/cpp/src/Ice/GeneralConfig.cpp b/cpp/src/IceSSL/GeneralConfig.cpp index fc55d48df58..3ad39917e1e 100644 --- a/cpp/src/Ice/GeneralConfig.cpp +++ b/cpp/src/IceSSL/GeneralConfig.cpp @@ -20,7 +20,7 @@ #include <string> #include <algorithm> -#include <Ice/GeneralConfig.h> +#include <IceSSL/GeneralConfig.h> using namespace std; diff --git a/cpp/src/Ice/GeneralConfig.h b/cpp/src/IceSSL/GeneralConfig.h index db9938fb70c..c9bca2c9090 100644 --- a/cpp/src/Ice/GeneralConfig.h +++ b/cpp/src/IceSSL/GeneralConfig.h @@ -11,8 +11,7 @@ #ifndef ICE_SSL_GENERAL_CONFIG_H #define ICE_SSL_GENERAL_CONFIG_H -#include <Ice/OpenSSL.h> -#include <string> +#include <IceSSL/OpenSSL.h> namespace IceSSL { diff --git a/cpp/src/IceSSL/Makefile b/cpp/src/IceSSL/Makefile new file mode 100644 index 00000000000..dbf900fdfc2 --- /dev/null +++ b/cpp/src/IceSSL/Makefile @@ -0,0 +1,118 @@ +#********************************************************************** +# +# Copyright (c) 2002 +# MutableRealms, Inc. +# Huntsville, AL, USA +# +# All Rights Reserved +# +# ********************************************************************** + +top_srcdir = ../.. + +BASE = libIceSSL.so +VERSIONED_BASE = $(BASE).$(VERSION) + +NAME = $(top_srcdir)/lib/$(BASE) +VERSIONED_NAME = $(top_srcdir)/lib/$(VERSIONED_BASE) + +TARGETS = $(NAME) $(VERSIONED_NAME) + +OBJS = Plugin.o \ + Exception.o \ + PluginBaseI.o \ + OpenSSLPluginI.o \ + SslEndpoint.o \ + SslException.o \ + SslConnector.o \ + SslAcceptor.o \ + SslTransceiver.o \ + BaseCerts.o \ + CertificateAuthority.o \ + CertificateDesc.o \ + ConfigParser.o \ + ConfigParserErrorReporter.o \ + SslConnection.o \ + SslConnectionOpenSSLClient.o \ + SslConnectionOpenSSL.o \ + SslConnectionOpenSSLServer.o \ + ContextOpenSSL.o \ + ContextOpenSSLClient.o \ + ContextOpenSSLServer.o \ + GeneralConfig.o \ + TempCerts.o \ + CertificateVerifier.o \ + CertificateVerifierOpenSSL.o \ + OpenSSLJanitors.o \ + RSACertificateGen.o \ + Convert.o \ + RSAPrivateKey.o \ + RSAPublicKey.o \ + RSAKeyPair.o \ + DHParams.o \ + OpenSSLUtils.o \ + DefaultCertificateVerifier.o \ + SingleCertificateVerifier.o + +SRCS = $(OBJS:.o=.cpp) + +HDIR = $(includedir)/IceSSL +SDIR = $(slicedir)/IceSSL +SLICECMD = $(SLICE2CPP) --include-dir IceSSL --dll-export ICE_SSL_API -I$(slicedir) + +include $(top_srcdir)/config/Make.rules + +CPPFLAGS := -I.. $(CPPFLAGS) $(OPENSSL_FLAGS) $(XERCESC_FLAGS) +LDFLAGS := $(LDFLAGS) $(OPENSSL_LIBS) $(XERCESC_LIBS) + +$(VERSIONED_NAME): $(OBJS) + rm -f $@ + $(CXX) $(CXXFLAGS) -shared -o $@ $(OBJS) $(LDFLAGS) + +$(NAME): $(VERSIONED_NAME) + rm -f $@ + ln -s $(VERSIONED_BASE) $@ + +$(HDIR)/Exception.h Exception.cpp: $(SDIR)/Exception.ice $(SLICE2CPP) + rm -f $(HDIR)/Exception.h Exception.cpp + $(SLICECMD) $(SDIR)/Exception.ice + mv Exception.h $(HDIR) + +clean:: + rm -f $(HDIR)/Exception.h Exception.cpp + +$(HDIR)/CertificateVerifier.h CertificateVerifier.cpp: $(SDIR)/CertificateVerifier.ice $(SLICE2CPP) + rm -f $(HDIR)/CertificateVerifier.h CertificateVerifier.cpp + $(SLICECMD) $(SDIR)/CertificateVerifier.ice + mv CertificateVerifier.h $(HDIR) + +clean:: + rm -f $(HDIR)/CertificateVerifier.h CertificateVerifier.cpp + +$(HDIR)/CertificateVerifierF.h: $(SDIR)/CertificateVerifierF.ice $(SLICE2CPP) + rm -f $(HDIR)/CertificateVerifierF.h CertificateVerifierF.cpp + $(SLICECMD) $(SDIR)/CertificateVerifierF.ice + mv CertificateVerifierF.h $(HDIR) + rm -f CertificateVerifierF.cpp + +clean:: + rm -f $(HDIR)/CertificateVerifierF.h + +$(HDIR)/Plugin.h Plugin.cpp: $(SDIR)/Plugin.ice $(SLICE2CPP) + rm -f $(HDIR)/Plugin.h Plugin.cpp + $(SLICECMD) $(SDIR)/Plugin.ice + mv Plugin.h $(HDIR) + +clean:: + rm -f $(HDIR)/Plugin.h Plugin.cpp + +$(HDIR)/PluginF.h: $(SDIR)/PluginF.ice $(SLICE2CPP) + rm -f $(HDIR)/PluginF.h PluginF.cpp + $(SLICECMD) $(SDIR)/PluginF.ice + mv PluginF.h $(HDIR) + rm -f PluginF.cpp + +clean:: + rm -f $(HDIR)/PluginF.h + +include .depend diff --git a/cpp/src/Ice/OpenSSL.h b/cpp/src/IceSSL/OpenSSL.h index ddb4219e321..9315fb3ed89 100644 --- a/cpp/src/Ice/OpenSSL.h +++ b/cpp/src/IceSSL/OpenSSL.h @@ -7,6 +7,7 @@ // All Rights Reserved // // ********************************************************************** + #ifndef ICE_OPENSSL_H #define ICE_OPENSSL_H @@ -34,5 +35,4 @@ enum SslProtocol } - #endif diff --git a/cpp/src/Ice/OpenSSLJanitors.cpp b/cpp/src/IceSSL/OpenSSLJanitors.cpp index f28564789b2..7779f3a0959 100644 --- a/cpp/src/Ice/OpenSSLJanitors.cpp +++ b/cpp/src/IceSSL/OpenSSLJanitors.cpp @@ -8,7 +8,7 @@ // // ********************************************************************** -#include <Ice/OpenSSLJanitors.h> +#include <IceSSL/OpenSSLJanitors.h> IceSSL::OpenSSL::RSAJanitor::RSAJanitor(RSA* rsa) : _rsa(rsa) diff --git a/cpp/src/Ice/OpenSSLJanitors.h b/cpp/src/IceSSL/OpenSSLJanitors.h index 63802ae50ba..63802ae50ba 100644 --- a/cpp/src/Ice/OpenSSLJanitors.h +++ b/cpp/src/IceSSL/OpenSSLJanitors.h diff --git a/cpp/src/Ice/SystemOpenSSL.cpp b/cpp/src/IceSSL/OpenSSLPluginI.cpp index ef53730c019..3f2d82ee162 100644 --- a/cpp/src/Ice/SystemOpenSSL.cpp +++ b/cpp/src/IceSSL/OpenSSLPluginI.cpp @@ -24,33 +24,127 @@ #include <IceUtil/Config.h> #include <IceUtil/Mutex.h> #include <IceUtil/RecMutex.h> -#include <Ice/SslConnectionOpenSSL.h> -#include <Ice/SystemOpenSSL.h> -#include <Ice/SslException.h> -#include <Ice/ConfigParser.h> -#include <Ice/OpenSSLJanitors.h> #include <Ice/TraceLevels.h> #include <Ice/Logger.h> - -#include <Ice/RSAPrivateKey.h> -#include <Ice/DHParams.h> +#include <Ice/Initialize.h> +#include <Ice/Communicator.h> +#include <Ice/EndpointFactory.h> +#include <IceSSL/OpenSSLPluginI.h> +#include <IceSSL/Exception.h> +#include <IceSSL/ConfigParser.h> +#include <IceSSL/OpenSSLJanitors.h> +#include <IceSSL/OpenSSLUtils.h> +#include <IceSSL/SslConnectionOpenSSL.h> +#include <IceSSL/DefaultCertificateVerifier.h> +#include <IceSSL/SingleCertificateVerifier.h> +#include <IceSSL/SslEndpoint.h> + +#include <IceSSL/RSAPrivateKey.h> +#include <IceSSL/DHParams.h> #include <openssl/e_os.h> #include <openssl/rand.h> -#include <openssl/dh.h> +//#include <openssl/dh.h> #include <sstream> +#define OPENSSL_THREAD_DEFINES +#include <openssl/opensslconf.h> +#if defined(THREADS) +#else +#error "Thread support not enabled" +#endif + using namespace std; -using IceInternal::TraceLevelsPtr; -using Ice::LoggerPtr; +using namespace Ice; +using namespace IceInternal; +using namespace IceSSL; + +// +// Plugin factory function +// +extern "C" +{ + +Ice::Plugin* +create(const CommunicatorPtr& communicator, const string& name, const StringSeq& args) +{ + InstancePtr instance = getInstance(communicator); + + // + // Install the SSL endpoint factory + // + EndpointFactoryPtr sslEndpointFactory = new SslEndpointFactory(instance); + instance->endpointFactoryManager()->add(sslEndpointFactory); + + PluginBaseI* plugin = new IceSSL::OpenSSL::PluginI(instance); + try + { + plugin->configure(); + } + catch (...) + { + plugin->__decRef(); + throw; + } + return plugin; +} + +} + +// +// Thread safety implementation for OpenSSL +// +namespace IceSSL +{ + +extern "C" +{ + void lockingCallback(int, int, const char*, int); +} + +class SslLockKeeper +{ +public: + + SslLockKeeper(); + ~SslLockKeeper(); + + IceUtil::Mutex sslLocks[CRYPTO_NUM_LOCKS]; -using IceSSL::OpenSSL::ContextException; -using IceSSL::OpenSSL::UnsupportedContextException; -using IceSSL::SystemInternalPtr; +}; +SslLockKeeper lockKeeper; + +} + +void IceSSL::lockingCallback(int mode, int type, const char *file, int line) +{ + if (mode & CRYPTO_LOCK) + { + lockKeeper.sslLocks[type].lock(); + } + else + { + lockKeeper.sslLocks[type].unlock(); + } +} + +IceSSL::SslLockKeeper::SslLockKeeper() +{ + CRYPTO_set_locking_callback((void (*)(int, int, const char*, int))IceSSL::lockingCallback); +} + +IceSSL::SslLockKeeper::~SslLockKeeper() +{ + CRYPTO_set_locking_callback(NULL); +} + +// +// PluginI implementation +// IceSSL::ConnectionPtr -IceSSL::OpenSSL::System::createConnection(ContextType connectionType, int socket) +IceSSL::OpenSSL::PluginI::createConnection(ContextType connectionType, int socket) { IceUtil::RecMutex::Lock sync(_configMutex); @@ -84,7 +178,7 @@ IceSSL::OpenSSL::System::createConnection(ContextType connectionType, int socket } bool -IceSSL::OpenSSL::System::isConfigured(ContextType contextType) +IceSSL::OpenSSL::PluginI::isConfigured(ContextType contextType) { IceUtil::RecMutex::Lock sync(_configMutex); @@ -115,10 +209,10 @@ IceSSL::OpenSSL::System::isConfigured(ContextType contextType) } void -IceSSL::OpenSSL::System::configure() +IceSSL::OpenSSL::PluginI::configure() { - string clientConfigFile = _properties->getProperty("Ice.SSL.Client.Config"); - string serverConfigFile = _properties->getProperty("Ice.SSL.Server.Config"); + string clientConfigFile = _properties->getProperty("IceSSL.Client.Config"); + string serverConfigFile = _properties->getProperty("IceSSL.Server.Config"); bool clientConfig = (clientConfigFile.empty() ? false : true); bool serverConfig = (serverConfigFile.empty() ? false : true); @@ -138,7 +232,7 @@ IceSSL::OpenSSL::System::configure() } void -IceSSL::OpenSSL::System::configure(ContextType contextType) +IceSSL::OpenSSL::PluginI::configure(ContextType contextType) { IceUtil::RecMutex::Lock sync(_configMutex); @@ -146,26 +240,26 @@ IceSSL::OpenSSL::System::configure(ContextType contextType) { case Client : { - string configFile = _properties->getProperty("Ice.SSL.Client.Config"); - string certPath = _properties->getProperty("Ice.SSL.Client.CertPath"); + string configFile = _properties->getProperty("IceSSL.Client.Config"); + string certPath = _properties->getProperty("IceSSL.Client.CertPath"); loadConfig(Client, configFile, certPath); break; } case Server : { - string configFile = _properties->getProperty("Ice.SSL.Server.Config"); - string certPath = _properties->getProperty("Ice.SSL.Server.CertPath"); + string configFile = _properties->getProperty("IceSSL.Server.Config"); + string certPath = _properties->getProperty("IceSSL.Server.CertPath"); loadConfig(Server, configFile, certPath); break; } case ClientServer : { - string clientConfigFile = _properties->getProperty("Ice.SSL.Client.Config"); - string clientCertPath = _properties->getProperty("Ice.SSL.Client.CertPath"); - string serverConfigFile = _properties->getProperty("Ice.SSL.Server.Config"); - string serverCertPath = _properties->getProperty("Ice.SSL.Server.CertPath"); + string clientConfigFile = _properties->getProperty("IceSSL.Client.Config"); + string clientCertPath = _properties->getProperty("IceSSL.Client.CertPath"); + string serverConfigFile = _properties->getProperty("IceSSL.Server.Config"); + string serverCertPath = _properties->getProperty("IceSSL.Server.CertPath"); // Short cut, so that we only have to load the file once. if ((clientConfigFile == serverConfigFile) && (clientCertPath == serverCertPath)) @@ -183,13 +277,13 @@ IceSSL::OpenSSL::System::configure(ContextType contextType) } void -IceSSL::OpenSSL::System::loadConfig(ContextType contextType, - const std::string& configFile, - const std::string& certPath) +IceSSL::OpenSSL::PluginI::loadConfig(ContextType contextType, + const std::string& configFile, + const std::string& certPath) { if (configFile.empty()) { - IceSSL::ConfigurationLoadingException configEx(__FILE__, __LINE__); + ConfigurationLoadingException configEx(__FILE__, __LINE__); string contextString; @@ -274,7 +368,7 @@ IceSSL::OpenSSL::System::loadConfig(ContextType contextType, } RSA* -IceSSL::OpenSSL::System::getRSAKey(int isExport, int keyLength) +IceSSL::OpenSSL::PluginI::getRSAKey(int isExport, int keyLength) { IceUtil::Mutex::Lock sync(_tempRSAKeysMutex); @@ -367,7 +461,7 @@ IceSSL::OpenSSL::System::getRSAKey(int isExport, int keyLength) } DH* -IceSSL::OpenSSL::System::getDHParams(int isExport, int keyLength) +IceSSL::OpenSSL::PluginI::getDHParams(int isExport, int keyLength) { IceUtil::Mutex::Lock sync(_tempDHKeysMutex); @@ -447,8 +541,8 @@ IceSSL::OpenSSL::System::getDHParams(int isExport, int keyLength) } void -IceSSL::OpenSSL::System::setCertificateVerifier(ContextType contextType, - const IceSSL::CertificateVerifierPtr& verifier) +IceSSL::OpenSSL::PluginI::setCertificateVerifier(ContextType contextType, + const IceSSL::CertificateVerifierPtr& verifier) { IceUtil::RecMutex::Lock sync(_configMutex); @@ -473,7 +567,7 @@ IceSSL::OpenSSL::System::setCertificateVerifier(ContextType contextType, } void -IceSSL::OpenSSL::System::addTrustedCertificateBase64(ContextType contextType, const string& certString) +IceSSL::OpenSSL::PluginI::addTrustedCertificateBase64(ContextType contextType, const string& certString) { IceUtil::RecMutex::Lock sync(_configMutex); @@ -489,7 +583,7 @@ IceSSL::OpenSSL::System::addTrustedCertificateBase64(ContextType contextType, co } void -IceSSL::OpenSSL::System::addTrustedCertificate(ContextType contextType, const Ice::ByteSeq& certSeq) +IceSSL::OpenSSL::PluginI::addTrustedCertificate(ContextType contextType, const Ice::ByteSeq& certSeq) { IceUtil::RecMutex::Lock sync(_configMutex); @@ -505,9 +599,9 @@ IceSSL::OpenSSL::System::addTrustedCertificate(ContextType contextType, const Ic } void -IceSSL::OpenSSL::System::setRSAKeysBase64(ContextType contextType, - const std::string& privateKey, - const std::string& publicKey) +IceSSL::OpenSSL::PluginI::setRSAKeysBase64(ContextType contextType, + const std::string& privateKey, + const std::string& publicKey) { IceUtil::RecMutex::Lock sync(_configMutex); @@ -523,9 +617,9 @@ IceSSL::OpenSSL::System::setRSAKeysBase64(ContextType contextType, } void -IceSSL::OpenSSL::System::setRSAKeys(ContextType contextType, - const ::Ice::ByteSeq& privateKey, - const ::Ice::ByteSeq& publicKey) +IceSSL::OpenSSL::PluginI::setRSAKeys(ContextType contextType, + const ::Ice::ByteSeq& privateKey, + const ::Ice::ByteSeq& publicKey) { IceUtil::RecMutex::Lock sync(_configMutex); @@ -540,14 +634,31 @@ IceSSL::OpenSSL::System::setRSAKeys(ContextType contextType, } } +IceSSL::CertificateVerifierPtr +IceSSL::OpenSSL::PluginI::getDefaultCertVerifier() +{ + return new DefaultCertificateVerifier(_instance); +} + +IceSSL::CertificateVerifierPtr +IceSSL::OpenSSL::PluginI::getSingleCertVerifier(const ByteSeq& certSeq) +{ + return new SingleCertificateVerifier(certSeq); +} + +void +IceSSL::OpenSSL::PluginI::destroy() +{ +} + // // Protected // -IceSSL::OpenSSL::System::System(const IceInternal::InstancePtr& instance) : - IceSSL::SystemInternal(instance), - _serverContext(instance), - _clientContext(instance) +IceSSL::OpenSSL::PluginI::PluginI(const InstancePtr& instance) : + PluginBaseI(instance), + _serverContext(instance), + _clientContext(instance) { _randSeeded = 0; @@ -556,7 +667,7 @@ IceSSL::OpenSSL::System::System(const IceInternal::InstancePtr& instance) : OpenSSL_add_ssl_algorithms(); } -IceSSL::OpenSSL::System::~System() +IceSSL::OpenSSL::PluginI::~PluginI() { } @@ -565,7 +676,7 @@ IceSSL::OpenSSL::System::~System() // int -IceSSL::OpenSSL::System::seedRand() +IceSSL::OpenSSL::PluginI::seedRand() { #ifdef WINDOWS RAND_screen(); @@ -583,7 +694,7 @@ IceSSL::OpenSSL::System::seedRand() } long -IceSSL::OpenSSL::System::loadRandFiles(const string& names) +IceSSL::OpenSSL::PluginI::loadRandFiles(const string& names) { if (!names.empty()) { @@ -632,7 +743,7 @@ IceSSL::OpenSSL::System::loadRandFiles(const string& names) } void -IceSSL::OpenSSL::System::initRandSystem(const string& randBytesFiles) +IceSSL::OpenSSL::PluginI::initRandSystem(const string& randBytesFiles) { if (_randSeeded) { @@ -659,7 +770,7 @@ IceSSL::OpenSSL::System::initRandSystem(const string& randBytesFiles) } void -IceSSL::OpenSSL::System::loadTempCerts(TempCertificates& tempCerts) +IceSSL::OpenSSL::PluginI::loadTempCerts(TempCertificates& tempCerts) { RSAVector::iterator iRSA = tempCerts.getRSACerts().begin(); RSAVector::iterator eRSA = tempCerts.getRSACerts().end(); diff --git a/cpp/src/Ice/SystemOpenSSL.h b/cpp/src/IceSSL/OpenSSLPluginI.h index 9f201c05cc7..700aec5efab 100644 --- a/cpp/src/Ice/SystemOpenSSL.h +++ b/cpp/src/IceSSL/OpenSSLPluginI.h @@ -7,39 +7,34 @@ // All Rights Reserved // // ********************************************************************** -#ifndef ICE_SSL_SYSTEM_OPENSSL_H -#define ICE_SSL_SYSTEM_OPENSSL_H -#include <Ice/Config.h> +#ifndef ICE_SSL_OPENSSL_PLUGIN_I_H +#define ICE_SSL_OPENSSL_PLUGIN_I_H + +#include <IceUtil/RecMutex.h> + #include <Ice/TraceLevelsF.h> #include <Ice/LoggerF.h> -#include <IceUtil/RecMutex.h> -#include <Ice/GeneralConfig.h> -#include <Ice/CertificateDesc.h> -#include <Ice/CertificateAuthority.h> -#include <Ice/BaseCerts.h> -#include <Ice/TempCerts.h> +#include <IceSSL/PluginBaseI.h> +#include <IceSSL/CertificateDesc.h> +#include <IceSSL/CertificateAuthority.h> +#include <IceSSL/BaseCerts.h> +#include <IceSSL/TempCerts.h> -#include <Ice/ContextOpenSSLServer.h> -#include <Ice/ContextOpenSSLClient.h> -#include <Ice/SslConnectionOpenSSL.h> -#include <Ice/SystemInternal.h> -#include <Ice/SslFactory.h> +#include <IceSSL/ContextOpenSSLServer.h> +#include <IceSSL/ContextOpenSSLClient.h> -#include <Ice/OpenSSLUtils.h> #include <openssl/ssl.h> -#include <string> -#include <map> -#include <Ice/RSAPrivateKeyF.h> -#include <Ice/DHParamsF.h> +#include <IceSSL/RSAPrivateKeyF.h> +#include <IceSSL/DHParamsF.h> + +#include <map> namespace IceSSL { -class GeneralConfig; - namespace OpenSSL { @@ -49,16 +44,19 @@ typedef std::map<int,DHParamsPtr> DHMap; typedef std::map<int,CertificateDesc> RSACertMap; typedef std::map<int,DiffieHellmanParamsFile> DHParamsMap; -class System : public IceSSL::SystemInternal +class PluginI : public PluginBaseI { public: + PluginI(const IceInternal::InstancePtr&); + ~PluginI(); + virtual IceSSL::ConnectionPtr createConnection(ContextType, int); virtual bool isConfigured(ContextType); virtual void configure(); virtual void configure(ContextType); - virtual void loadConfig(ContextType, const ::std::string&, const ::std::string&); + virtual void loadConfig(ContextType, const std::string&, const std::string&); // Returns the desired RSA Key, or creates it if not already created. // This is public because the tmpRSACallback must be able to access it. @@ -81,11 +79,12 @@ public: virtual void setRSAKeys(ContextType, const Ice::ByteSeq&, const Ice::ByteSeq&); -protected: + virtual IceSSL::CertificateVerifierPtr getDefaultCertVerifier(); + + virtual IceSSL::CertificateVerifierPtr getSingleCertVerifier(const Ice::ByteSeq&); + + virtual void destroy(); - System(const IceInternal::InstancePtr&); - ~System(); - private: ServerContext _serverContext; @@ -93,15 +92,15 @@ private: // Mutex to ensure synchronization of calls to configure // the contexts and calls to create connections. - ::IceUtil::RecMutex _configMutex; + IceUtil::RecMutex _configMutex; // Keep a cache of all temporary RSA keys. RSAMap _tempRSAKeys; - ::IceUtil::Mutex _tempRSAKeysMutex; + IceUtil::Mutex _tempRSAKeysMutex; // Keep a cache of all temporary Diffie-Hellman keys. DHMap _tempDHKeys; - ::IceUtil::Mutex _tempDHKeysMutex; + IceUtil::Mutex _tempDHKeysMutex; // Maps of all temporary keying information. // The files themselves will not be loaded until @@ -118,9 +117,7 @@ private: void initRandSystem(const std::string&); // Load the temporary (ephemeral) certificates for Server operations. - void loadTempCerts(IceSSL::TempCertificates&); - - friend class IceSSL::Factory; + void loadTempCerts(TempCertificates&); }; } diff --git a/cpp/src/Ice/OpenSSLUtils.cpp b/cpp/src/IceSSL/OpenSSLUtils.cpp index 4cdcb7cfe35..2767ce97aba 100644 --- a/cpp/src/Ice/OpenSSLUtils.cpp +++ b/cpp/src/IceSSL/OpenSSLUtils.cpp @@ -8,15 +8,13 @@ // // ********************************************************************** -#include <Ice/OpenSSLUtils.h> -#include <Ice/SystemInternalF.h> -#include <Ice/SystemOpenSSL.h> -#include <Ice/SslFactory.h> #include <IceUtil/Mutex.h> +#include <IceSSL/OpenSSLUtils.h> +#include <IceSSL/OpenSSLPluginI.h> +#include <IceSSL/SslConnectionOpenSSL.h> #include <openssl/err.h> -#include <assert.h> -using std::string; +using namespace std; // The following arrays are compiled-in diffie hellman group parameters. // These are used when OpenSSL opts to use ephemeral diffie-hellman keys @@ -419,13 +417,14 @@ tmpRSACallback(SSL* sslConnection, int isExport, int keyLength) { assert(sslConnection != 0); - IceSSL::SystemInternalPtr sslSystem = IceSSL::Factory::getSystemFromHandle(sslConnection); - assert(sslSystem != 0); + void* p = SSL_get_ex_data(sslConnection, 0); + assert(p != 0); + IceSSL::PluginBaseI* plugin = static_cast<IceSSL::PluginBaseI*>(p); - IceSSL::OpenSSL::System* openSslSystem = dynamic_cast<IceSSL::OpenSSL::System*>(sslSystem.get()); - assert(openSslSystem != 0); + IceSSL::OpenSSL::PluginI* openSslPlugin = dynamic_cast<IceSSL::OpenSSL::PluginI*>(plugin); + assert(openSslPlugin != 0); - return openSslSystem->getRSAKey(isExport, keyLength); + return openSslPlugin->getRSAKey(isExport, keyLength); } DH* @@ -433,13 +432,14 @@ tmpDHCallback(SSL* sslConnection, int isExport, int keyLength) { assert(sslConnection != 0); - IceSSL::SystemInternalPtr sslSystem = IceSSL::Factory::getSystemFromHandle(sslConnection); - assert(sslSystem != 0); + void* p = SSL_get_ex_data(sslConnection, 0); + assert(p != 0); + IceSSL::PluginBaseI* plugin = static_cast<IceSSL::PluginBaseI*>(p); - IceSSL::OpenSSL::System* openSslSystem = dynamic_cast<IceSSL::OpenSSL::System*>(sslSystem.get()); - assert(openSslSystem != 0); + IceSSL::OpenSSL::PluginI* openSslPlugin = dynamic_cast<IceSSL::OpenSSL::PluginI*>(plugin); + assert(openSslPlugin != 0); - return openSslSystem->getDHParams(isExport, keyLength); + return openSslPlugin->getDHParams(isExport, keyLength); } // verifyCallback - Certificate Verification callback function. @@ -462,4 +462,3 @@ verifyCallback(int ok, X509_STORE_CTX* ctx) } } - diff --git a/cpp/src/Ice/OpenSSLUtils.h b/cpp/src/IceSSL/OpenSSLUtils.h index 254d1ea1210..254d1ea1210 100644 --- a/cpp/src/Ice/OpenSSLUtils.h +++ b/cpp/src/IceSSL/OpenSSLUtils.h diff --git a/cpp/src/IceSSL/PluginBaseI.cpp b/cpp/src/IceSSL/PluginBaseI.cpp new file mode 100644 index 00000000000..4a2f065112e --- /dev/null +++ b/cpp/src/IceSSL/PluginBaseI.cpp @@ -0,0 +1,36 @@ +// ********************************************************************** +// +// Copyright (c) 2001 +// MutableRealms, Inc. +// Huntsville, AL, USA +// +// All Rights Reserved +// +// ********************************************************************** + +#include <Ice/Instance.h> +#include <IceSSL/PluginBaseI.h> + +using namespace std; +using namespace Ice; +using namespace IceInternal; +using namespace IceSSL; + +void IceInternal::incRef(PluginBaseI* p) { p->__incRef(); } +void IceInternal::decRef(PluginBaseI* p) { p->__decRef(); } + +// +// Protected Methods +// + +IceSSL::PluginBaseI::PluginBaseI(const InstancePtr& instance) : + _instance(instance), + _traceLevels(instance->traceLevels()), + _logger(instance->logger()), + _properties(instance->properties()) +{ +} + +IceSSL::PluginBaseI::~PluginBaseI() +{ +} diff --git a/cpp/src/Ice/SystemInternal.h b/cpp/src/IceSSL/PluginBaseI.h index ffa86bb0e95..c3fac981416 100644 --- a/cpp/src/Ice/SystemInternal.h +++ b/cpp/src/IceSSL/PluginBaseI.h @@ -8,25 +8,22 @@ // // ********************************************************************** -#ifndef ICE_SSL_SYSTEM_H -#define ICE_SSL_SYSTEM_H +#ifndef ICE_SSL_PLUGIN_I_H +#define ICE_SSL_PLUGIN_I_H -#include <string> -#include <Ice/System.h> #include <Ice/InstanceF.h> -#include <Ice/SslConnectionF.h> #include <Ice/Properties.h> -#include <Ice/SystemInternalF.h> -#include <Ice/CertificateVerifierF.h> #include <Ice/TraceLevelsF.h> #include <Ice/LoggerF.h> +#include <IceSSL/Plugin.h> +#include <IceSSL/PluginBaseIF.h> +#include <IceSSL/SslConnectionF.h> +#include <IceSSL/CertificateVerifierF.h> namespace IceSSL { -class Factory; - -class SystemInternal : public System +class PluginBaseI : public IceSSL::Plugin { public: @@ -52,14 +49,13 @@ public: protected: - SystemInternal(const IceInternal::InstancePtr&); - virtual ~SystemInternal(); + PluginBaseI(const IceInternal::InstancePtr&); + virtual ~PluginBaseI(); + IceInternal::InstancePtr _instance; IceInternal::TraceLevelsPtr _traceLevels; Ice::LoggerPtr _logger; Ice::PropertiesPtr _properties; - - friend class Factory; }; } diff --git a/cpp/src/Ice/SystemInternalF.h b/cpp/src/IceSSL/PluginBaseIF.h index adc33454842..1f7cf16bd6e 100644 --- a/cpp/src/Ice/SystemInternalF.h +++ b/cpp/src/IceSSL/PluginBaseIF.h @@ -8,24 +8,24 @@ // // ********************************************************************** -#ifndef ICE_SSL_SYSTEM_F_H -#define ICE_SSL_SYSTEM_F_H +#ifndef ICE_SSL_PLUGIN_BASE_I_F_H +#define ICE_SSL_PLUGIN_BASE_I_F_H #include <Ice/Handle.h> namespace IceSSL { -class SystemInternal; -typedef IceInternal::Handle<SystemInternal> SystemInternalPtr; +class PluginBaseI; +typedef IceInternal::Handle<PluginBaseI> PluginBaseIPtr; } namespace IceInternal { -void incRef(IceSSL::SystemInternal*); -void decRef(IceSSL::SystemInternal*); +void incRef(IceSSL::PluginBaseI*); +void decRef(IceSSL::PluginBaseI*); } diff --git a/cpp/src/Ice/RSACertificateGen.cpp b/cpp/src/IceSSL/RSACertificateGen.cpp index 91280016dcb..173e18a1017 100644 --- a/cpp/src/Ice/RSACertificateGen.cpp +++ b/cpp/src/IceSSL/RSACertificateGen.cpp @@ -9,13 +9,13 @@ // ********************************************************************** #include <IceUtil/Config.h> -#include <Ice/RSACertificateGen.h> -#include <Ice/OpenSSLJanitors.h> -#include <Ice/RSAKeyPair.h> -#include <Ice/RSAPrivateKey.h> -#include <Ice/RSAPublicKey.h> -#include <Ice/SslException.h> -#include <Ice/OpenSSLUtils.h> +#include <IceSSL/RSACertificateGen.h> +#include <IceSSL/OpenSSLJanitors.h> +#include <IceSSL/RSAKeyPair.h> +#include <IceSSL/RSAPrivateKey.h> +#include <IceSSL/RSAPublicKey.h> +#include <IceSSL/Exception.h> +#include <IceSSL/OpenSSLUtils.h> #include <openssl/err.h> #include <openssl/ssl.h> @@ -219,7 +219,7 @@ IceSSL::OpenSSL::RSACertificateGen::generate(const RSACertificateGenContext& con X509* x509SelfSigned = x509Janitor.get(); assert(x509SelfSigned != 0); - // Set version to V3.
+ // Set version to V3. int setVersionReturn = X509_set_version(x509SelfSigned, 2); assert(setVersionReturn != 0); diff --git a/cpp/src/Ice/RSAKeyPair.cpp b/cpp/src/IceSSL/RSAKeyPair.cpp index 3cae356d441..1d494c22328 100644 --- a/cpp/src/Ice/RSAKeyPair.cpp +++ b/cpp/src/IceSSL/RSAKeyPair.cpp @@ -10,9 +10,9 @@ #include <IceUtil/Config.h> #include <IceUtil/Base64.h> -#include <Ice/RSAKeyPair.h> -#include <Ice/RSAPrivateKey.h> -#include <Ice/RSAPublicKey.h> +#include <IceSSL/RSAKeyPair.h> +#include <IceSSL/RSAPrivateKey.h> +#include <IceSSL/RSAPublicKey.h> #include <assert.h> void ::IceInternal::incRef(::IceSSL::OpenSSL::RSAKeyPair* p) { p->__incRef(); } diff --git a/cpp/src/Ice/RSAPrivateKey.cpp b/cpp/src/IceSSL/RSAPrivateKey.cpp index 8df0f157fce..9c6bdf4e29c 100644 --- a/cpp/src/Ice/RSAPrivateKey.cpp +++ b/cpp/src/IceSSL/RSAPrivateKey.cpp @@ -10,10 +10,10 @@ #include <IceUtil/Config.h> #include <IceUtil/Base64.h> -#include <Ice/RSAPrivateKey.h> -#include <Ice/SslIceUtils.h> -#include <Ice/OpenSSLUtils.h> -#include <Ice/SslException.h> +#include <IceSSL/RSAPrivateKey.h> +#include <IceSSL/Convert.h> +#include <IceSSL/OpenSSLUtils.h> +#include <IceSSL/Exception.h> #include <assert.h> void ::IceInternal::incRef(::IceSSL::OpenSSL::RSAPrivateKey* p) { p->__incRef(); } diff --git a/cpp/src/Ice/RSAPublicKey.cpp b/cpp/src/IceSSL/RSAPublicKey.cpp index b8918884522..70ddadeb1bd 100644 --- a/cpp/src/Ice/RSAPublicKey.cpp +++ b/cpp/src/IceSSL/RSAPublicKey.cpp @@ -10,10 +10,10 @@ #include <IceUtil/Config.h> #include <IceUtil/Base64.h> -#include <Ice/RSAPublicKey.h> -#include <Ice/SslIceUtils.h> -#include <Ice/OpenSSLUtils.h> -#include <Ice/SslException.h> +#include <IceSSL/RSAPublicKey.h> +#include <IceSSL/Convert.h> +#include <IceSSL/OpenSSLUtils.h> +#include <IceSSL/Exception.h> #include <assert.h> void ::IceInternal::incRef(::IceSSL::OpenSSL::RSAPublicKey* p) { p->__incRef(); } diff --git a/cpp/src/Ice/SingleCertificateVerifier.cpp b/cpp/src/IceSSL/SingleCertificateVerifier.cpp index 2467bd1e7f2..05b9823c40b 100644 --- a/cpp/src/Ice/SingleCertificateVerifier.cpp +++ b/cpp/src/IceSSL/SingleCertificateVerifier.cpp @@ -8,8 +8,8 @@ // // ********************************************************************** -#include <Ice/SingleCertificateVerifier.h> -#include <Ice/SslIceUtils.h> +#include <IceSSL/SingleCertificateVerifier.h> +#include <IceSSL/Convert.h> #include <openssl/err.h> #include <algorithm> #include <iostream> diff --git a/cpp/src/Ice/SingleCertificateVerifier.h b/cpp/src/IceSSL/SingleCertificateVerifier.h index 20a0c78324c..89753b620e9 100644 --- a/cpp/src/Ice/SingleCertificateVerifier.h +++ b/cpp/src/IceSSL/SingleCertificateVerifier.h @@ -12,7 +12,7 @@ #define ICE_SSL_SINGLE_CERTIFICATE_VERIFIER_H #include <Ice/BuiltinSequences.h> -#include <Ice/CertificateVerifierOpenSSL.h> +#include <IceSSL/CertificateVerifierOpenSSL.h> namespace IceSSL { diff --git a/cpp/src/Ice/SslAcceptor.cpp b/cpp/src/IceSSL/SslAcceptor.cpp index f421a7d2fe5..e75b20ef88f 100644 --- a/cpp/src/Ice/SslAcceptor.cpp +++ b/cpp/src/IceSSL/SslAcceptor.cpp @@ -17,35 +17,32 @@ # pragma warning(disable:4786) #endif -#include <Ice/SystemInternal.h> -#include <Ice/SslAcceptor.h> -#include <Ice/SslTransceiver.h> #include <Ice/Instance.h> #include <Ice/TraceLevels.h> #include <Ice/Logger.h> #include <Ice/Network.h> #include <Ice/Properties.h> #include <Ice/Exception.h> -#include <Ice/SslException.h> + +#include <IceSSL/PluginBaseI.h> +#include <IceSSL/SslAcceptor.h> +#include <IceSSL/SslTransceiver.h> +#include <IceSSL/Exception.h> + #include <sstream> using namespace std; using namespace Ice; using namespace IceInternal; -using std::string; -using std::ostringstream; -using IceSSL::Connection; -using IceSSL::SystemInternalPtr; - SOCKET -IceInternal::SslAcceptor::fd() +IceSSL::SslAcceptor::fd() { return _fd; } void -IceInternal::SslAcceptor::close() +IceSSL::SslAcceptor::close() { if (_traceLevels->network >= 1) { @@ -60,7 +57,7 @@ IceInternal::SslAcceptor::close() } void -IceInternal::SslAcceptor::listen() +IceSSL::SslAcceptor::listen() { try { @@ -81,7 +78,7 @@ IceInternal::SslAcceptor::listen() } TransceiverPtr -IceInternal::SslAcceptor::accept(int timeout) +IceSSL::SslAcceptor::accept(int timeout) { SOCKET fd = doAccept(_fd, timeout); setBlock(fd, false); @@ -93,24 +90,26 @@ IceInternal::SslAcceptor::accept(int timeout) _logger->trace(_traceLevels->networkCat, s.str()); } - // Get an instance of the SslSystem. - SystemInternalPtr sslSystem = _instance->getSslSystem(); - assert(sslSystem != 0); + // Get the SSL plug-in + PluginManagerPtr pluginManager = _instance->pluginManager(); + Ice::PluginPtr plugin = pluginManager->getPlugin("IceSSL"); + PluginBaseIPtr sslPlugin = PluginBaseIPtr::dynamicCast(plugin); + assert(sslPlugin); - IceSSL::ConnectionPtr connection = sslSystem->createConnection(IceSSL::Server, fd); + IceSSL::ConnectionPtr connection = sslPlugin->createConnection(IceSSL::Server, fd); TransceiverPtr transPtr = new SslTransceiver(_instance, fd, connection); return transPtr; } string -IceInternal::SslAcceptor::toString() const +IceSSL::SslAcceptor::toString() const { return addrToString(_addr); } bool -IceInternal::SslAcceptor::equivalent(const string& host, int port) const +IceSSL::SslAcceptor::equivalent(const string& host, int port) const { struct sockaddr_in addr; getAddress(host, port, addr); @@ -118,12 +117,12 @@ IceInternal::SslAcceptor::equivalent(const string& host, int port) const } int -IceInternal::SslAcceptor::effectivePort() +IceSSL::SslAcceptor::effectivePort() { return ntohs(_addr.sin_port); } -IceInternal::SslAcceptor::SslAcceptor(const InstancePtr& instance, const string& host, int port) : +IceSSL::SslAcceptor::SslAcceptor(const InstancePtr& instance, const string& host, int port) : _instance(instance), _traceLevels(instance->traceLevels()), _logger(instance->logger()), @@ -148,7 +147,7 @@ IceInternal::SslAcceptor::SslAcceptor(const InstancePtr& instance, const string& } } -IceInternal::SslAcceptor::~SslAcceptor() +IceSSL::SslAcceptor::~SslAcceptor() { assert(_fd == INVALID_SOCKET); } diff --git a/cpp/src/Ice/SslAcceptor.h b/cpp/src/IceSSL/SslAcceptor.h index b0596b46dd1..9424a35170f 100644 --- a/cpp/src/Ice/SslAcceptor.h +++ b/cpp/src/IceSSL/SslAcceptor.h @@ -21,19 +21,19 @@ # include <netinet/in.h> // For struct sockaddr_in #endif -namespace IceInternal +namespace IceSSL { class SslEndpoint; -class SslAcceptor : public Acceptor +class SslAcceptor : public IceInternal::Acceptor { public: virtual SOCKET fd(); virtual void close(); virtual void listen(); - virtual TransceiverPtr accept(int); + virtual IceInternal::TransceiverPtr accept(int); virtual std::string toString() const; bool equivalent(const std::string&, int) const; @@ -41,12 +41,12 @@ public: private: - SslAcceptor(const InstancePtr&, const std::string&, int); + SslAcceptor(const IceInternal::InstancePtr&, const std::string&, int); virtual ~SslAcceptor(); friend class SslEndpoint; - InstancePtr _instance; - TraceLevelsPtr _traceLevels; + IceInternal::InstancePtr _instance; + IceInternal::TraceLevelsPtr _traceLevels; ::Ice::LoggerPtr _logger; SOCKET _fd; int _backlog; diff --git a/cpp/src/Ice/SslConnection.cpp b/cpp/src/IceSSL/SslConnection.cpp index 30a00540caf..5d431f6af52 100644 --- a/cpp/src/Ice/SslConnection.cpp +++ b/cpp/src/IceSSL/SslConnection.cpp @@ -8,7 +8,7 @@ // // ********************************************************************** -#include <Ice/SslConnection.h> +#include <IceSSL/SslConnection.h> void ::IceInternal::incRef(::IceSSL::Connection* p) { p->__incRef(); } void ::IceInternal::decRef(::IceSSL::Connection* p) { p->__decRef(); } diff --git a/cpp/src/Ice/SslConnection.h b/cpp/src/IceSSL/SslConnection.h index 3acfd387c08..f1251b16c93 100644 --- a/cpp/src/Ice/SslConnection.h +++ b/cpp/src/IceSSL/SslConnection.h @@ -15,8 +15,8 @@ #include <Ice/Buffer.h> #include <Ice/TraceLevelsF.h> #include <Ice/LoggerF.h> -#include <Ice/SslConnectionF.h> -#include <Ice/CertificateVerifierF.h> +#include <IceSSL/SslConnectionF.h> +#include <IceSSL/CertificateVerifierF.h> namespace IceSSL { diff --git a/cpp/src/Ice/SslConnectionF.h b/cpp/src/IceSSL/SslConnectionF.h index 5d394788405..5d394788405 100644 --- a/cpp/src/Ice/SslConnectionF.h +++ b/cpp/src/IceSSL/SslConnectionF.h diff --git a/cpp/src/Ice/SslConnectionOpenSSL.cpp b/cpp/src/IceSSL/SslConnectionOpenSSL.cpp index 132429375a9..b06f6cc95a2 100644 --- a/cpp/src/Ice/SslConnectionOpenSSL.cpp +++ b/cpp/src/IceSSL/SslConnectionOpenSSL.cpp @@ -17,36 +17,26 @@ #pragma warning(disable:4786) #endif -#include <openssl/err.h> -#include <string> -#include <sstream> #include <Ice/Network.h> -#include <Ice/OpenSSL.h> -#include <Ice/LocalException.h> -#include <Ice/SslException.h> -#include <Ice/SslFactory.h> -#include <Ice/SslConnection.h> -#include <Ice/SslConnectionOpenSSL.h> -#include <Ice/SystemOpenSSL.h> -#include <Ice/CertificateVerifierOpenSSL.h> -#include <Ice/OpenSSLUtils.h> - #include <Ice/TraceLevels.h> #include <Ice/Logger.h> +#include <Ice/LocalException.h> -using namespace std; -using namespace IceInternal; +#include <IceSSL/OpenSSL.h> +#include <IceSSL/Exception.h> +#include <IceSSL/SslConnection.h> +#include <IceSSL/SslConnectionOpenSSL.h> +#include <IceSSL/OpenSSLPluginI.h> +#include <IceSSL/CertificateVerifierOpenSSL.h> +#include <IceSSL/OpenSSLUtils.h> -using Ice::SocketException; -using Ice::TimeoutException; -using Ice::ConnectionLostException; -using Ice::LoggerPtr; -using Ice::Int; +#include <openssl/err.h> -using std::endl; +#include <sstream> -using IceSSL::Factory; -using IceSSL::SystemInternalPtr; +using namespace std; +using namespace Ice; +using namespace IceInternal; //////////////////////////////// ////////// Connection ////////// @@ -56,32 +46,32 @@ using IceSSL::SystemInternalPtr; // Static Member Initialization // IceSSL::OpenSSL::SslConnectionMap IceSSL::OpenSSL::Connection::_connectionMap; -::IceUtil::Mutex IceSSL::OpenSSL::Connection::_connectionRepositoryMutex; +IceUtil::Mutex IceSSL::OpenSSL::Connection::_connectionRepositoryMutex; // // Public Methods // -void ::IceInternal::incRef(::IceSSL::OpenSSL::Connection* p) { p->__incRef(); } -void ::IceInternal::decRef(::IceSSL::OpenSSL::Connection* p) { p->__decRef(); } +void IceInternal::incRef(IceSSL::OpenSSL::Connection* p) { p->__incRef(); } +void IceInternal::decRef(IceSSL::OpenSSL::Connection* p) { p->__decRef(); } // Note: I would use a using directive of the form: // using IceSSL::CertificateVerifierPtr; // but unfortunately, it appears that this is not properly picked up. // -IceSSL::OpenSSL::Connection::Connection(const IceInternal::TraceLevelsPtr& traceLevels, - const Ice::LoggerPtr& logger, +IceSSL::OpenSSL::Connection::Connection(const TraceLevelsPtr& traceLevels, + const LoggerPtr& logger, const IceSSL::CertificateVerifierPtr& certificateVerifier, SSL* sslConnection, - const IceSSL::SystemInternalPtr& system) : - IceSSL::Connection(traceLevels, logger, certificateVerifier), - _sslConnection(sslConnection) + const PluginBaseIPtr& plugin) : + IceSSL::Connection(traceLevels, logger, certificateVerifier), + _sslConnection(sslConnection) { assert(_sslConnection != 0); assert(system != 0); - Factory::addSystemHandle(_sslConnection, system); + SSL_set_ex_data(sslConnection, 0, static_cast<void*>(plugin.get())); _lastError = SSL_ERROR_NONE; @@ -100,7 +90,7 @@ IceSSL::OpenSSL::Connection::~Connection() if (_sslConnection != 0) { removeConnection(_sslConnection); - Factory::removeSystemHandle(_sslConnection); + SSL_set_ex_data(_sslConnection, 0, 0); SSL_free(_sslConnection); _sslConnection = 0; } @@ -445,22 +435,22 @@ IceSSL::OpenSSL::Connection::read(Buffer& buf, int timeout) continue; } - // initReturn must be > 0, so we're okay to try a read
-
- if (!pending() && !readSelect(_readTimeout))
- {
- // Nothing is left to read (according to SSL).
- if (_traceLevels->security >= IceSSL::SECURITY_PROTOCOL)
- {
- _logger->trace(_traceLevels->securityCat, "no pending application-level bytes");
- }
-
- // We're done here.
- break;
- }
-
- _readTimeout = timeout;
-
+ // initReturn must be > 0, so we're okay to try a write + + if (!pending() && !readSelect(_readTimeout)) + { + // Nothing is left to read (according to SSL). + if (_traceLevels->security >= IceSSL::SECURITY_PROTOCOL) + { + _logger->trace(_traceLevels->securityCat, "no pending application-level bytes"); + } + + // We're done here. + break; + } + + _readTimeout = timeout; + bytesRead = sslRead((char *)buf.i, packetSize); switch (getLastError()) @@ -489,17 +479,17 @@ IceSSL::OpenSSL::Connection::read(Buffer& buf, int timeout) continue; } - case SSL_ERROR_WANT_READ:
- {
- if (!readSelect(timeout))
- {
- // Timeout and wait for them to arrive.
- throw TimeoutException(__FILE__, __LINE__);
- }
- continue;
+ case SSL_ERROR_WANT_READ: + { + if (!readSelect(timeout)) + { + // Timeout and wait for them to arrive. + throw TimeoutException(__FILE__, __LINE__); + } + continue; } -
- case SSL_ERROR_WANT_WRITE:
+ + case SSL_ERROR_WANT_WRITE: case SSL_ERROR_WANT_X509_LOOKUP: { // Perform another read. The read should take care of this. @@ -537,13 +527,9 @@ IceSSL::OpenSSL::Connection::read(Buffer& buf, int timeout) } else // (bytesRead == 0) { - ProtocolException protocolEx(__FILE__, __LINE__); - - // Protocol Error: Unexpected EOF - protocolEx._message = "encountered an EOF that violates the ssl protocol\n"; - protocolEx._message += sslGetErrors(); - - throw protocolEx; + ConnectionLostException ex(__FILE__, __LINE__); + ex.error = 0; + throw ex; } } diff --git a/cpp/src/Ice/SslConnectionOpenSSL.h b/cpp/src/IceSSL/SslConnectionOpenSSL.h index e755e002cc1..fdf331227ab 100644 --- a/cpp/src/Ice/SslConnectionOpenSSL.h +++ b/cpp/src/IceSSL/SslConnectionOpenSSL.h @@ -11,13 +11,15 @@ #ifndef ICE_SSL_CONNECTION_OPENSSL_H #define ICE_SSL_CONNECTION_OPENSSL_H -#include <map> -#include <openssl/ssl.h> #include <IceUtil/Mutex.h> -#include <Ice/SslConnection.h> -#include <Ice/SystemInternalF.h> -#include <Ice/SslConnectionOpenSSLF.h> -#include <Ice/CertificateVerifierOpenSSL.h> +#include <IceSSL/SslConnection.h> +#include <IceSSL/PluginBaseIF.h> +#include <IceSSL/SslConnectionOpenSSLF.h> +#include <IceSSL/CertificateVerifierOpenSSL.h> + +#include <openssl/ssl.h> + +#include <map> namespace IceSSL { @@ -40,7 +42,7 @@ public: bool checkAndSet() { - ::IceUtil::Mutex::Lock sync(_mutex); + IceUtil::Mutex::Lock sync(_mutex); if (_flag) { @@ -55,25 +57,25 @@ public: bool check() { - ::IceUtil::Mutex::Lock sync(_mutex); + IceUtil::Mutex::Lock sync(_mutex); return _flag; } void set() { - ::IceUtil::Mutex::Lock sync(_mutex); + IceUtil::Mutex::Lock sync(_mutex); _flag = true; } void unset() { - ::IceUtil::Mutex::Lock sync(_mutex); + IceUtil::Mutex::Lock sync(_mutex); _flag = false; } private: - ::IceUtil::Mutex _mutex; + IceUtil::Mutex _mutex; bool _flag; }; @@ -121,7 +123,7 @@ public: const Ice::LoggerPtr&, const IceSSL::CertificateVerifierPtr&, SSL*, - const IceSSL::SystemInternalPtr&); + const IceSSL::PluginBaseIPtr&); virtual ~Connection(); virtual void shutdown(); @@ -173,14 +175,14 @@ protected: void setLastError(int errorCode) { _lastError = errorCode; }; static SslConnectionMap _connectionMap; - static ::IceUtil::Mutex _connectionRepositoryMutex; + static IceUtil::Mutex _connectionRepositoryMutex; // Pointer to the OpenSSL Connection structure. SSL* _sslConnection; int _lastError; - ::IceUtil::Mutex _handshakeWaitMutex; + IceUtil::Mutex _handshakeWaitMutex; // IceInternal::TraceLevelsPtr _traceLevels; // Ice::LoggerPtr _logger; diff --git a/cpp/src/Ice/SslConnectionOpenSSLClient.cpp b/cpp/src/IceSSL/SslConnectionOpenSSLClient.cpp index 1ac03e39766..0920aa798d3 100644 --- a/cpp/src/Ice/SslConnectionOpenSSLClient.cpp +++ b/cpp/src/IceSSL/SslConnectionOpenSSLClient.cpp @@ -8,31 +8,21 @@ // // ********************************************************************** -#include <string> -#include <sstream> -#include <Ice/OpenSSLUtils.h> #include <Ice/Network.h> -#include <Ice/OpenSSL.h> -#include <Ice/LocalException.h> -#include <Ice/SslException.h> -#include <Ice/OpenSSLJanitors.h> -#include <Ice/SslConnectionOpenSSLClient.h> - #include <Ice/TraceLevels.h> #include <Ice/Logger.h> +#include <Ice/LocalException.h> +#include <IceSSL/OpenSSLUtils.h> +#include <IceSSL/OpenSSL.h> +#include <IceSSL/Exception.h> +#include <IceSSL/OpenSSLJanitors.h> +#include <IceSSL/SslConnectionOpenSSLClient.h> -using IceSSL::ShutdownException; -using IceSSL::SystemInternalPtr; -using Ice::ConnectionLostException; -using Ice::SocketException; +#include <sstream> -using namespace IceInternal; using namespace std; - -using std::string; -using std::ostringstream; -using std::hex; -using std::dec; +using namespace Ice; +using namespace IceInternal; //////////////////////////////////////////////// ////////// SslConnectionOpenSSLClient ////////// @@ -47,12 +37,12 @@ using std::dec; // but unfortunately, it appears that this is not properly picked up. // -IceSSL::OpenSSL::ClientConnection::ClientConnection(const IceInternal::TraceLevelsPtr& traceLevels, - const Ice::LoggerPtr& logger, +IceSSL::OpenSSL::ClientConnection::ClientConnection(const TraceLevelsPtr& traceLevels, + const LoggerPtr& logger, const IceSSL::CertificateVerifierPtr& certificateVerifier, SSL* connection, - const IceSSL::SystemInternalPtr& system) : - Connection(traceLevels, logger, certificateVerifier, connection, system) + const PluginBaseIPtr& plugin) : + Connection(traceLevels, logger, certificateVerifier, connection, plugin) { assert(_sslConnection != 0); @@ -165,13 +155,16 @@ IceSSL::OpenSSL::ClientConnection::init(int timeout) } else // result == 0 { - ProtocolException protocolEx(__FILE__, __LINE__); - - // Protocol Error: Unexpected EOF - protocolEx._message = "encountered an EOF during handshake that violates the ssl protocol\n"; - protocolEx._message += sslGetErrors(); - - throw protocolEx; + // + // The OpenSSL docs say that a result code of 0 indicates + // a graceful shutdown. In order to cause a retry in the + // Ice core, we raise ConnectFailedException. However, + // errno isn't set in this situation, so we always use + // ECONNREFUSED. + // + ConnectFailedException ex(__FILE__, __LINE__); + ex.error = ECONNREFUSED; + throw ex; } } diff --git a/cpp/src/Ice/SslConnectionOpenSSLClient.h b/cpp/src/IceSSL/SslConnectionOpenSSLClient.h index 27547898961..bc6f1cc493d 100644 --- a/cpp/src/Ice/SslConnectionOpenSSLClient.h +++ b/cpp/src/IceSSL/SslConnectionOpenSSLClient.h @@ -11,7 +11,7 @@ #ifndef ICE_SSL_CONNECTION_OPENSSL_CLIENT_H #define ICE_SSL_CONNECTION_OPENSSL_CLIENT_H -#include <Ice/SslConnectionOpenSSL.h> +#include <IceSSL/SslConnectionOpenSSL.h> namespace IceSSL { @@ -27,7 +27,7 @@ public: const Ice::LoggerPtr&, const IceSSL::CertificateVerifierPtr&, SSL*, - const IceSSL::SystemInternalPtr&); + const IceSSL::PluginBaseIPtr&); virtual ~ClientConnection(); virtual void shutdown(); diff --git a/cpp/src/Ice/SslConnectionOpenSSLF.h b/cpp/src/IceSSL/SslConnectionOpenSSLF.h index 4c35b8166a3..4c35b8166a3 100644 --- a/cpp/src/Ice/SslConnectionOpenSSLF.h +++ b/cpp/src/IceSSL/SslConnectionOpenSSLF.h diff --git a/cpp/src/Ice/SslConnectionOpenSSLServer.cpp b/cpp/src/IceSSL/SslConnectionOpenSSLServer.cpp index 2871add9946..868ae4a9926 100644 --- a/cpp/src/Ice/SslConnectionOpenSSLServer.cpp +++ b/cpp/src/IceSSL/SslConnectionOpenSSLServer.cpp @@ -8,33 +8,21 @@ // // ********************************************************************** -#include <string> -#include <sstream> -#include <Ice/OpenSSLUtils.h> #include <Ice/Network.h> -#include <Ice/OpenSSL.h> -#include <Ice/LocalException.h> -#include <Ice/SslException.h> -#include <Ice/OpenSSLJanitors.h> -#include <Ice/SslConnectionOpenSSLServer.h> - #include <Ice/TraceLevels.h> #include <Ice/Logger.h> +#include <Ice/LocalException.h> +#include <IceSSL/OpenSSLUtils.h> +#include <IceSSL/OpenSSL.h> +#include <IceSSL/Exception.h> +#include <IceSSL/OpenSSLJanitors.h> +#include <IceSSL/SslConnectionOpenSSLServer.h> -using IceSSL::CertificateException; -using IceSSL::ProtocolException; -using IceSSL::SystemInternalPtr; - -using Ice::ConnectionLostException; -using Ice::SocketException; +#include <sstream> -using namespace IceInternal; using namespace std; - -using std::string; -using std::ostringstream; -using std::hex; -using std::dec; +using namespace Ice; +using namespace IceInternal; ////////////////////////////////////// ////////// ServerConnection ////////// @@ -49,12 +37,12 @@ using std::dec; // but unfortunately, it appears that this is not properly picked up. // -IceSSL::OpenSSL::ServerConnection::ServerConnection(const IceInternal::TraceLevelsPtr& traceLevels, - const Ice::LoggerPtr& logger, +IceSSL::OpenSSL::ServerConnection::ServerConnection(const TraceLevelsPtr& traceLevels, + const LoggerPtr& logger, const IceSSL::CertificateVerifierPtr& certificateVerifier, SSL* connection, - const IceSSL::SystemInternalPtr& system) : - Connection(traceLevels, logger, certificateVerifier, connection, system) + const PluginBaseIPtr& plugin) : + Connection(traceLevels, logger, certificateVerifier, connection, plugin) { assert(_sslConnection != 0); @@ -149,7 +137,7 @@ IceSSL::OpenSSL::ServerConnection::init(int timeout) _initWantWrite = 1; break; } - + case SSL_ERROR_WANT_READ: case SSL_ERROR_NONE: case SSL_ERROR_WANT_X509_LOOKUP: diff --git a/cpp/src/Ice/SslConnectionOpenSSLServer.h b/cpp/src/IceSSL/SslConnectionOpenSSLServer.h index 599be04efb2..398c82409b9 100644 --- a/cpp/src/Ice/SslConnectionOpenSSLServer.h +++ b/cpp/src/IceSSL/SslConnectionOpenSSLServer.h @@ -11,7 +11,7 @@ #ifndef ICE_SSL_CONNECTION_OPENSSL_SERVER_H #define ICE_SSL_CONNECTION_OPENSSL_SERVER_H -#include <Ice/SslConnectionOpenSSL.h> +#include <IceSSL/SslConnectionOpenSSL.h> namespace IceSSL { @@ -27,7 +27,7 @@ public: const Ice::LoggerPtr&, const IceSSL::CertificateVerifierPtr&, SSL*, - const IceSSL::SystemInternalPtr&); + const IceSSL::PluginBaseIPtr&); virtual ~ServerConnection(); virtual void shutdown(); diff --git a/cpp/src/Ice/SslConnector.cpp b/cpp/src/IceSSL/SslConnector.cpp index 09d51af325c..c5faab4c860 100644 --- a/cpp/src/Ice/SslConnector.cpp +++ b/cpp/src/IceSSL/SslConnector.cpp @@ -17,29 +17,26 @@ # pragma warning(disable:4786) #endif -#include <Ice/SystemInternal.h> -#include <Ice/SslConnector.h> -#include <Ice/SslTransceiver.h> #include <Ice/Instance.h> #include <Ice/TraceLevels.h> #include <Ice/Logger.h> #include <Ice/Network.h> #include <Ice/Properties.h> #include <Ice/Exception.h> -#include <Ice/SslException.h> + +#include <IceSSL/PluginBaseI.h> +#include <IceSSL/SslConnector.h> +#include <IceSSL/SslTransceiver.h> +#include <IceSSL/Exception.h> + #include <sstream> using namespace std; using namespace Ice; using namespace IceInternal; -using std::ostringstream; -using std::string; -using IceSSL::Connection; -using IceSSL::SystemInternalPtr; - TransceiverPtr -IceInternal::SslConnector::connect(int timeout) +IceSSL::SslConnector::connect(int timeout) { if (_traceLevels->network >= 2) { @@ -59,30 +56,32 @@ IceInternal::SslConnector::connect(int timeout) _logger->trace(_traceLevels->networkCat, s.str()); } - // Get an instance of the SslSystem - SystemInternalPtr sslSystem = _instance->getSslSystem(); - assert(sslSystem != 0); + // Get the SSL plug-in + PluginManagerPtr pluginManager = _instance->pluginManager(); + Ice::PluginPtr plugin = pluginManager->getPlugin("IceSSL"); + PluginBaseIPtr sslPlugin = PluginBaseIPtr::dynamicCast(plugin); + assert(sslPlugin); - IceSSL::ConnectionPtr connection = sslSystem->createConnection(IceSSL::Client, fd); + IceSSL::ConnectionPtr connection = sslPlugin->createConnection(IceSSL::Client, fd); TransceiverPtr transPtr = new SslTransceiver(_instance, fd, connection); return transPtr; } string -IceInternal::SslConnector::toString() const +IceSSL::SslConnector::toString() const { return addrToString(_addr); } -IceInternal::SslConnector::SslConnector(const InstancePtr& instance, const string& host, int port) : - _instance(instance), - _traceLevels(instance->traceLevels()), - _logger(instance->logger()) +IceSSL::SslConnector::SslConnector(const InstancePtr& instance, const string& host, int port) : + _instance(instance), + _traceLevels(instance->traceLevels()), + _logger(instance->logger()) { getAddress(host.c_str(), port, _addr); } -IceInternal::SslConnector::~SslConnector() +IceSSL::SslConnector::~SslConnector() { } diff --git a/cpp/src/Ice/SslConnector.h b/cpp/src/IceSSL/SslConnector.h index 533d3be2018..ed47903a6df 100644 --- a/cpp/src/Ice/SslConnector.h +++ b/cpp/src/IceSSL/SslConnector.h @@ -21,26 +21,26 @@ # include <netinet/in.h> // For struct sockaddr_in #endif -namespace IceInternal +namespace IceSSL { class SslEndpoint; -class SslConnector : public Connector +class SslConnector : public IceInternal::Connector { public: - virtual TransceiverPtr connect(int); + virtual IceInternal::TransceiverPtr connect(int); virtual std::string toString() const; private: - SslConnector(const InstancePtr&, const std::string&, int); + SslConnector(const IceInternal::InstancePtr&, const std::string&, int); virtual ~SslConnector(); friend class SslEndpoint; - InstancePtr _instance; - TraceLevelsPtr _traceLevels; + IceInternal::InstancePtr _instance; + IceInternal::TraceLevelsPtr _traceLevels; ::Ice::LoggerPtr _logger; struct sockaddr_in _addr; }; diff --git a/cpp/src/IceSSL/SslEndpoint.cpp b/cpp/src/IceSSL/SslEndpoint.cpp new file mode 100644 index 00000000000..595e33e0383 --- /dev/null +++ b/cpp/src/IceSSL/SslEndpoint.cpp @@ -0,0 +1,379 @@ +// ********************************************************************** +// +// Copyright (c) 2001 +// MutableRealms, Inc. +// Huntsville, AL, USA +// +// All Rights Reserved +// +// ********************************************************************** + +#include <Ice/Network.h> +#include <IceSSL/SslEndpoint.h> +#include <IceSSL/SslAcceptor.h> +#include <IceSSL/SslConnector.h> +#include <IceSSL/SslTransceiver.h> +#include <Ice/BasicStream.h> +#include <Ice/LocalException.h> +#include <Ice/Instance.h> + +using namespace std; +using namespace Ice; +using namespace IceInternal; + +IceSSL::SslEndpoint::SslEndpoint(const InstancePtr& instance, const string& ho, Int po, Int ti) : + _instance(instance), + _host(ho), + _port(po), + _timeout(ti) +{ +} + +IceSSL::SslEndpoint::SslEndpoint(const InstancePtr& instance, const string& str) : + _instance(instance), + _port(0), + _timeout(-1) +{ + static const string delim = " \t\n\r"; + + string::size_type beg; + string::size_type end = 0; + + while (true) + { + beg = str.find_first_not_of(delim, end); + if (beg == string::npos) + { + break; + } + + end = str.find_first_of(delim, beg); + if (end == string::npos) + { + end = str.length(); + } + + string option = str.substr(beg, end - beg); + if (option.length() != 2 || option[0] != '-') + { + throw EndpointParseException(__FILE__, __LINE__); + } + + string argument; + string::size_type argumentBeg = str.find_first_not_of(delim, end); + if (argumentBeg != string::npos && str[argumentBeg] != '-') + { + beg = argumentBeg; + end = str.find_first_of(delim, beg); + if (end == string::npos) + { + end = str.length(); + } + argument = str.substr(beg, end - beg); + } + + switch (option[1]) + { + case 'h': + { + if (argument.empty()) + { + throw EndpointParseException(__FILE__, __LINE__); + } + const_cast<string&>(_host) = argument; + break; + } + + case 'p': + { + if (argument.empty()) + { + throw EndpointParseException(__FILE__, __LINE__); + } + const_cast<Int&>(_port) = atoi(argument.c_str()); + break; + } + + case 't': + { + if (argument.empty()) + { + throw EndpointParseException(__FILE__, __LINE__); + } + const_cast<Int&>(_timeout) = atoi(argument.c_str()); + break; + } + + default: + { + throw EndpointParseException(__FILE__, __LINE__); + } + } + } + + if (_host.empty()) + { + const_cast<string&>(_host) = _instance->defaultHost(); + } +} + +IceSSL::SslEndpoint::SslEndpoint(BasicStream* s) : + _instance(s->instance()), + _port(0), + _timeout(-1) +{ + s->startReadEncaps(); + s->read(const_cast<string&>(_host)); + s->read(const_cast<Int&>(_port)); + s->read(const_cast<Int&>(_timeout)); + s->endReadEncaps(); +} + +void +IceSSL::SslEndpoint::streamWrite(BasicStream* s) const +{ + s->write(SslEndpointType); + s->startWriteEncaps(); + s->write(_host); + s->write(_port); + s->write(_timeout); + s->endWriteEncaps(); +} + +string +IceSSL::SslEndpoint::toString() const +{ + ostringstream s; + s << "ssl -h " << _host << " -p " << _port; + if (_timeout != -1) + { + s << " -t " << _timeout; + } + return s.str(); +} + +Short +IceSSL::SslEndpoint::type() const +{ + return SslEndpointType; +} + +Int +IceSSL::SslEndpoint::timeout() const +{ + return _timeout; +} + +EndpointPtr +IceSSL::SslEndpoint::timeout(Int timeout) const +{ + if (timeout == _timeout) + { + return const_cast<SslEndpoint*>(this); + } + else + { + return new SslEndpoint(_instance, _host, _port, timeout); + } +} + +bool +IceSSL::SslEndpoint::datagram() const +{ + return false; +} + +bool +IceSSL::SslEndpoint::secure() const +{ + return true; +} + +bool +IceSSL::SslEndpoint::unknown() const +{ + return false; +} + +TransceiverPtr +IceSSL::SslEndpoint::clientTransceiver() const +{ + return 0; +} + +TransceiverPtr +IceSSL::SslEndpoint::serverTransceiver(EndpointPtr& endp) const +{ + endp = const_cast<SslEndpoint*>(this); + return 0; +} + +ConnectorPtr +IceSSL::SslEndpoint::connector() const +{ + return new SslConnector(_instance, _host, _port); +} + +AcceptorPtr +IceSSL::SslEndpoint::acceptor(EndpointPtr& endp) const +{ + SslAcceptor* p = new SslAcceptor(_instance, _host, _port); + endp = new SslEndpoint(_instance, _host, p->effectivePort(), _timeout); + return p; +} + +bool +IceSSL::SslEndpoint::equivalent(const TransceiverPtr&) const +{ + return false; +} + +bool +IceSSL::SslEndpoint::equivalent(const AcceptorPtr& acceptor) const +{ + const SslAcceptor* sslAcceptor = dynamic_cast<const SslAcceptor*>(acceptor.get()); + if (!sslAcceptor) + { + return false; + } + return sslAcceptor->equivalent(_host, _port); +} + +bool +IceSSL::SslEndpoint::operator==(const Endpoint& r) const +{ + const SslEndpoint* p = dynamic_cast<const SslEndpoint*>(&r); + if (!p) + { + return false; + } + + if (this == p) + { + return true; + } + + if (_port != p->_port) + { + return false; + } + + if (_timeout != p->_timeout) + { + return false; + } + + if (_host != p->_host) + { + // + // We do the most time-consuming part of the comparison last. + // + struct sockaddr_in laddr; + struct sockaddr_in raddr; + getAddress(_host, _port, laddr); + getAddress(p->_host, p->_port, raddr); + return compareAddress(laddr, raddr); + } + + return true; +} + +bool +IceSSL::SslEndpoint::operator!=(const Endpoint& r) const +{ + return !operator==(r); +} + +bool +IceSSL::SslEndpoint::operator<(const Endpoint& r) const +{ + const SslEndpoint* p = dynamic_cast<const SslEndpoint*>(&r); + if (!p) + { + return type() < r.type(); + } + + if (this == p) + { + return false; + } + + if (_port < p->_port) + { + return true; + } + else if (p->_port < _port) + { + return false; + } + + if (_timeout < p->_timeout) + { + return true; + } + else if (p->_timeout < _timeout) + { + return false; + } + + if (_host != p->_host) + { + // + // We do the most time-consuming part of the comparison last. + // + struct sockaddr_in laddr; + struct sockaddr_in raddr; + getAddress(_host, _port, laddr); + getAddress(p->_host, p->_port, raddr); + if (laddr.sin_addr.s_addr < raddr.sin_addr.s_addr) + { + return true; + } + else if (raddr.sin_addr.s_addr < laddr.sin_addr.s_addr) + { + return false; + } + } + + return false; +} + +IceSSL::SslEndpointFactory::SslEndpointFactory(const InstancePtr& instance) + : _instance(instance) +{ +} + +IceSSL::SslEndpointFactory::~SslEndpointFactory() +{ +} + +Short +IceSSL::SslEndpointFactory::type() const +{ + return SslEndpointType; +} + +const string& +IceSSL::SslEndpointFactory::protocol() const +{ + const static string result = "ssl"; + return result; +} + +EndpointPtr +IceSSL::SslEndpointFactory::create(const std::string& str) const +{ + return new SslEndpoint(_instance, str); +} + +EndpointPtr +IceSSL::SslEndpointFactory::read(BasicStream* s) const +{ + return new SslEndpoint(s); +} + +void +IceSSL::SslEndpointFactory::destroy() +{ + _instance = 0; +} diff --git a/cpp/src/IceSSL/SslEndpoint.h b/cpp/src/IceSSL/SslEndpoint.h new file mode 100644 index 00000000000..54e1a283843 --- /dev/null +++ b/cpp/src/IceSSL/SslEndpoint.h @@ -0,0 +1,80 @@ +// ********************************************************************** +// +// Copyright (c) 2002 +// MutableRealms, Inc. +// Huntsville, AL, USA +// +// All Rights Reserved +// +// ********************************************************************** + +#ifndef ICE_SSL_ENDPOINT_H +#define ICE_SSL_ENDPOINT_H + +#include <Ice/Endpoint.h> +#include <Ice/EndpointFactory.h> + +namespace IceSSL +{ + +const ::Ice::Short SslEndpointType = 2; + +class SslEndpoint : public IceInternal::Endpoint +{ +public: + + SslEndpoint(const IceInternal::InstancePtr&, const std::string&, ::Ice::Int, ::Ice::Int); + SslEndpoint(const IceInternal::InstancePtr&, const std::string&); + SslEndpoint(IceInternal::BasicStream*); + + virtual void streamWrite(IceInternal::BasicStream*) const; + virtual std::string toString() const; + virtual ::Ice::Short type() const; + virtual ::Ice::Int timeout() const; + virtual IceInternal::EndpointPtr timeout(::Ice::Int) const; + virtual bool datagram() const; + virtual bool secure() const; + virtual bool unknown() const; + virtual IceInternal::TransceiverPtr clientTransceiver() const; + virtual IceInternal::TransceiverPtr serverTransceiver(IceInternal::EndpointPtr&) const; + virtual IceInternal::ConnectorPtr connector() const; + virtual IceInternal::AcceptorPtr acceptor(IceInternal::EndpointPtr&) const; + virtual bool equivalent(const IceInternal::TransceiverPtr&) const; + virtual bool equivalent(const IceInternal::AcceptorPtr&) const; + + virtual bool operator==(const IceInternal::Endpoint&) const; + virtual bool operator!=(const IceInternal::Endpoint&) const; + virtual bool operator<(const IceInternal::Endpoint&) const; + +private: + + // + // All members are const, because endpoints are immutable. + // + const IceInternal::InstancePtr _instance; + const std::string _host; + const ::Ice::Int _port; + const ::Ice::Int _timeout; +}; + +class SslEndpointFactory : public IceInternal::EndpointFactory +{ +public: + + SslEndpointFactory(const IceInternal::InstancePtr&); + virtual ~SslEndpointFactory(); + + virtual ::Ice::Short type() const; + virtual const ::std::string& protocol() const; + virtual IceInternal::EndpointPtr create(const std::string&) const; + virtual IceInternal::EndpointPtr read(IceInternal::BasicStream*) const; + virtual void destroy(); + +private: + + IceInternal::InstancePtr _instance; +}; + +} + +#endif diff --git a/cpp/src/Ice/SslException2.cpp b/cpp/src/IceSSL/SslException.cpp index ffbcf7a71d0..e0ccf7f56bb 100644 --- a/cpp/src/Ice/SslException2.cpp +++ b/cpp/src/IceSSL/SslException.cpp @@ -18,11 +18,10 @@ #endif #include <Ice/LocalException.h> -#include <Ice/SslException.h> +#include <IceSSL/Exception.h> -using Ice::SocketException; -using Ice::Exception; -using std::ostream; +using namespace std; +using namespace Ice; void IceSSL::SslException::ice_print(ostream& out) const @@ -153,4 +152,3 @@ IceSSL::OpenSSL::TrustedCertificateAddException::ice_print(ostream& out) const { SslException::ice_print(out); } - diff --git a/cpp/src/Ice/SslTransceiver.cpp b/cpp/src/IceSSL/SslTransceiver.cpp index fde1a13c9f1..f49fc49e32f 100644 --- a/cpp/src/Ice/SslTransceiver.cpp +++ b/cpp/src/IceSSL/SslTransceiver.cpp @@ -8,9 +8,9 @@ // // ********************************************************************** -#include <Ice/OpenSSL.h> -#include <Ice/SslConnection.h> -#include <Ice/SslTransceiver.h> +#include <IceSSL/OpenSSL.h> +#include <IceSSL/SslConnection.h> +#include <IceSSL/SslTransceiver.h> #include <Ice/Instance.h> #include <Ice/TraceLevels.h> #include <Ice/Logger.h> @@ -25,13 +25,13 @@ using namespace IceInternal; using IceSSL::ConnectionPtr; SOCKET -IceInternal::SslTransceiver::fd() +IceSSL::SslTransceiver::fd() { return _fd; } void -IceInternal::SslTransceiver::close() +IceSSL::SslTransceiver::close() { if (_traceLevels->network >= 1) { @@ -48,7 +48,7 @@ IceInternal::SslTransceiver::close() } void -IceInternal::SslTransceiver::shutdown() +IceSSL::SslTransceiver::shutdown() { if (_traceLevels->network >= 2) { @@ -62,13 +62,13 @@ IceInternal::SslTransceiver::shutdown() } void -IceInternal::SslTransceiver::write(Buffer& buf, int timeout) +IceSSL::SslTransceiver::write(Buffer& buf, int timeout) { _sslConnection->write(buf, timeout); } void -IceInternal::SslTransceiver::read(Buffer& buf, int timeout) +IceSSL::SslTransceiver::read(Buffer& buf, int timeout) { if (!_sslConnection->read(buf, timeout)) { @@ -80,14 +80,14 @@ IceInternal::SslTransceiver::read(Buffer& buf, int timeout) } string -IceInternal::SslTransceiver::toString() const +IceSSL::SslTransceiver::toString() const { return fdToString(_fd); } -IceInternal::SslTransceiver::SslTransceiver(const InstancePtr& instance, - SOCKET fd, - const ConnectionPtr& sslConnection) : +IceSSL::SslTransceiver::SslTransceiver(const InstancePtr& instance, + SOCKET fd, + const ConnectionPtr& sslConnection) : _instance(instance), _traceLevels(instance->traceLevels()), _logger(instance->logger()), @@ -100,7 +100,7 @@ IceInternal::SslTransceiver::SslTransceiver(const InstancePtr& instance, FD_ZERO(&_wFdSet); } -IceInternal::SslTransceiver::~SslTransceiver() +IceSSL::SslTransceiver::~SslTransceiver() { assert(_fd == INVALID_SOCKET); } diff --git a/cpp/src/Ice/SslTransceiver.h b/cpp/src/IceSSL/SslTransceiver.h index 492e30d7681..3c10484cbb2 100644 --- a/cpp/src/Ice/SslTransceiver.h +++ b/cpp/src/IceSSL/SslTransceiver.h @@ -11,39 +11,39 @@ #ifndef ICE_SSL_TRANSCEIVER_H #define ICE_SSL_TRANSCEIVER_H -#include <Ice/SslConnectionF.h> +#include <IceSSL/SslConnectionF.h> #include <Ice/InstanceF.h> #include <Ice/TraceLevelsF.h> #include <Ice/LoggerF.h> #include <Ice/Transceiver.h> -namespace IceInternal +namespace IceSSL { class SslConnector; class SslAcceptor; -class SslTransceiver : public Transceiver +class SslTransceiver : public IceInternal::Transceiver { public: virtual SOCKET fd(); virtual void close(); virtual void shutdown(); - virtual void write(Buffer&, int); - virtual void read(Buffer&, int); + virtual void write(IceInternal::Buffer&, int); + virtual void read(IceInternal::Buffer&, int); virtual std::string toString() const; private: - SslTransceiver(const InstancePtr&, SOCKET, const ::IceSSL::ConnectionPtr&); + SslTransceiver(const IceInternal::InstancePtr&, SOCKET, const ::IceSSL::ConnectionPtr&); virtual ~SslTransceiver(); friend class SslConnector; friend class SslAcceptor; - InstancePtr _instance; - TraceLevelsPtr _traceLevels; + IceInternal::InstancePtr _instance; + IceInternal::TraceLevelsPtr _traceLevels; ::Ice::LoggerPtr _logger; SOCKET _fd; fd_set _rFdSet; diff --git a/cpp/src/Ice/TempCerts.cpp b/cpp/src/IceSSL/TempCerts.cpp index 9f3cac921d6..c58146c3b39 100644 --- a/cpp/src/Ice/TempCerts.cpp +++ b/cpp/src/IceSSL/TempCerts.cpp @@ -8,7 +8,7 @@ // // ********************************************************************** -#include <Ice/TempCerts.h> +#include <IceSSL/TempCerts.h> IceSSL::TempCertificates::TempCertificates() { diff --git a/cpp/src/Ice/TempCerts.h b/cpp/src/IceSSL/TempCerts.h index 029292d76ca..a9f8c6cf03e 100644 --- a/cpp/src/Ice/TempCerts.h +++ b/cpp/src/IceSSL/TempCerts.h @@ -11,7 +11,7 @@ #ifndef ICE_SSL_TEMP_CERTS_H #define ICE_SSL_TEMP_CERTS_H -#include <Ice/CertificateDesc.h> +#include <IceSSL/CertificateDesc.h> #include <ostream> namespace IceSSL diff --git a/cpp/src/IceStorm/.depend b/cpp/src/IceStorm/.depend index 28418dc2484..74e2bb86f83 100644 --- a/cpp/src/IceStorm/.depend +++ b/cpp/src/IceStorm/.depend @@ -1,20 +1,20 @@ IceStorm.o: IceStorm.cpp ../../include/IceStorm/IceStorm.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/LocalException.h ../../include/Ice/ObjectFactory.h ../../include/Ice/Stream.h ../../include/Ice/BuiltinSequences.h TraceLevels.o: TraceLevels.cpp ../../include/Ice/Properties.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/BuiltinSequences.h ../IceStorm/TraceLevels.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h -Flusher.o: Flusher.cpp ../../include/IceUtil/Thread.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Lock.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h ../../include/Ice/Properties.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Communicator.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/SystemF.h ../../include/Ice/SslExtensionF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/Functional.h ../../include/IceUtil/Functional.h ../IceStorm/Flushable.h ../IceStorm/TraceLevels.h ../IceStorm/Flusher.h +Flusher.o: Flusher.cpp ../../include/IceUtil/Thread.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Lock.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Communicator.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/Functional.h ../../include/IceUtil/Functional.h ../IceStorm/Flushable.h ../IceStorm/TraceLevels.h ../IceStorm/Flusher.h Subscriber.o: Subscriber.cpp ../IceStorm/Subscriber.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Config.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Lock.h ../../include/Ice/Current.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/Identity.h ../IceStorm/TraceLevels.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h -OnewaySubscriber.o: OnewaySubscriber.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h ../../include/Ice/Properties.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Communicator.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/SystemF.h ../../include/Ice/SslExtensionF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../IceStorm/OnewaySubscriber.h ../IceStorm/Subscriber.h ../IceStorm/TraceLevels.h -OnewayBatchSubscriber.o: OnewayBatchSubscriber.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h ../../include/Ice/Properties.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Communicator.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/SystemF.h ../../include/Ice/SslExtensionF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../IceStorm/OnewayBatchSubscriber.h ../IceStorm/OnewaySubscriber.h ../IceStorm/Subscriber.h ../IceStorm/Flushable.h ../IceStorm/TraceLevels.h ../IceStorm/Flusher.h -LinkSubscriber.o: LinkSubscriber.cpp ../IceStorm/LinkSubscriber.h ../IceStorm/Flushable.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/IceUtil/Shared.h ../IceStorm/Subscriber.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/Current.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/StreamF.h ../../include/Ice/Identity.h ../IceStorm/IceStormInternal.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/IceStorm/IceStorm.h ../IceStorm/TraceLevels.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/Communicator.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/SystemF.h ../../include/Ice/SslExtensionF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h -SubscriberFactory.o: SubscriberFactory.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h ../../include/Ice/Properties.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Communicator.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/SystemF.h ../../include/Ice/SslExtensionF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../IceStorm/SubscriberFactory.h ../IceStorm/IceStormInternal.h ../../include/IceStorm/IceStorm.h ../IceStorm/LinkSubscriber.h ../IceStorm/Flushable.h ../IceStorm/Subscriber.h ../IceStorm/OnewaySubscriber.h ../IceStorm/OnewayBatchSubscriber.h ../IceStorm/Flusher.h ../IceStorm/TraceLevels.h -TopicI.o: TopicI.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h ../../include/Ice/Properties.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Communicator.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/SystemF.h ../../include/Ice/SslExtensionF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/Functional.h ../../include/IceUtil/Functional.h ../IceStorm/TopicI.h ../../include/IceUtil/RecMutex.h ../IceStorm/IceStormInternal.h ../../include/IceStorm/IceStorm.h ../IceStorm/IdentityLinkDict.h ../../include/Freeze/Map.h ../../include/Freeze/DB.h ../../include/Freeze/DBException.h ../../include/Freeze/DBF.h ../../include/Freeze/EvictorF.h ../IceStorm/LinkDB.h ../IceStorm/SubscriberFactory.h ../IceStorm/Subscriber.h ../IceStorm/TraceLevels.h -TopicManagerI.o: TopicManagerI.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h ../../include/Ice/Properties.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Communicator.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/SystemF.h ../../include/Ice/SslExtensionF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../IceStorm/TopicManagerI.h ../../include/IceStorm/IceStorm.h ../IceStorm/StringBoolDict.h ../../include/Freeze/Map.h ../../include/Freeze/DB.h ../../include/Freeze/DBException.h ../../include/Freeze/DBF.h ../../include/Freeze/EvictorF.h ../IceStorm/TopicI.h ../../include/IceUtil/RecMutex.h ../IceStorm/IceStormInternal.h ../IceStorm/IdentityLinkDict.h ../IceStorm/LinkDB.h ../IceStorm/SubscriberFactory.h ../IceStorm/Flusher.h ../IceStorm/TraceLevels.h -StringBoolDict.o: StringBoolDict.cpp ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../IceStorm/StringBoolDict.h ../../include/Freeze/Map.h ../../include/Freeze/DB.h ../../include/Ice/CommunicatorF.h ../../include/Freeze/DBException.h ../../include/Freeze/DBF.h ../../include/Freeze/EvictorF.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/PropertiesF.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h ../../include/Ice/Properties.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Communicator.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/SystemF.h ../../include/Ice/SslExtensionF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h -IdentityLinkDict.o: IdentityLinkDict.cpp ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../IceStorm/IdentityLinkDict.h ../../include/Freeze/Map.h ../../include/Freeze/DB.h ../../include/Ice/CommunicatorF.h ../../include/Freeze/DBException.h ../../include/Freeze/DBF.h ../../include/Freeze/EvictorF.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/PropertiesF.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h ../../include/Ice/Properties.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Communicator.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/SystemF.h ../../include/Ice/SslExtensionF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../IceStorm/LinkDB.h ../IceStorm/IceStormInternal.h ../../include/IceStorm/IceStorm.h +OnewaySubscriber.o: OnewaySubscriber.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Communicator.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../IceStorm/OnewaySubscriber.h ../IceStorm/Subscriber.h ../IceStorm/TraceLevels.h +OnewayBatchSubscriber.o: OnewayBatchSubscriber.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Communicator.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../IceStorm/OnewayBatchSubscriber.h ../IceStorm/OnewaySubscriber.h ../IceStorm/Subscriber.h ../IceStorm/Flushable.h ../IceStorm/TraceLevels.h ../IceStorm/Flusher.h +LinkSubscriber.o: LinkSubscriber.cpp ../IceStorm/LinkSubscriber.h ../IceStorm/Flushable.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/IceUtil/Shared.h ../IceStorm/Subscriber.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/Current.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/StreamF.h ../../include/Ice/Identity.h ../IceStorm/IceStormInternal.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/IceStorm/IceStorm.h ../IceStorm/TraceLevels.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/Communicator.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h +SubscriberFactory.o: SubscriberFactory.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Communicator.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../IceStorm/SubscriberFactory.h ../IceStorm/IceStormInternal.h ../../include/IceStorm/IceStorm.h ../IceStorm/LinkSubscriber.h ../IceStorm/Flushable.h ../IceStorm/Subscriber.h ../IceStorm/OnewaySubscriber.h ../IceStorm/OnewayBatchSubscriber.h ../IceStorm/Flusher.h ../IceStorm/TraceLevels.h +TopicI.o: TopicI.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Communicator.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Ice/Functional.h ../../include/IceUtil/Functional.h ../IceStorm/TopicI.h ../../include/IceUtil/RecMutex.h ../IceStorm/IceStormInternal.h ../../include/IceStorm/IceStorm.h ../IceStorm/IdentityLinkDict.h ../../include/Freeze/Map.h ../../include/Freeze/DB.h ../../include/Freeze/DBException.h ../../include/Freeze/DBF.h ../../include/Freeze/EvictorF.h ../IceStorm/LinkDB.h ../IceStorm/SubscriberFactory.h ../IceStorm/Subscriber.h ../IceStorm/TraceLevels.h +TopicManagerI.o: TopicManagerI.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Communicator.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../IceStorm/TopicManagerI.h ../../include/IceStorm/IceStorm.h ../IceStorm/StringBoolDict.h ../../include/Freeze/Map.h ../../include/Freeze/DB.h ../../include/Freeze/DBException.h ../../include/Freeze/DBF.h ../../include/Freeze/EvictorF.h ../IceStorm/TopicI.h ../../include/IceUtil/RecMutex.h ../IceStorm/IceStormInternal.h ../IceStorm/IdentityLinkDict.h ../IceStorm/LinkDB.h ../IceStorm/SubscriberFactory.h ../IceStorm/Flusher.h ../IceStorm/TraceLevels.h +StringBoolDict.o: StringBoolDict.cpp ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../IceStorm/StringBoolDict.h ../../include/Freeze/Map.h ../../include/Freeze/DB.h ../../include/Ice/CommunicatorF.h ../../include/Freeze/DBException.h ../../include/Freeze/DBF.h ../../include/Freeze/EvictorF.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/PropertiesF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Communicator.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h +IdentityLinkDict.o: IdentityLinkDict.cpp ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../IceStorm/IdentityLinkDict.h ../../include/Freeze/Map.h ../../include/Freeze/DB.h ../../include/Ice/CommunicatorF.h ../../include/Freeze/DBException.h ../../include/Freeze/DBF.h ../../include/Freeze/EvictorF.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/PropertiesF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Communicator.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../IceStorm/LinkDB.h ../IceStorm/IceStormInternal.h ../../include/IceStorm/IceStorm.h LinkDB.o: LinkDB.cpp ../IceStorm/LinkDB.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../IceStorm/IceStormInternal.h ../../include/IceStorm/IceStorm.h ../../include/Ice/LocalException.h ../../include/Ice/ObjectFactory.h ../../include/Ice/Stream.h ../../include/Ice/BuiltinSequences.h IceStormInternal.o: IceStormInternal.cpp ../IceStorm/IceStormInternal.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/IceStorm/IceStorm.h ../../include/Ice/LocalException.h ../../include/Ice/ObjectFactory.h ../../include/Ice/Stream.h ../../include/Ice/BuiltinSequences.h -Server.o: Server.cpp ../../include/Freeze/Application.h ../../include/Ice/Application.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h ../../include/Ice/Properties.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Communicator.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/SystemF.h ../../include/Ice/SslExtensionF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Freeze/Freeze.h ../../include/Freeze/Initialize.h ../../include/Freeze/DBF.h ../../include/Freeze/DB.h ../../include/Freeze/DBException.h ../../include/Freeze/EvictorF.h ../../include/Freeze/Evictor.h ../../include/Freeze/Map.h ../IceStorm/TopicManagerI.h ../../include/IceStorm/IceStorm.h ../IceStorm/StringBoolDict.h ../IceStorm/TraceLevels.h -Admin.o: Admin.cpp ../../include/Ice/Application.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h ../../include/Ice/Properties.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Communicator.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/SystemF.h ../../include/Ice/SslExtensionF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../IceStorm/Parser.h ../../include/IceStorm/IceStorm.h -Grammar.o: Grammar.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h ../../include/Ice/Properties.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Communicator.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/SystemF.h ../../include/Ice/SslExtensionF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../IceStorm/Parser.h ../../include/IceStorm/IceStorm.h -Scanner.o: Scanner.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h ../../include/Ice/Properties.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Communicator.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/SystemF.h ../../include/Ice/SslExtensionF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../IceStorm/Parser.h ../../include/IceStorm/IceStorm.h ../IceStorm/Grammar.h +Server.o: Server.cpp ../../include/Freeze/Application.h ../../include/Ice/Application.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Communicator.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../../include/Freeze/Freeze.h ../../include/Freeze/Initialize.h ../../include/Freeze/DBF.h ../../include/Freeze/DB.h ../../include/Freeze/DBException.h ../../include/Freeze/EvictorF.h ../../include/Freeze/Evictor.h ../../include/Freeze/Map.h ../IceStorm/TopicManagerI.h ../../include/IceStorm/IceStorm.h ../IceStorm/StringBoolDict.h ../IceStorm/TraceLevels.h +Admin.o: Admin.cpp ../../include/Ice/Application.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Communicator.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../IceStorm/Parser.h ../../include/IceStorm/IceStorm.h +Grammar.o: Grammar.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Communicator.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../IceStorm/Parser.h ../../include/IceStorm/IceStorm.h +Scanner.o: Scanner.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Communicator.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../IceStorm/Parser.h ../../include/IceStorm/IceStorm.h ../IceStorm/Grammar.h WeightedGraph.o: WeightedGraph.cpp ../IceStorm/WeightedGraph.h -Parser.o: Parser.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h ../../include/Ice/Properties.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Communicator.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/SystemF.h ../../include/Ice/SslExtensionF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../IceStorm/Parser.h ../../include/IceStorm/IceStorm.h ../IceStorm/WeightedGraph.h +Parser.o: Parser.cpp ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Communicator.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/PluginF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../IceStorm/Parser.h ../../include/IceStorm/IceStorm.h ../IceStorm/WeightedGraph.h diff --git a/cpp/src/IceStorm/Admin.cpp b/cpp/src/IceStorm/Admin.cpp index bcf7e9f51a7..6f0dd39968a 100644 --- a/cpp/src/IceStorm/Admin.cpp +++ b/cpp/src/IceStorm/Admin.cpp @@ -39,8 +39,6 @@ main(int argc, char* argv[]) return EXIT_FAILURE; } - addArgumentPrefix("IceStorm"); - Client app; int rc = app.main(argc, argv); @@ -69,6 +67,12 @@ Client::usage() int Client::run(int argc, char* argv[]) { + PropertiesPtr properties = communicator()->getProperties(); + + StringSeq args = argsToStringSeq(argc, argv); + args = properties->parseCommandLineOptions("IceStorm", args); + stringSeqToArgs(args, argc, argv); + string cpp("cpp"); string commands; bool debug = false; @@ -154,7 +158,6 @@ Client::run(int argc, char* argv[]) return EXIT_FAILURE; } - PropertiesPtr properties = communicator()->getProperties(); const char* managerEndpointsProperty = "IceStorm.TopicManager.Endpoints"; string managerEndpoints = properties->getProperty(managerEndpointsProperty); if (managerEndpoints.empty()) diff --git a/cpp/src/IceStorm/Makefile b/cpp/src/IceStorm/Makefile index 4ba740c7f36..7b84bfa7e01 100644 --- a/cpp/src/IceStorm/Makefile +++ b/cpp/src/IceStorm/Makefile @@ -55,7 +55,7 @@ SLICE2FREEZECMD = $(SLICE2FREEZE) --include-dir IceStorm -I$(slicedir) -I.. include $(top_srcdir)/config/Make.rules -CPPFLAGS := -I.. -I$(DB_HOME)/include -I$(XERCESC_HOME)/include/xercesc $(CPPFLAGS) +CPPFLAGS := -I.. -I$(DB_HOME)/include $(XERCESC_FLAGS) $(CPPFLAGS) LDFLAGS := $(LDFLAGS) -L$(DB_HOME)/lib $(VERSIONED_NAME): $(OBJS) @@ -68,11 +68,11 @@ $(NAME): $(VERSIONED_NAME) $(SERVER): $(SOBJS) rm -f $@ - $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(SOBJS) -lIceStorm -lFreeze -ldb $(LIBS) + $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(SOBJS) -lIceStorm -lFreeze $(XERCESC_LIBS) -ldb $(LIBS) $(ADMIN): $(AOBJS) rm -f $@ - $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(AOBJS) -lIceStorm $(LIBS) -lreadline -lcurses + $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(AOBJS) -lIceStorm $(XERCESC_LIBS) $(LIBS) -lreadline -lcurses $(HDIR)/IceStorm.h IceStorm.cpp: $(SDIR)/IceStorm.ice $(SLICE2CPP) rm -f $(HDIR)/IceStorm.h IceStorm.cpp diff --git a/cpp/src/IceStorm/Server.cpp b/cpp/src/IceStorm/Server.cpp index 17e1ef3d1de..cb9565bc813 100644 --- a/cpp/src/IceStorm/Server.cpp +++ b/cpp/src/IceStorm/Server.cpp @@ -37,11 +37,13 @@ public: int main(int argc, char* argv[]) { - addArgumentPrefix("IceStorm"); PropertiesPtr defaultProperties; try { defaultProperties = getDefaultProperties(argc, argv); + StringSeq args = argsToStringSeq(argc, argv); + args = defaultProperties->parseCommandLineOptions("IceStorm", args); + stringSeqToArgs(args, argc, argv); } catch(const Exception& ex) { diff --git a/cpp/src/IceWall/.depend b/cpp/src/IceWall/.depend index 17fac9eea7d..e69de29bb2d 100644 --- a/cpp/src/IceWall/.depend +++ b/cpp/src/IceWall/.depend @@ -1,2 +0,0 @@ -Router.o: Router.cpp ../IceWall/Router.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/Stream.h ../../include/Ice/Communicator.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/LoggerF.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/StreamF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h -Server.o: Server.cpp ../../include/Ice/Application.h ../../include/Ice/Ice.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/Properties.h ../../include/Ice/Logger.h ../../include/Ice/Stream.h ../../include/Ice/Communicator.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/LoggerF.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/StreamF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/ServantLocator.h ../../include/Ice/IdentityUtil.h ../IceWall/Router.h diff --git a/cpp/src/IceXML/.depend b/cpp/src/IceXML/.depend index 13336d5a2ef..b5ca39201ed 100644 --- a/cpp/src/IceXML/.depend +++ b/cpp/src/IceXML/.depend @@ -1 +1 @@ -StreamI.o: StreamI.cpp ../../include/Ice/Object.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Lock.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/StreamF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Communicator.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/LoggerF.h ../../include/Ice/PropertiesF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/SystemF.h ../../include/Ice/SslExtensionF.h ../../include/Ice/Logger.h ../../include/Ice/LocalException.h ../../include/Ice/ObjectFactory.h ../../include/IceXML/StreamI.h ../../include/Ice/Stream.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/CommunicatorF.h ../../include/IceUtil/OutputUtil.h +StreamI.o: StreamI.cpp ../../include/Ice/Object.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Lock.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/StreamF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Communicator.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/LoggerF.h ../../include/Ice/PropertiesF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/PluginF.h ../../include/Ice/Logger.h ../../include/Ice/LocalException.h ../../include/Ice/ObjectFactory.h ../../include/IceXML/StreamI.h ../../include/Ice/Stream.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/CommunicatorF.h ../../include/IceUtil/OutputUtil.h diff --git a/cpp/src/IceXML/Makefile b/cpp/src/IceXML/Makefile index eb0fae63837..9f7fa17cf6a 100644 --- a/cpp/src/IceXML/Makefile +++ b/cpp/src/IceXML/Makefile @@ -24,11 +24,11 @@ SRCS = $(OBJS:.o=.cpp) include $(top_srcdir)/config/Make.rules -CPPFLAGS := -I.. $(CPPFLAGS) -I$(XERCESC_HOME)/include/xercesc +CPPFLAGS := -I.. $(CPPFLAGS) $(XERCESC_FLAGS) $(VERSIONED_NAME): $(OBJS) rm -f $@ - $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $(OBJS) + $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $(OBJS) $(XERCESC_LIBS) $(NAME): $(VERSIONED_NAME) rm -f $@ diff --git a/cpp/src/Makefile b/cpp/src/Makefile index dd0430c1c76..da9fff5a4a4 100644 --- a/cpp/src/Makefile +++ b/cpp/src/Makefile @@ -22,6 +22,7 @@ SUBDIRS = IceUtil \ slice2xsd \ slice2wsdl \ Ice \ + IceSSL \ IceXML \ Freeze \ IceStorm \ diff --git a/cpp/src/slice2wsdl/Makefile b/cpp/src/slice2wsdl/Makefile index 7cda23c0b47..afddcd7818f 100644 --- a/cpp/src/slice2wsdl/Makefile +++ b/cpp/src/slice2wsdl/Makefile @@ -22,10 +22,10 @@ SRCS = $(OBJS:.o=.cpp) \ include $(top_srcdir)/config/Make.rules -CPPFLAGS := -I. $(CPPFLAGS) -I$(XERCESC_HOME)/include/xercesc +CPPFLAGS := -I. $(CPPFLAGS) $(XERCESC_FLAGS) $(NAME): $(OBJS) rm -f $@ - $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJS) -lSlice $(BASELIBS) + $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJS) -lSlice $(BASELIBS) $(XERCESC_LIBS) include .depend diff --git a/cpp/src/slice2xsd/Makefile b/cpp/src/slice2xsd/Makefile index 72811f02572..c837c463545 100644 --- a/cpp/src/slice2xsd/Makefile +++ b/cpp/src/slice2xsd/Makefile @@ -25,14 +25,14 @@ SRCS = $(OBJS:.o=.cpp) \ include $(top_srcdir)/config/Make.rules -CPPFLAGS := -I. $(CPPFLAGS) -I$(XERCESC_HOME)/include/xercesc +CPPFLAGS := -I. $(CPPFLAGS) $(XERCESC_FLAGS) $(NAME): $(OBJS) rm -f $@ - $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJS) -lSlice $(BASELIBS) + $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJS) -lSlice $(BASELIBS) $(XERCESC_LIBS) $(VALIDATE): $(VOBJS) rm -f $@ - $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(VOBJS) $(BASELIBS) -lxerces-c1_5_2 + $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(VOBJS) $(BASELIBS) $(XERCESC_LIBS) include .depend |