zeroc-ice 3.6.5 → 3.7.4
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +5 -5
- data/ICE_LICENSE +17 -17
- data/LICENSE +12 -12
- data/bin/slice2rb +1 -6
- data/ext/Communicator.cpp +223 -61
- data/ext/Communicator.h +1 -6
- data/ext/Config.h +23 -7
- data/ext/Connection.cpp +108 -76
- data/ext/Connection.h +4 -6
- data/ext/Endpoint.cpp +16 -54
- data/ext/Endpoint.h +1 -6
- data/ext/ImplicitContext.cpp +1 -10
- data/ext/ImplicitContext.h +1 -6
- data/ext/Init.cpp +4 -6
- data/ext/Logger.cpp +1 -6
- data/ext/Logger.h +1 -6
- data/ext/Operation.cpp +38 -54
- data/ext/Operation.h +1 -6
- data/ext/Properties.cpp +3 -8
- data/ext/Properties.h +1 -6
- data/ext/Proxy.cpp +111 -70
- data/ext/Proxy.h +1 -6
- data/ext/Slice.cpp +5 -20
- data/ext/Slice.h +1 -6
- data/ext/Types.cpp +313 -224
- data/ext/Types.h +118 -71
- data/ext/Util.cpp +69 -36
- data/ext/Util.h +117 -42
- data/ext/ValueFactoryManager.cpp +440 -0
- data/ext/ValueFactoryManager.h +95 -0
- data/ext/extconf.rb +52 -48
- data/ext/ice/cpp/include/Ice/Application.h +275 -105
- data/ext/ice/cpp/include/Ice/AsyncResult.h +124 -337
- data/ext/ice/cpp/include/Ice/AsyncResultF.h +4 -7
- data/ext/ice/cpp/include/Ice/BatchRequestInterceptor.h +39 -16
- data/ext/ice/cpp/include/Ice/BatchRequestQueueF.h +1 -6
- data/ext/ice/cpp/include/Ice/Buffer.h +10 -15
- data/ext/ice/cpp/include/Ice/CommunicatorAsync.h +56 -17
- data/ext/ice/cpp/include/Ice/Comparable.h +205 -0
- data/ext/ice/cpp/include/Ice/Config.h +16 -39
- data/ext/ice/cpp/include/Ice/ConnectionAsync.h +203 -16
- data/ext/ice/cpp/include/Ice/ConnectionIF.h +7 -6
- data/ext/ice/cpp/include/Ice/ConsoleUtil.h +23 -0
- data/ext/ice/cpp/include/Ice/DefaultValueFactory.h +57 -0
- data/ext/ice/cpp/include/Ice/DispatchInterceptor.h +20 -12
- data/ext/ice/cpp/include/Ice/Dispatcher.h +35 -19
- data/ext/ice/cpp/include/Ice/DynamicLibrary.h +7 -10
- data/ext/ice/cpp/include/Ice/DynamicLibraryF.h +1 -6
- data/ext/ice/cpp/include/Ice/Exception.h +110 -63
- data/ext/ice/cpp/include/Ice/ExceptionHelpers.h +74 -0
- data/ext/ice/cpp/include/Ice/FactoryTable.h +22 -18
- data/ext/ice/cpp/include/Ice/FactoryTableInit.h +28 -31
- data/ext/ice/cpp/include/Ice/Format.h +17 -18
- data/ext/ice/cpp/include/Ice/Functional.h +38 -38
- data/ext/ice/cpp/include/Ice/GCObject.h +9 -10
- data/ext/ice/cpp/include/Ice/Handle.h +6 -16
- data/ext/ice/cpp/include/Ice/Ice.h +9 -10
- data/ext/ice/cpp/include/Ice/IconvStringConverter.h +377 -0
- data/ext/ice/cpp/include/Ice/Incoming.h +132 -38
- data/ext/ice/cpp/include/Ice/IncomingAsync.h +109 -31
- data/ext/ice/cpp/include/Ice/IncomingAsyncF.h +7 -6
- data/ext/ice/cpp/include/Ice/Initialize.h +872 -60
- data/ext/ice/cpp/include/Ice/InputStream.h +1514 -0
- data/ext/ice/cpp/include/Ice/InstanceF.h +1 -7
- data/ext/ice/cpp/include/Ice/InterfaceByValue.h +57 -0
- data/ext/ice/cpp/include/Ice/LocalObject.h +13 -14
- data/ext/ice/cpp/include/Ice/LocalObjectF.h +1 -6
- data/ext/ice/cpp/include/Ice/LoggerUtil.h +56 -24
- data/ext/ice/cpp/include/Ice/MetricsAdminI.h +124 -71
- data/ext/ice/cpp/include/Ice/MetricsFunctional.h +25 -10
- data/ext/ice/cpp/include/Ice/MetricsObserverI.h +116 -32
- data/ext/ice/cpp/include/Ice/NativePropertiesAdmin.h +61 -30
- data/ext/ice/cpp/include/Ice/Object.h +413 -78
- data/ext/ice/cpp/include/Ice/ObjectF.h +12 -8
- data/ext/ice/cpp/include/Ice/ObserverHelper.h +18 -13
- data/ext/ice/cpp/include/Ice/Optional.h +1114 -0
- data/ext/ice/cpp/include/Ice/OutgoingAsync.h +684 -89
- data/ext/ice/cpp/include/Ice/OutgoingAsyncF.h +12 -11
- data/ext/ice/cpp/include/Ice/OutputStream.h +1092 -0
- data/ext/ice/cpp/include/Ice/Protocol.h +49 -17
- data/ext/ice/cpp/include/Ice/Proxy.h +3438 -745
- data/ext/ice/cpp/include/Ice/ProxyF.h +13 -38
- data/ext/ice/cpp/include/Ice/ProxyFactoryF.h +1 -6
- data/ext/ice/cpp/include/Ice/ProxyHandle.h +43 -55
- data/ext/ice/cpp/include/Ice/ReferenceF.h +1 -6
- data/ext/ice/cpp/include/Ice/RegisterPlugins.h +84 -12
- data/ext/ice/cpp/include/Ice/RequestHandlerF.h +10 -9
- data/ext/ice/cpp/include/Ice/ResponseHandlerF.h +6 -6
- data/ext/ice/cpp/include/Ice/SHA1.h +42 -0
- data/ext/ice/cpp/include/Ice/ServantManagerF.h +1 -6
- data/ext/ice/cpp/include/Ice/Service.h +273 -154
- data/ext/ice/cpp/include/Ice/SliceChecksums.h +5 -6
- data/ext/ice/cpp/include/Ice/SlicedData.h +121 -53
- data/ext/ice/cpp/include/Ice/SlicedDataF.h +17 -11
- data/ext/ice/cpp/include/Ice/StreamHelpers.h +453 -140
- data/ext/ice/cpp/include/Ice/StringConverter.h +78 -0
- data/ext/ice/cpp/include/Ice/ThreadPoolF.h +1 -6
- data/ext/ice/cpp/include/Ice/UUID.h +19 -0
- data/ext/ice/cpp/include/{IceUtil → Ice}/UniquePtr.h +22 -28
- data/ext/ice/cpp/include/Ice/UniqueRef.h +97 -0
- data/ext/ice/cpp/include/Ice/UserExceptionFactory.h +45 -13
- data/ext/ice/cpp/include/Ice/Value.h +139 -0
- data/ext/ice/cpp/include/Ice/ValueF.h +21 -0
- data/ext/ice/cpp/include/IceSSL/Config.h +8 -28
- data/ext/ice/cpp/include/IceSSL/IceSSL.h +17 -11
- data/ext/ice/cpp/include/IceSSL/OpenSSL.h +147 -0
- data/ext/ice/cpp/include/IceSSL/Plugin.h +461 -448
- data/ext/ice/cpp/include/IceSSL/SChannel.h +72 -0
- data/ext/ice/cpp/include/IceSSL/SecureTransport.h +72 -0
- data/ext/ice/cpp/include/IceSSL/UWP.h +62 -0
- data/ext/ice/cpp/include/IceUtil/Atomic.h +7 -14
- data/ext/ice/cpp/include/IceUtil/Cond.h +17 -23
- data/ext/ice/cpp/include/IceUtil/Config.h +166 -46
- data/ext/ice/cpp/include/IceUtil/ConsoleUtil.h +92 -0
- data/ext/ice/cpp/include/IceUtil/CountDownLatch.h +5 -10
- data/ext/ice/cpp/include/IceUtil/CtrlCHandler.h +63 -41
- data/ext/ice/cpp/include/IceUtil/DisableWarnings.h +5 -13
- data/ext/ice/cpp/include/IceUtil/Exception.h +284 -75
- data/ext/ice/cpp/include/IceUtil/FileUtil.h +143 -0
- data/ext/ice/cpp/include/IceUtil/Functional.h +4 -6
- data/ext/ice/cpp/include/IceUtil/Handle.h +11 -16
- data/ext/ice/cpp/include/IceUtil/IceUtil.h +4 -15
- data/ext/ice/cpp/include/IceUtil/InputUtil.h +3 -8
- data/ext/ice/cpp/include/IceUtil/Iterator.h +2 -7
- data/ext/ice/cpp/include/IceUtil/Lock.h +8 -15
- data/ext/ice/cpp/include/IceUtil/Monitor.h +1 -7
- data/ext/ice/cpp/include/IceUtil/Mutex.h +19 -23
- data/ext/ice/cpp/include/IceUtil/MutexProtocol.h +2 -7
- data/ext/ice/cpp/include/IceUtil/MutexPtrLock.h +4 -9
- data/ext/ice/cpp/include/IceUtil/MutexPtrTryLock.h +4 -9
- data/ext/ice/cpp/include/IceUtil/Optional.h +134 -23
- data/ext/ice/cpp/include/IceUtil/Options.h +17 -23
- data/ext/ice/cpp/include/IceUtil/OutputUtil.h +61 -37
- data/ext/ice/cpp/include/IceUtil/PopDisableWarnings.h +6 -11
- data/ext/ice/cpp/include/IceUtil/PushDisableWarnings.h +18 -15
- data/ext/ice/cpp/include/IceUtil/Random.h +39 -8
- data/ext/ice/cpp/include/IceUtil/RecMutex.h +7 -13
- data/ext/ice/cpp/include/IceUtil/ResourceConfig.h +53 -0
- data/ext/ice/cpp/include/IceUtil/ScannerConfig.h +10 -15
- data/ext/ice/cpp/include/IceUtil/ScopedArray.h +8 -7
- data/ext/ice/cpp/include/IceUtil/Shared.h +5 -12
- data/ext/ice/cpp/{src → include}/IceUtil/StopWatch.h +2 -7
- data/ext/ice/cpp/include/IceUtil/StringConverter.h +146 -126
- data/ext/ice/cpp/include/IceUtil/StringUtil.h +32 -26
- data/ext/ice/cpp/include/IceUtil/Thread.h +10 -17
- data/ext/ice/cpp/include/IceUtil/ThreadException.h +33 -47
- data/ext/ice/cpp/include/IceUtil/Time.h +3 -8
- data/ext/ice/cpp/include/IceUtil/Timer.h +18 -18
- data/ext/ice/cpp/include/IceUtil/UUID.h +6 -7
- data/ext/ice/cpp/include/IceUtil/UndefSysMacros.h +1 -6
- data/ext/ice/cpp/include/generated/Ice/BuiltinSequences.h +170 -0
- data/ext/ice/cpp/include/generated/Ice/Communicator.h +1156 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/CommunicatorF.h +51 -16
- data/ext/ice/cpp/include/generated/Ice/Connection.h +1660 -0
- data/ext/ice/cpp/include/generated/Ice/ConnectionF.h +119 -0
- data/ext/ice/cpp/include/generated/Ice/Current.h +322 -0
- data/ext/ice/cpp/include/generated/Ice/Endpoint.h +943 -0
- data/ext/ice/cpp/include/generated/Ice/EndpointF.h +166 -0
- data/ext/ice/cpp/include/generated/Ice/EndpointTypes.h +118 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/FacetMap.h +31 -15
- data/ext/ice/cpp/include/generated/Ice/Identity.h +264 -0
- data/ext/ice/cpp/include/generated/Ice/ImplicitContext.h +278 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/ImplicitContextF.h +51 -16
- data/ext/ice/cpp/include/generated/Ice/Instrumentation.h +1143 -0
- data/ext/ice/cpp/include/generated/Ice/InstrumentationF.h +128 -0
- data/ext/ice/cpp/include/generated/Ice/LocalException.h +7041 -0
- data/ext/ice/cpp/include/generated/Ice/Locator.h +3850 -0
- data/ext/ice/cpp/include/generated/Ice/LocatorF.h +147 -0
- data/ext/ice/cpp/include/generated/Ice/Logger.h +231 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/LoggerF.h +51 -16
- data/ext/ice/cpp/include/generated/Ice/Metrics.h +4717 -0
- data/ext/ice/cpp/include/generated/Ice/ObjectAdapter.h +1175 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/ObjectAdapterF.h +51 -16
- data/ext/ice/cpp/include/generated/Ice/ObjectFactory.h +197 -0
- data/ext/ice/cpp/include/generated/Ice/Plugin.h +306 -0
- data/ext/ice/cpp/include/generated/Ice/PluginF.h +110 -0
- data/ext/ice/cpp/include/generated/Ice/Process.h +971 -0
- data/ext/ice/cpp/include/generated/Ice/ProcessF.h +125 -0
- data/ext/ice/cpp/include/generated/Ice/Properties.h +446 -0
- data/ext/ice/cpp/include/generated/Ice/PropertiesAdmin.h +1360 -0
- data/ext/ice/cpp/include/generated/Ice/PropertiesF.h +134 -0
- data/ext/ice/cpp/include/generated/Ice/RemoteLogger.h +2689 -0
- data/ext/ice/cpp/include/generated/Ice/Router.h +1838 -0
- data/ext/ice/cpp/include/generated/Ice/RouterF.h +125 -0
- data/ext/ice/cpp/include/generated/Ice/ServantLocator.h +299 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/ServantLocatorF.h +51 -16
- data/ext/ice/cpp/include/{Ice → generated/Ice}/SliceChecksumDict.h +34 -14
- data/ext/ice/cpp/include/generated/Ice/ValueFactory.h +318 -0
- data/ext/ice/cpp/include/generated/Ice/Version.h +357 -0
- data/ext/ice/cpp/include/generated/IceSSL/ConnectionInfo.h +223 -0
- data/ext/ice/cpp/include/generated/IceSSL/ConnectionInfoF.h +101 -0
- data/ext/ice/cpp/include/generated/IceSSL/EndpointInfo.h +181 -0
- data/ext/ice/cpp/src/Ice/ACM.cpp +38 -27
- data/ext/ice/cpp/src/Ice/ACM.h +9 -7
- data/ext/ice/cpp/src/Ice/ACMF.h +30 -0
- data/ext/ice/cpp/src/Ice/Acceptor.cpp +6 -6
- data/ext/ice/cpp/src/Ice/Acceptor.h +4 -8
- data/ext/ice/cpp/src/Ice/AcceptorF.h +1 -6
- data/ext/ice/cpp/src/Ice/ArgVector.cpp +59 -0
- data/ext/ice/cpp/src/Ice/ArgVector.h +36 -0
- data/ext/ice/cpp/src/Ice/AsyncResult.cpp +15 -544
- data/ext/ice/cpp/src/Ice/Base64.cpp +22 -28
- data/ext/ice/cpp/src/Ice/Base64.h +1 -6
- data/ext/ice/cpp/src/Ice/BatchRequestQueue.cpp +41 -18
- data/ext/ice/cpp/src/Ice/BatchRequestQueue.h +15 -15
- data/ext/ice/cpp/src/Ice/Buffer.cpp +75 -18
- data/ext/ice/cpp/src/Ice/BuiltinSequences.cpp +21 -12
- data/ext/ice/cpp/src/Ice/CollocatedRequestHandler.cpp +86 -197
- data/ext/ice/cpp/src/Ice/CollocatedRequestHandler.h +17 -23
- data/ext/ice/cpp/src/Ice/Communicator.cpp +43 -15
- data/ext/ice/cpp/src/Ice/CommunicatorF.cpp +28 -11
- data/ext/ice/cpp/src/Ice/CommunicatorI.cpp +318 -117
- data/ext/ice/cpp/src/Ice/CommunicatorI.h +95 -40
- data/ext/ice/cpp/src/{IceUtil → Ice}/Cond.cpp +3 -8
- data/ext/ice/cpp/src/Ice/ConnectRequestHandler.cpp +55 -122
- data/ext/ice/cpp/src/Ice/ConnectRequestHandler.h +15 -31
- data/ext/ice/cpp/src/Ice/ConnectRequestHandlerF.h +6 -7
- data/ext/ice/cpp/src/Ice/Connection.cpp +111 -20
- data/ext/ice/cpp/src/Ice/ConnectionF.cpp +28 -11
- data/ext/ice/cpp/src/Ice/ConnectionFactory.cpp +300 -107
- data/ext/ice/cpp/src/Ice/ConnectionFactory.h +44 -28
- data/ext/ice/cpp/src/Ice/ConnectionFactoryF.h +30 -0
- data/ext/ice/cpp/src/Ice/ConnectionI.cpp +785 -713
- data/ext/ice/cpp/src/Ice/ConnectionI.h +105 -80
- data/ext/ice/cpp/src/Ice/ConnectionRequestHandler.cpp +2 -20
- data/ext/ice/cpp/src/Ice/ConnectionRequestHandler.h +5 -9
- data/ext/ice/cpp/src/Ice/Connector.cpp +6 -6
- data/ext/ice/cpp/src/Ice/Connector.h +4 -8
- data/ext/ice/cpp/src/Ice/ConnectorF.h +1 -6
- data/ext/ice/cpp/src/{IceUtil → Ice}/CountDownLatch.cpp +4 -9
- data/ext/ice/cpp/src/Ice/Current.cpp +30 -12
- data/ext/ice/cpp/src/Ice/DefaultsAndOverrides.cpp +10 -16
- data/ext/ice/cpp/src/Ice/DefaultsAndOverrides.h +1 -6
- data/ext/ice/cpp/src/Ice/DefaultsAndOverridesF.h +1 -6
- data/ext/ice/cpp/src/Ice/DispatchInterceptor.cpp +13 -25
- data/ext/ice/cpp/src/Ice/DynamicLibrary.cpp +34 -28
- data/ext/ice/cpp/src/Ice/Endpoint.cpp +107 -19
- data/ext/ice/cpp/src/Ice/EndpointF.cpp +28 -11
- data/ext/ice/cpp/src/Ice/EndpointFactory.cpp +152 -6
- data/ext/ice/cpp/src/Ice/EndpointFactory.h +72 -11
- data/ext/ice/cpp/src/Ice/EndpointFactoryF.h +1 -6
- data/ext/ice/cpp/src/Ice/EndpointFactoryManager.cpp +41 -36
- data/ext/ice/cpp/src/Ice/EndpointFactoryManager.h +10 -9
- data/ext/ice/cpp/src/Ice/EndpointFactoryManagerF.h +1 -6
- data/ext/ice/cpp/src/Ice/EndpointI.cpp +18 -7
- data/ext/ice/cpp/src/Ice/EndpointI.h +39 -18
- data/ext/ice/cpp/src/Ice/EndpointIF.h +18 -10
- data/ext/ice/cpp/src/Ice/EndpointTypes.cpp +19 -12
- data/ext/ice/cpp/src/Ice/EventHandler.cpp +6 -9
- data/ext/ice/cpp/src/Ice/EventHandler.h +13 -13
- data/ext/ice/cpp/src/Ice/EventHandlerF.h +5 -7
- data/ext/ice/cpp/src/Ice/Exception.cpp +102 -98
- data/ext/ice/cpp/src/Ice/FacetMap.cpp +21 -12
- data/ext/ice/cpp/src/Ice/FactoryTable.cpp +37 -33
- data/ext/ice/cpp/src/Ice/FactoryTableInit.cpp +2 -9
- data/ext/ice/cpp/src/Ice/GCObject.cpp +29 -31
- data/ext/ice/cpp/src/Ice/HashUtil.h +3 -9
- data/ext/ice/cpp/src/Ice/HttpParser.cpp +1 -7
- data/ext/ice/cpp/src/Ice/HttpParser.h +1 -6
- data/ext/ice/cpp/src/Ice/IPEndpointI.cpp +128 -111
- data/ext/ice/cpp/src/Ice/IPEndpointI.h +23 -19
- data/ext/ice/cpp/src/Ice/IPEndpointIF.h +6 -7
- data/ext/ice/cpp/src/Ice/IconvStringConverter.cpp +51 -0
- data/ext/ice/cpp/src/Ice/Identity.cpp +25 -16
- data/ext/ice/cpp/src/Ice/ImplicitContext.cpp +41 -13
- data/ext/ice/cpp/src/Ice/ImplicitContextF.cpp +28 -11
- data/ext/ice/cpp/src/Ice/ImplicitContextI.cpp +11 -28
- data/ext/ice/cpp/src/Ice/ImplicitContextI.h +7 -10
- data/ext/ice/cpp/src/Ice/Incoming.cpp +284 -255
- data/ext/ice/cpp/src/Ice/IncomingAsync.cpp +104 -214
- data/ext/ice/cpp/src/Ice/IncomingRequest.h +5 -9
- data/ext/ice/cpp/src/Ice/Initialize.cpp +309 -193
- data/ext/ice/cpp/src/Ice/InputStream.cpp +2726 -0
- data/ext/ice/cpp/src/Ice/Instance.cpp +243 -262
- data/ext/ice/cpp/src/Ice/Instance.h +30 -23
- data/ext/ice/cpp/src/Ice/Instrumentation.cpp +137 -23
- data/ext/ice/cpp/src/Ice/InstrumentationF.cpp +28 -11
- data/ext/ice/cpp/src/Ice/InstrumentationI.cpp +118 -105
- data/ext/ice/cpp/src/Ice/InstrumentationI.h +30 -36
- data/ext/ice/cpp/src/Ice/LocalException.cpp +1191 -422
- data/ext/ice/cpp/src/Ice/LocalObject.cpp +1 -7
- data/ext/ice/cpp/src/Ice/Locator.cpp +1282 -1222
- data/ext/ice/cpp/src/Ice/LocatorF.cpp +30 -12
- data/ext/ice/cpp/src/Ice/LocatorInfo.cpp +150 -186
- data/ext/ice/cpp/src/Ice/LocatorInfo.h +31 -36
- data/ext/ice/cpp/src/Ice/LocatorInfoF.h +1 -6
- data/ext/ice/cpp/src/Ice/Logger.cpp +39 -12
- data/ext/ice/cpp/src/Ice/LoggerAdminI.cpp +182 -88
- data/ext/ice/cpp/src/Ice/LoggerAdminI.h +4 -9
- data/ext/ice/cpp/src/Ice/LoggerF.cpp +28 -11
- data/ext/ice/cpp/src/Ice/LoggerI.cpp +26 -55
- data/ext/ice/cpp/src/Ice/LoggerI.h +7 -18
- data/ext/ice/cpp/src/Ice/LoggerUtil.cpp +10 -17
- data/ext/ice/cpp/src/Ice/Metrics.cpp +1280 -1107
- data/ext/ice/cpp/src/Ice/MetricsAdminI.cpp +58 -33
- data/ext/ice/cpp/src/Ice/MetricsObserverI.cpp +1 -7
- data/ext/ice/cpp/src/Ice/Network.cpp +753 -408
- data/ext/ice/cpp/src/Ice/Network.h +99 -36
- data/ext/ice/cpp/src/Ice/NetworkF.h +2 -7
- data/ext/ice/cpp/src/Ice/NetworkProxy.cpp +20 -19
- data/ext/ice/cpp/src/Ice/NetworkProxy.h +5 -7
- data/ext/ice/cpp/src/Ice/NetworkProxyF.h +1 -6
- data/ext/ice/cpp/src/Ice/OSLogLoggerI.cpp +57 -0
- data/ext/ice/cpp/src/Ice/OSLogLoggerI.h +40 -0
- data/ext/ice/cpp/src/Ice/Object.cpp +227 -232
- data/ext/ice/cpp/src/Ice/ObjectAdapter.cpp +45 -13
- data/ext/ice/cpp/src/Ice/ObjectAdapterF.cpp +28 -11
- data/ext/ice/cpp/src/Ice/ObjectAdapterFactory.cpp +83 -33
- data/ext/ice/cpp/src/Ice/ObjectAdapterFactory.h +13 -12
- data/ext/ice/cpp/src/Ice/ObjectAdapterFactoryF.h +25 -0
- data/ext/ice/cpp/src/Ice/ObjectAdapterI.cpp +298 -191
- data/ext/ice/cpp/src/Ice/ObjectAdapterI.h +44 -39
- data/ext/ice/cpp/src/Ice/ObjectFactory.cpp +41 -13
- data/ext/ice/cpp/src/Ice/ObserverHelper.cpp +9 -37
- data/ext/ice/cpp/src/Ice/OpaqueEndpointI.cpp +67 -67
- data/ext/ice/cpp/src/Ice/OpaqueEndpointI.h +15 -11
- data/ext/ice/cpp/src/Ice/OutgoingAsync.cpp +801 -366
- data/ext/ice/cpp/src/Ice/OutputStream.cpp +1367 -0
- data/ext/ice/cpp/src/Ice/Plugin.cpp +52 -14
- data/ext/ice/cpp/src/Ice/PluginF.cpp +28 -11
- data/ext/ice/cpp/src/Ice/PluginManagerI.cpp +27 -51
- data/ext/ice/cpp/src/Ice/PluginManagerI.h +7 -13
- data/ext/ice/cpp/src/Ice/Process.cpp +294 -128
- data/ext/ice/cpp/src/Ice/ProcessF.cpp +30 -12
- data/ext/ice/cpp/src/Ice/Properties.cpp +42 -15
- data/ext/ice/cpp/src/Ice/PropertiesAdmin.cpp +382 -340
- data/ext/ice/cpp/src/Ice/PropertiesAdminI.cpp +83 -24
- data/ext/ice/cpp/src/Ice/PropertiesAdminI.h +29 -10
- data/ext/ice/cpp/src/Ice/PropertiesF.cpp +30 -12
- data/ext/ice/cpp/src/Ice/PropertiesI.cpp +46 -57
- data/ext/ice/cpp/src/Ice/PropertiesI.h +18 -26
- data/ext/ice/cpp/src/Ice/PropertyNames.cpp +112 -19
- data/ext/ice/cpp/src/Ice/PropertyNames.h +4 -7
- data/ext/ice/cpp/src/Ice/Protocol.cpp +6 -19
- data/ext/ice/cpp/src/Ice/ProtocolInstance.cpp +37 -7
- data/ext/ice/cpp/src/Ice/ProtocolInstance.h +9 -25
- data/ext/ice/cpp/src/Ice/ProtocolInstanceF.h +1 -6
- data/ext/ice/cpp/src/Ice/ProtocolPluginFacade.cpp +6 -6
- data/ext/ice/cpp/src/Ice/ProtocolPluginFacade.h +3 -6
- data/ext/ice/cpp/src/Ice/ProtocolPluginFacadeF.h +1 -6
- data/ext/ice/cpp/src/Ice/Proxy.cpp +729 -957
- data/ext/ice/cpp/src/Ice/ProxyFactory.cpp +33 -38
- data/ext/ice/cpp/src/Ice/ProxyFactory.h +16 -16
- data/ext/ice/cpp/src/Ice/Reference.cpp +190 -106
- data/ext/ice/cpp/src/Ice/Reference.h +39 -28
- data/ext/ice/cpp/src/Ice/ReferenceFactory.cpp +69 -118
- data/ext/ice/cpp/src/Ice/ReferenceFactory.h +12 -17
- data/ext/ice/cpp/src/Ice/ReferenceFactoryF.h +1 -6
- data/ext/ice/cpp/src/Ice/RegisterPluginsInit.cpp +19 -9
- data/ext/ice/cpp/src/Ice/RegisterPluginsInit.h +1 -6
- data/ext/ice/cpp/src/Ice/RemoteLogger.cpp +766 -565
- data/ext/ice/cpp/src/Ice/ReplyStatus.h +1 -6
- data/ext/ice/cpp/src/Ice/RequestHandler.cpp +5 -8
- data/ext/ice/cpp/src/Ice/RequestHandler.h +10 -18
- data/ext/ice/cpp/src/Ice/RequestHandlerFactory.cpp +10 -11
- data/ext/ice/cpp/src/Ice/RequestHandlerFactory.h +2 -7
- data/ext/ice/cpp/src/Ice/ResponseHandler.cpp +3 -11
- data/ext/ice/cpp/src/Ice/ResponseHandler.h +16 -12
- data/ext/ice/cpp/src/Ice/RetryQueue.cpp +12 -20
- data/ext/ice/cpp/src/Ice/RetryQueue.h +7 -11
- data/ext/ice/cpp/src/Ice/RetryQueueF.h +1 -6
- data/ext/ice/cpp/src/Ice/Router.cpp +614 -492
- data/ext/ice/cpp/src/Ice/RouterF.cpp +30 -12
- data/ext/ice/cpp/src/Ice/RouterInfo.cpp +93 -99
- data/ext/ice/cpp/src/Ice/RouterInfo.h +42 -38
- data/ext/ice/cpp/src/Ice/RouterInfoF.h +1 -6
- data/ext/ice/cpp/src/{IceUtil → Ice}/SHA1.cpp +23 -28
- data/ext/ice/cpp/src/Ice/Selector.cpp +948 -855
- data/ext/ice/cpp/src/Ice/Selector.h +100 -152
- data/ext/ice/cpp/src/Ice/ServantLocator.cpp +41 -13
- data/ext/ice/cpp/src/Ice/ServantLocatorF.cpp +28 -11
- data/ext/ice/cpp/src/Ice/ServantManager.cpp +24 -45
- data/ext/ice/cpp/src/Ice/ServantManager.h +1 -6
- data/ext/ice/cpp/src/Ice/SharedContext.h +2 -7
- data/ext/ice/cpp/src/Ice/SliceChecksumDict.cpp +21 -12
- data/ext/ice/cpp/src/Ice/SliceChecksums.cpp +2 -7
- data/ext/ice/cpp/src/Ice/SlicedData.cpp +72 -25
- data/ext/ice/cpp/src/Ice/StreamSocket.cpp +208 -76
- data/ext/ice/cpp/src/Ice/StreamSocket.h +13 -9
- data/ext/ice/cpp/src/Ice/StringConverterPlugin.cpp +57 -22
- data/ext/ice/cpp/src/Ice/StringUtil.h +30 -0
- data/ext/ice/cpp/src/Ice/SysLoggerI.cpp +6 -7
- data/ext/ice/cpp/src/Ice/SysLoggerI.h +2 -8
- data/ext/ice/cpp/src/Ice/SystemdJournalI.cpp +66 -0
- data/ext/ice/cpp/src/Ice/SystemdJournalI.h +39 -0
- data/ext/ice/cpp/src/Ice/TcpAcceptor.cpp +169 -49
- data/ext/ice/cpp/src/Ice/TcpAcceptor.h +12 -10
- data/ext/ice/cpp/src/Ice/TcpConnector.cpp +6 -12
- data/ext/ice/cpp/src/Ice/TcpConnector.h +1 -7
- data/ext/ice/cpp/src/Ice/TcpEndpointI.cpp +51 -46
- data/ext/ice/cpp/src/Ice/TcpEndpointI.h +12 -14
- data/ext/ice/cpp/src/Ice/TcpTransceiver.cpp +17 -32
- data/ext/ice/cpp/src/Ice/TcpTransceiver.h +7 -15
- data/ext/ice/cpp/src/{IceUtil → Ice}/Thread.cpp +41 -54
- data/ext/ice/cpp/src/Ice/ThreadPool.cpp +242 -274
- data/ext/ice/cpp/src/Ice/ThreadPool.h +46 -48
- data/ext/ice/cpp/src/{IceUtil → Ice}/Timer.cpp +38 -26
- data/ext/ice/cpp/src/Ice/TraceLevels.cpp +2 -7
- data/ext/ice/cpp/src/Ice/TraceLevels.h +1 -6
- data/ext/ice/cpp/src/Ice/TraceLevelsF.h +2 -7
- data/ext/ice/cpp/src/Ice/TraceUtil.cpp +53 -36
- data/ext/ice/cpp/src/Ice/TraceUtil.h +13 -11
- data/ext/ice/cpp/src/Ice/Transceiver.cpp +1 -7
- data/ext/ice/cpp/src/Ice/Transceiver.h +8 -12
- data/ext/ice/cpp/src/Ice/TransceiverF.h +3 -8
- data/ext/ice/cpp/src/Ice/UdpConnector.cpp +5 -13
- data/ext/ice/cpp/src/Ice/UdpConnector.h +1 -7
- data/ext/ice/cpp/src/Ice/UdpEndpointI.cpp +118 -60
- data/ext/ice/cpp/src/Ice/UdpEndpointI.h +13 -10
- data/ext/ice/cpp/src/Ice/UdpTransceiver.cpp +177 -236
- data/ext/ice/cpp/src/Ice/UdpTransceiver.h +15 -22
- data/ext/ice/cpp/src/Ice/Value.cpp +76 -0
- data/ext/ice/cpp/src/Ice/ValueFactory.cpp +83 -0
- data/ext/ice/cpp/src/Ice/ValueFactoryManagerI.cpp +61 -0
- data/ext/ice/cpp/src/Ice/ValueFactoryManagerI.h +37 -0
- data/ext/ice/cpp/src/Ice/Version.cpp +25 -20
- data/ext/ice/cpp/src/Ice/VirtualShared.h +38 -0
- data/ext/ice/cpp/src/Ice/WSAcceptor.cpp +3 -14
- data/ext/ice/cpp/src/Ice/WSAcceptor.h +3 -12
- data/ext/ice/cpp/src/Ice/WSConnector.cpp +5 -16
- data/ext/ice/cpp/src/Ice/WSConnector.h +3 -11
- data/ext/ice/cpp/src/Ice/WSEndpoint.cpp +188 -89
- data/ext/ice/cpp/src/Ice/WSEndpoint.h +22 -37
- data/ext/ice/cpp/src/Ice/WSTransceiver.cpp +65 -66
- data/ext/ice/cpp/src/Ice/WSTransceiver.h +7 -27
- data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.cpp +596 -281
- data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.h +1383 -543
- data/ext/ice/cpp/src/IceDiscovery/LocatorI.cpp +89 -32
- data/ext/ice/cpp/src/IceDiscovery/LocatorI.h +59 -28
- data/ext/ice/cpp/src/IceDiscovery/LookupI.cpp +315 -66
- data/ext/ice/cpp/src/IceDiscovery/LookupI.h +83 -41
- data/ext/ice/cpp/src/IceDiscovery/PluginI.cpp +57 -64
- data/ext/ice/cpp/src/IceDiscovery/PluginI.h +3 -8
- data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.cpp +450 -172
- data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.h +863 -406
- data/ext/ice/cpp/src/IceLocatorDiscovery/Plugin.h +47 -0
- data/ext/ice/cpp/src/IceLocatorDiscovery/PluginI.cpp +636 -144
- data/ext/ice/cpp/src/IceSSL/AcceptorI.cpp +20 -173
- data/ext/ice/cpp/src/IceSSL/AcceptorI.h +8 -22
- data/ext/ice/cpp/src/IceSSL/CertificateI.cpp +279 -0
- data/ext/ice/cpp/src/IceSSL/CertificateI.h +64 -0
- data/ext/ice/cpp/src/IceSSL/ConnectionInfo.cpp +42 -17
- data/ext/ice/cpp/src/IceSSL/ConnectionInfoF.cpp +61 -0
- data/ext/ice/cpp/src/IceSSL/ConnectorI.cpp +15 -64
- data/ext/ice/cpp/src/IceSSL/ConnectorI.h +6 -18
- data/ext/ice/cpp/src/IceSSL/EndpointI.cpp +207 -204
- data/ext/ice/cpp/src/IceSSL/EndpointI.h +43 -40
- data/ext/ice/cpp/src/IceSSL/EndpointInfo.cpp +42 -16
- data/ext/ice/cpp/src/IceSSL/Instance.cpp +1 -11
- data/ext/ice/cpp/src/IceSSL/Instance.h +7 -12
- data/ext/ice/cpp/src/IceSSL/InstanceF.h +11 -12
- data/ext/ice/cpp/src/IceSSL/OpenSSLCertificateI.cpp +583 -0
- data/ext/ice/cpp/src/IceSSL/OpenSSLEngine.cpp +134 -115
- data/ext/ice/cpp/src/IceSSL/OpenSSLEngine.h +59 -0
- data/ext/ice/cpp/src/IceSSL/OpenSSLEngineF.h +27 -0
- data/ext/ice/cpp/src/IceSSL/OpenSSLPluginI.cpp +127 -0
- data/ext/ice/cpp/src/IceSSL/OpenSSLTransceiverI.cpp +477 -182
- data/ext/ice/cpp/src/IceSSL/OpenSSLTransceiverI.h +32 -26
- data/ext/ice/cpp/src/IceSSL/OpenSSLUtil.cpp +286 -0
- data/ext/ice/cpp/src/IceSSL/OpenSSLUtil.h +58 -0
- data/ext/ice/cpp/src/IceSSL/PluginI.cpp +71 -46
- data/ext/ice/cpp/src/IceSSL/PluginI.h +13 -23
- data/ext/ice/cpp/src/IceSSL/RFC2253.cpp +9 -60
- data/ext/ice/cpp/src/IceSSL/RFC2253.h +7 -12
- data/ext/ice/cpp/src/IceSSL/SChannelCertificateI.cpp +580 -0
- data/ext/ice/cpp/src/IceSSL/SChannelEngine.cpp +523 -74
- data/ext/ice/cpp/src/IceSSL/SChannelEngine.h +123 -0
- data/ext/ice/cpp/src/IceSSL/SChannelEngineF.h +31 -0
- data/ext/ice/cpp/src/IceSSL/SChannelPluginI.cpp +73 -0
- data/ext/ice/cpp/src/IceSSL/SChannelTransceiverI.cpp +187 -221
- data/ext/ice/cpp/src/IceSSL/SChannelTransceiverI.h +24 -26
- data/ext/ice/cpp/src/IceSSL/SSLEngine.cpp +97 -94
- data/ext/ice/cpp/src/IceSSL/SSLEngine.h +26 -192
- data/ext/ice/cpp/src/IceSSL/SSLEngineF.h +4 -24
- data/ext/ice/cpp/src/IceSSL/SecureTransportCertificateI.cpp +868 -0
- data/ext/ice/cpp/src/IceSSL/SecureTransportEngine.cpp +69 -201
- data/ext/ice/cpp/src/IceSSL/SecureTransportEngine.h +59 -0
- data/ext/ice/cpp/src/IceSSL/SecureTransportEngineF.h +29 -0
- data/ext/ice/cpp/src/IceSSL/SecureTransportPluginI.cpp +75 -0
- data/ext/ice/cpp/src/IceSSL/SecureTransportTransceiverI.cpp +174 -161
- data/ext/ice/cpp/src/IceSSL/SecureTransportTransceiverI.h +29 -33
- data/ext/ice/cpp/src/IceSSL/SecureTransportUtil.cpp +864 -0
- data/ext/ice/cpp/src/IceSSL/SecureTransportUtil.h +45 -0
- data/ext/ice/cpp/src/IceSSL/TrustManager.cpp +12 -22
- data/ext/ice/cpp/src/IceSSL/TrustManager.h +4 -9
- data/ext/ice/cpp/src/IceSSL/TrustManagerF.h +3 -8
- data/ext/ice/cpp/src/IceSSL/UWPCertificateI.cpp +266 -0
- data/ext/ice/cpp/src/IceSSL/UWPEngine.cpp +338 -0
- data/ext/ice/cpp/src/IceSSL/UWPEngine.h +41 -0
- data/ext/ice/cpp/src/IceSSL/UWPEngineF.h +26 -0
- data/ext/ice/cpp/src/IceSSL/UWPPluginI.cpp +89 -0
- data/ext/ice/cpp/src/IceSSL/UWPTransceiverI.cpp +383 -0
- data/ext/ice/cpp/src/IceSSL/UWPTransceiverI.h +71 -0
- data/ext/ice/cpp/src/IceSSL/Util.cpp +71 -1260
- data/ext/ice/cpp/src/IceSSL/Util.h +48 -142
- data/ext/ice/cpp/src/IceUtil/ConsoleUtil.cpp +157 -0
- data/ext/ice/cpp/src/IceUtil/ConvertUTF.cpp +22 -27
- data/ext/ice/cpp/src/IceUtil/ConvertUTF.h +34 -31
- data/ext/ice/cpp/src/IceUtil/CtrlCHandler.cpp +22 -36
- data/ext/ice/cpp/src/IceUtil/FileUtil.cpp +30 -126
- data/ext/ice/cpp/src/IceUtil/InputUtil.cpp +1 -6
- data/ext/ice/cpp/src/IceUtil/MutexProtocol.cpp +1 -6
- data/ext/ice/cpp/src/IceUtil/Options.cpp +20 -33
- data/ext/ice/cpp/src/IceUtil/OutputUtil.cpp +47 -21
- data/ext/ice/cpp/src/IceUtil/Random.cpp +15 -20
- data/ext/ice/cpp/src/IceUtil/RecMutex.cpp +4 -19
- data/ext/ice/cpp/src/IceUtil/Shared.cpp +8 -8
- data/ext/ice/cpp/src/IceUtil/StringConverter.cpp +501 -269
- data/ext/ice/cpp/src/IceUtil/StringUtil.cpp +582 -244
- data/ext/ice/cpp/src/IceUtil/ThreadException.cpp +37 -79
- data/ext/ice/cpp/src/IceUtil/Time.cpp +6 -11
- data/ext/ice/cpp/src/IceUtil/UUID.cpp +17 -22
- data/ext/ice/cpp/src/IceUtil/Unicode.cpp +97 -101
- data/ext/ice/cpp/src/IceUtil/Unicode.h +21 -40
- data/ext/ice/cpp/src/IceUtil/UtilException.cpp +839 -0
- data/ext/ice/cpp/src/Slice/CPlusPlusUtil.cpp +894 -234
- data/ext/ice/cpp/src/Slice/CPlusPlusUtil.h +72 -0
- data/ext/ice/cpp/src/Slice/Checksum.cpp +2 -7
- data/ext/ice/cpp/src/Slice/Checksum.h +21 -0
- data/ext/ice/cpp/src/Slice/FileTracker.cpp +25 -83
- data/ext/ice/cpp/{include → src}/Slice/FileTracker.h +9 -14
- data/ext/ice/cpp/src/Slice/Grammar.cpp +1981 -1944
- data/ext/ice/cpp/src/Slice/Grammar.h +39 -19
- data/ext/ice/cpp/src/Slice/GrammarUtil.h +14 -20
- data/ext/ice/cpp/src/Slice/JavaUtil.cpp +2752 -1948
- data/ext/ice/cpp/src/Slice/JavaUtil.h +398 -0
- data/ext/ice/cpp/src/Slice/MD5.cpp +1 -6
- data/ext/ice/cpp/src/Slice/MD5.h +1 -6
- data/ext/ice/cpp/src/Slice/MD5I.cpp +8 -1
- data/ext/ice/cpp/src/Slice/MD5I.h +1 -1
- data/ext/ice/cpp/src/Slice/PHPUtil.cpp +17 -20
- data/ext/ice/cpp/src/Slice/PHPUtil.h +36 -0
- data/ext/ice/cpp/src/Slice/Parser.cpp +1190 -426
- data/ext/ice/cpp/{include → src}/Slice/Parser.h +143 -91
- data/ext/ice/cpp/src/Slice/Preprocessor.cpp +67 -36
- data/ext/ice/cpp/{include → src}/Slice/Preprocessor.h +8 -18
- data/ext/ice/cpp/src/Slice/Python.cpp +218 -111
- data/ext/ice/cpp/src/Slice/PythonUtil.cpp +787 -699
- data/ext/ice/cpp/src/Slice/PythonUtil.h +70 -0
- data/ext/ice/cpp/src/Slice/Ruby.cpp +42 -43
- data/ext/ice/cpp/src/Slice/RubyUtil.cpp +175 -445
- data/ext/ice/cpp/{include → src}/Slice/RubyUtil.h +6 -11
- data/ext/ice/cpp/src/Slice/Scanner.cpp +390 -399
- data/ext/ice/cpp/src/Slice/{Util.cpp → SliceUtil.cpp} +36 -69
- data/ext/ice/cpp/src/Slice/StringLiteralUtil.cpp +456 -0
- data/ext/ice/cpp/src/Slice/Util.h +50 -0
- data/ice.gemspec +2 -9
- data/lib/Glacier2.rb +1 -6
- data/lib/Glacier2/Metrics.rb +6 -50
- data/lib/Glacier2/PermissionsVerifier.rb +23 -99
- data/lib/Glacier2/PermissionsVerifierF.rb +2 -7
- data/lib/Glacier2/Router.rb +31 -78
- data/lib/Glacier2/RouterF.rb +2 -7
- data/lib/Glacier2/SSLInfo.rb +3 -11
- data/lib/Glacier2/Session.rb +87 -311
- data/lib/Ice.rb +84 -58
- data/lib/Ice/BuiltinSequences.rb +3 -8
- data/lib/Ice/Communicator.rb +54 -61
- data/lib/Ice/CommunicatorF.rb +2 -7
- data/lib/Ice/Connection.rb +152 -166
- data/lib/Ice/ConnectionF.rb +2 -7
- data/lib/Ice/Current.rb +3 -15
- data/lib/Ice/Endpoint.rb +56 -137
- data/lib/Ice/EndpointF.rb +2 -7
- data/lib/Ice/EndpointTypes.rb +2 -11
- data/lib/Ice/FacetMap.rb +3 -8
- data/lib/Ice/Identity.rb +4 -12
- data/lib/Ice/ImplicitContext.rb +4 -38
- data/lib/Ice/ImplicitContextF.rb +2 -7
- data/lib/Ice/Instrumentation.rb +22 -279
- data/lib/Ice/InstrumentationF.rb +2 -7
- data/lib/Ice/LocalException.rb +94 -145
- data/lib/Ice/Locator.rb +50 -169
- data/lib/Ice/LocatorF.rb +2 -7
- data/lib/Ice/Logger.rb +4 -38
- data/lib/Ice/LoggerF.rb +2 -7
- data/lib/Ice/Metrics.rb +60 -420
- data/lib/Ice/ObjectAdapter.rb +29 -0
- data/lib/Ice/ObjectAdapterF.rb +2 -7
- data/lib/Ice/ObjectFactory.rb +4 -34
- data/lib/Ice/Plugin.rb +6 -64
- data/lib/Ice/PluginF.rb +2 -7
- data/lib/Ice/Process.rb +15 -56
- data/lib/Ice/ProcessF.rb +2 -7
- data/lib/Ice/Properties.rb +4 -45
- data/lib/Ice/PropertiesAdmin.rb +18 -60
- data/lib/Ice/PropertiesF.rb +2 -7
- data/lib/Ice/RemoteLogger.rb +33 -119
- data/lib/Ice/Router.rb +28 -105
- data/lib/Ice/RouterF.rb +2 -7
- data/lib/Ice/ServantLocator.rb +26 -0
- data/lib/Ice/ServantLocatorF.rb +24 -0
- data/lib/Ice/SliceChecksumDict.rb +2 -7
- data/lib/Ice/ValueFactory.rb +28 -0
- data/lib/Ice/Version.rb +4 -15
- data/lib/IceBox.rb +1 -6
- data/lib/IceBox/IceBox.rb +43 -152
- data/lib/IceGrid.rb +1 -9
- data/lib/IceGrid/Admin.rb +550 -431
- data/lib/IceGrid/Descriptor.rb +61 -533
- data/lib/IceGrid/Exception.rb +23 -49
- data/lib/IceGrid/FileParser.rb +13 -54
- data/lib/IceGrid/PluginFacade.rb +35 -0
- data/lib/IceGrid/Registry.rb +150 -62
- data/lib/IceGrid/Session.rb +24 -68
- data/lib/IceGrid/UserAccountMapper.rb +13 -54
- data/lib/IcePatch2.rb +1 -6
- data/lib/IcePatch2/FileInfo.rb +4 -15
- data/lib/IcePatch2/FileServer.rb +32 -80
- data/lib/IceStorm.rb +1 -6
- data/lib/IceStorm/IceStorm.rb +78 -210
- data/lib/IceStorm/Metrics.rb +10 -93
- data/slice/Glacier2/Metrics.ice +20 -10
- data/slice/Glacier2/PermissionsVerifier.ice +19 -12
- data/slice/Glacier2/PermissionsVerifierF.ice +16 -9
- data/slice/Glacier2/Router.ice +19 -13
- data/slice/Glacier2/RouterF.ice +16 -9
- data/slice/Glacier2/SSLInfo.ice +17 -10
- data/slice/Glacier2/Session.ice +24 -18
- data/slice/Ice/BuiltinSequences.ice +18 -9
- data/slice/Ice/Communicator.ice +180 -64
- data/slice/Ice/CommunicatorF.ice +18 -9
- data/slice/Ice/Connection.ice +208 -75
- data/slice/Ice/ConnectionF.ice +18 -9
- data/slice/Ice/Current.ice +37 -28
- data/slice/Ice/Endpoint.ice +73 -21
- data/slice/Ice/EndpointF.ice +19 -10
- data/slice/Ice/EndpointTypes.ice +21 -13
- data/slice/Ice/FacetMap.ice +19 -10
- data/slice/Ice/Identity.ice +24 -10
- data/slice/Ice/ImplicitContext.ice +41 -33
- data/slice/Ice/ImplicitContextF.ice +17 -9
- data/slice/Ice/Instrumentation.ice +37 -30
- data/slice/Ice/InstrumentationF.ice +19 -10
- data/slice/Ice/LocalException.ice +118 -112
- data/slice/Ice/Locator.ice +28 -21
- data/slice/Ice/LocatorF.ice +18 -9
- data/slice/Ice/Logger.ice +26 -18
- data/slice/Ice/LoggerF.ice +18 -9
- data/slice/Ice/Metrics.ice +42 -30
- data/slice/Ice/ObjectAdapter.ice +88 -53
- data/slice/Ice/ObjectAdapterF.ice +18 -9
- data/slice/Ice/ObjectFactory.ice +28 -17
- data/slice/Ice/Plugin.ice +25 -13
- data/slice/Ice/PluginF.ice +22 -9
- data/slice/Ice/Process.ice +20 -11
- data/slice/Ice/ProcessF.ice +18 -9
- data/slice/Ice/Properties.ice +42 -28
- data/slice/Ice/PropertiesAdmin.ice +20 -10
- data/slice/Ice/PropertiesF.ice +18 -9
- data/slice/Ice/RemoteLogger.ice +23 -19
- data/slice/Ice/Router.ice +28 -13
- data/slice/Ice/RouterF.ice +18 -9
- data/slice/Ice/ServantLocator.ice +40 -29
- data/slice/Ice/ServantLocatorF.ice +18 -9
- data/slice/Ice/SliceChecksumDict.ice +18 -9
- data/slice/Ice/ValueFactory.ice +132 -0
- data/slice/Ice/Version.ice +20 -10
- data/slice/IceBT/ConnectionInfo.ice +58 -0
- data/slice/IceBT/EndpointInfo.ice +56 -0
- data/slice/IceBT/Types.ice +44 -0
- data/slice/IceBox/IceBox.ice +45 -27
- data/slice/IceDiscovery/IceDiscovery.ice +75 -10
- data/slice/IceGrid/Admin.ice +410 -44
- data/slice/IceGrid/Descriptor.ice +47 -34
- data/slice/IceGrid/Exception.ice +43 -32
- data/slice/IceGrid/FileParser.ice +21 -12
- data/slice/IceGrid/PluginFacade.ice +26 -18
- data/slice/IceGrid/Registry.ice +150 -21
- data/slice/IceGrid/Session.ice +25 -17
- data/slice/IceGrid/UserAccountMapper.ice +23 -14
- data/slice/IceIAP/ConnectionInfo.ice +73 -0
- data/slice/IceIAP/EndpointInfo.ice +67 -0
- data/slice/IceLocatorDiscovery/IceLocatorDiscovery.ice +19 -12
- data/slice/IcePatch2/FileInfo.ice +19 -13
- data/slice/IcePatch2/FileServer.ice +27 -18
- data/slice/IceSSL/ConnectionInfo.ice +27 -23
- data/slice/IceSSL/ConnectionInfoF.ice +30 -0
- data/slice/IceSSL/EndpointInfo.ice +21 -36
- data/slice/IceStorm/IceStorm.ice +33 -24
- data/slice/IceStorm/Metrics.ice +19 -11
- metadata +148 -120
- data/ext/ObjectFactory.cpp +0 -140
- data/ext/ObjectFactory.h +0 -50
- data/ext/ice/cpp/include/Ice/ACMF.h +0 -30
- data/ext/ice/cpp/include/Ice/BasicStream.h +0 -1335
- data/ext/ice/cpp/include/Ice/BuiltinSequences.h +0 -82
- data/ext/ice/cpp/include/Ice/Communicator.h +0 -200
- data/ext/ice/cpp/include/Ice/Connection.h +0 -497
- data/ext/ice/cpp/include/Ice/ConnectionF.h +0 -74
- data/ext/ice/cpp/include/Ice/ConnectionFactoryF.h +0 -30
- data/ext/ice/cpp/include/Ice/Current.h +0 -102
- data/ext/ice/cpp/include/Ice/DefaultObjectFactory.h +0 -48
- data/ext/ice/cpp/include/Ice/DeprecatedStringConverter.h +0 -62
- data/ext/ice/cpp/include/Ice/Endpoint.h +0 -341
- data/ext/ice/cpp/include/Ice/EndpointF.h +0 -93
- data/ext/ice/cpp/include/Ice/EndpointTypes.h +0 -82
- data/ext/ice/cpp/include/Ice/Identity.h +0 -168
- data/ext/ice/cpp/include/Ice/ImplicitContext.h +0 -102
- data/ext/ice/cpp/include/Ice/Instrumentation.h +0 -365
- data/ext/ice/cpp/include/Ice/InstrumentationF.h +0 -75
- data/ext/ice/cpp/include/Ice/LocalException.h +0 -1030
- data/ext/ice/cpp/include/Ice/Locator.h +0 -2193
- data/ext/ice/cpp/include/Ice/LocatorF.h +0 -93
- data/ext/ice/cpp/include/Ice/Logger.h +0 -100
- data/ext/ice/cpp/include/Ice/Metrics.h +0 -2974
- data/ext/ice/cpp/include/Ice/ObjectAdapter.h +0 -168
- data/ext/ice/cpp/include/Ice/ObjectAdapterFactoryF.h +0 -26
- data/ext/ice/cpp/include/Ice/ObjectFactory.h +0 -92
- data/ext/ice/cpp/include/Ice/ObjectFactoryF.h +0 -66
- data/ext/ice/cpp/include/Ice/ObjectFactoryManagerF.h +0 -26
- data/ext/ice/cpp/include/Ice/Outgoing.h +0 -225
- data/ext/ice/cpp/include/Ice/Plugin.h +0 -125
- data/ext/ice/cpp/include/Ice/PluginF.h +0 -70
- data/ext/ice/cpp/include/Ice/Process.h +0 -574
- data/ext/ice/cpp/include/Ice/ProcessF.h +0 -83
- data/ext/ice/cpp/include/Ice/Properties.h +0 -136
- data/ext/ice/cpp/include/Ice/PropertiesAdmin.h +0 -830
- data/ext/ice/cpp/include/Ice/PropertiesF.h +0 -87
- data/ext/ice/cpp/include/Ice/RemoteLogger.h +0 -1500
- data/ext/ice/cpp/include/Ice/Router.h +0 -1159
- data/ext/ice/cpp/include/Ice/RouterF.h +0 -83
- data/ext/ice/cpp/include/Ice/ServantLocator.h +0 -96
- data/ext/ice/cpp/include/Ice/Stream.h +0 -447
- data/ext/ice/cpp/include/Ice/StreamF.h +0 -30
- data/ext/ice/cpp/include/Ice/Version.h +0 -262
- data/ext/ice/cpp/include/IceSSL/ConnectionInfo.h +0 -158
- data/ext/ice/cpp/include/IceSSL/EndpointInfo.h +0 -142
- data/ext/ice/cpp/include/IceUtil/AbstractMutex.h +0 -119
- data/ext/ice/cpp/include/IceUtil/Cache.h +0 -362
- data/ext/ice/cpp/include/IceUtil/IconvStringConverter.h +0 -302
- data/ext/ice/cpp/include/IceUtil/SHA1.h +0 -47
- data/ext/ice/cpp/include/Slice/CPlusPlusUtil.h +0 -65
- data/ext/ice/cpp/include/Slice/Checksum.h +0 -26
- data/ext/ice/cpp/include/Slice/CsUtil.h +0 -92
- data/ext/ice/cpp/include/Slice/DotNetNames.h +0 -34
- data/ext/ice/cpp/include/Slice/JavaUtil.h +0 -279
- data/ext/ice/cpp/include/Slice/ObjCUtil.h +0 -127
- data/ext/ice/cpp/include/Slice/PHPUtil.h +0 -50
- data/ext/ice/cpp/include/Slice/PythonUtil.h +0 -64
- data/ext/ice/cpp/include/Slice/Util.h +0 -56
- data/ext/ice/cpp/src/Ice/BasicStream.cpp +0 -3428
- data/ext/ice/cpp/src/Ice/DeprecatedStringConverter.cpp +0 -62
- data/ext/ice/cpp/src/Ice/ObjectFactoryF.cpp +0 -44
- data/ext/ice/cpp/src/Ice/ObjectFactoryManager.cpp +0 -139
- data/ext/ice/cpp/src/Ice/ObjectFactoryManager.h +0 -43
- data/ext/ice/cpp/src/Ice/Outgoing.cpp +0 -694
- data/ext/ice/cpp/src/Ice/Stream.cpp +0 -53
- data/ext/ice/cpp/src/Ice/StreamI.cpp +0 -832
- data/ext/ice/cpp/src/Ice/StreamI.h +0 -198
- data/ext/ice/cpp/src/IceSSL/Certificate.cpp +0 -1336
- data/ext/ice/cpp/src/IceUtil/ArgVector.cpp +0 -64
- data/ext/ice/cpp/src/IceUtil/ArgVector.h +0 -41
- data/ext/ice/cpp/src/IceUtil/Exception.cpp +0 -792
- data/ext/ice/cpp/src/IceUtil/FileUtil.h +0 -185
- data/ext/ice/cpp/src/Slice/CsUtil.cpp +0 -2660
- data/ext/ice/cpp/src/Slice/DotNetNames.cpp +0 -146
- data/ext/ice/cpp/src/Slice/ObjCUtil.cpp +0 -1310
- data/lib/Ice/ObjectFactoryF.rb +0 -29
- data/lib/IceGrid/Locator.rb +0 -106
- data/lib/IceGrid/Observer.rb +0 -572
- data/lib/IceGrid/Query.rb +0 -169
- data/slice/Freeze/BackgroundSaveEvictor.ice +0 -111
- data/slice/Freeze/CatalogData.ice +0 -49
- data/slice/Freeze/Connection.ice +0 -121
- data/slice/Freeze/ConnectionF.ice +0 -20
- data/slice/Freeze/DB.ice +0 -37
- data/slice/Freeze/Evictor.ice +0 -346
- data/slice/Freeze/EvictorF.ice +0 -22
- data/slice/Freeze/EvictorStorage.ice +0 -72
- data/slice/Freeze/Exception.ice +0 -100
- data/slice/Freeze/Transaction.ice +0 -58
- data/slice/Freeze/TransactionalEvictor.ice +0 -50
- data/slice/Ice/ObjectFactoryF.ice +0 -21
- data/slice/IceGrid/Locator.ice +0 -57
- data/slice/IceGrid/Observer.ice +0 -395
- data/slice/IceGrid/Query.ice +0 -131
@@ -0,0 +1,64 @@
|
|
1
|
+
//
|
2
|
+
// Copyright (c) ZeroC, Inc. All rights reserved.
|
3
|
+
//
|
4
|
+
|
5
|
+
#ifndef ICESSL_CERTIFICATE_I_H
|
6
|
+
#define ICESSL_CERTIFICATE_I_H
|
7
|
+
|
8
|
+
#include <IceSSL/Plugin.h>
|
9
|
+
|
10
|
+
#include <vector>
|
11
|
+
#include <string>
|
12
|
+
|
13
|
+
namespace IceSSL
|
14
|
+
{
|
15
|
+
|
16
|
+
//
|
17
|
+
// Map a certificate OID to its alias
|
18
|
+
//
|
19
|
+
struct ICESSL_API CertificateOID
|
20
|
+
{
|
21
|
+
const char* name;
|
22
|
+
const char* alias;
|
23
|
+
};
|
24
|
+
|
25
|
+
extern const ICESSL_API CertificateOID certificateOIDS[];
|
26
|
+
extern const ICESSL_API int certificateOIDSSize;
|
27
|
+
|
28
|
+
//
|
29
|
+
// Certificate common implementation
|
30
|
+
//
|
31
|
+
class ICESSL_API CertificateI : public virtual IceSSL::Certificate
|
32
|
+
{
|
33
|
+
public:
|
34
|
+
|
35
|
+
virtual bool operator!=(const IceSSL::Certificate&) const;
|
36
|
+
|
37
|
+
virtual std::vector<X509ExtensionPtr> getX509Extensions() const;
|
38
|
+
virtual X509ExtensionPtr getX509Extension(const std::string&) const;
|
39
|
+
|
40
|
+
virtual bool checkValidity() const;
|
41
|
+
# ifdef ICE_CPP11_MAPPING
|
42
|
+
virtual bool checkValidity(const std::chrono::system_clock::time_point& now) const;
|
43
|
+
# else
|
44
|
+
virtual bool checkValidity(const IceUtil::Time& now) const;
|
45
|
+
# endif
|
46
|
+
|
47
|
+
virtual std::string toString() const;
|
48
|
+
|
49
|
+
protected:
|
50
|
+
|
51
|
+
//
|
52
|
+
// Implementations that support retrieving X509 extensions must
|
53
|
+
// reimplement this method to lazzy initialize the extensions
|
54
|
+
// list.
|
55
|
+
//
|
56
|
+
// The default implementation just throw FeatureNotSupportedException
|
57
|
+
//
|
58
|
+
virtual void loadX509Extensions() const;
|
59
|
+
mutable std::vector<X509ExtensionPtr> _extensions;
|
60
|
+
};
|
61
|
+
|
62
|
+
} // IceSSL namespace end
|
63
|
+
|
64
|
+
#endif
|
@@ -1,13 +1,8 @@
|
|
1
|
-
// **********************************************************************
|
2
1
|
//
|
3
|
-
// Copyright (c)
|
2
|
+
// Copyright (c) ZeroC, Inc. All rights reserved.
|
4
3
|
//
|
5
|
-
// This copy of Ice is licensed to you under the terms described in the
|
6
|
-
// ICE_LICENSE file included in this distribution.
|
7
4
|
//
|
8
|
-
//
|
9
|
-
//
|
10
|
-
// Ice version 3.6.5
|
5
|
+
// Ice version 3.7.4
|
11
6
|
//
|
12
7
|
// <auto-generated>
|
13
8
|
//
|
@@ -18,33 +13,63 @@
|
|
18
13
|
// </auto-generated>
|
19
14
|
//
|
20
15
|
|
21
|
-
#ifndef
|
22
|
-
# define
|
16
|
+
#ifndef ICESSL_API_EXPORTS
|
17
|
+
# define ICESSL_API_EXPORTS
|
23
18
|
#endif
|
24
19
|
#include <IceSSL/ConnectionInfo.h>
|
25
20
|
#include <IceUtil/PushDisableWarnings.h>
|
26
|
-
#include <Ice/
|
27
|
-
#include <Ice/
|
28
|
-
#include <IceUtil/Iterator.h>
|
21
|
+
#include <Ice/InputStream.h>
|
22
|
+
#include <Ice/OutputStream.h>
|
29
23
|
#include <IceUtil/PopDisableWarnings.h>
|
30
24
|
|
25
|
+
#if defined(_MSC_VER)
|
26
|
+
# pragma warning(disable:4458) // declaration of ... hides class member
|
27
|
+
#elif defined(__clang__)
|
28
|
+
# pragma clang diagnostic ignored "-Wshadow"
|
29
|
+
#elif defined(__GNUC__)
|
30
|
+
# pragma GCC diagnostic ignored "-Wshadow"
|
31
|
+
#endif
|
32
|
+
|
31
33
|
#ifndef ICE_IGNORE_VERSION
|
32
|
-
# if ICE_INT_VERSION / 100 !=
|
34
|
+
# if ICE_INT_VERSION / 100 != 307
|
33
35
|
# error Ice version mismatch!
|
34
36
|
# endif
|
35
|
-
# if ICE_INT_VERSION % 100
|
37
|
+
# if ICE_INT_VERSION % 100 >= 50
|
36
38
|
# error Beta header file detected
|
37
39
|
# endif
|
38
|
-
# if ICE_INT_VERSION % 100 <
|
40
|
+
# if ICE_INT_VERSION % 100 < 4
|
39
41
|
# error Ice patch level mismatch!
|
40
42
|
# endif
|
41
43
|
#endif
|
42
44
|
|
45
|
+
#ifdef ICE_CPP11_MAPPING // C++11 mapping
|
46
|
+
|
47
|
+
namespace
|
48
|
+
{
|
49
|
+
|
50
|
+
}
|
51
|
+
|
52
|
+
IceSSL::ConnectionInfo::~ConnectionInfo()
|
53
|
+
{
|
54
|
+
}
|
55
|
+
|
56
|
+
#else // C++98 mapping
|
57
|
+
|
43
58
|
namespace
|
44
59
|
{
|
45
60
|
|
46
61
|
}
|
47
62
|
|
48
|
-
|
63
|
+
IceSSL::ConnectionInfo::~ConnectionInfo()
|
64
|
+
{
|
65
|
+
}
|
66
|
+
|
67
|
+
/// \cond INTERNAL
|
68
|
+
ICESSL_API ::Ice::LocalObject* IceSSL::upCast(ConnectionInfo* p) { return p; }
|
69
|
+
/// \endcond
|
49
70
|
|
50
|
-
|
71
|
+
namespace Ice
|
72
|
+
{
|
73
|
+
}
|
74
|
+
|
75
|
+
#endif
|
@@ -0,0 +1,61 @@
|
|
1
|
+
//
|
2
|
+
// Copyright (c) ZeroC, Inc. All rights reserved.
|
3
|
+
//
|
4
|
+
//
|
5
|
+
// Ice version 3.7.4
|
6
|
+
//
|
7
|
+
// <auto-generated>
|
8
|
+
//
|
9
|
+
// Generated from file `ConnectionInfoF.ice'
|
10
|
+
//
|
11
|
+
// Warning: do not edit this file.
|
12
|
+
//
|
13
|
+
// </auto-generated>
|
14
|
+
//
|
15
|
+
|
16
|
+
#ifndef ICESSL_API_EXPORTS
|
17
|
+
# define ICESSL_API_EXPORTS
|
18
|
+
#endif
|
19
|
+
#include <IceSSL/ConnectionInfoF.h>
|
20
|
+
#include <IceUtil/PushDisableWarnings.h>
|
21
|
+
#include <IceUtil/PopDisableWarnings.h>
|
22
|
+
|
23
|
+
#if defined(_MSC_VER)
|
24
|
+
# pragma warning(disable:4458) // declaration of ... hides class member
|
25
|
+
#elif defined(__clang__)
|
26
|
+
# pragma clang diagnostic ignored "-Wshadow"
|
27
|
+
#elif defined(__GNUC__)
|
28
|
+
# pragma GCC diagnostic ignored "-Wshadow"
|
29
|
+
#endif
|
30
|
+
|
31
|
+
#ifndef ICE_IGNORE_VERSION
|
32
|
+
# if ICE_INT_VERSION / 100 != 307
|
33
|
+
# error Ice version mismatch!
|
34
|
+
# endif
|
35
|
+
# if ICE_INT_VERSION % 100 >= 50
|
36
|
+
# error Beta header file detected
|
37
|
+
# endif
|
38
|
+
# if ICE_INT_VERSION % 100 < 4
|
39
|
+
# error Ice patch level mismatch!
|
40
|
+
# endif
|
41
|
+
#endif
|
42
|
+
|
43
|
+
#ifdef ICE_CPP11_MAPPING // C++11 mapping
|
44
|
+
|
45
|
+
namespace
|
46
|
+
{
|
47
|
+
|
48
|
+
}
|
49
|
+
|
50
|
+
#else // C++98 mapping
|
51
|
+
|
52
|
+
namespace
|
53
|
+
{
|
54
|
+
|
55
|
+
}
|
56
|
+
|
57
|
+
namespace Ice
|
58
|
+
{
|
59
|
+
}
|
60
|
+
|
61
|
+
#endif
|
@@ -1,21 +1,13 @@
|
|
1
|
-
// **********************************************************************
|
2
1
|
//
|
3
|
-
// Copyright (c)
|
2
|
+
// Copyright (c) ZeroC, Inc. All rights reserved.
|
4
3
|
//
|
5
|
-
// This copy of Ice is licensed to you under the terms described in the
|
6
|
-
// ICE_LICENSE file included in this distribution.
|
7
|
-
//
|
8
|
-
// **********************************************************************
|
9
4
|
|
10
5
|
#include <IceSSL/ConnectorI.h>
|
11
6
|
#include <IceSSL/Instance.h>
|
12
7
|
|
13
|
-
#include <IceSSL/OpenSSLTransceiverI.h>
|
14
|
-
#include <IceSSL/SecureTransportTransceiverI.h>
|
15
|
-
#include <IceSSL/SChannelTransceiverI.h>
|
16
|
-
|
17
8
|
#include <IceSSL/EndpointI.h>
|
18
9
|
#include <IceSSL/Util.h>
|
10
|
+
#include <IceSSL/SSLEngine.h>
|
19
11
|
#include <Ice/Communicator.h>
|
20
12
|
#include <Ice/LocalException.h>
|
21
13
|
#include <Ice/StreamSocket.h>
|
@@ -34,25 +26,22 @@ IceSSL::ConnectorI::connect()
|
|
34
26
|
//
|
35
27
|
if(!_instance->initialized())
|
36
28
|
{
|
37
|
-
PluginInitializationException
|
38
|
-
ex.reason = "IceSSL: plug-in is not initialized";
|
39
|
-
throw ex;
|
29
|
+
throw PluginInitializationException(__FILE__, __LINE__, "IceSSL: plug-in is not initialized");
|
40
30
|
}
|
41
31
|
|
42
|
-
|
43
|
-
return new TransceiverI(_instance, stream, _host, false);
|
32
|
+
return _instance->engine()->createTransceiver(_instance, _delegate->connect(), _host, false);
|
44
33
|
}
|
45
34
|
|
46
35
|
Short
|
47
36
|
IceSSL::ConnectorI::type() const
|
48
37
|
{
|
49
|
-
return
|
38
|
+
return _delegate->type();
|
50
39
|
}
|
51
40
|
|
52
41
|
string
|
53
42
|
IceSSL::ConnectorI::toString() const
|
54
43
|
{
|
55
|
-
return
|
44
|
+
return _delegate->toString();
|
56
45
|
}
|
57
46
|
|
58
47
|
bool
|
@@ -64,22 +53,12 @@ IceSSL::ConnectorI::operator==(const IceInternal::Connector& r) const
|
|
64
53
|
return false;
|
65
54
|
}
|
66
55
|
|
67
|
-
if(
|
56
|
+
if(this == p)
|
68
57
|
{
|
69
|
-
return
|
70
|
-
}
|
71
|
-
|
72
|
-
if(_timeout != p->_timeout)
|
73
|
-
{
|
74
|
-
return false;
|
75
|
-
}
|
76
|
-
|
77
|
-
if(IceInternal::compareAddress(_sourceAddr, p->_sourceAddr) != 0)
|
78
|
-
{
|
79
|
-
return false;
|
58
|
+
return true;
|
80
59
|
}
|
81
60
|
|
82
|
-
if(
|
61
|
+
if(_delegate != p->_delegate)
|
83
62
|
{
|
84
63
|
return false;
|
85
64
|
}
|
@@ -87,12 +66,6 @@ IceSSL::ConnectorI::operator==(const IceInternal::Connector& r) const
|
|
87
66
|
return true;
|
88
67
|
}
|
89
68
|
|
90
|
-
bool
|
91
|
-
IceSSL::ConnectorI::operator!=(const IceInternal::Connector& r) const
|
92
|
-
{
|
93
|
-
return !operator==(r);
|
94
|
-
}
|
95
|
-
|
96
69
|
bool
|
97
70
|
IceSSL::ConnectorI::operator<(const IceInternal::Connector& r) const
|
98
71
|
{
|
@@ -102,47 +75,25 @@ IceSSL::ConnectorI::operator<(const IceInternal::Connector& r) const
|
|
102
75
|
return type() < r.type();
|
103
76
|
}
|
104
77
|
|
105
|
-
if(
|
106
|
-
{
|
107
|
-
return true;
|
108
|
-
}
|
109
|
-
else if(p->_timeout < _timeout)
|
110
|
-
{
|
111
|
-
return false;
|
112
|
-
}
|
113
|
-
|
114
|
-
int rc = compareAddress(_sourceAddr, p->_sourceAddr);
|
115
|
-
if(rc < 0)
|
116
|
-
{
|
117
|
-
return true;
|
118
|
-
}
|
119
|
-
else if(rc > 0)
|
78
|
+
if(this == p)
|
120
79
|
{
|
121
80
|
return false;
|
122
81
|
}
|
123
82
|
|
124
|
-
if(
|
83
|
+
if(_delegate < p->_delegate)
|
125
84
|
{
|
126
85
|
return true;
|
127
86
|
}
|
128
|
-
else if(p->
|
87
|
+
else if(p->_delegate < _delegate)
|
129
88
|
{
|
130
89
|
return false;
|
131
90
|
}
|
132
91
|
|
133
|
-
return
|
92
|
+
return false;
|
134
93
|
}
|
135
94
|
|
136
|
-
IceSSL::ConnectorI::ConnectorI(const InstancePtr& instance, const
|
137
|
-
|
138
|
-
Ice::Int timeout, const string& connectionId) :
|
139
|
-
_instance(instance),
|
140
|
-
_host(host),
|
141
|
-
_addr(addr),
|
142
|
-
_proxy(proxy),
|
143
|
-
_sourceAddr(sourceAddr),
|
144
|
-
_timeout(timeout),
|
145
|
-
_connectionId(connectionId)
|
95
|
+
IceSSL::ConnectorI::ConnectorI(const InstancePtr& instance, const IceInternal::ConnectorPtr& del, const string& h) :
|
96
|
+
_instance(instance), _delegate(del), _host(h)
|
146
97
|
{
|
147
98
|
}
|
148
99
|
|
@@ -1,14 +1,9 @@
|
|
1
|
-
// **********************************************************************
|
2
1
|
//
|
3
|
-
// Copyright (c)
|
2
|
+
// Copyright (c) ZeroC, Inc. All rights reserved.
|
4
3
|
//
|
5
|
-
// This copy of Ice is licensed to you under the terms described in the
|
6
|
-
// ICE_LICENSE file included in this distribution.
|
7
|
-
//
|
8
|
-
// **********************************************************************
|
9
4
|
|
10
|
-
#ifndef
|
11
|
-
#define
|
5
|
+
#ifndef ICESSL_CONNECTOR_I_H
|
6
|
+
#define ICESSL_CONNECTOR_I_H
|
12
7
|
|
13
8
|
#include <Ice/TransceiverF.h>
|
14
9
|
#include <Ice/Connector.h>
|
@@ -31,26 +26,19 @@ public:
|
|
31
26
|
virtual std::string toString() const;
|
32
27
|
|
33
28
|
virtual bool operator==(const IceInternal::Connector&) const;
|
34
|
-
virtual bool operator!=(const IceInternal::Connector&) const;
|
35
29
|
virtual bool operator<(const IceInternal::Connector&) const;
|
36
30
|
|
37
31
|
private:
|
38
32
|
|
39
|
-
ConnectorI(const InstancePtr&, const
|
40
|
-
const IceInternal::NetworkProxyPtr&, const IceInternal::Address&,
|
41
|
-
Ice::Int, const std::string&);
|
33
|
+
ConnectorI(const InstancePtr&, const IceInternal::ConnectorPtr&, const std::string&);
|
42
34
|
virtual ~ConnectorI();
|
43
35
|
friend class EndpointI;
|
44
36
|
|
45
37
|
const InstancePtr _instance;
|
38
|
+
const IceInternal::ConnectorPtr _delegate;
|
46
39
|
const std::string _host;
|
47
|
-
const IceInternal::Address _addr;
|
48
|
-
const IceInternal::NetworkProxyPtr _proxy;
|
49
|
-
const IceInternal::Address _sourceAddr;
|
50
|
-
const Ice::Int _timeout;
|
51
|
-
const std::string _connectionId;
|
52
40
|
};
|
53
41
|
|
54
|
-
}
|
42
|
+
} // IceSSL namespace end
|
55
43
|
|
56
44
|
#endif
|
@@ -1,114 +1,146 @@
|
|
1
|
-
// **********************************************************************
|
2
1
|
//
|
3
|
-
// Copyright (c)
|
2
|
+
// Copyright (c) ZeroC, Inc. All rights reserved.
|
4
3
|
//
|
5
|
-
// This copy of Ice is licensed to you under the terms described in the
|
6
|
-
// ICE_LICENSE file included in this distribution.
|
7
|
-
//
|
8
|
-
// **********************************************************************
|
9
4
|
|
10
5
|
#include <IceSSL/EndpointI.h>
|
11
6
|
#include <IceSSL/AcceptorI.h>
|
12
7
|
#include <IceSSL/ConnectorI.h>
|
13
8
|
#include <IceSSL/Instance.h>
|
14
|
-
#include <Ice/
|
9
|
+
#include <Ice/OutputStream.h>
|
10
|
+
#include <Ice/InputStream.h>
|
15
11
|
#include <Ice/LocalException.h>
|
16
12
|
#include <Ice/DefaultsAndOverrides.h>
|
17
13
|
#include <Ice/Object.h>
|
18
14
|
#include <Ice/HashUtil.h>
|
15
|
+
#include <Ice/Comparable.h>
|
19
16
|
|
20
17
|
using namespace std;
|
21
18
|
using namespace Ice;
|
22
19
|
using namespace IceSSL;
|
23
20
|
|
24
|
-
|
21
|
+
namespace
|
22
|
+
{
|
25
23
|
|
26
|
-
|
27
|
-
|
28
|
-
IceInternal::IPEndpointI(instance, ho, po, sourceAddr, conId),
|
29
|
-
_instance(instance),
|
30
|
-
_timeout(ti),
|
31
|
-
_compress(co)
|
24
|
+
Ice::IPEndpointInfoPtr
|
25
|
+
getIPEndpointInfo(const Ice::EndpointInfoPtr& info)
|
32
26
|
{
|
27
|
+
for(Ice::EndpointInfoPtr p = info; p; p = p->underlying)
|
28
|
+
{
|
29
|
+
Ice::IPEndpointInfoPtr ipInfo = ICE_DYNAMIC_CAST(Ice::IPEndpointInfo, p);
|
30
|
+
if(ipInfo)
|
31
|
+
{
|
32
|
+
return ipInfo;
|
33
|
+
}
|
34
|
+
}
|
35
|
+
return ICE_NULLPTR;
|
36
|
+
}
|
37
|
+
|
33
38
|
}
|
34
39
|
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
+
#ifndef ICE_CPP11_MAPPING
|
41
|
+
IceUtil::Shared* IceSSL::upCast(EndpointI* p) { return p; }
|
42
|
+
#endif
|
43
|
+
|
44
|
+
IceSSL::EndpointI::EndpointI(const InstancePtr& instance, const IceInternal::EndpointIPtr& del) :
|
45
|
+
_instance(instance), _delegate(del)
|
40
46
|
{
|
41
47
|
}
|
42
48
|
|
43
|
-
|
44
|
-
|
45
|
-
_instance(instance),
|
46
|
-
_timeout(-1),
|
47
|
-
_compress(false)
|
49
|
+
void
|
50
|
+
IceSSL::EndpointI::streamWriteImpl(Ice::OutputStream* stream) const
|
48
51
|
{
|
49
|
-
|
50
|
-
s->read(const_cast<bool&>(_compress));
|
52
|
+
_delegate->streamWriteImpl(stream);
|
51
53
|
}
|
52
54
|
|
53
55
|
Ice::EndpointInfoPtr
|
54
|
-
IceSSL::EndpointI::getInfo() const
|
56
|
+
IceSSL::EndpointI::getInfo() const ICE_NOEXCEPT
|
55
57
|
{
|
56
|
-
EndpointInfoPtr info =
|
57
|
-
|
58
|
+
EndpointInfoPtr info = ICE_MAKE_SHARED(IceInternal::InfoI<EndpointInfo>, ICE_SHARED_FROM_CONST_THIS(EndpointI));
|
59
|
+
info->underlying = _delegate->getInfo();
|
60
|
+
info->compress = info->underlying->compress;
|
61
|
+
info->timeout = info->underlying->timeout;
|
58
62
|
return info;
|
59
63
|
}
|
60
64
|
|
61
|
-
Ice::
|
62
|
-
IceSSL::EndpointI::
|
65
|
+
Ice::Short
|
66
|
+
IceSSL::EndpointI::type() const
|
63
67
|
{
|
64
|
-
|
65
|
-
|
66
|
-
|
67
|
-
|
68
|
+
return _delegate->type();
|
69
|
+
}
|
70
|
+
|
71
|
+
const std::string&
|
72
|
+
IceSSL::EndpointI::protocol() const
|
73
|
+
{
|
74
|
+
return _delegate->protocol();
|
68
75
|
}
|
69
76
|
|
70
77
|
Int
|
71
78
|
IceSSL::EndpointI::timeout() const
|
72
79
|
{
|
73
|
-
return
|
80
|
+
return _delegate->timeout();
|
74
81
|
}
|
75
82
|
|
76
83
|
IceInternal::EndpointIPtr
|
77
84
|
IceSSL::EndpointI::timeout(Int timeout) const
|
78
85
|
{
|
79
|
-
if(timeout ==
|
86
|
+
if(timeout == _delegate->timeout())
|
87
|
+
{
|
88
|
+
return ICE_SHARED_FROM_CONST_THIS(EndpointI);
|
89
|
+
}
|
90
|
+
else
|
91
|
+
{
|
92
|
+
return ICE_MAKE_SHARED(EndpointI, _instance, _delegate->timeout(timeout));
|
93
|
+
}
|
94
|
+
}
|
95
|
+
|
96
|
+
const string&
|
97
|
+
IceSSL::EndpointI::connectionId() const
|
98
|
+
{
|
99
|
+
return _delegate->connectionId();
|
100
|
+
}
|
101
|
+
|
102
|
+
IceInternal::EndpointIPtr
|
103
|
+
IceSSL::EndpointI::connectionId(const string& connectionId) const
|
104
|
+
{
|
105
|
+
if(connectionId == _delegate->connectionId())
|
80
106
|
{
|
81
|
-
return
|
107
|
+
return ICE_SHARED_FROM_CONST_THIS(EndpointI);
|
82
108
|
}
|
83
109
|
else
|
84
110
|
{
|
85
|
-
return
|
111
|
+
return ICE_MAKE_SHARED(EndpointI, _instance, _delegate->connectionId(connectionId));
|
86
112
|
}
|
87
113
|
}
|
88
114
|
|
89
115
|
bool
|
90
116
|
IceSSL::EndpointI::compress() const
|
91
117
|
{
|
92
|
-
return
|
118
|
+
return _delegate->compress();
|
93
119
|
}
|
94
120
|
|
95
121
|
IceInternal::EndpointIPtr
|
96
122
|
IceSSL::EndpointI::compress(bool compress) const
|
97
123
|
{
|
98
|
-
if(compress ==
|
124
|
+
if(compress == _delegate->compress())
|
99
125
|
{
|
100
|
-
return
|
126
|
+
return ICE_SHARED_FROM_CONST_THIS(EndpointI);
|
101
127
|
}
|
102
128
|
else
|
103
129
|
{
|
104
|
-
return
|
130
|
+
return ICE_MAKE_SHARED(EndpointI, _instance, _delegate->compress(compress));
|
105
131
|
}
|
106
132
|
}
|
107
133
|
|
108
134
|
bool
|
109
135
|
IceSSL::EndpointI::datagram() const
|
110
136
|
{
|
111
|
-
return
|
137
|
+
return _delegate->datagram();
|
138
|
+
}
|
139
|
+
|
140
|
+
bool
|
141
|
+
IceSSL::EndpointI::secure() const
|
142
|
+
{
|
143
|
+
return _delegate->secure();
|
112
144
|
}
|
113
145
|
|
114
146
|
IceInternal::TransceiverPtr
|
@@ -117,56 +149,139 @@ IceSSL::EndpointI::transceiver() const
|
|
117
149
|
return 0;
|
118
150
|
}
|
119
151
|
|
120
|
-
|
121
|
-
IceSSL::EndpointI::
|
152
|
+
void
|
153
|
+
IceSSL::EndpointI::connectors_async(Ice::EndpointSelectionType selType,
|
154
|
+
const IceInternal::EndpointI_connectorsPtr& callback) const
|
122
155
|
{
|
123
|
-
|
156
|
+
class CallbackI : public IceInternal::EndpointI_connectors
|
157
|
+
{
|
158
|
+
public:
|
159
|
+
|
160
|
+
CallbackI(const IceInternal::EndpointI_connectorsPtr& callback, const InstancePtr& instance,
|
161
|
+
const string& host) :
|
162
|
+
_callback(callback), _instance(instance), _host(host)
|
163
|
+
{
|
164
|
+
}
|
165
|
+
|
166
|
+
virtual void connectors(const vector<IceInternal::ConnectorPtr>& c)
|
167
|
+
{
|
168
|
+
vector<IceInternal::ConnectorPtr> connectors = c;
|
169
|
+
for(vector<IceInternal::ConnectorPtr>::iterator p = connectors.begin(); p != connectors.end(); ++p)
|
170
|
+
{
|
171
|
+
*p = new ConnectorI(_instance, *p, _host);
|
172
|
+
}
|
173
|
+
_callback->connectors(connectors);
|
174
|
+
}
|
175
|
+
|
176
|
+
virtual void exception(const Ice::LocalException& ex)
|
177
|
+
{
|
178
|
+
_callback->exception(ex);
|
179
|
+
}
|
180
|
+
|
181
|
+
private:
|
182
|
+
|
183
|
+
const IceInternal::EndpointI_connectorsPtr _callback;
|
184
|
+
const InstancePtr _instance;
|
185
|
+
const string _host;
|
186
|
+
};
|
187
|
+
|
188
|
+
IPEndpointInfoPtr info = getIPEndpointInfo(_delegate->getInfo());
|
189
|
+
_delegate->connectors_async(selType, ICE_MAKE_SHARED(CallbackI, callback, _instance, info ? info->host : string()));
|
124
190
|
}
|
125
191
|
|
126
|
-
|
127
|
-
IceSSL::EndpointI::
|
192
|
+
IceInternal::AcceptorPtr
|
193
|
+
IceSSL::EndpointI::acceptor(const string& adapterName) const
|
128
194
|
{
|
129
|
-
return new EndpointI
|
195
|
+
return new AcceptorI(ICE_SHARED_FROM_CONST_THIS(EndpointI), _instance, _delegate->acceptor(adapterName), adapterName);
|
130
196
|
}
|
131
197
|
|
132
|
-
|
133
|
-
IceSSL::EndpointI::
|
198
|
+
EndpointIPtr
|
199
|
+
IceSSL::EndpointI::endpoint(const IceInternal::EndpointIPtr& delEndp) const
|
134
200
|
{
|
135
|
-
|
136
|
-
// WARNING: Certain features, such as proxy validation in Glacier2,
|
137
|
-
// depend on the format of proxy strings. Changes to toString() and
|
138
|
-
// methods called to generate parts of the reference string could break
|
139
|
-
// these features. Please review for all features that depend on the
|
140
|
-
// format of proxyToString() before changing this and related code.
|
141
|
-
//
|
142
|
-
ostringstream s;
|
143
|
-
s << IPEndpointI::options();
|
144
|
-
|
145
|
-
if(_timeout == -1)
|
201
|
+
if(delEndp.get() == _delegate.get())
|
146
202
|
{
|
147
|
-
|
203
|
+
return ICE_DYNAMIC_CAST(EndpointI, ICE_SHARED_FROM_CONST_THIS(EndpointI));
|
148
204
|
}
|
149
205
|
else
|
150
206
|
{
|
151
|
-
|
207
|
+
return ICE_MAKE_SHARED(EndpointI, _instance, delEndp);
|
152
208
|
}
|
209
|
+
}
|
153
210
|
|
154
|
-
|
211
|
+
vector<IceInternal::EndpointIPtr>
|
212
|
+
IceSSL::EndpointI::expandIfWildcard() const
|
213
|
+
{
|
214
|
+
vector<IceInternal::EndpointIPtr> endps = _delegate->expandIfWildcard();
|
215
|
+
for(vector<IceInternal::EndpointIPtr>::iterator p = endps.begin(); p != endps.end(); ++p)
|
155
216
|
{
|
156
|
-
|
217
|
+
if(p->get() == _delegate.get())
|
218
|
+
{
|
219
|
+
*p = ICE_SHARED_FROM_CONST_THIS(EndpointI);
|
220
|
+
}
|
221
|
+
else
|
222
|
+
{
|
223
|
+
*p = ICE_MAKE_SHARED(EndpointI, _instance, *p);
|
224
|
+
}
|
157
225
|
}
|
226
|
+
return endps;
|
227
|
+
}
|
158
228
|
|
159
|
-
|
229
|
+
vector<IceInternal::EndpointIPtr>
|
230
|
+
IceSSL::EndpointI::expandHost(IceInternal::EndpointIPtr& publish) const
|
231
|
+
{
|
232
|
+
vector<IceInternal::EndpointIPtr> endps = _delegate->expandHost(publish);
|
233
|
+
if(publish.get() == _delegate.get())
|
234
|
+
{
|
235
|
+
publish = ICE_SHARED_FROM_CONST_THIS(EndpointI);
|
236
|
+
}
|
237
|
+
else if(publish.get())
|
238
|
+
{
|
239
|
+
publish = ICE_MAKE_SHARED(EndpointI, _instance, publish);
|
240
|
+
}
|
241
|
+
for(vector<IceInternal::EndpointIPtr>::iterator p = endps.begin(); p != endps.end(); ++p)
|
242
|
+
{
|
243
|
+
if(p->get() == _delegate.get())
|
244
|
+
{
|
245
|
+
*p = ICE_SHARED_FROM_CONST_THIS(EndpointI);
|
246
|
+
}
|
247
|
+
else
|
248
|
+
{
|
249
|
+
*p = ICE_MAKE_SHARED(EndpointI, _instance, *p);
|
250
|
+
}
|
251
|
+
}
|
252
|
+
return endps;
|
160
253
|
}
|
161
254
|
|
162
255
|
bool
|
163
|
-
IceSSL::EndpointI::
|
256
|
+
IceSSL::EndpointI::equivalent(const IceInternal::EndpointIPtr& endpoint) const
|
164
257
|
{
|
165
|
-
|
258
|
+
const EndpointI* endpointI = dynamic_cast<const EndpointI*>(endpoint.get());
|
259
|
+
if(!endpointI)
|
166
260
|
{
|
167
261
|
return false;
|
168
262
|
}
|
263
|
+
return _delegate->equivalent(endpointI->_delegate);
|
264
|
+
}
|
169
265
|
|
266
|
+
Ice::Int
|
267
|
+
IceSSL::EndpointI::hash() const
|
268
|
+
{
|
269
|
+
return _delegate->hash();
|
270
|
+
}
|
271
|
+
|
272
|
+
string
|
273
|
+
IceSSL::EndpointI::options() const
|
274
|
+
{
|
275
|
+
return _delegate->options();
|
276
|
+
}
|
277
|
+
|
278
|
+
bool
|
279
|
+
#ifdef ICE_CPP11_MAPPING
|
280
|
+
IceSSL::EndpointI::operator==(const Ice::Endpoint& r) const
|
281
|
+
#else
|
282
|
+
IceSSL::EndpointI::operator==(const Ice::LocalObject& r) const
|
283
|
+
#endif
|
284
|
+
{
|
170
285
|
const EndpointI* p = dynamic_cast<const EndpointI*>(&r);
|
171
286
|
if(!p)
|
172
287
|
{
|
@@ -178,12 +293,7 @@ IceSSL::EndpointI::operator==(const Ice::LocalObject& r) const
|
|
178
293
|
return true;
|
179
294
|
}
|
180
295
|
|
181
|
-
if(
|
182
|
-
{
|
183
|
-
return false;
|
184
|
-
}
|
185
|
-
|
186
|
-
if(_compress != p->_compress)
|
296
|
+
if(!Ice::targetEqualTo(_delegate, p->_delegate))
|
187
297
|
{
|
188
298
|
return false;
|
189
299
|
}
|
@@ -192,7 +302,11 @@ IceSSL::EndpointI::operator==(const Ice::LocalObject& r) const
|
|
192
302
|
}
|
193
303
|
|
194
304
|
bool
|
305
|
+
#ifdef ICE_CPP11_MAPPING
|
306
|
+
IceSSL::EndpointI::operator<(const Ice::Endpoint& r) const
|
307
|
+
#else
|
195
308
|
IceSSL::EndpointI::operator<(const Ice::LocalObject& r) const
|
309
|
+
#endif
|
196
310
|
{
|
197
311
|
const EndpointI* p = dynamic_cast<const EndpointI*>(&r);
|
198
312
|
if(!p)
|
@@ -210,160 +324,49 @@ IceSSL::EndpointI::operator<(const Ice::LocalObject& r) const
|
|
210
324
|
return false;
|
211
325
|
}
|
212
326
|
|
213
|
-
if(
|
327
|
+
if(Ice::targetLess(_delegate, p->_delegate))
|
214
328
|
{
|
215
329
|
return true;
|
216
330
|
}
|
217
|
-
else if(p->
|
331
|
+
else if (Ice::targetLess(p->_delegate, _delegate))
|
218
332
|
{
|
219
333
|
return false;
|
220
334
|
}
|
221
335
|
|
222
|
-
|
223
|
-
{
|
224
|
-
return true;
|
225
|
-
}
|
226
|
-
else if(p->_compress < _compress)
|
227
|
-
{
|
228
|
-
return false;
|
229
|
-
}
|
230
|
-
|
231
|
-
return IPEndpointI::operator<(r);
|
232
|
-
}
|
233
|
-
|
234
|
-
void
|
235
|
-
IceSSL::EndpointI::streamWriteImpl(IceInternal::BasicStream* s) const
|
236
|
-
{
|
237
|
-
IPEndpointI::streamWriteImpl(s);
|
238
|
-
s->write(_timeout);
|
239
|
-
s->write(_compress);
|
240
|
-
}
|
241
|
-
|
242
|
-
void
|
243
|
-
IceSSL::EndpointI::hashInit(Ice::Int& h) const
|
244
|
-
{
|
245
|
-
IPEndpointI::hashInit(h);
|
246
|
-
IceInternal::hashAdd(h, _timeout);
|
247
|
-
IceInternal::hashAdd(h, _compress);
|
248
|
-
}
|
249
|
-
|
250
|
-
void
|
251
|
-
IceSSL::EndpointI::fillEndpointInfo(IPEndpointInfo* info) const
|
252
|
-
{
|
253
|
-
IPEndpointI::fillEndpointInfo(info);
|
254
|
-
info->timeout = _timeout;
|
255
|
-
info->compress = _compress;
|
336
|
+
return false;
|
256
337
|
}
|
257
338
|
|
258
339
|
bool
|
259
|
-
IceSSL::EndpointI::checkOption(const string& option
|
260
|
-
{
|
261
|
-
if(IPEndpointI::checkOption(option, argument, endpoint))
|
262
|
-
{
|
263
|
-
return true;
|
264
|
-
}
|
265
|
-
|
266
|
-
switch(option[1])
|
267
|
-
{
|
268
|
-
case 't':
|
269
|
-
{
|
270
|
-
if(argument.empty())
|
271
|
-
{
|
272
|
-
EndpointParseException ex(__FILE__, __LINE__);
|
273
|
-
ex.str = "no argument provided for -t option in endpoint " + endpoint;
|
274
|
-
throw ex;
|
275
|
-
}
|
276
|
-
|
277
|
-
if(argument == "infinite")
|
278
|
-
{
|
279
|
-
const_cast<Int&>(_timeout) = -1;
|
280
|
-
}
|
281
|
-
else
|
282
|
-
{
|
283
|
-
istringstream t(argument);
|
284
|
-
if(!(t >> const_cast<Int&>(_timeout)) || !t.eof() || _timeout < 1)
|
285
|
-
{
|
286
|
-
EndpointParseException ex(__FILE__, __LINE__);
|
287
|
-
ex.str = "invalid timeout value `" + argument + "' in endpoint " + endpoint;
|
288
|
-
throw ex;
|
289
|
-
}
|
290
|
-
}
|
291
|
-
return true;
|
292
|
-
}
|
293
|
-
|
294
|
-
case 'z':
|
295
|
-
{
|
296
|
-
if(!argument.empty())
|
297
|
-
{
|
298
|
-
EndpointParseException ex(__FILE__, __LINE__);
|
299
|
-
ex.str = "unexpected argument `" + argument + "' provided for -z option in " + endpoint;
|
300
|
-
throw ex;
|
301
|
-
}
|
302
|
-
const_cast<bool&>(_compress) = true;
|
303
|
-
return true;
|
304
|
-
}
|
305
|
-
|
306
|
-
default:
|
307
|
-
{
|
308
|
-
return false;
|
309
|
-
}
|
310
|
-
}
|
311
|
-
}
|
312
|
-
|
313
|
-
IceInternal::ConnectorPtr
|
314
|
-
IceSSL::EndpointI::createConnector(const IceInternal::Address& address, const IceInternal::NetworkProxyPtr& proxy) const
|
315
|
-
{
|
316
|
-
return new ConnectorI(_instance, _host, address, proxy, _sourceAddr, _timeout, _connectionId);
|
317
|
-
}
|
318
|
-
|
319
|
-
IceInternal::IPEndpointIPtr
|
320
|
-
IceSSL::EndpointI::createEndpoint(const string& host, int port, const string& connectionId) const
|
321
|
-
{
|
322
|
-
return new EndpointI(_instance, host, port, _sourceAddr, _timeout, connectionId, _compress);
|
323
|
-
}
|
324
|
-
|
325
|
-
IceSSL::EndpointFactoryI::EndpointFactoryI(const InstancePtr& instance) : _instance(instance)
|
340
|
+
IceSSL::EndpointI::checkOption(const string& /*option*/, const string& /*argument*/, const string& /*endpoint*/)
|
326
341
|
{
|
342
|
+
return false;
|
327
343
|
}
|
328
344
|
|
329
|
-
IceSSL::EndpointFactoryI
|
345
|
+
IceSSL::EndpointFactoryI::EndpointFactoryI(const InstancePtr& instance, Short type) :
|
346
|
+
IceInternal::EndpointFactoryWithUnderlying(instance, type), _sslInstance(instance.get())
|
330
347
|
{
|
331
348
|
}
|
332
349
|
|
333
|
-
|
334
|
-
IceSSL::EndpointFactoryI::
|
350
|
+
void
|
351
|
+
IceSSL::EndpointFactoryI::destroy()
|
335
352
|
{
|
336
|
-
|
353
|
+
_sslInstance = 0;
|
337
354
|
}
|
338
355
|
|
339
|
-
|
340
|
-
IceSSL::EndpointFactoryI::
|
356
|
+
IceInternal::EndpointFactoryPtr
|
357
|
+
IceSSL::EndpointFactoryI::cloneWithUnderlying(const IceInternal::ProtocolInstancePtr& instance, Short underlying) const
|
341
358
|
{
|
342
|
-
return
|
359
|
+
return new EndpointFactoryI(new Instance(_sslInstance->engine(), instance->type(), instance->protocol()), underlying);
|
343
360
|
}
|
344
361
|
|
345
362
|
IceInternal::EndpointIPtr
|
346
|
-
IceSSL::EndpointFactoryI::
|
363
|
+
IceSSL::EndpointFactoryI::createWithUnderlying(const IceInternal::EndpointIPtr& underlying, vector<string>&, bool) const
|
347
364
|
{
|
348
|
-
|
349
|
-
endpt->initWithOptions(args, oaEndpoint);
|
350
|
-
return endpt;
|
365
|
+
return ICE_MAKE_SHARED(EndpointI, _sslInstance, underlying);
|
351
366
|
}
|
352
367
|
|
353
368
|
IceInternal::EndpointIPtr
|
354
|
-
IceSSL::EndpointFactoryI::
|
355
|
-
{
|
356
|
-
return new EndpointI(_instance, s);
|
357
|
-
}
|
358
|
-
|
359
|
-
void
|
360
|
-
IceSSL::EndpointFactoryI::destroy()
|
361
|
-
{
|
362
|
-
_instance = 0;
|
363
|
-
}
|
364
|
-
|
365
|
-
IceInternal::EndpointFactoryPtr
|
366
|
-
IceSSL::EndpointFactoryI::clone(const IceInternal::ProtocolInstancePtr& instance) const
|
369
|
+
IceSSL::EndpointFactoryI::readWithUnderlying(const IceInternal::EndpointIPtr& underlying, Ice::InputStream*) const
|
367
370
|
{
|
368
|
-
return
|
371
|
+
return ICE_MAKE_SHARED(EndpointI, _sslInstance, underlying);
|
369
372
|
}
|