zeroc-ice 3.7.1 → 3.7.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/ICE_LICENSE +1 -1
- data/bin/slice2rb +1 -6
- data/ext/Communicator.cpp +4 -9
- data/ext/Communicator.h +1 -6
- data/ext/Config.h +18 -6
- data/ext/Connection.cpp +1 -10
- data/ext/Connection.h +1 -6
- data/ext/Endpoint.cpp +1 -10
- data/ext/Endpoint.h +1 -6
- data/ext/ImplicitContext.cpp +1 -6
- data/ext/ImplicitContext.h +1 -6
- data/ext/Init.cpp +1 -6
- data/ext/Logger.cpp +1 -6
- data/ext/Logger.h +1 -6
- data/ext/Operation.cpp +1 -6
- data/ext/Operation.h +1 -6
- data/ext/Properties.cpp +2 -7
- data/ext/Properties.h +1 -6
- data/ext/Proxy.cpp +5 -12
- data/ext/Proxy.h +1 -6
- data/ext/Slice.cpp +3 -18
- data/ext/Slice.h +1 -6
- data/ext/Types.cpp +11 -16
- data/ext/Types.h +1 -6
- data/ext/Util.cpp +45 -28
- data/ext/Util.h +62 -25
- data/ext/ValueFactoryManager.cpp +1 -6
- data/ext/ValueFactoryManager.h +1 -6
- data/ext/extconf.rb +5 -3
- data/ext/ice/cpp/include/Ice/Application.h +1 -6
- data/ext/ice/cpp/include/Ice/AsyncResult.h +1 -6
- data/ext/ice/cpp/include/Ice/AsyncResultF.h +1 -6
- data/ext/ice/cpp/include/Ice/BatchRequestInterceptor.h +1 -6
- data/ext/ice/cpp/include/Ice/BatchRequestQueueF.h +1 -6
- data/ext/ice/cpp/include/Ice/Buffer.h +1 -6
- data/ext/ice/cpp/include/Ice/CommunicatorAsync.h +1 -6
- data/ext/ice/cpp/include/Ice/Comparable.h +1 -6
- data/ext/ice/cpp/include/Ice/Config.h +1 -6
- data/ext/ice/cpp/include/Ice/ConnectionAsync.h +1 -6
- data/ext/ice/cpp/include/Ice/ConnectionIF.h +1 -6
- data/ext/ice/cpp/include/Ice/ConsoleUtil.h +1 -6
- data/ext/ice/cpp/include/Ice/DefaultValueFactory.h +1 -6
- data/ext/ice/cpp/include/Ice/DispatchInterceptor.h +1 -6
- data/ext/ice/cpp/include/Ice/Dispatcher.h +1 -6
- data/ext/ice/cpp/include/Ice/DynamicLibrary.h +1 -6
- data/ext/ice/cpp/include/Ice/DynamicLibraryF.h +1 -6
- data/ext/ice/cpp/include/Ice/Exception.h +1 -6
- data/ext/ice/cpp/include/Ice/ExceptionHelpers.h +3 -16
- data/ext/ice/cpp/include/Ice/FactoryTable.h +1 -6
- data/ext/ice/cpp/include/Ice/FactoryTableInit.h +1 -6
- data/ext/ice/cpp/include/Ice/Format.h +1 -6
- data/ext/ice/cpp/include/Ice/Functional.h +2 -7
- data/ext/ice/cpp/include/Ice/GCObject.h +1 -6
- data/ext/ice/cpp/include/Ice/Handle.h +1 -6
- data/ext/ice/cpp/include/Ice/Ice.h +1 -6
- data/ext/ice/cpp/include/Ice/IconvStringConverter.h +6 -13
- data/ext/ice/cpp/include/Ice/Incoming.h +13 -8
- data/ext/ice/cpp/include/Ice/IncomingAsync.h +11 -6
- data/ext/ice/cpp/include/Ice/IncomingAsyncF.h +1 -6
- data/ext/ice/cpp/include/Ice/Initialize.h +12 -6
- data/ext/ice/cpp/include/Ice/InputStream.h +2 -7
- data/ext/ice/cpp/include/Ice/InstanceF.h +1 -6
- data/ext/ice/cpp/include/Ice/InterfaceByValue.h +1 -6
- data/ext/ice/cpp/include/Ice/LocalObject.h +1 -6
- data/ext/ice/cpp/include/Ice/LocalObjectF.h +1 -6
- data/ext/ice/cpp/include/Ice/LoggerUtil.h +1 -6
- data/ext/ice/cpp/include/Ice/MetricsAdminI.h +9 -7
- data/ext/ice/cpp/include/Ice/MetricsFunctional.h +1 -6
- data/ext/ice/cpp/include/Ice/MetricsObserverI.h +16 -7
- data/ext/ice/cpp/include/Ice/NativePropertiesAdmin.h +1 -6
- data/ext/ice/cpp/include/Ice/Object.h +1 -6
- data/ext/ice/cpp/include/Ice/ObjectF.h +1 -6
- data/ext/ice/cpp/include/Ice/ObserverHelper.h +1 -6
- data/ext/ice/cpp/include/Ice/Optional.h +9 -6
- data/ext/ice/cpp/include/Ice/OutgoingAsync.h +2 -7
- data/ext/ice/cpp/include/Ice/OutgoingAsyncF.h +1 -6
- data/ext/ice/cpp/include/Ice/OutputStream.h +1 -6
- data/ext/ice/cpp/include/Ice/Protocol.h +1 -6
- data/ext/ice/cpp/include/Ice/Proxy.h +2 -9
- data/ext/ice/cpp/include/Ice/ProxyF.h +1 -6
- data/ext/ice/cpp/include/Ice/ProxyFactoryF.h +1 -6
- data/ext/ice/cpp/include/Ice/ProxyHandle.h +1 -6
- data/ext/ice/cpp/include/Ice/ReferenceF.h +1 -6
- data/ext/ice/cpp/include/Ice/RegisterPlugins.h +1 -6
- data/ext/ice/cpp/include/Ice/RequestHandlerF.h +1 -6
- data/ext/ice/cpp/include/Ice/ResponseHandlerF.h +1 -6
- data/ext/ice/cpp/include/Ice/SHA1.h +1 -6
- data/ext/ice/cpp/include/Ice/ServantManagerF.h +1 -6
- data/ext/ice/cpp/include/Ice/Service.h +1 -6
- data/ext/ice/cpp/include/Ice/SliceChecksums.h +1 -6
- data/ext/ice/cpp/include/Ice/SlicedData.h +1 -6
- data/ext/ice/cpp/include/Ice/SlicedDataF.h +1 -6
- data/ext/ice/cpp/include/Ice/StreamHelpers.h +1 -6
- data/ext/ice/cpp/include/Ice/StringConverter.h +1 -6
- data/ext/ice/cpp/include/Ice/ThreadPoolF.h +1 -6
- data/ext/ice/cpp/include/Ice/UUID.h +1 -6
- data/ext/ice/cpp/include/Ice/UniquePtr.h +1 -6
- data/ext/ice/cpp/include/Ice/UniqueRef.h +1 -6
- data/ext/ice/cpp/include/Ice/UserExceptionFactory.h +1 -6
- data/ext/ice/cpp/include/Ice/Value.h +1 -6
- data/ext/ice/cpp/include/Ice/ValueF.h +1 -6
- data/ext/ice/cpp/include/IceSSL/Config.h +1 -6
- data/ext/ice/cpp/include/IceSSL/IceSSL.h +1 -6
- data/ext/ice/cpp/include/IceSSL/OpenSSL.h +1 -6
- data/ext/ice/cpp/include/IceSSL/Plugin.h +1 -6
- data/ext/ice/cpp/include/IceSSL/SChannel.h +5 -6
- data/ext/ice/cpp/include/IceSSL/SecureTransport.h +5 -6
- data/ext/ice/cpp/include/IceSSL/UWP.h +1 -6
- data/ext/ice/cpp/include/IceUtil/Atomic.h +1 -6
- data/ext/ice/cpp/include/IceUtil/Cond.h +1 -6
- data/ext/ice/cpp/include/IceUtil/Config.h +19 -16
- data/ext/ice/cpp/include/IceUtil/ConsoleUtil.h +1 -6
- data/ext/ice/cpp/include/IceUtil/CountDownLatch.h +1 -6
- data/ext/ice/cpp/include/IceUtil/CtrlCHandler.h +26 -38
- data/ext/ice/cpp/include/IceUtil/DisableWarnings.h +5 -11
- data/ext/ice/cpp/include/IceUtil/Exception.h +130 -11
- data/ext/ice/cpp/include/IceUtil/FileUtil.h +1 -6
- data/ext/ice/cpp/include/IceUtil/Functional.h +5 -6
- data/ext/ice/cpp/include/IceUtil/Handle.h +1 -6
- data/ext/ice/cpp/include/IceUtil/IceUtil.h +1 -6
- data/ext/ice/cpp/include/IceUtil/InputUtil.h +1 -6
- data/ext/ice/cpp/include/IceUtil/Iterator.h +1 -6
- data/ext/ice/cpp/include/IceUtil/Lock.h +1 -6
- data/ext/ice/cpp/include/IceUtil/Monitor.h +1 -6
- data/ext/ice/cpp/include/IceUtil/Mutex.h +2 -9
- data/ext/ice/cpp/include/IceUtil/MutexProtocol.h +1 -6
- data/ext/ice/cpp/include/IceUtil/MutexPtrLock.h +1 -6
- data/ext/ice/cpp/include/IceUtil/MutexPtrTryLock.h +1 -6
- data/ext/ice/cpp/include/IceUtil/Optional.h +1 -6
- data/ext/ice/cpp/include/IceUtil/Options.h +1 -6
- data/ext/ice/cpp/include/IceUtil/OutputUtil.h +1 -6
- data/ext/ice/cpp/include/IceUtil/PopDisableWarnings.h +1 -6
- data/ext/ice/cpp/include/IceUtil/PushDisableWarnings.h +8 -6
- data/ext/ice/cpp/include/IceUtil/Random.h +37 -6
- data/ext/ice/cpp/include/IceUtil/RecMutex.h +1 -6
- data/ext/ice/cpp/include/IceUtil/ResourceConfig.h +4 -9
- data/ext/ice/cpp/include/IceUtil/ScannerConfig.h +2 -7
- data/ext/ice/cpp/include/IceUtil/ScopedArray.h +1 -6
- data/ext/ice/cpp/include/IceUtil/Shared.h +1 -6
- data/ext/ice/cpp/include/IceUtil/StopWatch.h +1 -6
- data/ext/ice/cpp/include/IceUtil/StringConverter.h +1 -6
- data/ext/ice/cpp/include/IceUtil/StringUtil.h +1 -6
- data/ext/ice/cpp/include/IceUtil/Thread.h +1 -6
- data/ext/ice/cpp/include/IceUtil/ThreadException.h +1 -6
- data/ext/ice/cpp/include/IceUtil/Time.h +1 -6
- data/ext/ice/cpp/include/IceUtil/Timer.h +1 -6
- data/ext/ice/cpp/include/IceUtil/UUID.h +1 -6
- data/ext/ice/cpp/include/IceUtil/UndefSysMacros.h +1 -6
- data/ext/ice/cpp/include/generated/Ice/BuiltinSequences.h +11 -16
- data/ext/ice/cpp/include/generated/Ice/Communicator.h +26 -31
- data/ext/ice/cpp/include/generated/Ice/CommunicatorF.h +3 -8
- data/ext/ice/cpp/include/generated/Ice/Connection.h +5 -10
- data/ext/ice/cpp/include/generated/Ice/ConnectionF.h +3 -8
- data/ext/ice/cpp/include/generated/Ice/Current.h +33 -38
- data/ext/ice/cpp/include/generated/Ice/Endpoint.h +3 -8
- data/ext/ice/cpp/include/generated/Ice/EndpointF.h +4 -9
- data/ext/ice/cpp/include/generated/Ice/EndpointTypes.h +7 -12
- data/ext/ice/cpp/include/generated/Ice/FacetMap.h +4 -9
- data/ext/ice/cpp/include/generated/Ice/Identity.h +5 -10
- data/ext/ice/cpp/include/generated/Ice/ImplicitContext.h +21 -26
- data/ext/ice/cpp/include/generated/Ice/ImplicitContextF.h +3 -8
- data/ext/ice/cpp/include/generated/Ice/Instrumentation.h +3 -8
- data/ext/ice/cpp/include/generated/Ice/InstrumentationF.h +3 -8
- data/ext/ice/cpp/include/generated/Ice/LocalException.h +51 -56
- data/ext/ice/cpp/include/generated/Ice/Locator.h +61 -21
- data/ext/ice/cpp/include/generated/Ice/LocatorF.h +7 -12
- data/ext/ice/cpp/include/generated/Ice/Logger.h +3 -8
- data/ext/ice/cpp/include/generated/Ice/LoggerF.h +3 -8
- data/ext/ice/cpp/include/generated/Ice/Metrics.h +33 -40
- data/ext/ice/cpp/include/generated/Ice/ObjectAdapter.h +13 -18
- data/ext/ice/cpp/include/generated/Ice/ObjectAdapterF.h +3 -8
- data/ext/ice/cpp/include/generated/Ice/ObjectFactory.h +9 -14
- data/ext/ice/cpp/include/generated/Ice/Plugin.h +5 -10
- data/ext/ice/cpp/include/generated/Ice/PluginF.h +3 -8
- data/ext/ice/cpp/include/generated/Ice/Process.h +7 -12
- data/ext/ice/cpp/include/generated/Ice/ProcessF.h +5 -10
- data/ext/ice/cpp/include/generated/Ice/Properties.h +15 -20
- data/ext/ice/cpp/include/generated/Ice/PropertiesAdmin.h +8 -13
- data/ext/ice/cpp/include/generated/Ice/PropertiesF.h +5 -10
- data/ext/ice/cpp/include/generated/Ice/RemoteLogger.h +13 -18
- data/ext/ice/cpp/include/generated/Ice/Router.h +14 -19
- data/ext/ice/cpp/include/generated/Ice/RouterF.h +5 -10
- data/ext/ice/cpp/include/generated/Ice/ServantLocator.h +31 -36
- data/ext/ice/cpp/include/generated/Ice/ServantLocatorF.h +3 -8
- data/ext/ice/cpp/include/generated/Ice/SliceChecksumDict.h +3 -8
- data/ext/ice/cpp/include/generated/Ice/ValueFactory.h +9 -14
- data/ext/ice/cpp/include/generated/Ice/Version.h +3 -8
- data/ext/ice/cpp/include/generated/IceSSL/ConnectionInfo.h +3 -8
- data/ext/ice/cpp/include/generated/IceSSL/ConnectionInfoF.h +3 -8
- data/ext/ice/cpp/include/generated/IceSSL/EndpointInfo.h +3 -8
- data/ext/ice/cpp/src/Ice/ACM.cpp +14 -16
- data/ext/ice/cpp/src/Ice/ACM.h +1 -6
- data/ext/ice/cpp/src/Ice/ACMF.h +1 -6
- data/ext/ice/cpp/src/Ice/Acceptor.cpp +1 -6
- data/ext/ice/cpp/src/Ice/Acceptor.h +1 -6
- data/ext/ice/cpp/src/Ice/AcceptorF.h +1 -6
- data/ext/ice/cpp/src/Ice/ArgVector.cpp +6 -11
- data/ext/ice/cpp/src/Ice/ArgVector.h +1 -6
- data/ext/ice/cpp/src/Ice/AsyncResult.cpp +1 -7
- data/ext/ice/cpp/src/Ice/Base64.cpp +1 -6
- data/ext/ice/cpp/src/Ice/Base64.h +1 -6
- data/ext/ice/cpp/src/Ice/BatchRequestQueue.cpp +1 -6
- data/ext/ice/cpp/src/Ice/BatchRequestQueue.h +1 -6
- data/ext/ice/cpp/src/Ice/Buffer.cpp +1 -6
- data/ext/ice/cpp/src/Ice/BuiltinSequences.cpp +3 -8
- data/ext/ice/cpp/src/Ice/CollocatedRequestHandler.cpp +2 -8
- data/ext/ice/cpp/src/Ice/CollocatedRequestHandler.h +1 -6
- data/ext/ice/cpp/src/Ice/Communicator.cpp +3 -8
- data/ext/ice/cpp/src/Ice/CommunicatorF.cpp +3 -8
- data/ext/ice/cpp/src/Ice/CommunicatorI.cpp +4 -10
- data/ext/ice/cpp/src/Ice/CommunicatorI.h +1 -7
- data/ext/ice/cpp/src/Ice/Cond.cpp +1 -6
- data/ext/ice/cpp/src/Ice/ConnectRequestHandler.cpp +1 -6
- data/ext/ice/cpp/src/Ice/ConnectRequestHandler.h +5 -10
- data/ext/ice/cpp/src/Ice/ConnectRequestHandlerF.h +1 -6
- data/ext/ice/cpp/src/Ice/Connection.cpp +3 -8
- data/ext/ice/cpp/src/Ice/ConnectionF.cpp +3 -8
- data/ext/ice/cpp/src/Ice/ConnectionFactory.cpp +146 -36
- data/ext/ice/cpp/src/Ice/ConnectionFactory.h +4 -6
- data/ext/ice/cpp/src/Ice/ConnectionFactoryF.h +1 -6
- data/ext/ice/cpp/src/Ice/ConnectionI.cpp +3 -8
- data/ext/ice/cpp/src/Ice/ConnectionI.h +1 -6
- data/ext/ice/cpp/src/Ice/ConnectionRequestHandler.cpp +1 -6
- data/ext/ice/cpp/src/Ice/ConnectionRequestHandler.h +2 -7
- data/ext/ice/cpp/src/Ice/Connector.cpp +1 -6
- data/ext/ice/cpp/src/Ice/Connector.h +1 -6
- data/ext/ice/cpp/src/Ice/ConnectorF.h +1 -6
- data/ext/ice/cpp/src/Ice/CountDownLatch.cpp +1 -6
- data/ext/ice/cpp/src/Ice/Current.cpp +3 -8
- data/ext/ice/cpp/src/Ice/DefaultsAndOverrides.cpp +1 -6
- 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 +1 -6
- data/ext/ice/cpp/src/Ice/DynamicLibrary.cpp +1 -6
- data/ext/ice/cpp/src/Ice/Endpoint.cpp +3 -8
- data/ext/ice/cpp/src/Ice/EndpointF.cpp +3 -8
- data/ext/ice/cpp/src/Ice/EndpointFactory.cpp +1 -6
- data/ext/ice/cpp/src/Ice/EndpointFactory.h +1 -6
- data/ext/ice/cpp/src/Ice/EndpointFactoryF.h +1 -6
- data/ext/ice/cpp/src/Ice/EndpointFactoryManager.cpp +1 -6
- data/ext/ice/cpp/src/Ice/EndpointFactoryManager.h +1 -6
- data/ext/ice/cpp/src/Ice/EndpointFactoryManagerF.h +1 -6
- data/ext/ice/cpp/src/Ice/EndpointI.cpp +1 -6
- data/ext/ice/cpp/src/Ice/EndpointI.h +1 -6
- data/ext/ice/cpp/src/Ice/EndpointIF.h +1 -6
- data/ext/ice/cpp/src/Ice/EndpointTypes.cpp +3 -8
- data/ext/ice/cpp/src/Ice/EventHandler.cpp +1 -6
- data/ext/ice/cpp/src/Ice/EventHandler.h +1 -6
- data/ext/ice/cpp/src/Ice/EventHandlerF.h +1 -6
- data/ext/ice/cpp/src/Ice/Exception.cpp +3 -8
- data/ext/ice/cpp/src/Ice/FacetMap.cpp +3 -8
- data/ext/ice/cpp/src/Ice/FactoryTable.cpp +1 -6
- data/ext/ice/cpp/src/Ice/FactoryTableInit.cpp +1 -6
- data/ext/ice/cpp/src/Ice/GCObject.cpp +2 -7
- data/ext/ice/cpp/src/Ice/HashUtil.h +1 -6
- data/ext/ice/cpp/src/Ice/HttpParser.cpp +1 -6
- data/ext/ice/cpp/src/Ice/HttpParser.h +1 -6
- data/ext/ice/cpp/src/Ice/IPEndpointI.cpp +2 -30
- data/ext/ice/cpp/src/Ice/IPEndpointI.h +1 -6
- data/ext/ice/cpp/src/Ice/IPEndpointIF.h +1 -6
- data/ext/ice/cpp/src/Ice/IconvStringConverter.cpp +1 -6
- data/ext/ice/cpp/src/Ice/Identity.cpp +3 -8
- data/ext/ice/cpp/src/Ice/ImplicitContext.cpp +3 -8
- data/ext/ice/cpp/src/Ice/ImplicitContextF.cpp +3 -8
- data/ext/ice/cpp/src/Ice/ImplicitContextI.cpp +1 -7
- data/ext/ice/cpp/src/Ice/ImplicitContextI.h +1 -6
- data/ext/ice/cpp/src/Ice/Incoming.cpp +9 -13
- data/ext/ice/cpp/src/Ice/IncomingAsync.cpp +1 -6
- data/ext/ice/cpp/src/Ice/IncomingRequest.h +1 -6
- data/ext/ice/cpp/src/Ice/Initialize.cpp +1 -7
- data/ext/ice/cpp/src/Ice/InputStream.cpp +7 -54
- data/ext/ice/cpp/src/Ice/Instance.cpp +30 -8
- data/ext/ice/cpp/src/Ice/Instance.h +1 -6
- data/ext/ice/cpp/src/Ice/Instrumentation.cpp +3 -8
- data/ext/ice/cpp/src/Ice/InstrumentationF.cpp +3 -8
- data/ext/ice/cpp/src/Ice/InstrumentationI.cpp +2 -7
- data/ext/ice/cpp/src/Ice/InstrumentationI.h +1 -6
- data/ext/ice/cpp/src/Ice/LocalException.cpp +3 -8
- data/ext/ice/cpp/src/Ice/LocalObject.cpp +1 -6
- data/ext/ice/cpp/src/Ice/Locator.cpp +17 -22
- data/ext/ice/cpp/src/Ice/LocatorF.cpp +3 -8
- data/ext/ice/cpp/src/Ice/LocatorInfo.cpp +25 -22
- data/ext/ice/cpp/src/Ice/LocatorInfo.h +3 -8
- data/ext/ice/cpp/src/Ice/LocatorInfoF.h +1 -6
- data/ext/ice/cpp/src/Ice/Logger.cpp +3 -8
- data/ext/ice/cpp/src/Ice/LoggerAdminI.cpp +7 -12
- data/ext/ice/cpp/src/Ice/LoggerAdminI.h +1 -6
- data/ext/ice/cpp/src/Ice/LoggerF.cpp +3 -8
- data/ext/ice/cpp/src/Ice/LoggerI.cpp +7 -12
- data/ext/ice/cpp/src/Ice/LoggerI.h +1 -6
- data/ext/ice/cpp/src/Ice/LoggerUtil.cpp +1 -6
- data/ext/ice/cpp/src/Ice/Metrics.cpp +3 -8
- data/ext/ice/cpp/src/Ice/MetricsAdminI.cpp +9 -9
- data/ext/ice/cpp/src/Ice/MetricsObserverI.cpp +1 -6
- data/ext/ice/cpp/src/Ice/Network.cpp +46 -29
- data/ext/ice/cpp/src/Ice/Network.h +3 -8
- data/ext/ice/cpp/src/Ice/NetworkF.h +1 -6
- data/ext/ice/cpp/src/Ice/NetworkProxy.cpp +2 -8
- data/ext/ice/cpp/src/Ice/NetworkProxy.h +1 -6
- data/ext/ice/cpp/src/Ice/NetworkProxyF.h +1 -6
- data/ext/ice/cpp/src/Ice/Object.cpp +1 -7
- data/ext/ice/cpp/src/Ice/ObjectAdapter.cpp +3 -8
- data/ext/ice/cpp/src/Ice/ObjectAdapterF.cpp +3 -8
- data/ext/ice/cpp/src/Ice/ObjectAdapterFactory.cpp +1 -6
- data/ext/ice/cpp/src/Ice/ObjectAdapterFactory.h +1 -6
- data/ext/ice/cpp/src/Ice/ObjectAdapterFactoryF.h +1 -6
- data/ext/ice/cpp/src/Ice/ObjectAdapterI.cpp +9 -6
- data/ext/ice/cpp/src/Ice/ObjectAdapterI.h +1 -6
- data/ext/ice/cpp/src/Ice/ObjectFactory.cpp +3 -8
- data/ext/ice/cpp/src/Ice/ObserverHelper.cpp +1 -6
- data/ext/ice/cpp/src/Ice/OpaqueEndpointI.cpp +5 -10
- data/ext/ice/cpp/src/Ice/OpaqueEndpointI.h +1 -6
- data/ext/ice/cpp/src/Ice/OutgoingAsync.cpp +5 -8
- data/ext/ice/cpp/src/Ice/OutputStream.cpp +5 -37
- data/ext/ice/cpp/src/Ice/Plugin.cpp +3 -8
- data/ext/ice/cpp/src/Ice/PluginF.cpp +3 -8
- data/ext/ice/cpp/src/Ice/PluginManagerI.cpp +1 -6
- data/ext/ice/cpp/src/Ice/PluginManagerI.h +1 -6
- data/ext/ice/cpp/src/Ice/Process.cpp +7 -12
- data/ext/ice/cpp/src/Ice/ProcessF.cpp +3 -8
- data/ext/ice/cpp/src/Ice/Properties.cpp +3 -8
- data/ext/ice/cpp/src/Ice/PropertiesAdmin.cpp +9 -14
- data/ext/ice/cpp/src/Ice/PropertiesAdminI.cpp +3 -8
- data/ext/ice/cpp/src/Ice/PropertiesAdminI.h +1 -6
- data/ext/ice/cpp/src/Ice/PropertiesF.cpp +3 -8
- data/ext/ice/cpp/src/Ice/PropertiesI.cpp +13 -17
- data/ext/ice/cpp/src/Ice/PropertiesI.h +1 -6
- data/ext/ice/cpp/src/Ice/PropertyNames.cpp +41 -8
- data/ext/ice/cpp/src/Ice/PropertyNames.h +2 -7
- data/ext/ice/cpp/src/Ice/Protocol.cpp +1 -6
- data/ext/ice/cpp/src/Ice/ProtocolInstance.cpp +1 -6
- data/ext/ice/cpp/src/Ice/ProtocolInstance.h +1 -6
- data/ext/ice/cpp/src/Ice/ProtocolInstanceF.h +1 -6
- data/ext/ice/cpp/src/Ice/ProtocolPluginFacade.cpp +1 -6
- data/ext/ice/cpp/src/Ice/ProtocolPluginFacade.h +1 -6
- data/ext/ice/cpp/src/Ice/ProtocolPluginFacadeF.h +1 -6
- data/ext/ice/cpp/src/Ice/Proxy.cpp +3 -8
- data/ext/ice/cpp/src/Ice/ProxyFactory.cpp +1 -6
- data/ext/ice/cpp/src/Ice/ProxyFactory.h +1 -6
- data/ext/ice/cpp/src/Ice/Reference.cpp +61 -33
- data/ext/ice/cpp/src/Ice/Reference.h +1 -6
- data/ext/ice/cpp/src/Ice/ReferenceFactory.cpp +1 -8
- data/ext/ice/cpp/src/Ice/ReferenceFactory.h +1 -6
- data/ext/ice/cpp/src/Ice/ReferenceFactoryF.h +1 -6
- data/ext/ice/cpp/src/Ice/RegisterPluginsInit.cpp +1 -6
- data/ext/ice/cpp/src/Ice/RegisterPluginsInit.h +1 -6
- data/ext/ice/cpp/src/Ice/RemoteLogger.cpp +13 -18
- data/ext/ice/cpp/src/Ice/ReplyStatus.h +1 -6
- data/ext/ice/cpp/src/Ice/RequestHandler.cpp +1 -6
- data/ext/ice/cpp/src/Ice/RequestHandler.h +1 -6
- data/ext/ice/cpp/src/Ice/RequestHandlerFactory.cpp +1 -6
- data/ext/ice/cpp/src/Ice/RequestHandlerFactory.h +1 -6
- data/ext/ice/cpp/src/Ice/ResponseHandler.cpp +1 -6
- data/ext/ice/cpp/src/Ice/ResponseHandler.h +1 -6
- data/ext/ice/cpp/src/Ice/RetryQueue.cpp +2 -7
- data/ext/ice/cpp/src/Ice/RetryQueue.h +1 -6
- data/ext/ice/cpp/src/Ice/RetryQueueF.h +1 -6
- data/ext/ice/cpp/src/Ice/Router.cpp +11 -16
- data/ext/ice/cpp/src/Ice/RouterF.cpp +3 -8
- data/ext/ice/cpp/src/Ice/RouterInfo.cpp +3 -8
- data/ext/ice/cpp/src/Ice/RouterInfo.h +1 -6
- data/ext/ice/cpp/src/Ice/RouterInfoF.h +1 -6
- data/ext/ice/cpp/src/Ice/SHA1.cpp +1 -6
- data/ext/ice/cpp/src/Ice/Selector.cpp +46 -17
- data/ext/ice/cpp/src/Ice/Selector.h +1 -6
- data/ext/ice/cpp/src/Ice/ServantLocator.cpp +3 -8
- data/ext/ice/cpp/src/Ice/ServantLocatorF.cpp +3 -8
- data/ext/ice/cpp/src/Ice/ServantManager.cpp +7 -12
- data/ext/ice/cpp/src/Ice/ServantManager.h +1 -6
- data/ext/ice/cpp/src/Ice/SharedContext.h +1 -6
- data/ext/ice/cpp/src/Ice/SliceChecksumDict.cpp +3 -8
- data/ext/ice/cpp/src/Ice/SliceChecksums.cpp +1 -6
- data/ext/ice/cpp/src/Ice/SlicedData.cpp +1 -6
- data/ext/ice/cpp/src/Ice/StreamSocket.cpp +9 -12
- data/ext/ice/cpp/src/Ice/StreamSocket.h +1 -6
- data/ext/ice/cpp/src/Ice/StringConverterPlugin.cpp +1 -6
- data/ext/ice/cpp/src/Ice/StringUtil.h +1 -6
- data/ext/ice/cpp/src/Ice/SysLoggerI.cpp +3 -8
- data/ext/ice/cpp/src/Ice/SysLoggerI.h +1 -6
- 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 +3 -7
- data/ext/ice/cpp/src/Ice/TcpAcceptor.h +1 -6
- data/ext/ice/cpp/src/Ice/TcpConnector.cpp +1 -6
- data/ext/ice/cpp/src/Ice/TcpConnector.h +1 -6
- data/ext/ice/cpp/src/Ice/TcpEndpointI.cpp +1 -6
- data/ext/ice/cpp/src/Ice/TcpEndpointI.h +1 -6
- data/ext/ice/cpp/src/Ice/TcpTransceiver.cpp +1 -6
- data/ext/ice/cpp/src/Ice/TcpTransceiver.h +1 -6
- data/ext/ice/cpp/src/Ice/Thread.cpp +18 -14
- data/ext/ice/cpp/src/Ice/ThreadPool.cpp +6 -9
- data/ext/ice/cpp/src/Ice/ThreadPool.h +1 -6
- data/ext/ice/cpp/src/Ice/Timer.cpp +1 -6
- data/ext/ice/cpp/src/Ice/TraceLevels.cpp +1 -6
- data/ext/ice/cpp/src/Ice/TraceLevels.h +1 -6
- data/ext/ice/cpp/src/Ice/TraceLevelsF.h +1 -6
- data/ext/ice/cpp/src/Ice/TraceUtil.cpp +1 -6
- data/ext/ice/cpp/src/Ice/TraceUtil.h +1 -6
- data/ext/ice/cpp/src/Ice/Transceiver.cpp +1 -6
- data/ext/ice/cpp/src/Ice/Transceiver.h +1 -6
- data/ext/ice/cpp/src/Ice/TransceiverF.h +3 -8
- data/ext/ice/cpp/src/Ice/UdpConnector.cpp +4 -6
- data/ext/ice/cpp/src/Ice/UdpConnector.h +1 -6
- data/ext/ice/cpp/src/Ice/UdpEndpointI.cpp +1 -6
- data/ext/ice/cpp/src/Ice/UdpEndpointI.h +1 -6
- data/ext/ice/cpp/src/Ice/UdpTransceiver.cpp +23 -24
- data/ext/ice/cpp/src/Ice/UdpTransceiver.h +1 -6
- data/ext/ice/cpp/src/Ice/Value.cpp +1 -6
- data/ext/ice/cpp/src/Ice/ValueFactory.cpp +3 -8
- data/ext/ice/cpp/src/Ice/ValueFactoryManagerI.cpp +1 -7
- data/ext/ice/cpp/src/Ice/ValueFactoryManagerI.h +1 -6
- data/ext/ice/cpp/src/Ice/Version.cpp +3 -8
- data/ext/ice/cpp/src/Ice/VirtualShared.h +1 -6
- data/ext/ice/cpp/src/Ice/WSAcceptor.cpp +1 -6
- data/ext/ice/cpp/src/Ice/WSAcceptor.h +1 -6
- data/ext/ice/cpp/src/Ice/WSConnector.cpp +1 -6
- data/ext/ice/cpp/src/Ice/WSConnector.h +1 -6
- data/ext/ice/cpp/src/Ice/WSEndpoint.cpp +1 -6
- data/ext/ice/cpp/src/Ice/WSEndpoint.h +1 -6
- data/ext/ice/cpp/src/Ice/WSTransceiver.cpp +2 -7
- data/ext/ice/cpp/src/Ice/WSTransceiver.h +1 -7
- data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.cpp +3 -8
- data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.h +11 -16
- data/ext/ice/cpp/src/IceDiscovery/LocatorI.cpp +4 -7
- data/ext/ice/cpp/src/IceDiscovery/LocatorI.h +1 -6
- data/ext/ice/cpp/src/IceDiscovery/LookupI.cpp +5 -10
- data/ext/ice/cpp/src/IceDiscovery/LookupI.h +1 -6
- data/ext/ice/cpp/src/IceDiscovery/PluginI.cpp +1 -6
- data/ext/ice/cpp/src/IceDiscovery/PluginI.h +1 -6
- data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.cpp +3 -8
- data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.h +9 -14
- data/ext/ice/cpp/src/IceLocatorDiscovery/Plugin.h +1 -6
- data/ext/ice/cpp/src/IceLocatorDiscovery/PluginI.cpp +3 -8
- data/ext/ice/cpp/src/IceSSL/AcceptorI.cpp +1 -6
- data/ext/ice/cpp/src/IceSSL/AcceptorI.h +1 -6
- data/ext/ice/cpp/src/IceSSL/CertificateI.cpp +1 -6
- data/ext/ice/cpp/src/IceSSL/CertificateI.h +1 -6
- data/ext/ice/cpp/src/IceSSL/ConnectionInfo.cpp +3 -8
- data/ext/ice/cpp/src/IceSSL/ConnectionInfoF.cpp +3 -8
- data/ext/ice/cpp/src/IceSSL/ConnectorI.cpp +1 -6
- data/ext/ice/cpp/src/IceSSL/ConnectorI.h +1 -6
- data/ext/ice/cpp/src/IceSSL/EndpointI.cpp +8 -13
- data/ext/ice/cpp/src/IceSSL/EndpointI.h +2 -7
- data/ext/ice/cpp/src/IceSSL/EndpointInfo.cpp +3 -8
- data/ext/ice/cpp/src/IceSSL/Instance.cpp +1 -6
- data/ext/ice/cpp/src/IceSSL/Instance.h +1 -6
- data/ext/ice/cpp/src/IceSSL/InstanceF.h +1 -6
- data/ext/ice/cpp/src/IceSSL/OpenSSLCertificateI.cpp +1 -6
- data/ext/ice/cpp/src/IceSSL/OpenSSLEngine.cpp +96 -30
- data/ext/ice/cpp/src/IceSSL/OpenSSLEngine.h +3 -7
- data/ext/ice/cpp/src/IceSSL/OpenSSLEngineF.h +1 -6
- data/ext/ice/cpp/src/IceSSL/OpenSSLPluginI.cpp +1 -6
- data/ext/ice/cpp/src/IceSSL/OpenSSLTransceiverI.cpp +127 -143
- data/ext/ice/cpp/src/IceSSL/OpenSSLTransceiverI.h +2 -11
- data/ext/ice/cpp/src/IceSSL/OpenSSLUtil.cpp +1 -6
- data/ext/ice/cpp/src/IceSSL/OpenSSLUtil.h +1 -6
- data/ext/ice/cpp/src/IceSSL/PluginI.cpp +1 -6
- data/ext/ice/cpp/src/IceSSL/PluginI.h +1 -6
- data/ext/ice/cpp/src/IceSSL/RFC2253.cpp +1 -7
- data/ext/ice/cpp/src/IceSSL/RFC2253.h +1 -6
- data/ext/ice/cpp/src/IceSSL/SChannelCertificateI.cpp +5 -10
- data/ext/ice/cpp/src/IceSSL/SChannelEngine.cpp +69 -29
- data/ext/ice/cpp/src/IceSSL/SChannelEngine.h +5 -6
- data/ext/ice/cpp/src/IceSSL/SChannelEngineF.h +5 -6
- data/ext/ice/cpp/src/IceSSL/SChannelPluginI.cpp +1 -6
- data/ext/ice/cpp/src/IceSSL/SChannelTransceiverI.cpp +35 -30
- data/ext/ice/cpp/src/IceSSL/SChannelTransceiverI.h +7 -6
- data/ext/ice/cpp/src/IceSSL/SSLEngine.cpp +2 -7
- data/ext/ice/cpp/src/IceSSL/SSLEngine.h +1 -6
- data/ext/ice/cpp/src/IceSSL/SSLEngineF.h +1 -6
- data/ext/ice/cpp/src/IceSSL/SecureTransportCertificateI.cpp +7 -12
- data/ext/ice/cpp/src/IceSSL/SecureTransportEngine.cpp +44 -18
- data/ext/ice/cpp/src/IceSSL/SecureTransportEngine.h +5 -6
- data/ext/ice/cpp/src/IceSSL/SecureTransportEngineF.h +4 -6
- data/ext/ice/cpp/src/IceSSL/SecureTransportPluginI.cpp +1 -6
- data/ext/ice/cpp/src/IceSSL/SecureTransportTransceiverI.cpp +28 -23
- data/ext/ice/cpp/src/IceSSL/SecureTransportTransceiverI.h +6 -7
- data/ext/ice/cpp/src/IceSSL/SecureTransportUtil.cpp +16 -9
- data/ext/ice/cpp/src/IceSSL/SecureTransportUtil.h +5 -6
- data/ext/ice/cpp/src/IceSSL/TrustManager.cpp +1 -6
- data/ext/ice/cpp/src/IceSSL/TrustManager.h +1 -6
- data/ext/ice/cpp/src/IceSSL/TrustManagerF.h +1 -6
- data/ext/ice/cpp/src/IceSSL/UWPCertificateI.cpp +4 -9
- data/ext/ice/cpp/src/IceSSL/UWPEngine.cpp +4 -9
- data/ext/ice/cpp/src/IceSSL/UWPEngine.h +1 -6
- data/ext/ice/cpp/src/IceSSL/UWPEngineF.h +1 -6
- data/ext/ice/cpp/src/IceSSL/UWPPluginI.cpp +1 -6
- data/ext/ice/cpp/src/IceSSL/UWPTransceiverI.cpp +5 -10
- data/ext/ice/cpp/src/IceSSL/UWPTransceiverI.h +1 -6
- data/ext/ice/cpp/src/IceSSL/Util.cpp +1 -6
- data/ext/ice/cpp/src/IceSSL/Util.h +1 -6
- data/ext/ice/cpp/src/IceUtil/ConsoleUtil.cpp +1 -6
- data/ext/ice/cpp/src/IceUtil/ConvertUTF.cpp +1 -6
- data/ext/ice/cpp/src/IceUtil/ConvertUTF.h +1 -6
- data/ext/ice/cpp/src/IceUtil/CtrlCHandler.cpp +3 -6
- data/ext/ice/cpp/src/IceUtil/FileUtil.cpp +1 -6
- 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 +22 -12
- data/ext/ice/cpp/src/IceUtil/OutputUtil.cpp +1 -6
- data/ext/ice/cpp/src/IceUtil/Random.cpp +1 -6
- data/ext/ice/cpp/src/IceUtil/RecMutex.cpp +2 -7
- data/ext/ice/cpp/src/IceUtil/Shared.cpp +1 -6
- data/ext/ice/cpp/src/IceUtil/StringConverter.cpp +1 -6
- data/ext/ice/cpp/src/IceUtil/StringUtil.cpp +42 -9
- data/ext/ice/cpp/src/IceUtil/ThreadException.cpp +1 -6
- data/ext/ice/cpp/src/IceUtil/Time.cpp +1 -6
- data/ext/ice/cpp/src/IceUtil/UUID.cpp +1 -6
- data/ext/ice/cpp/src/IceUtil/Unicode.cpp +1 -6
- data/ext/ice/cpp/src/IceUtil/Unicode.h +1 -6
- data/ext/ice/cpp/src/IceUtil/UtilException.cpp +13 -12
- data/ext/ice/cpp/src/Slice/CPlusPlusUtil.cpp +58 -64
- data/ext/ice/cpp/src/Slice/CPlusPlusUtil.h +2 -7
- data/ext/ice/cpp/src/Slice/Checksum.cpp +1 -6
- data/ext/ice/cpp/src/Slice/Checksum.h +1 -6
- data/ext/ice/cpp/src/Slice/FileTracker.cpp +1 -6
- data/ext/ice/cpp/src/Slice/FileTracker.h +1 -6
- data/ext/ice/cpp/src/Slice/Grammar.cpp +241 -245
- data/ext/ice/cpp/src/Slice/Grammar.h +5 -5
- data/ext/ice/cpp/src/Slice/GrammarUtil.h +1 -7
- data/ext/ice/cpp/src/Slice/JavaUtil.cpp +76 -86
- data/ext/ice/cpp/src/Slice/JavaUtil.h +5 -10
- 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/PHPUtil.cpp +6 -6
- data/ext/ice/cpp/src/Slice/PHPUtil.h +1 -6
- data/ext/ice/cpp/src/Slice/Parser.cpp +86 -47
- data/ext/ice/cpp/src/Slice/Parser.h +6 -9
- data/ext/ice/cpp/src/Slice/Preprocessor.cpp +11 -16
- data/ext/ice/cpp/src/Slice/Preprocessor.h +1 -6
- data/ext/ice/cpp/src/Slice/Python.cpp +21 -27
- data/ext/ice/cpp/src/Slice/PythonUtil.cpp +62 -35
- data/ext/ice/cpp/src/Slice/PythonUtil.h +1 -6
- data/ext/ice/cpp/src/Slice/Ruby.cpp +5 -10
- data/ext/ice/cpp/src/Slice/RubyUtil.cpp +12 -14
- data/ext/ice/cpp/src/Slice/RubyUtil.h +1 -6
- data/ext/ice/cpp/src/Slice/Scanner.cpp +101 -109
- data/ext/ice/cpp/src/Slice/SliceUtil.cpp +2 -8
- data/ext/ice/cpp/src/Slice/StringLiteralUtil.cpp +1 -6
- data/ext/ice/cpp/src/Slice/Util.h +1 -6
- data/ice.gemspec +2 -4
- data/lib/Glacier2.rb +1 -6
- data/lib/Glacier2/Metrics.rb +3 -8
- data/lib/Glacier2/PermissionsVerifier.rb +3 -8
- data/lib/Glacier2/PermissionsVerifierF.rb +3 -8
- data/lib/Glacier2/Router.rb +3 -8
- data/lib/Glacier2/RouterF.rb +3 -8
- data/lib/Glacier2/SSLInfo.rb +3 -8
- data/lib/Glacier2/Session.rb +3 -8
- data/lib/Ice.rb +1 -6
- data/lib/Ice/BuiltinSequences.rb +3 -8
- data/lib/Ice/Communicator.rb +3 -8
- data/lib/Ice/CommunicatorF.rb +3 -8
- data/lib/Ice/Connection.rb +3 -8
- data/lib/Ice/ConnectionF.rb +3 -8
- data/lib/Ice/Current.rb +3 -8
- data/lib/Ice/Endpoint.rb +3 -8
- data/lib/Ice/EndpointF.rb +3 -8
- data/lib/Ice/EndpointTypes.rb +3 -8
- data/lib/Ice/FacetMap.rb +3 -8
- data/lib/Ice/Identity.rb +3 -8
- data/lib/Ice/ImplicitContext.rb +3 -8
- data/lib/Ice/ImplicitContextF.rb +3 -8
- data/lib/Ice/Instrumentation.rb +3 -8
- data/lib/Ice/InstrumentationF.rb +3 -8
- data/lib/Ice/LocalException.rb +3 -8
- data/lib/Ice/Locator.rb +3 -8
- data/lib/Ice/LocatorF.rb +3 -8
- data/lib/Ice/Logger.rb +3 -8
- data/lib/Ice/LoggerF.rb +3 -8
- data/lib/Ice/Metrics.rb +3 -8
- data/lib/Ice/ObjectAdapter.rb +3 -8
- data/lib/Ice/ObjectAdapterF.rb +3 -8
- data/lib/Ice/ObjectFactory.rb +3 -8
- data/lib/Ice/Plugin.rb +3 -8
- data/lib/Ice/PluginF.rb +3 -8
- data/lib/Ice/Process.rb +3 -8
- data/lib/Ice/ProcessF.rb +3 -8
- data/lib/Ice/Properties.rb +3 -8
- data/lib/Ice/PropertiesAdmin.rb +3 -8
- data/lib/Ice/PropertiesF.rb +3 -8
- data/lib/Ice/RemoteLogger.rb +3 -8
- data/lib/Ice/Router.rb +3 -8
- data/lib/Ice/RouterF.rb +3 -8
- data/lib/Ice/ServantLocator.rb +3 -8
- data/lib/Ice/ServantLocatorF.rb +3 -8
- data/lib/Ice/SliceChecksumDict.rb +3 -8
- data/lib/Ice/ValueFactory.rb +3 -8
- data/lib/Ice/Version.rb +3 -8
- data/lib/IceBox.rb +1 -6
- data/lib/IceBox/IceBox.rb +3 -8
- data/lib/IceGrid.rb +1 -6
- data/lib/IceGrid/Admin.rb +3 -8
- data/lib/IceGrid/Descriptor.rb +3 -8
- data/lib/IceGrid/Exception.rb +3 -8
- data/lib/IceGrid/FileParser.rb +3 -8
- data/lib/IceGrid/PluginFacade.rb +3 -8
- data/lib/IceGrid/Registry.rb +3 -8
- data/lib/IceGrid/Session.rb +3 -8
- data/lib/IceGrid/UserAccountMapper.rb +3 -8
- data/lib/IcePatch2.rb +1 -6
- data/lib/IcePatch2/FileInfo.rb +3 -8
- data/lib/IcePatch2/FileServer.rb +3 -8
- data/lib/IceStorm.rb +1 -6
- data/lib/IceStorm/IceStorm.rb +3 -8
- data/lib/IceStorm/Metrics.rb +3 -8
- data/slice/Glacier2/Metrics.ice +13 -7
- data/slice/Glacier2/PermissionsVerifier.ice +11 -7
- data/slice/Glacier2/PermissionsVerifierF.ice +11 -7
- data/slice/Glacier2/Router.ice +12 -8
- data/slice/Glacier2/RouterF.ice +11 -7
- data/slice/Glacier2/SSLInfo.ice +11 -7
- data/slice/Glacier2/Session.ice +11 -7
- data/slice/Ice/BuiltinSequences.ice +13 -7
- data/slice/Ice/Communicator.ice +42 -26
- data/slice/Ice/CommunicatorF.ice +13 -7
- data/slice/Ice/Connection.ice +21 -15
- data/slice/Ice/ConnectionF.ice +13 -7
- data/slice/Ice/Current.ice +28 -22
- data/slice/Ice/Endpoint.ice +17 -14
- data/slice/Ice/EndpointF.ice +13 -7
- data/slice/Ice/EndpointTypes.ice +15 -9
- data/slice/Ice/FacetMap.ice +13 -7
- data/slice/Ice/Identity.ice +13 -7
- data/slice/Ice/ImplicitContext.ice +22 -16
- data/slice/Ice/ImplicitContextF.ice +12 -7
- data/slice/Ice/Instrumentation.ice +13 -7
- data/slice/Ice/InstrumentationF.ice +13 -7
- data/slice/Ice/LocalException.ice +35 -29
- data/slice/Ice/Locator.ice +13 -7
- data/slice/Ice/LocatorF.ice +13 -7
- data/slice/Ice/Logger.ice +13 -7
- data/slice/Ice/LoggerF.ice +13 -7
- data/slice/Ice/Metrics.ice +14 -9
- data/slice/Ice/ObjectAdapter.ice +24 -18
- data/slice/Ice/ObjectAdapterF.ice +13 -7
- data/slice/Ice/ObjectFactory.ice +20 -12
- data/slice/Ice/Plugin.ice +17 -8
- data/slice/Ice/PluginF.ice +17 -7
- data/slice/Ice/Process.ice +13 -7
- data/slice/Ice/ProcessF.ice +13 -7
- data/slice/Ice/Properties.ice +25 -14
- data/slice/Ice/PropertiesAdmin.ice +13 -7
- data/slice/Ice/PropertiesF.ice +13 -7
- data/slice/Ice/RemoteLogger.ice +13 -7
- data/slice/Ice/Router.ice +14 -8
- data/slice/Ice/RouterF.ice +13 -7
- data/slice/Ice/ServantLocator.ice +27 -21
- data/slice/Ice/ServantLocatorF.ice +13 -7
- data/slice/Ice/SliceChecksumDict.ice +13 -7
- data/slice/Ice/ValueFactory.ice +19 -12
- data/slice/Ice/Version.ice +13 -7
- data/slice/IceBT/ConnectionInfo.ice +12 -7
- data/slice/IceBT/EndpointInfo.ice +12 -7
- data/slice/IceBT/Types.ice +12 -7
- data/slice/IceBox/IceBox.ice +12 -7
- data/slice/IceDiscovery/IceDiscovery.ice +12 -7
- data/slice/IceGrid/Admin.ice +41 -35
- data/slice/IceGrid/Descriptor.ice +15 -10
- data/slice/IceGrid/Exception.ice +15 -10
- data/slice/IceGrid/FileParser.ice +14 -8
- data/slice/IceGrid/PluginFacade.ice +13 -7
- data/slice/IceGrid/Registry.ice +13 -7
- data/slice/IceGrid/Session.ice +18 -12
- data/slice/IceGrid/UserAccountMapper.ice +16 -10
- data/slice/IceIAP/ConnectionInfo.ice +10 -7
- data/slice/IceIAP/EndpointInfo.ice +10 -7
- data/slice/IceLocatorDiscovery/IceLocatorDiscovery.ice +12 -7
- data/slice/IcePatch2/FileInfo.ice +12 -7
- data/slice/IcePatch2/FileServer.ice +13 -8
- data/slice/IceSSL/ConnectionInfo.ice +13 -7
- data/slice/IceSSL/ConnectionInfoF.ice +13 -7
- data/slice/IceSSL/EndpointInfo.ice +13 -7
- data/slice/IceStorm/IceStorm.ice +17 -11
- data/slice/IceStorm/Metrics.ice +12 -8
- metadata +4 -2
@@ -1,11 +1,6 @@
|
|
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
|
#ifndef ICESSL_OPENSSL_ENGINE_H
|
11
6
|
#define ICESSL_OPENSSL_ENGINE_H
|
@@ -45,9 +40,10 @@ public:
|
|
45
40
|
|
46
41
|
private:
|
47
42
|
|
43
|
+
void cleanup();
|
48
44
|
SSL_METHOD* getMethod(int);
|
49
45
|
void setOptions(int);
|
50
|
-
enum Protocols { SSLv3 =
|
46
|
+
enum Protocols { SSLv3 = 1, TLSv1_0 = 2, TLSv1_1 = 4, TLSv1_2 = 8, TLSv1_3 = 16 };
|
51
47
|
int parseProtocols(const Ice::StringSeq&) const;
|
52
48
|
|
53
49
|
SSL_CTX* _ctx;
|
@@ -1,11 +1,6 @@
|
|
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
|
#ifndef ICESSL_OPENSSL_ENGINE_F_H
|
11
6
|
#define ICESSL_OPENSSL_ENGINE_F_H
|
@@ -1,11 +1,6 @@
|
|
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/PluginI.h>
|
11
6
|
#include <IceSSL/OpenSSL.h>
|
@@ -1,11 +1,6 @@
|
|
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/OpenSSLTransceiverI.h>
|
11
6
|
#include <IceSSL/OpenSSLEngine.h>
|
@@ -99,31 +94,33 @@ OpenSSL::TransceiverI::initialize(IceInternal::Buffer& readBuffer, IceInternal::
|
|
99
94
|
if(!_ssl)
|
100
95
|
{
|
101
96
|
SOCKET fd = _delegate->getNativeInfo()->fd();
|
97
|
+
BIO* bio = 0;
|
102
98
|
if(fd == INVALID_SOCKET)
|
103
99
|
{
|
104
|
-
|
105
|
-
|
106
|
-
|
107
|
-
|
108
|
-
|
100
|
+
assert(_sentBytes == 0);
|
101
|
+
_maxSendPacketSize = 128 * 1024; // 128KB
|
102
|
+
_maxRecvPacketSize = 128 * 1024; // 128KB
|
103
|
+
if(!BIO_new_bio_pair(&bio, _maxSendPacketSize, &_memBio, _maxRecvPacketSize))
|
104
|
+
{
|
105
|
+
bio = 0;
|
106
|
+
_memBio = 0;
|
107
|
+
}
|
109
108
|
}
|
110
|
-
|
111
|
-
#ifdef ICE_USE_IOCP
|
112
|
-
_maxSendPacketSize = std::max(512, IceInternal::getSendBufferSize(fd));
|
113
|
-
_maxRecvPacketSize = std::max(512, IceInternal::getRecvBufferSize(fd));
|
114
|
-
BIO* bio;
|
115
|
-
_sentBytes = 0;
|
116
|
-
if(!BIO_new_bio_pair(&bio, _maxSendPacketSize, &_iocpBio, _maxRecvPacketSize))
|
109
|
+
else
|
117
110
|
{
|
118
|
-
|
119
|
-
|
120
|
-
|
111
|
+
#ifdef ICE_USE_IOCP
|
112
|
+
assert(_sentBytes == 0);
|
113
|
+
_maxSendPacketSize = std::max(512, IceInternal::getSendBufferSize(fd));
|
114
|
+
_maxRecvPacketSize = std::max(512, IceInternal::getRecvBufferSize(fd));
|
115
|
+
if(!BIO_new_bio_pair(&bio, _maxSendPacketSize, &_memBio, _maxRecvPacketSize))
|
116
|
+
{
|
117
|
+
bio = 0;
|
118
|
+
_memBio = 0;
|
119
|
+
}
|
121
120
|
#else
|
122
|
-
|
123
|
-
// This static_cast is necessary due to 64bit windows. There SOCKET is a non-int type.
|
124
|
-
//
|
125
|
-
BIO* bio = BIO_new_socket(static_cast<int>(fd), 0);
|
121
|
+
bio = BIO_new_socket(fd, 0);
|
126
122
|
#endif
|
123
|
+
}
|
127
124
|
|
128
125
|
if(!bio)
|
129
126
|
{
|
@@ -134,10 +131,11 @@ OpenSSL::TransceiverI::initialize(IceInternal::Buffer& readBuffer, IceInternal::
|
|
134
131
|
if(!_ssl)
|
135
132
|
{
|
136
133
|
BIO_free(bio);
|
137
|
-
|
138
|
-
|
139
|
-
|
140
|
-
|
134
|
+
if(_memBio)
|
135
|
+
{
|
136
|
+
BIO_free(_memBio);
|
137
|
+
_memBio = 0;
|
138
|
+
}
|
141
139
|
throw SecurityException(__FILE__, __LINE__, "openssl failure");
|
142
140
|
}
|
143
141
|
SSL_set_bio(_ssl, bio, bio);
|
@@ -213,8 +211,7 @@ OpenSSL::TransceiverI::initialize(IceInternal::Buffer& readBuffer, IceInternal::
|
|
213
211
|
sync.release();
|
214
212
|
#endif
|
215
213
|
|
216
|
-
|
217
|
-
if(BIO_ctrl_pending(_iocpBio))
|
214
|
+
if(_memBio && BIO_ctrl_pending(_memBio))
|
218
215
|
{
|
219
216
|
if(!send())
|
220
217
|
{
|
@@ -222,7 +219,6 @@ OpenSSL::TransceiverI::initialize(IceInternal::Buffer& readBuffer, IceInternal::
|
|
222
219
|
}
|
223
220
|
continue;
|
224
221
|
}
|
225
|
-
#endif
|
226
222
|
|
227
223
|
if(ret <= 0)
|
228
224
|
{
|
@@ -239,58 +235,55 @@ OpenSSL::TransceiverI::initialize(IceInternal::Buffer& readBuffer, IceInternal::
|
|
239
235
|
}
|
240
236
|
case SSL_ERROR_WANT_READ:
|
241
237
|
{
|
242
|
-
|
243
|
-
if(receive())
|
238
|
+
if(_memBio && receive())
|
244
239
|
{
|
245
240
|
continue;
|
246
241
|
}
|
247
|
-
#endif
|
248
242
|
return IceInternal::SocketOperationRead;
|
249
243
|
}
|
250
244
|
case SSL_ERROR_WANT_WRITE:
|
251
245
|
{
|
252
|
-
|
253
|
-
if(send())
|
246
|
+
if(_memBio && send())
|
254
247
|
{
|
255
248
|
continue;
|
256
249
|
}
|
257
|
-
#endif
|
258
250
|
return IceInternal::SocketOperationWrite;
|
259
251
|
}
|
260
252
|
case SSL_ERROR_SYSCALL:
|
261
253
|
{
|
262
|
-
|
263
|
-
if(IceInternal::interrupted())
|
264
|
-
{
|
265
|
-
break;
|
266
|
-
}
|
267
|
-
|
268
|
-
if(IceInternal::wouldBlock())
|
254
|
+
if(!_memBio)
|
269
255
|
{
|
270
|
-
if(
|
256
|
+
if(IceInternal::interrupted())
|
271
257
|
{
|
272
|
-
|
258
|
+
break;
|
273
259
|
}
|
274
|
-
|
260
|
+
|
261
|
+
if(IceInternal::wouldBlock())
|
275
262
|
{
|
276
|
-
|
263
|
+
if(SSL_want_read(_ssl))
|
264
|
+
{
|
265
|
+
return IceInternal::SocketOperationRead;
|
266
|
+
}
|
267
|
+
else if(SSL_want_write(_ssl))
|
268
|
+
{
|
269
|
+
return IceInternal::SocketOperationWrite;
|
270
|
+
}
|
271
|
+
|
272
|
+
break;
|
277
273
|
}
|
278
274
|
|
279
|
-
|
280
|
-
|
281
|
-
|
282
|
-
|
283
|
-
{
|
284
|
-
throw ConnectionLostException(__FILE__, __LINE__, IceInternal::getSocketErrno());
|
275
|
+
if(IceInternal::connectionLost() || IceInternal::getSocketErrno() == 0)
|
276
|
+
{
|
277
|
+
throw ConnectionLostException(__FILE__, __LINE__, IceInternal::getSocketErrno());
|
278
|
+
}
|
285
279
|
}
|
286
|
-
#endif
|
287
280
|
throw SocketException(__FILE__, __LINE__, IceInternal::getSocketErrno());
|
288
281
|
}
|
289
282
|
case SSL_ERROR_SSL:
|
290
283
|
{
|
291
284
|
ostringstream ostr;
|
292
285
|
ostr << "SSL error occurred for new " << (_incoming ? "incoming" : "outgoing")
|
293
|
-
<< " connection:\
|
286
|
+
<< " connection:\n" << _delegate->toString() << "\n" << _engine->sslErrors();
|
294
287
|
throw ProtocolException(__FILE__, __LINE__, ostr.str());
|
295
288
|
}
|
296
289
|
}
|
@@ -349,7 +342,7 @@ OpenSSL::TransceiverI::initialize(IceInternal::Buffer& readBuffer, IceInternal::
|
|
349
342
|
out << "bits = " << SSL_CIPHER_get_bits(cipher, 0) << "\n";
|
350
343
|
out << "protocol = " << SSL_get_version(_ssl) << "\n";
|
351
344
|
}
|
352
|
-
out <<
|
345
|
+
out << toString();
|
353
346
|
}
|
354
347
|
|
355
348
|
return IceInternal::SocketOperationNone;
|
@@ -382,13 +375,11 @@ OpenSSL::TransceiverI::close()
|
|
382
375
|
_ssl = 0;
|
383
376
|
}
|
384
377
|
|
385
|
-
|
386
|
-
if(_iocpBio)
|
378
|
+
if(_memBio)
|
387
379
|
{
|
388
|
-
BIO_free(
|
389
|
-
|
380
|
+
BIO_free(_memBio);
|
381
|
+
_memBio = 0;
|
390
382
|
}
|
391
|
-
#endif
|
392
383
|
|
393
384
|
_delegate->close();
|
394
385
|
}
|
@@ -401,15 +392,13 @@ OpenSSL::TransceiverI::write(IceInternal::Buffer& buf)
|
|
401
392
|
return _delegate->write(buf);
|
402
393
|
}
|
403
394
|
|
404
|
-
|
405
|
-
if(_writeBuffer.i != _writeBuffer.b.end())
|
395
|
+
if(_memBio && _writeBuffer.i != _writeBuffer.b.end())
|
406
396
|
{
|
407
397
|
if(!send())
|
408
398
|
{
|
409
399
|
return IceInternal::SocketOperationWrite;
|
410
400
|
}
|
411
401
|
}
|
412
|
-
#endif
|
413
402
|
|
414
403
|
if(buf.i == buf.b.end())
|
415
404
|
{
|
@@ -419,37 +408,39 @@ OpenSSL::TransceiverI::write(IceInternal::Buffer& buf)
|
|
419
408
|
//
|
420
409
|
// It's impossible for packetSize to be more than an Int.
|
421
410
|
//
|
422
|
-
int packetSize =
|
423
|
-
|
424
|
-
std::min(static_cast<int>(_maxSendPacketSize), static_cast<int>(buf.b.end() - buf.i));
|
425
|
-
#else
|
411
|
+
int packetSize = _memBio ?
|
412
|
+
std::min(static_cast<int>(_maxSendPacketSize), static_cast<int>(buf.b.end() - buf.i)) :
|
426
413
|
static_cast<int>(buf.b.end() - buf.i);
|
427
|
-
|
414
|
+
|
428
415
|
while(buf.i != buf.b.end())
|
429
416
|
{
|
430
417
|
ERR_clear_error(); // Clear any spurious errors.
|
431
|
-
#ifdef ICE_USE_IOCP
|
432
418
|
int ret;
|
433
|
-
if(
|
419
|
+
if(_memBio)
|
434
420
|
{
|
435
|
-
|
436
|
-
|
437
|
-
|
438
|
-
|
439
|
-
|
440
|
-
|
441
|
-
if(ret > 0)
|
421
|
+
if(_sentBytes)
|
422
|
+
{
|
423
|
+
ret = _sentBytes;
|
424
|
+
_sentBytes = 0;
|
425
|
+
}
|
426
|
+
else
|
442
427
|
{
|
443
|
-
|
428
|
+
ret = SSL_write(_ssl, reinterpret_cast<const void*>(&*buf.i), packetSize);
|
429
|
+
if(ret > 0)
|
444
430
|
{
|
445
|
-
|
446
|
-
|
431
|
+
if(!send())
|
432
|
+
{
|
433
|
+
_sentBytes = ret;
|
434
|
+
return IceInternal::SocketOperationWrite;
|
435
|
+
}
|
447
436
|
}
|
448
437
|
}
|
449
438
|
}
|
450
|
-
|
451
|
-
|
452
|
-
|
439
|
+
else
|
440
|
+
{
|
441
|
+
ret = SSL_write(_ssl, reinterpret_cast<const void*>(&*buf.i), packetSize);
|
442
|
+
}
|
443
|
+
|
453
444
|
if(ret <= 0)
|
454
445
|
{
|
455
446
|
switch(SSL_get_error(_ssl, ret))
|
@@ -468,35 +459,34 @@ OpenSSL::TransceiverI::write(IceInternal::Buffer& buf)
|
|
468
459
|
}
|
469
460
|
case SSL_ERROR_WANT_WRITE:
|
470
461
|
{
|
471
|
-
|
472
|
-
if(send())
|
462
|
+
if(_memBio && send())
|
473
463
|
{
|
474
464
|
continue;
|
475
465
|
}
|
476
|
-
#endif
|
477
466
|
return IceInternal::SocketOperationWrite;
|
478
467
|
}
|
479
468
|
case SSL_ERROR_SYSCALL:
|
480
469
|
{
|
481
|
-
|
482
|
-
|
483
|
-
if(IceInternal::interrupted())
|
470
|
+
if(!_memBio)
|
484
471
|
{
|
485
|
-
|
486
|
-
|
472
|
+
if(IceInternal::interrupted())
|
473
|
+
{
|
474
|
+
continue;
|
475
|
+
}
|
487
476
|
|
488
|
-
|
489
|
-
|
490
|
-
|
491
|
-
|
492
|
-
|
477
|
+
if(IceInternal::noBuffers() && packetSize > 1024)
|
478
|
+
{
|
479
|
+
packetSize /= 2;
|
480
|
+
continue;
|
481
|
+
}
|
493
482
|
|
494
|
-
|
495
|
-
|
496
|
-
|
497
|
-
|
483
|
+
if(IceInternal::wouldBlock())
|
484
|
+
{
|
485
|
+
assert(SSL_want_write(_ssl));
|
486
|
+
return IceInternal::SocketOperationWrite;
|
487
|
+
}
|
498
488
|
}
|
499
|
-
|
489
|
+
|
500
490
|
if(IceInternal::connectionLost() || IceInternal::getSocketErrno() == 0)
|
501
491
|
{
|
502
492
|
throw ConnectionLostException(__FILE__, __LINE__, IceInternal::getSocketErrno());
|
@@ -532,15 +522,13 @@ OpenSSL::TransceiverI::read(IceInternal::Buffer& buf)
|
|
532
522
|
return _delegate->read(buf);
|
533
523
|
}
|
534
524
|
|
535
|
-
|
536
|
-
if(_readBuffer.i != _readBuffer.b.end())
|
525
|
+
if(_memBio && _readBuffer.i != _readBuffer.b.end())
|
537
526
|
{
|
538
527
|
if(!receive())
|
539
528
|
{
|
540
529
|
return IceInternal::SocketOperationRead;
|
541
530
|
}
|
542
531
|
}
|
543
|
-
#endif
|
544
532
|
|
545
533
|
//
|
546
534
|
// Note: We assume that OpenSSL doesn't read more SSL records than
|
@@ -578,12 +566,10 @@ OpenSSL::TransceiverI::read(IceInternal::Buffer& buf)
|
|
578
566
|
}
|
579
567
|
case SSL_ERROR_WANT_READ:
|
580
568
|
{
|
581
|
-
|
582
|
-
if(receive())
|
569
|
+
if(_memBio && receive())
|
583
570
|
{
|
584
571
|
continue;
|
585
572
|
}
|
586
|
-
#endif
|
587
573
|
return IceInternal::SocketOperationRead;
|
588
574
|
}
|
589
575
|
case SSL_ERROR_WANT_WRITE:
|
@@ -593,24 +579,26 @@ OpenSSL::TransceiverI::read(IceInternal::Buffer& buf)
|
|
593
579
|
}
|
594
580
|
case SSL_ERROR_SYSCALL:
|
595
581
|
{
|
596
|
-
|
597
|
-
if(IceInternal::interrupted())
|
582
|
+
if(!_memBio)
|
598
583
|
{
|
599
|
-
|
600
|
-
|
584
|
+
if(IceInternal::interrupted())
|
585
|
+
{
|
586
|
+
continue;
|
587
|
+
}
|
601
588
|
|
602
|
-
|
603
|
-
|
604
|
-
|
605
|
-
|
606
|
-
|
589
|
+
if(IceInternal::noBuffers() && packetSize > 1024)
|
590
|
+
{
|
591
|
+
packetSize /= 2;
|
592
|
+
continue;
|
593
|
+
}
|
607
594
|
|
608
|
-
|
609
|
-
|
610
|
-
|
611
|
-
|
595
|
+
if(IceInternal::wouldBlock())
|
596
|
+
{
|
597
|
+
assert(SSL_want_read(_ssl));
|
598
|
+
return IceInternal::SocketOperationRead;
|
599
|
+
}
|
612
600
|
}
|
613
|
-
|
601
|
+
|
614
602
|
if(IceInternal::connectionLost() || IceInternal::getSocketErrno() == 0)
|
615
603
|
{
|
616
604
|
throw ConnectionLostException(__FILE__, __LINE__, IceInternal::getSocketErrno());
|
@@ -660,10 +648,10 @@ OpenSSL::TransceiverI::startWrite(IceInternal::Buffer& buffer)
|
|
660
648
|
int packetSize = std::min(static_cast<int>(_maxSendPacketSize), static_cast<int>(buffer.b.end() - buffer.i));
|
661
649
|
_sentBytes = SSL_write(_ssl, reinterpret_cast<void*>(&*buffer.i), packetSize);
|
662
650
|
|
663
|
-
assert(BIO_ctrl_pending(
|
664
|
-
_writeBuffer.b.resize( BIO_ctrl_pending(
|
651
|
+
assert(BIO_ctrl_pending(_memBio));
|
652
|
+
_writeBuffer.b.resize( BIO_ctrl_pending(_memBio));
|
665
653
|
_writeBuffer.i = _writeBuffer.b.begin();
|
666
|
-
BIO_read(
|
654
|
+
BIO_read(_memBio, _writeBuffer.i, static_cast<int>(_writeBuffer.b.size()));
|
667
655
|
}
|
668
656
|
|
669
657
|
return _delegate->startWrite(_writeBuffer) && buffer.i == buffer.b.end();
|
@@ -705,8 +693,8 @@ OpenSSL::TransceiverI::startRead(IceInternal::Buffer& buffer)
|
|
705
693
|
SSL_read(_ssl, reinterpret_cast<void*>(&*buffer.i), static_cast<int>(buffer.b.end() - buffer.i));
|
706
694
|
assert(ret <= 0 && SSL_get_error(_ssl, ret) == SSL_ERROR_WANT_READ);
|
707
695
|
|
708
|
-
assert(BIO_ctrl_get_read_request(
|
709
|
-
_readBuffer.b.resize(BIO_ctrl_get_read_request(
|
696
|
+
assert(BIO_ctrl_get_read_request(_memBio));
|
697
|
+
_readBuffer.b.resize(BIO_ctrl_get_read_request(_memBio));
|
710
698
|
_readBuffer.i = _readBuffer.b.begin();
|
711
699
|
}
|
712
700
|
|
@@ -727,7 +715,7 @@ OpenSSL::TransceiverI::finishRead(IceInternal::Buffer& buffer)
|
|
727
715
|
_delegate->finishRead(_readBuffer);
|
728
716
|
if(_readBuffer.i == _readBuffer.b.end())
|
729
717
|
{
|
730
|
-
int n = BIO_write(
|
718
|
+
int n = BIO_write(_memBio, _readBuffer.b.begin(), static_cast<int>(_readBuffer.b.size()));
|
731
719
|
if(n < 0) // Expected if the transceiver was closed.
|
732
720
|
{
|
733
721
|
throw SecurityException(__FILE__, __LINE__, "SSL bio write failed");
|
@@ -837,7 +825,7 @@ OpenSSL::TransceiverI::verifyCallback(int ok, X509_STORE_CTX* c)
|
|
837
825
|
out << "subject = " << buf << '\n';
|
838
826
|
out << "depth = " << X509_STORE_CTX_get_error_depth(c) << '\n';
|
839
827
|
out << "error = " << X509_verify_cert_error_string(err) << '\n';
|
840
|
-
out <<
|
828
|
+
out << toString();
|
841
829
|
}
|
842
830
|
|
843
831
|
//
|
@@ -877,13 +865,11 @@ OpenSSL::TransceiverI::TransceiverI(const InstancePtr& instance,
|
|
877
865
|
_delegate(delegate),
|
878
866
|
_connected(false),
|
879
867
|
_verified(false),
|
880
|
-
_ssl(0)
|
881
|
-
|
882
|
-
, _iocpBio(0),
|
868
|
+
_ssl(0),
|
869
|
+
_memBio(0),
|
883
870
|
_sentBytes(0),
|
884
871
|
_maxSendPacketSize(0),
|
885
872
|
_maxRecvPacketSize(0)
|
886
|
-
#endif
|
887
873
|
{
|
888
874
|
}
|
889
875
|
|
@@ -891,14 +877,13 @@ OpenSSL::TransceiverI::~TransceiverI()
|
|
891
877
|
{
|
892
878
|
}
|
893
879
|
|
894
|
-
#ifdef ICE_USE_IOCP
|
895
880
|
bool
|
896
881
|
OpenSSL::TransceiverI::receive()
|
897
882
|
{
|
898
883
|
if(_readBuffer.i == _readBuffer.b.end())
|
899
884
|
{
|
900
|
-
assert(BIO_ctrl_get_read_request(
|
901
|
-
_readBuffer.b.resize(BIO_ctrl_get_read_request(
|
885
|
+
assert(BIO_ctrl_get_read_request(_memBio));
|
886
|
+
_readBuffer.b.resize(BIO_ctrl_get_read_request(_memBio));
|
902
887
|
_readBuffer.i = _readBuffer.b.begin();
|
903
888
|
}
|
904
889
|
|
@@ -915,7 +900,7 @@ OpenSSL::TransceiverI::receive()
|
|
915
900
|
#ifndef NDEBUG
|
916
901
|
int n =
|
917
902
|
#endif
|
918
|
-
BIO_write(
|
903
|
+
BIO_write(_memBio, &_readBuffer.b[0], static_cast<int>(_readBuffer.b.end() - _readBuffer.b.begin()));
|
919
904
|
|
920
905
|
assert(n == static_cast<int>(_readBuffer.b.end() - _readBuffer.b.begin()));
|
921
906
|
|
@@ -927,10 +912,10 @@ OpenSSL::TransceiverI::send()
|
|
927
912
|
{
|
928
913
|
if(_writeBuffer.i == _writeBuffer.b.end())
|
929
914
|
{
|
930
|
-
assert(BIO_ctrl_pending(
|
931
|
-
_writeBuffer.b.resize( BIO_ctrl_pending(
|
915
|
+
assert(BIO_ctrl_pending(_memBio));
|
916
|
+
_writeBuffer.b.resize( BIO_ctrl_pending(_memBio));
|
932
917
|
_writeBuffer.i = _writeBuffer.b.begin();
|
933
|
-
BIO_read(
|
918
|
+
BIO_read(_memBio, _writeBuffer.i, static_cast<int>(_writeBuffer.b.size()));
|
934
919
|
}
|
935
920
|
|
936
921
|
if(_writeBuffer.i != _writeBuffer.b.end())
|
@@ -942,4 +927,3 @@ OpenSSL::TransceiverI::send()
|
|
942
927
|
}
|
943
928
|
return _writeBuffer.i == _writeBuffer.b.end();
|
944
929
|
}
|
945
|
-
#endif
|