zeroc-ice 3.7.0 → 3.7.5
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +5 -5
- data/ICE_LICENSE +1 -1
- data/bin/slice2rb +1 -6
- data/ext/Communicator.cpp +78 -10
- data/ext/Communicator.h +1 -6
- data/ext/Config.h +35 -6
- data/ext/Connection.cpp +22 -11
- data/ext/Connection.h +4 -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 +6 -11
- data/ext/Operation.h +1 -6
- data/ext/Properties.cpp +3 -8
- data/ext/Properties.h +1 -6
- data/ext/Proxy.cpp +90 -14
- data/ext/Proxy.h +1 -6
- data/ext/Slice.cpp +3 -18
- data/ext/Slice.h +1 -6
- data/ext/Types.cpp +92 -60
- data/ext/Types.h +1 -6
- data/ext/Util.cpp +61 -32
- data/ext/Util.h +108 -33
- data/ext/ValueFactoryManager.cpp +2 -7
- data/ext/ValueFactoryManager.h +2 -7
- data/ext/extconf.rb +5 -3
- data/ext/ice/cpp/include/Ice/Application.h +234 -81
- data/ext/ice/cpp/include/Ice/AsyncResult.h +77 -6
- data/ext/ice/cpp/include/Ice/AsyncResultF.h +1 -6
- data/ext/ice/cpp/include/Ice/BatchRequestInterceptor.h +35 -7
- 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 +43 -6
- data/ext/ice/cpp/include/Ice/Comparable.h +81 -6
- data/ext/ice/cpp/include/Ice/Config.h +12 -6
- data/ext/ice/cpp/include/Ice/ConnectionAsync.h +97 -6
- data/ext/ice/cpp/include/Ice/ConnectionIF.h +3 -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 +17 -7
- data/ext/ice/cpp/include/Ice/Dispatcher.h +22 -7
- 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 +57 -20
- data/ext/ice/cpp/include/Ice/ExceptionHelpers.h +11 -6
- data/ext/ice/cpp/include/Ice/FactoryTable.h +12 -7
- data/ext/ice/cpp/include/Ice/FactoryTableInit.h +2 -7
- data/ext/ice/cpp/include/Ice/Format.h +13 -19
- data/ext/ice/cpp/include/Ice/Functional.h +6 -6
- 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 +47 -18
- data/ext/ice/cpp/include/Ice/Incoming.h +27 -9
- data/ext/ice/cpp/include/Ice/IncomingAsync.h +47 -9
- data/ext/ice/cpp/include/Ice/IncomingAsyncF.h +1 -6
- data/ext/ice/cpp/include/Ice/Initialize.h +775 -103
- data/ext/ice/cpp/include/Ice/InputStream.h +642 -122
- data/ext/ice/cpp/include/Ice/InstanceF.h +1 -6
- data/ext/ice/cpp/include/Ice/InterfaceByValue.h +17 -6
- data/ext/ice/cpp/include/Ice/LocalObject.h +5 -6
- data/ext/ice/cpp/include/Ice/LocalObjectF.h +1 -6
- data/ext/ice/cpp/include/Ice/LoggerUtil.h +37 -11
- data/ext/ice/cpp/include/Ice/MetricsAdminI.h +11 -7
- data/ext/ice/cpp/include/Ice/MetricsFunctional.h +3 -6
- data/ext/ice/cpp/include/Ice/MetricsObserverI.h +18 -7
- data/ext/ice/cpp/include/Ice/NativePropertiesAdmin.h +46 -28
- data/ext/ice/cpp/include/Ice/Object.h +338 -52
- data/ext/ice/cpp/include/Ice/ObjectF.h +5 -6
- data/ext/ice/cpp/include/Ice/ObserverHelper.h +1 -6
- data/ext/ice/cpp/include/Ice/Optional.h +42 -12
- data/ext/ice/cpp/include/Ice/OutgoingAsync.h +32 -8
- data/ext/ice/cpp/include/Ice/OutgoingAsyncF.h +1 -6
- data/ext/ice/cpp/include/Ice/OutputStream.h +441 -102
- data/ext/ice/cpp/include/Ice/Protocol.h +31 -6
- data/ext/ice/cpp/include/Ice/Proxy.h +2288 -207
- data/ext/ice/cpp/include/Ice/ProxyF.h +3 -6
- data/ext/ice/cpp/include/Ice/ProxyFactoryF.h +1 -6
- data/ext/ice/cpp/include/Ice/ProxyHandle.h +10 -6
- data/ext/ice/cpp/include/Ice/ReferenceF.h +1 -6
- data/ext/ice/cpp/include/Ice/RegisterPlugins.h +67 -14
- 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 +267 -143
- data/ext/ice/cpp/include/Ice/SliceChecksums.h +5 -6
- data/ext/ice/cpp/include/Ice/SlicedData.h +80 -38
- data/ext/ice/cpp/include/Ice/SlicedDataF.h +4 -6
- data/ext/ice/cpp/include/Ice/StreamHelpers.h +325 -122
- data/ext/ice/cpp/include/Ice/StringConverter.h +32 -6
- data/ext/ice/cpp/include/Ice/ThreadPoolF.h +1 -6
- data/ext/ice/cpp/include/Ice/UUID.h +2 -6
- data/ext/ice/cpp/include/Ice/UniquePtr.h +2 -7
- data/ext/ice/cpp/include/Ice/UniqueRef.h +6 -7
- data/ext/ice/cpp/include/Ice/UserExceptionFactory.h +6 -6
- data/ext/ice/cpp/include/Ice/Value.h +41 -6
- data/ext/ice/cpp/include/Ice/ValueF.h +3 -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 +75 -58
- data/ext/ice/cpp/include/IceSSL/Plugin.h +323 -223
- data/ext/ice/cpp/include/IceSSL/SChannel.h +41 -35
- data/ext/ice/cpp/include/IceSSL/SecureTransport.h +39 -33
- data/ext/ice/cpp/include/IceSSL/UWP.h +33 -29
- data/ext/ice/cpp/include/IceUtil/Atomic.h +2 -7
- data/ext/ice/cpp/include/IceUtil/Cond.h +1 -6
- data/ext/ice/cpp/include/IceUtil/Config.h +35 -14
- data/ext/ice/cpp/include/IceUtil/ConsoleUtil.h +5 -10
- data/ext/ice/cpp/include/IceUtil/CountDownLatch.h +1 -6
- data/ext/ice/cpp/include/IceUtil/CtrlCHandler.h +52 -36
- 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 +3 -13
- 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 +103 -6
- data/ext/ice/cpp/include/IceUtil/Options.h +1 -6
- data/ext/ice/cpp/include/IceUtil/OutputUtil.h +18 -20
- 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 +12 -9
- 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 +107 -92
- 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 +5 -6
- data/ext/ice/cpp/include/IceUtil/UUID.h +5 -6
- data/ext/ice/cpp/include/IceUtil/UndefSysMacros.h +1 -6
- data/ext/ice/cpp/include/generated/Ice/BuiltinSequences.h +81 -26
- data/ext/ice/cpp/include/generated/Ice/Communicator.h +928 -136
- data/ext/ice/cpp/include/generated/Ice/CommunicatorF.h +14 -11
- data/ext/ice/cpp/include/generated/Ice/Connection.h +968 -180
- data/ext/ice/cpp/include/generated/Ice/ConnectionF.h +22 -15
- data/ext/ice/cpp/include/generated/Ice/Current.h +166 -9
- data/ext/ice/cpp/include/generated/Ice/Endpoint.h +476 -115
- data/ext/ice/cpp/include/generated/Ice/EndpointF.h +42 -23
- data/ext/ice/cpp/include/generated/Ice/EndpointTypes.h +30 -9
- data/ext/ice/cpp/include/generated/Ice/FacetMap.h +12 -11
- data/ext/ice/cpp/include/generated/Ice/Identity.h +56 -13
- data/ext/ice/cpp/include/generated/Ice/ImplicitContext.h +151 -34
- data/ext/ice/cpp/include/generated/Ice/ImplicitContextF.h +14 -11
- data/ext/ice/cpp/include/generated/Ice/Instrumentation.h +630 -89
- data/ext/ice/cpp/include/generated/Ice/InstrumentationF.h +20 -13
- data/ext/ice/cpp/include/generated/Ice/LocalException.h +5009 -770
- data/ext/ice/cpp/include/generated/Ice/Locator.h +2255 -441
- data/ext/ice/cpp/include/generated/Ice/LocatorF.h +32 -19
- data/ext/ice/cpp/include/generated/Ice/Logger.h +105 -32
- data/ext/ice/cpp/include/generated/Ice/LoggerF.h +14 -11
- data/ext/ice/cpp/include/generated/Ice/Metrics.h +2539 -471
- data/ext/ice/cpp/include/generated/Ice/ObjectAdapter.h +1005 -132
- data/ext/ice/cpp/include/generated/Ice/ObjectAdapterF.h +14 -11
- data/ext/ice/cpp/include/generated/Ice/ObjectFactory.h +73 -18
- data/ext/ice/cpp/include/generated/Ice/Plugin.h +143 -34
- data/ext/ice/cpp/include/generated/Ice/PluginF.h +18 -13
- data/ext/ice/cpp/include/generated/Ice/Process.h +514 -79
- data/ext/ice/cpp/include/generated/Ice/ProcessF.h +21 -14
- data/ext/ice/cpp/include/generated/Ice/Properties.h +307 -64
- data/ext/ice/cpp/include/generated/Ice/PropertiesAdmin.h +738 -127
- data/ext/ice/cpp/include/generated/Ice/PropertiesF.h +25 -16
- data/ext/ice/cpp/include/generated/Ice/RemoteLogger.h +1524 -284
- data/ext/ice/cpp/include/generated/Ice/Router.h +1007 -201
- data/ext/ice/cpp/include/generated/Ice/RouterF.h +21 -14
- data/ext/ice/cpp/include/generated/Ice/ServantLocator.h +175 -24
- data/ext/ice/cpp/include/generated/Ice/ServantLocatorF.h +14 -11
- data/ext/ice/cpp/include/generated/Ice/SliceChecksumDict.h +14 -9
- data/ext/ice/cpp/include/generated/Ice/ValueFactory.h +178 -29
- data/ext/ice/cpp/include/generated/Ice/Version.h +32 -9
- data/ext/ice/cpp/include/generated/IceSSL/ConnectionInfo.h +72 -21
- data/ext/ice/cpp/include/generated/IceSSL/ConnectionInfoF.h +14 -11
- data/ext/ice/cpp/include/generated/IceSSL/EndpointInfo.h +40 -15
- data/ext/ice/cpp/src/Ice/ACM.cpp +21 -14
- 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 +8 -13
- 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 +12 -18
- data/ext/ice/cpp/src/Ice/Base64.h +1 -6
- data/ext/ice/cpp/src/Ice/BatchRequestQueue.cpp +2 -7
- data/ext/ice/cpp/src/Ice/BatchRequestQueue.h +1 -6
- data/ext/ice/cpp/src/Ice/Buffer.cpp +3 -8
- data/ext/ice/cpp/src/Ice/BuiltinSequences.cpp +4 -9
- 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 +7 -10
- data/ext/ice/cpp/src/Ice/CommunicatorF.cpp +4 -9
- data/ext/ice/cpp/src/Ice/CommunicatorI.cpp +56 -22
- data/ext/ice/cpp/src/Ice/CommunicatorI.h +15 -16
- data/ext/ice/cpp/src/Ice/Cond.cpp +1 -6
- data/ext/ice/cpp/src/Ice/ConnectRequestHandler.cpp +11 -11
- 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 +28 -17
- data/ext/ice/cpp/src/Ice/ConnectionF.cpp +4 -9
- data/ext/ice/cpp/src/Ice/ConnectionFactory.cpp +167 -52
- 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 +78 -60
- data/ext/ice/cpp/src/Ice/ConnectionI.h +10 -13
- 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 +4 -9
- data/ext/ice/cpp/src/Ice/DefaultsAndOverrides.cpp +5 -12
- 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 +14 -6
- data/ext/ice/cpp/src/Ice/DynamicLibrary.cpp +7 -11
- data/ext/ice/cpp/src/Ice/Endpoint.cpp +25 -16
- data/ext/ice/cpp/src/Ice/EndpointF.cpp +4 -9
- 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 +7 -18
- 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 +2 -7
- data/ext/ice/cpp/src/Ice/EndpointI.h +5 -10
- data/ext/ice/cpp/src/Ice/EndpointIF.h +1 -6
- data/ext/ice/cpp/src/Ice/EndpointTypes.cpp +4 -9
- 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 +8 -13
- data/ext/ice/cpp/src/Ice/FacetMap.cpp +4 -9
- 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 +2 -7
- 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 +37 -59
- data/ext/ice/cpp/src/Ice/IPEndpointI.h +5 -10
- 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 +4 -9
- data/ext/ice/cpp/src/Ice/ImplicitContext.cpp +7 -10
- data/ext/ice/cpp/src/Ice/ImplicitContextF.cpp +4 -9
- data/ext/ice/cpp/src/Ice/ImplicitContextI.cpp +3 -20
- data/ext/ice/cpp/src/Ice/ImplicitContextI.h +1 -6
- data/ext/ice/cpp/src/Ice/Incoming.cpp +11 -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 +15 -26
- data/ext/ice/cpp/src/Ice/InputStream.cpp +45 -77
- data/ext/ice/cpp/src/Ice/Instance.cpp +70 -46
- data/ext/ice/cpp/src/Ice/Instance.h +3 -6
- data/ext/ice/cpp/src/Ice/Instrumentation.cpp +34 -19
- data/ext/ice/cpp/src/Ice/InstrumentationF.cpp +4 -9
- 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 +280 -285
- data/ext/ice/cpp/src/Ice/LocalObject.cpp +1 -6
- data/ext/ice/cpp/src/Ice/Locator.cpp +274 -166
- data/ext/ice/cpp/src/Ice/LocatorF.cpp +4 -9
- data/ext/ice/cpp/src/Ice/LocatorInfo.cpp +28 -30
- 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 +7 -10
- data/ext/ice/cpp/src/Ice/LoggerAdminI.cpp +8 -19
- data/ext/ice/cpp/src/Ice/LoggerAdminI.h +1 -6
- data/ext/ice/cpp/src/Ice/LoggerF.cpp +4 -9
- data/ext/ice/cpp/src/Ice/LoggerI.cpp +13 -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 +296 -113
- data/ext/ice/cpp/src/Ice/MetricsAdminI.cpp +10 -15
- data/ext/ice/cpp/src/Ice/MetricsObserverI.cpp +1 -6
- data/ext/ice/cpp/src/Ice/Network.cpp +252 -271
- data/ext/ice/cpp/src/Ice/Network.h +6 -20
- 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/OSLogLoggerI.cpp +57 -0
- data/ext/ice/cpp/src/Ice/OSLogLoggerI.h +40 -0
- data/ext/ice/cpp/src/Ice/Object.cpp +16 -17
- data/ext/ice/cpp/src/Ice/ObjectAdapter.cpp +7 -10
- data/ext/ice/cpp/src/Ice/ObjectAdapterF.cpp +4 -9
- data/ext/ice/cpp/src/Ice/ObjectAdapterFactory.cpp +53 -24
- 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 +137 -156
- data/ext/ice/cpp/src/Ice/ObjectAdapterI.h +15 -16
- data/ext/ice/cpp/src/Ice/ObjectFactory.cpp +7 -10
- data/ext/ice/cpp/src/Ice/ObserverHelper.cpp +1 -6
- data/ext/ice/cpp/src/Ice/OpaqueEndpointI.cpp +29 -51
- data/ext/ice/cpp/src/Ice/OpaqueEndpointI.h +2 -7
- data/ext/ice/cpp/src/Ice/OutgoingAsync.cpp +6 -9
- data/ext/ice/cpp/src/Ice/OutputStream.cpp +29 -61
- data/ext/ice/cpp/src/Ice/Plugin.cpp +10 -11
- data/ext/ice/cpp/src/Ice/PluginF.cpp +4 -9
- data/ext/ice/cpp/src/Ice/PluginManagerI.cpp +15 -39
- data/ext/ice/cpp/src/Ice/PluginManagerI.h +3 -8
- data/ext/ice/cpp/src/Ice/Process.cpp +66 -42
- data/ext/ice/cpp/src/Ice/ProcessF.cpp +4 -9
- data/ext/ice/cpp/src/Ice/Properties.cpp +7 -10
- data/ext/ice/cpp/src/Ice/PropertiesAdmin.cpp +84 -54
- 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 +4 -9
- data/ext/ice/cpp/src/Ice/PropertiesI.cpp +25 -35
- data/ext/ice/cpp/src/Ice/PropertiesI.h +10 -15
- data/ext/ice/cpp/src/Ice/PropertyNames.cpp +45 -8
- data/ext/ice/cpp/src/Ice/PropertyNames.h +2 -7
- data/ext/ice/cpp/src/Ice/Protocol.cpp +5 -18
- 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 +54 -8
- data/ext/ice/cpp/src/Ice/ProxyFactory.cpp +11 -7
- data/ext/ice/cpp/src/Ice/ProxyFactory.h +1 -6
- data/ext/ice/cpp/src/Ice/Reference.cpp +116 -38
- data/ext/ice/cpp/src/Ice/Reference.h +13 -7
- data/ext/ice/cpp/src/Ice/ReferenceFactory.cpp +52 -98
- 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 +4 -8
- data/ext/ice/cpp/src/Ice/RegisterPluginsInit.h +1 -6
- data/ext/ice/cpp/src/Ice/RemoteLogger.cpp +194 -113
- 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 +7 -9
- 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 +160 -87
- data/ext/ice/cpp/src/Ice/RouterF.cpp +4 -9
- data/ext/ice/cpp/src/Ice/RouterInfo.cpp +8 -35
- data/ext/ice/cpp/src/Ice/RouterInfo.h +1 -8
- data/ext/ice/cpp/src/Ice/RouterInfoF.h +1 -6
- data/ext/ice/cpp/src/Ice/SHA1.cpp +3 -8
- data/ext/ice/cpp/src/Ice/Selector.cpp +76 -49
- data/ext/ice/cpp/src/Ice/Selector.h +1 -6
- data/ext/ice/cpp/src/Ice/ServantLocator.cpp +7 -10
- data/ext/ice/cpp/src/Ice/ServantLocatorF.cpp +4 -9
- data/ext/ice/cpp/src/Ice/ServantManager.cpp +21 -42
- 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 +4 -9
- 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 +46 -69
- data/ext/ice/cpp/src/Ice/StreamSocket.h +1 -6
- data/ext/ice/cpp/src/Ice/StringConverterPlugin.cpp +10 -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 +13 -19
- data/ext/ice/cpp/src/Ice/TcpAcceptor.h +1 -6
- data/ext/ice/cpp/src/Ice/TcpConnector.cpp +6 -6
- data/ext/ice/cpp/src/Ice/TcpConnector.h +1 -6
- data/ext/ice/cpp/src/Ice/TcpEndpointI.cpp +13 -16
- data/ext/ice/cpp/src/Ice/TcpEndpointI.h +2 -7
- data/ext/ice/cpp/src/Ice/TcpTransceiver.cpp +6 -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 +79 -19
- data/ext/ice/cpp/src/Ice/ThreadPool.h +11 -12
- data/ext/ice/cpp/src/Ice/Timer.cpp +11 -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 +30 -33
- data/ext/ice/cpp/src/Ice/UdpEndpointI.h +2 -7
- data/ext/ice/cpp/src/Ice/UdpTransceiver.cpp +49 -79
- 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 +10 -11
- data/ext/ice/cpp/src/Ice/ValueFactoryManagerI.cpp +3 -12
- data/ext/ice/cpp/src/Ice/ValueFactoryManagerI.h +2 -7
- data/ext/ice/cpp/src/Ice/Version.cpp +4 -9
- 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 +4 -10
- data/ext/ice/cpp/src/Ice/WSEndpoint.h +2 -7
- data/ext/ice/cpp/src/Ice/WSTransceiver.cpp +25 -30
- data/ext/ice/cpp/src/Ice/WSTransceiver.h +1 -7
- data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.cpp +86 -33
- data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.h +1083 -129
- 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 +71 -30
- data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.h +640 -79
- data/ext/ice/cpp/src/IceLocatorDiscovery/Plugin.h +1 -6
- data/ext/ice/cpp/src/IceLocatorDiscovery/PluginI.cpp +122 -25
- data/ext/ice/cpp/src/IceSSL/AcceptorI.cpp +2 -9
- data/ext/ice/cpp/src/IceSSL/AcceptorI.h +1 -6
- data/ext/ice/cpp/src/IceSSL/CertificateI.cpp +4 -9
- data/ext/ice/cpp/src/IceSSL/CertificateI.h +1 -6
- data/ext/ice/cpp/src/IceSSL/ConnectionInfo.cpp +7 -10
- data/ext/ice/cpp/src/IceSSL/ConnectionInfoF.cpp +4 -9
- data/ext/ice/cpp/src/IceSSL/ConnectorI.cpp +2 -9
- data/ext/ice/cpp/src/IceSSL/ConnectorI.h +1 -6
- data/ext/ice/cpp/src/IceSSL/EndpointI.cpp +9 -14
- data/ext/ice/cpp/src/IceSSL/EndpointI.h +3 -8
- data/ext/ice/cpp/src/IceSSL/EndpointInfo.cpp +7 -10
- 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 +11 -19
- data/ext/ice/cpp/src/IceSSL/OpenSSLEngine.cpp +100 -46
- data/ext/ice/cpp/src/IceSSL/OpenSSLEngine.h +3 -8
- 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 +190 -206
- 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 -36
- data/ext/ice/cpp/src/IceSSL/SChannelEngine.h +5 -8
- 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 +71 -62
- data/ext/ice/cpp/src/IceSSL/SChannelTransceiverI.h +7 -6
- data/ext/ice/cpp/src/IceSSL/SSLEngine.cpp +26 -28
- data/ext/ice/cpp/src/IceSSL/SSLEngine.h +3 -6
- data/ext/ice/cpp/src/IceSSL/SSLEngineF.h +1 -6
- data/ext/ice/cpp/src/IceSSL/SecureTransportCertificateI.cpp +37 -31
- 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 +47 -27
- data/ext/ice/cpp/src/IceSSL/SecureTransportTransceiverI.h +6 -7
- data/ext/ice/cpp/src/IceSSL/SecureTransportUtil.cpp +41 -34
- data/ext/ice/cpp/src/IceSSL/SecureTransportUtil.h +5 -6
- data/ext/ice/cpp/src/IceSSL/TrustManager.cpp +4 -10
- 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 +12 -11
- 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 +6 -11
- 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 +25 -15
- data/ext/ice/cpp/src/IceUtil/OutputUtil.cpp +41 -16
- data/ext/ice/cpp/src/IceUtil/Random.cpp +3 -8
- data/ext/ice/cpp/src/IceUtil/RecMutex.cpp +2 -11
- data/ext/ice/cpp/src/IceUtil/Shared.cpp +1 -6
- data/ext/ice/cpp/src/IceUtil/StringConverter.cpp +6 -11
- data/ext/ice/cpp/src/IceUtil/StringUtil.cpp +45 -12
- data/ext/ice/cpp/src/IceUtil/ThreadException.cpp +1 -6
- data/ext/ice/cpp/src/IceUtil/Time.cpp +10 -17
- data/ext/ice/cpp/src/IceUtil/UUID.cpp +8 -13
- 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 +17 -16
- data/ext/ice/cpp/src/Slice/CPlusPlusUtil.cpp +178 -170
- data/ext/ice/cpp/src/Slice/CPlusPlusUtil.h +8 -12
- 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 +424 -438
- data/ext/ice/cpp/src/Slice/Grammar.h +7 -7
- data/ext/ice/cpp/src/Slice/GrammarUtil.h +1 -7
- data/ext/ice/cpp/src/Slice/JavaUtil.cpp +195 -122
- data/ext/ice/cpp/src/Slice/JavaUtil.h +12 -12
- 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 -0
- 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 +535 -266
- data/ext/ice/cpp/src/Slice/Parser.h +72 -12
- data/ext/ice/cpp/src/Slice/Preprocessor.cpp +26 -17
- data/ext/ice/cpp/src/Slice/Preprocessor.h +2 -7
- data/ext/ice/cpp/src/Slice/Python.cpp +28 -42
- data/ext/ice/cpp/src/Slice/PythonUtil.cpp +137 -53
- data/ext/ice/cpp/src/Slice/PythonUtil.h +2 -7
- data/ext/ice/cpp/src/Slice/Ruby.cpp +5 -10
- data/ext/ice/cpp/src/Slice/RubyUtil.cpp +13 -15
- data/ext/ice/cpp/src/Slice/RubyUtil.h +1 -6
- data/ext/ice/cpp/src/Slice/Scanner.cpp +296 -217
- data/ext/ice/cpp/src/Slice/SliceUtil.cpp +2 -8
- data/ext/ice/cpp/src/Slice/StringLiteralUtil.cpp +109 -27
- data/ext/ice/cpp/src/Slice/Util.h +5 -9
- data/ext/ice/mcpp/Makefile +2 -5
- data/ice.gemspec +3 -5
- 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 +2 -7
- 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 +14 -8
- 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 +143 -102
- data/slice/Ice/CommunicatorF.ice +13 -7
- data/slice/Ice/Connection.ice +65 -29
- data/slice/Ice/ConnectionF.ice +13 -7
- data/slice/Ice/Current.ice +31 -26
- data/slice/Ice/Endpoint.ice +24 -21
- data/slice/Ice/EndpointF.ice +14 -8
- data/slice/Ice/EndpointTypes.ice +15 -9
- data/slice/Ice/FacetMap.ice +14 -8
- data/slice/Ice/Identity.ice +13 -7
- data/slice/Ice/ImplicitContext.ice +31 -25
- data/slice/Ice/ImplicitContextF.ice +12 -7
- data/slice/Ice/Instrumentation.ice +19 -13
- data/slice/Ice/InstrumentationF.ice +13 -7
- data/slice/Ice/LocalException.ice +35 -29
- data/slice/Ice/Locator.ice +14 -8
- data/slice/Ice/LocatorF.ice +13 -7
- data/slice/Ice/Logger.ice +19 -13
- data/slice/Ice/LoggerF.ice +13 -7
- data/slice/Ice/Metrics.ice +26 -18
- data/slice/Ice/ObjectAdapter.ice +63 -45
- data/slice/Ice/ObjectAdapterF.ice +13 -7
- data/slice/Ice/ObjectFactory.ice +20 -12
- data/slice/Ice/Plugin.ice +19 -10
- 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 +35 -24
- data/slice/Ice/PropertiesAdmin.ice +13 -7
- data/slice/Ice/PropertiesF.ice +13 -7
- data/slice/Ice/RemoteLogger.ice +23 -28
- data/slice/Ice/Router.ice +14 -8
- data/slice/Ice/RouterF.ice +13 -7
- data/slice/Ice/ServantLocator.ice +31 -23
- data/slice/Ice/ServantLocatorF.ice +13 -7
- data/slice/Ice/SliceChecksumDict.ice +13 -7
- data/slice/Ice/ValueFactory.ice +31 -26
- data/slice/Ice/Version.ice +13 -7
- data/slice/IceBT/ConnectionInfo.ice +12 -7
- data/slice/IceBT/EndpointInfo.ice +13 -8
- data/slice/IceBT/Types.ice +12 -7
- data/slice/IceBox/IceBox.ice +30 -11
- data/slice/IceDiscovery/IceDiscovery.ice +68 -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 +17 -11
- 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 +11 -8
- data/slice/IceIAP/EndpointInfo.ice +11 -8
- 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 +16 -9
- data/slice/IceSSL/ConnectionInfoF.ice +14 -8
- data/slice/IceSSL/EndpointInfo.ice +14 -8
- data/slice/IceStorm/IceStorm.ice +20 -15
- data/slice/IceStorm/Metrics.ice +12 -8
- metadata +7 -13
- data/BZIP2_LICENSE +0 -42
- data/ext/ice/bzip2/blocksort.c +0 -1094
- data/ext/ice/bzip2/bzlib.c +0 -1572
- data/ext/ice/bzip2/bzlib.h +0 -282
- data/ext/ice/bzip2/bzlib_private.h +0 -509
- data/ext/ice/bzip2/compress.c +0 -672
- data/ext/ice/bzip2/crctable.c +0 -104
- data/ext/ice/bzip2/decompress.c +0 -646
- data/ext/ice/bzip2/huffman.c +0 -205
- data/ext/ice/bzip2/randtable.c +0 -84
@@ -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_PLUGIN_H
|
11
6
|
#define ICESSL_PLUGIN_H
|
@@ -36,22 +31,31 @@
|
|
36
31
|
namespace IceSSL
|
37
32
|
{
|
38
33
|
|
39
|
-
|
40
|
-
|
41
|
-
|
34
|
+
/**
|
35
|
+
* Thrown if the certificate cannot be read.
|
36
|
+
* \headerfile IceSSL/IceSSL.h
|
37
|
+
*/
|
42
38
|
class ICESSL_API CertificateReadException : public IceUtil::ExceptionHelper<CertificateReadException>
|
43
39
|
{
|
44
40
|
public:
|
45
41
|
|
46
42
|
CertificateReadException(const char*, int, const std::string&);
|
43
|
+
|
47
44
|
#ifndef ICE_CPP11_COMPILER
|
48
45
|
virtual ~CertificateReadException() throw();
|
49
46
|
#endif
|
47
|
+
|
50
48
|
virtual std::string ice_id() const;
|
49
|
+
|
51
50
|
#ifndef ICE_CPP11_MAPPING
|
51
|
+
/**
|
52
|
+
* Creates a shallow copy of this exception.
|
53
|
+
* @return The new exception instance.
|
54
|
+
*/
|
52
55
|
virtual CertificateReadException* ice_clone() const;
|
53
56
|
#endif
|
54
57
|
|
58
|
+
/** The reason for the exception. */
|
55
59
|
std::string reason;
|
56
60
|
|
57
61
|
private:
|
@@ -59,22 +63,31 @@ private:
|
|
59
63
|
static const char* _name;
|
60
64
|
};
|
61
65
|
|
62
|
-
|
63
|
-
|
64
|
-
|
66
|
+
/**
|
67
|
+
* Thrown if the certificate cannot be encoded.
|
68
|
+
* \headerfile IceSSL/IceSSL.h
|
69
|
+
*/
|
65
70
|
class ICESSL_API CertificateEncodingException : public IceUtil::ExceptionHelper<CertificateEncodingException>
|
66
71
|
{
|
67
72
|
public:
|
68
73
|
|
69
74
|
CertificateEncodingException(const char*, int, const std::string&);
|
75
|
+
|
70
76
|
#ifndef ICE_CPP11_COMPILER
|
71
77
|
virtual ~CertificateEncodingException() throw();
|
72
78
|
#endif
|
79
|
+
|
73
80
|
virtual std::string ice_id() const;
|
81
|
+
|
74
82
|
#ifndef ICE_CPP11_MAPPING
|
83
|
+
/**
|
84
|
+
* Creates a shallow copy of this exception.
|
85
|
+
* @return The new exception instance.
|
86
|
+
*/
|
75
87
|
virtual CertificateEncodingException* ice_clone() const;
|
76
88
|
#endif
|
77
89
|
|
90
|
+
/** The reason for the exception. */
|
78
91
|
std::string reason;
|
79
92
|
|
80
93
|
private:
|
@@ -82,22 +95,31 @@ private:
|
|
82
95
|
static const char* _name;
|
83
96
|
};
|
84
97
|
|
85
|
-
|
86
|
-
|
87
|
-
|
98
|
+
/**
|
99
|
+
* This exception is thrown if a distinguished name cannot be parsed.
|
100
|
+
* \headerfile IceSSL/IceSSL.h
|
101
|
+
*/
|
88
102
|
class ICESSL_API ParseException : public IceUtil::ExceptionHelper<ParseException>
|
89
103
|
{
|
90
104
|
public:
|
91
105
|
|
92
106
|
ParseException(const char*, int, const std::string&);
|
107
|
+
|
93
108
|
#ifndef ICE_CPP11_COMPILER
|
94
109
|
virtual ~ParseException() throw();
|
95
110
|
#endif
|
111
|
+
|
96
112
|
virtual std::string ice_id() const;
|
113
|
+
|
97
114
|
#ifndef ICE_CPP11_MAPPING
|
115
|
+
/**
|
116
|
+
* Creates a shallow copy of this exception.
|
117
|
+
* @return The new exception instance.
|
118
|
+
*/
|
98
119
|
virtual ParseException* ice_clone() const;
|
99
120
|
#endif
|
100
121
|
|
122
|
+
/** The reason for the exception. */
|
101
123
|
std::string reason;
|
102
124
|
|
103
125
|
private:
|
@@ -105,61 +127,76 @@ private:
|
|
105
127
|
static const char* _name;
|
106
128
|
};
|
107
129
|
|
108
|
-
|
109
|
-
|
110
|
-
|
111
|
-
|
112
|
-
|
113
|
-
|
114
|
-
|
115
|
-
|
116
|
-
|
117
|
-
|
118
|
-
|
119
|
-
|
130
|
+
/**
|
131
|
+
* This class represents a DistinguishedName, similar to the Java
|
132
|
+
* type X500Principal and the .NET type X500DistinguishedName.
|
133
|
+
*
|
134
|
+
* For comparison purposes, the value of a relative distinguished
|
135
|
+
* name (RDN) component is always unescaped before matching,
|
136
|
+
* therefore "ZeroC, Inc." will match ZeroC\, Inc.
|
137
|
+
*
|
138
|
+
* toString() always returns exactly the same information as was
|
139
|
+
* provided in the constructor (i.e., "ZeroC, Inc." will not turn
|
140
|
+
* into ZeroC\, Inc.).
|
141
|
+
* \headerfile IceSSL/IceSSL.h
|
142
|
+
*/
|
120
143
|
class ICESSL_API DistinguishedName
|
121
144
|
{
|
122
145
|
public:
|
123
146
|
|
124
|
-
|
125
|
-
|
126
|
-
|
127
|
-
|
128
|
-
|
129
|
-
|
130
|
-
|
131
|
-
|
132
|
-
|
133
|
-
|
134
|
-
|
135
|
-
|
136
|
-
|
137
|
-
|
147
|
+
/**
|
148
|
+
* Creates a DistinguishedName from a string encoded using the rules in RFC2253.
|
149
|
+
* @param name The encoded distinguished name.
|
150
|
+
* @throws ParseException if parsing fails.
|
151
|
+
*/
|
152
|
+
explicit DistinguishedName(const std::string& name);
|
153
|
+
|
154
|
+
/**
|
155
|
+
* Creates a DistinguishedName from a list of RDN pairs,
|
156
|
+
* where each pair consists of the RDN's type and value.
|
157
|
+
* For example, the RDN "O=ZeroC" is represented by the
|
158
|
+
* pair ("O", "ZeroC").
|
159
|
+
* @throws ParseException if parsing fails.
|
160
|
+
*/
|
138
161
|
explicit DistinguishedName(const std::list<std::pair<std::string, std::string> >&);
|
139
162
|
|
140
|
-
|
141
|
-
|
142
|
-
|
143
|
-
//
|
163
|
+
/**
|
164
|
+
* Performs an exact match. The order of the RDN components is important.
|
165
|
+
*/
|
144
166
|
friend ICESSL_API bool operator==(const DistinguishedName&, const DistinguishedName&);
|
167
|
+
|
168
|
+
/**
|
169
|
+
* Performs an exact match. The order of the RDN components is important.
|
170
|
+
*/
|
145
171
|
friend ICESSL_API bool operator<(const DistinguishedName&, const DistinguishedName&);
|
146
172
|
|
147
|
-
|
148
|
-
|
149
|
-
|
150
|
-
|
151
|
-
|
152
|
-
|
153
|
-
bool match(const
|
154
|
-
|
155
|
-
|
156
|
-
|
157
|
-
|
173
|
+
/**
|
174
|
+
* Performs a partial match with another DistinguishedName.
|
175
|
+
* @param dn The name to be matched.
|
176
|
+
* @return True if all of the RDNs in the argument are present in this
|
177
|
+
* DistinguishedName and they have the same values.
|
178
|
+
*/
|
179
|
+
bool match(const DistinguishedName& dn) const;
|
180
|
+
|
181
|
+
/**
|
182
|
+
* Performs a partial match with another DistinguishedName.
|
183
|
+
* @param dn The name to be matched.
|
184
|
+
* @return True if all of the RDNs in the argument are present in this
|
185
|
+
* DistinguishedName and they have the same values.
|
186
|
+
*/
|
187
|
+
bool match(const std::string& dn) const;
|
188
|
+
|
189
|
+
/**
|
190
|
+
* Encodes the DN in RFC2253 format.
|
191
|
+
* @return An encoded string.
|
192
|
+
*/
|
158
193
|
operator std::string() const;
|
159
194
|
|
160
195
|
protected:
|
161
196
|
|
197
|
+
/// \cond INTERNAL
|
162
198
|
void unescape();
|
199
|
+
/// \endcond
|
163
200
|
|
164
201
|
private:
|
165
202
|
|
@@ -167,33 +204,46 @@ private:
|
|
167
204
|
std::list<std::pair<std::string, std::string> > _unescaped;
|
168
205
|
};
|
169
206
|
|
207
|
+
/**
|
208
|
+
* Performs an exact match. The order of the RDN components is important.
|
209
|
+
*/
|
170
210
|
inline bool
|
171
211
|
operator>(const DistinguishedName& lhs, const DistinguishedName& rhs)
|
172
212
|
{
|
173
213
|
return rhs < lhs;
|
174
214
|
}
|
175
215
|
|
216
|
+
/**
|
217
|
+
* Performs an exact match. The order of the RDN components is important.
|
218
|
+
*/
|
176
219
|
inline bool
|
177
220
|
operator<=(const DistinguishedName& lhs, const DistinguishedName& rhs)
|
178
221
|
{
|
179
222
|
return !(lhs > rhs);
|
180
223
|
}
|
181
224
|
|
225
|
+
/**
|
226
|
+
* Performs an exact match. The order of the RDN components is important.
|
227
|
+
*/
|
182
228
|
inline bool
|
183
229
|
operator>=(const DistinguishedName& lhs, const DistinguishedName& rhs)
|
184
230
|
{
|
185
231
|
return !(lhs < rhs);
|
186
232
|
}
|
187
233
|
|
234
|
+
/**
|
235
|
+
* Performs an exact match. The order of the RDN components is important.
|
236
|
+
*/
|
188
237
|
inline bool
|
189
238
|
operator!=(const DistinguishedName& lhs, const DistinguishedName& rhs)
|
190
239
|
{
|
191
240
|
return !(lhs == rhs);
|
192
241
|
}
|
193
242
|
|
194
|
-
|
195
|
-
|
196
|
-
|
243
|
+
/**
|
244
|
+
* Represents an X509 Certificate extension.
|
245
|
+
* \headerfile IceSSL/IceSSL.h
|
246
|
+
*/
|
197
247
|
class ICESSL_API X509Extension
|
198
248
|
#ifndef ICE_CPP11_MAPPING
|
199
249
|
: public virtual IceUtil::Shared
|
@@ -201,267 +251,317 @@ class ICESSL_API X509Extension
|
|
201
251
|
{
|
202
252
|
public:
|
203
253
|
|
254
|
+
/**
|
255
|
+
* Determines whether the information in this extension is important.
|
256
|
+
* @return True if if information is important, false otherwise.
|
257
|
+
*/
|
204
258
|
virtual bool isCritical() const = 0;
|
259
|
+
|
260
|
+
/**
|
261
|
+
* Obtains the object ID of this extension.
|
262
|
+
* @return The object ID.
|
263
|
+
*/
|
205
264
|
virtual std::string getOID() const = 0;
|
265
|
+
|
266
|
+
/**
|
267
|
+
* Obtains the data associated with this extension.
|
268
|
+
* @return The extension data.
|
269
|
+
*/
|
206
270
|
virtual std::vector<Ice::Byte> getData() const = 0;
|
207
271
|
};
|
208
272
|
ICE_DEFINE_PTR(X509ExtensionPtr, X509Extension);
|
209
273
|
|
210
|
-
//
|
211
|
-
// This convenience class is a wrapper around a native certificate.
|
212
|
-
// The interface is inspired by java.security.cert.X509Certificate.
|
213
|
-
//
|
214
|
-
|
215
274
|
class Certificate;
|
216
275
|
ICE_DEFINE_PTR(CertificatePtr, Certificate);
|
217
276
|
|
277
|
+
/**
|
278
|
+
* This convenience class is a wrapper around a native certificate.
|
279
|
+
* The interface is inspired by java.security.cert.X509Certificate.
|
280
|
+
* \headerfile IceSSL/IceSSL.h
|
281
|
+
*/
|
218
282
|
class ICESSL_API Certificate :
|
219
283
|
#ifdef ICE_CPP11_MAPPING
|
220
|
-
|
284
|
+
public std::enable_shared_from_this<Certificate>
|
221
285
|
#else
|
222
|
-
|
286
|
+
public virtual IceUtil::Shared
|
223
287
|
#endif
|
224
288
|
{
|
225
289
|
public:
|
226
290
|
|
227
|
-
|
228
|
-
|
229
|
-
|
230
|
-
//
|
291
|
+
/**
|
292
|
+
* Compares the certificates for equality using the native certificate comparison method.
|
293
|
+
*/
|
231
294
|
virtual bool operator==(const Certificate&) const = 0;
|
295
|
+
|
296
|
+
/**
|
297
|
+
* Compares the certificates for equality using the native certificate comparison method.
|
298
|
+
*/
|
232
299
|
virtual bool operator!=(const Certificate&) const = 0;
|
233
300
|
|
234
|
-
|
235
|
-
|
236
|
-
|
301
|
+
/**
|
302
|
+
* Obtains the authority key identifier.
|
303
|
+
* @return The identifier.
|
304
|
+
*/
|
237
305
|
virtual std::vector<Ice::Byte> getAuthorityKeyIdentifier() const = 0;
|
238
306
|
|
239
|
-
|
240
|
-
|
241
|
-
|
307
|
+
/**
|
308
|
+
* Obtains the subject key identifier.
|
309
|
+
* @return The identifier.
|
310
|
+
*/
|
242
311
|
virtual std::vector<Ice::Byte> getSubjectKeyIdentifier() const = 0;
|
243
312
|
|
244
|
-
|
245
|
-
|
246
|
-
|
247
|
-
|
248
|
-
|
249
|
-
|
250
|
-
|
251
|
-
|
252
|
-
|
253
|
-
|
313
|
+
/**
|
314
|
+
* Verifies that this certificate was signed by the given certificate
|
315
|
+
* public key.
|
316
|
+
* @param cert A certificate containing the public key.
|
317
|
+
* @return True if signed, false otherwise.
|
318
|
+
*/
|
319
|
+
virtual bool verify(const CertificatePtr& cert) const = 0;
|
320
|
+
|
321
|
+
/**
|
322
|
+
* Obtains a string encoding of the certificate in PEM format.
|
323
|
+
* @return The encoded certificate.
|
324
|
+
* @throws CertificateEncodingException if an error occurs.
|
325
|
+
*/
|
254
326
|
virtual std::string encode() const = 0;
|
255
327
|
|
256
|
-
|
257
|
-
|
258
|
-
|
259
|
-
|
328
|
+
/**
|
329
|
+
* Checks that the certificate is currently valid, that is, the current
|
330
|
+
* date falls between the validity period given in the certificate.
|
331
|
+
* @return True if the certificate is valid, false otherwise.
|
332
|
+
*/
|
260
333
|
virtual bool checkValidity() const = 0;
|
261
334
|
|
262
|
-
|
263
|
-
|
264
|
-
|
335
|
+
/**
|
336
|
+
* Checks that the certificate is valid at the given time.
|
337
|
+
* @param t The target time.
|
338
|
+
* @return True if the certificate is valid, false otherwise.
|
339
|
+
*/
|
265
340
|
#ifdef ICE_CPP11_MAPPING
|
266
|
-
virtual bool checkValidity(const std::chrono::system_clock::time_point&) const = 0;
|
341
|
+
virtual bool checkValidity(const std::chrono::system_clock::time_point& t) const = 0;
|
267
342
|
#else
|
268
|
-
virtual bool checkValidity(const IceUtil::Time&) const = 0;
|
343
|
+
virtual bool checkValidity(const IceUtil::Time& t) const = 0;
|
269
344
|
#endif
|
270
345
|
|
271
|
-
|
272
|
-
|
273
|
-
|
346
|
+
/**
|
347
|
+
* Obtains the not-after validity time.
|
348
|
+
* @return The time after which this certificate is invalid.
|
349
|
+
*/
|
274
350
|
#ifdef ICE_CPP11_MAPPING
|
275
351
|
virtual std::chrono::system_clock::time_point getNotAfter() const = 0;
|
276
352
|
#else
|
277
353
|
virtual IceUtil::Time getNotAfter() const = 0;
|
278
354
|
#endif
|
279
355
|
|
280
|
-
|
281
|
-
|
282
|
-
|
356
|
+
/**
|
357
|
+
* Obtains the not-before validity time.
|
358
|
+
* @return The time at which this certificate is valid.
|
359
|
+
*/
|
283
360
|
#ifdef ICE_CPP11_MAPPING
|
284
361
|
virtual std::chrono::system_clock::time_point getNotBefore() const = 0;
|
285
362
|
#else
|
286
363
|
virtual IceUtil::Time getNotBefore() const = 0;
|
287
364
|
#endif
|
288
365
|
|
289
|
-
|
290
|
-
|
291
|
-
|
366
|
+
/**
|
367
|
+
* Obtains the serial number. This is an arbitrarily large number.
|
368
|
+
* @return The certificate's serial number.
|
369
|
+
*/
|
292
370
|
virtual std::string getSerialNumber() const = 0;
|
293
371
|
|
294
|
-
|
295
|
-
|
296
|
-
|
372
|
+
/**
|
373
|
+
* Obtains the issuer's distinguished name (DN).
|
374
|
+
* @return The distinguished name.
|
375
|
+
*/
|
297
376
|
virtual DistinguishedName getIssuerDN() const = 0;
|
298
377
|
|
299
|
-
|
300
|
-
|
301
|
-
|
302
|
-
|
303
|
-
|
304
|
-
|
305
|
-
|
306
|
-
|
307
|
-
|
308
|
-
|
309
|
-
|
310
|
-
|
311
|
-
|
312
|
-
|
313
|
-
|
314
|
-
|
315
|
-
|
316
|
-
|
317
|
-
|
318
|
-
|
319
|
-
|
320
|
-
|
321
|
-
|
322
|
-
|
323
|
-
|
324
|
-
|
378
|
+
/**
|
379
|
+
* Obtains the values in the issuer's alternative names extension.
|
380
|
+
*
|
381
|
+
* The returned list contains a pair of int, string.
|
382
|
+
*
|
383
|
+
* otherName [0] OtherName
|
384
|
+
* rfc822Name [1] IA5String
|
385
|
+
* dNSName [2] IA5String
|
386
|
+
* x400Address [3] ORAddress
|
387
|
+
* directoryName [4] Name
|
388
|
+
* ediPartyName [5] EDIPartyName
|
389
|
+
* uniformResourceIdentifier [6] IA5String
|
390
|
+
* iPAddress [7] OCTET STRING
|
391
|
+
* registeredID [8] OBJECT IDENTIFIER
|
392
|
+
*
|
393
|
+
* rfc822Name, dNSName, directoryName and
|
394
|
+
* uniformResourceIdentifier data is returned as a string.
|
395
|
+
*
|
396
|
+
* iPAddress is returned in dotted quad notation. IPv6 is not
|
397
|
+
* currently supported.
|
398
|
+
*
|
399
|
+
* All distinguished names are encoded in RFC2253 format.
|
400
|
+
*
|
401
|
+
* The remainder of the data will result in an empty string. Use the raw
|
402
|
+
* X509* certificate to obtain these values.
|
403
|
+
*
|
404
|
+
* @return The issuer's alternative names.
|
405
|
+
*/
|
325
406
|
virtual std::vector<std::pair<int, std::string> > getIssuerAlternativeNames() const = 0;
|
326
407
|
|
327
|
-
|
328
|
-
|
329
|
-
|
408
|
+
/**
|
409
|
+
* Obtains the subject's distinguished name (DN).
|
410
|
+
* @return The distinguished name.
|
411
|
+
*/
|
330
412
|
virtual DistinguishedName getSubjectDN() const = 0;
|
331
413
|
|
332
|
-
|
333
|
-
|
334
|
-
|
414
|
+
/**
|
415
|
+
* See the comment for Plugin::getIssuerAlternativeNames.
|
416
|
+
* @return The subject's alternative names.
|
417
|
+
*/
|
335
418
|
virtual std::vector<std::pair<int, std::string> > getSubjectAlternativeNames() const = 0;
|
336
419
|
|
337
|
-
|
338
|
-
|
339
|
-
|
420
|
+
/**
|
421
|
+
* Obtains the certificate version number.
|
422
|
+
* @return The version number.
|
423
|
+
*/
|
340
424
|
virtual int getVersion() const = 0;
|
341
425
|
|
342
|
-
|
343
|
-
|
344
|
-
|
345
|
-
|
426
|
+
/**
|
427
|
+
* Stringifies the certificate. This is a human readable version of
|
428
|
+
* the certificate, not a DER or PEM encoding.
|
429
|
+
* @return A string version of the certificate.
|
430
|
+
*/
|
346
431
|
virtual std::string toString() const = 0;
|
347
432
|
|
348
|
-
|
349
|
-
|
350
|
-
|
351
|
-
|
433
|
+
/**
|
434
|
+
* Obtains a list of the X509v3 extensions contained in the certificate.
|
435
|
+
* @return The extensions.
|
436
|
+
*/
|
352
437
|
virtual std::vector<X509ExtensionPtr> getX509Extensions() const = 0;
|
353
438
|
|
354
|
-
|
355
|
-
|
356
|
-
|
357
|
-
|
358
|
-
|
359
|
-
|
360
|
-
|
361
|
-
|
362
|
-
|
363
|
-
|
364
|
-
|
365
|
-
|
366
|
-
|
367
|
-
|
368
|
-
|
369
|
-
|
370
|
-
|
371
|
-
|
372
|
-
|
439
|
+
/**
|
440
|
+
* Obtains the extension with the given OID.
|
441
|
+
* @return The extension, or null if the certificate
|
442
|
+
* does not contain a extension with the given OID.
|
443
|
+
*/
|
444
|
+
virtual X509ExtensionPtr getX509Extension(const std::string& oid) const = 0;
|
445
|
+
|
446
|
+
/**
|
447
|
+
* Loads the certificate from a file. The certificate must use the
|
448
|
+
* PEM encoding format.
|
449
|
+
* @param file The certificate file.
|
450
|
+
* @return The new certificate instance.
|
451
|
+
* @throws CertificateReadException if the file cannot be read.
|
452
|
+
*/
|
453
|
+
static CertificatePtr load(const std::string& file);
|
454
|
+
|
455
|
+
/**
|
456
|
+
* Decodes a certificate from a string that uses the PEM encoding format.
|
457
|
+
* @param str A string containing the encoded certificate.
|
458
|
+
* @throws CertificateEncodingException if an error occurs.
|
459
|
+
*/
|
460
|
+
static CertificatePtr decode(const std::string& str);
|
373
461
|
};
|
374
462
|
|
375
463
|
#ifndef ICE_CPP11_MAPPING // C++98 mapping
|
376
|
-
//
|
377
|
-
// An application can customize the certificate verification process
|
378
|
-
// by implementing the CertificateVerifier interface.
|
379
|
-
//
|
380
464
|
|
465
|
+
/**
|
466
|
+
* An application can customize the certificate verification process
|
467
|
+
* by implementing the CertificateVerifier interface.
|
468
|
+
* \headerfile IceSSL/IceSSL.h
|
469
|
+
*/
|
381
470
|
class ICESSL_API CertificateVerifier : public IceUtil::Shared
|
382
471
|
{
|
383
472
|
public:
|
384
473
|
|
385
474
|
virtual ~CertificateVerifier();
|
386
475
|
|
387
|
-
|
388
|
-
|
389
|
-
|
390
|
-
|
391
|
-
|
476
|
+
/**
|
477
|
+
* Determines whether to accept a certificate.
|
478
|
+
* @param info Information about the connection.
|
479
|
+
* @return False if the connection should be rejected, or true to allow it.
|
480
|
+
*/
|
481
|
+
virtual bool verify(const ConnectionInfoPtr& info) = 0;
|
392
482
|
};
|
393
483
|
typedef IceUtil::Handle<CertificateVerifier> CertificateVerifierPtr;
|
394
484
|
|
395
|
-
|
396
|
-
|
397
|
-
|
398
|
-
|
399
|
-
|
400
|
-
|
401
|
-
|
402
|
-
|
403
|
-
|
404
|
-
|
405
|
-
|
406
|
-
|
407
|
-
|
408
|
-
|
409
|
-
|
485
|
+
/**
|
486
|
+
* In order to read an encrypted file, such as one containing a
|
487
|
+
* private key, OpenSSL requests a password from IceSSL. The password
|
488
|
+
* can be defined using an IceSSL configuration property, but a
|
489
|
+
* plain-text password is a security risk. If a password is not
|
490
|
+
* supplied via configuration, IceSSL allows OpenSSL to prompt the
|
491
|
+
* user interactively. This may not be desirable (or even possible),
|
492
|
+
* so the application can supply an implementation of PasswordPrompt
|
493
|
+
* to take responsibility for obtaining the password.
|
494
|
+
*
|
495
|
+
* Note that the password is needed during plug-in initialization, so
|
496
|
+
* in general you will need to delay initialization (by defining
|
497
|
+
* IceSSL.DelayInit=1), configure the PasswordPrompt, then manually
|
498
|
+
* initialize the plug-in.
|
499
|
+
* \headerfile IceSSL/IceSSL.h
|
500
|
+
*/
|
410
501
|
class ICESSL_API PasswordPrompt : public IceUtil::Shared
|
411
502
|
{
|
412
503
|
public:
|
413
504
|
|
414
505
|
virtual ~PasswordPrompt();
|
415
506
|
|
416
|
-
|
417
|
-
|
418
|
-
|
419
|
-
|
420
|
-
|
507
|
+
/**
|
508
|
+
* Obtains the password. This method may be invoked repeatedly, such as when
|
509
|
+
* several encrypted files are opened, or when multiple password
|
510
|
+
* attempts are allowed.
|
511
|
+
* @return The clear-text password.
|
512
|
+
*/
|
421
513
|
virtual std::string getPassword() = 0;
|
422
514
|
};
|
423
515
|
typedef IceUtil::Handle<PasswordPrompt> PasswordPromptPtr;
|
424
516
|
#endif
|
425
517
|
|
518
|
+
/**
|
519
|
+
* Represents the IceSSL plug-in object.
|
520
|
+
* \headerfile IceSSL/IceSSL.h
|
521
|
+
*/
|
426
522
|
class ICESSL_API Plugin : public Ice::Plugin
|
427
523
|
{
|
428
524
|
public:
|
429
525
|
|
430
526
|
virtual ~Plugin();
|
431
527
|
|
432
|
-
|
433
|
-
|
434
|
-
|
435
|
-
|
528
|
+
/**
|
529
|
+
* Establish the certificate verifier object. This should be done
|
530
|
+
* before any connections are established.
|
531
|
+
* @param v The verifier.
|
532
|
+
*/
|
436
533
|
#ifdef ICE_CPP11_MAPPING
|
437
|
-
virtual void setCertificateVerifier(std::function<bool(const std::shared_ptr<ConnectionInfo>&)>) = 0;
|
534
|
+
virtual void setCertificateVerifier(std::function<bool(const std::shared_ptr<ConnectionInfo>&)> v) = 0;
|
438
535
|
#else
|
439
|
-
virtual void setCertificateVerifier(const CertificateVerifierPtr&) = 0;
|
536
|
+
virtual void setCertificateVerifier(const CertificateVerifierPtr& v) = 0;
|
440
537
|
#endif
|
441
538
|
|
442
|
-
|
443
|
-
|
444
|
-
|
445
|
-
|
539
|
+
/**
|
540
|
+
* Establish the password prompt object. This must be done before
|
541
|
+
* the plug-in is initialized.
|
542
|
+
* @param p The password prompt.
|
543
|
+
*/
|
446
544
|
#ifdef ICE_CPP11_MAPPING
|
447
|
-
virtual void setPasswordPrompt(std::function<std::string()>) = 0;
|
545
|
+
virtual void setPasswordPrompt(std::function<std::string()> p) = 0;
|
448
546
|
#else
|
449
|
-
virtual void setPasswordPrompt(const PasswordPromptPtr&) = 0;
|
547
|
+
virtual void setPasswordPrompt(const PasswordPromptPtr& p) = 0;
|
450
548
|
#endif
|
451
549
|
|
452
|
-
|
453
|
-
|
454
|
-
|
455
|
-
|
456
|
-
|
457
|
-
|
458
|
-
|
459
|
-
|
460
|
-
|
461
|
-
|
462
|
-
|
463
|
-
|
464
|
-
|
550
|
+
/**
|
551
|
+
* Load the certificate from a file. The certificate must use the
|
552
|
+
* PEM encoding format.
|
553
|
+
* @param file The certificate file.
|
554
|
+
* @throws CertificateReadException if the file cannot be read.
|
555
|
+
*/
|
556
|
+
virtual CertificatePtr load(const std::string& file) const = 0;
|
557
|
+
|
558
|
+
/**
|
559
|
+
* Decode a certificate from a string that uses the PEM encoding
|
560
|
+
* format.
|
561
|
+
* @param str A string containing the encoded certificate.
|
562
|
+
* @throws CertificateEncodingException if an error occurs.
|
563
|
+
*/
|
564
|
+
virtual CertificatePtr decode(const std::string& str) const = 0;
|
465
565
|
};
|
466
566
|
ICE_DEFINE_PTR(PluginPtr, Plugin);
|
467
567
|
|