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,13 +1,8 @@
|
|
1
|
-
// **********************************************************************
|
2
1
|
//
|
3
|
-
// Copyright (c)
|
2
|
+
// Copyright (c) ZeroC, Inc. All rights reserved.
|
4
3
|
//
|
5
|
-
// This copy of Ice is licensed to you under the terms described in the
|
6
|
-
// ICE_LICENSE file included in this distribution.
|
7
4
|
//
|
8
|
-
//
|
9
|
-
//
|
10
|
-
// Ice version 3.7.0
|
5
|
+
// Ice version 3.7.5
|
11
6
|
//
|
12
7
|
// <auto-generated>
|
13
8
|
//
|
@@ -37,10 +32,10 @@
|
|
37
32
|
# if ICE_INT_VERSION / 100 != 307
|
38
33
|
# error Ice version mismatch!
|
39
34
|
# endif
|
40
|
-
# if ICE_INT_VERSION % 100
|
35
|
+
# if ICE_INT_VERSION % 100 >= 50
|
41
36
|
# error Beta header file detected
|
42
37
|
# endif
|
43
|
-
# if ICE_INT_VERSION % 100 <
|
38
|
+
# if ICE_INT_VERSION % 100 < 5
|
44
39
|
# error Ice patch level mismatch!
|
45
40
|
# endif
|
46
41
|
#endif
|
@@ -66,11 +61,14 @@ class Connection;
|
|
66
61
|
|
67
62
|
}
|
68
63
|
|
64
|
+
/// \cond STREAM
|
69
65
|
namespace Ice
|
70
66
|
{
|
71
67
|
|
72
68
|
}
|
69
|
+
/// \endcond
|
73
70
|
|
71
|
+
/// \cond INTERNAL
|
74
72
|
namespace Ice
|
75
73
|
{
|
76
74
|
|
@@ -81,6 +79,7 @@ using WSConnectionInfoPtr = ::std::shared_ptr<WSConnectionInfo>;
|
|
81
79
|
using ConnectionPtr = ::std::shared_ptr<Connection>;
|
82
80
|
|
83
81
|
}
|
82
|
+
/// \endcond
|
84
83
|
|
85
84
|
#else // C++98 mapping
|
86
85
|
|
@@ -88,23 +87,31 @@ namespace Ice
|
|
88
87
|
{
|
89
88
|
|
90
89
|
class ConnectionInfo;
|
91
|
-
|
92
|
-
|
90
|
+
/// \cond INTERNAL
|
91
|
+
ICE_API LocalObject* upCast(ConnectionInfo*);
|
92
|
+
/// \endcond
|
93
|
+
typedef ::IceInternal::Handle< ConnectionInfo> ConnectionInfoPtr;
|
93
94
|
|
94
95
|
class WSConnectionInfo;
|
95
|
-
|
96
|
-
|
96
|
+
/// \cond INTERNAL
|
97
|
+
ICE_API LocalObject* upCast(WSConnectionInfo*);
|
98
|
+
/// \endcond
|
99
|
+
typedef ::IceInternal::Handle< WSConnectionInfo> WSConnectionInfoPtr;
|
97
100
|
|
98
101
|
class Connection;
|
99
|
-
|
100
|
-
|
102
|
+
/// \cond INTERNAL
|
103
|
+
ICE_API LocalObject* upCast(Connection*);
|
104
|
+
/// \endcond
|
105
|
+
typedef ::IceInternal::Handle< Connection> ConnectionPtr;
|
101
106
|
|
102
107
|
}
|
103
108
|
|
109
|
+
/// \cond STREAM
|
104
110
|
namespace Ice
|
105
111
|
{
|
106
112
|
|
107
113
|
}
|
114
|
+
/// \endcond
|
108
115
|
|
109
116
|
#endif
|
110
117
|
|
@@ -1,13 +1,8 @@
|
|
1
|
-
// **********************************************************************
|
2
1
|
//
|
3
|
-
// Copyright (c)
|
2
|
+
// Copyright (c) ZeroC, Inc. All rights reserved.
|
4
3
|
//
|
5
|
-
// This copy of Ice is licensed to you under the terms described in the
|
6
|
-
// ICE_LICENSE file included in this distribution.
|
7
4
|
//
|
8
|
-
//
|
9
|
-
//
|
10
|
-
// Ice version 3.7.0
|
5
|
+
// Ice version 3.7.5
|
11
6
|
//
|
12
7
|
// <auto-generated>
|
13
8
|
//
|
@@ -41,10 +36,10 @@
|
|
41
36
|
# if ICE_INT_VERSION / 100 != 307
|
42
37
|
# error Ice version mismatch!
|
43
38
|
# endif
|
44
|
-
# if ICE_INT_VERSION % 100
|
39
|
+
# if ICE_INT_VERSION % 100 >= 50
|
45
40
|
# error Beta header file detected
|
46
41
|
# endif
|
47
|
-
# if ICE_INT_VERSION % 100 <
|
42
|
+
# if ICE_INT_VERSION % 100 < 5
|
48
43
|
# error Ice patch level mismatch!
|
49
44
|
# endif
|
50
45
|
#endif
|
@@ -64,27 +59,108 @@
|
|
64
59
|
namespace Ice
|
65
60
|
{
|
66
61
|
|
62
|
+
/**
|
63
|
+
* A request context. <code>Context</code> is used to transmit metadata about a
|
64
|
+
* request from the server to the client, such as Quality-of-Service
|
65
|
+
* (QoS) parameters. Each operation on the client has a <code>Context</code> as
|
66
|
+
* its implicit final parameter.
|
67
|
+
*/
|
67
68
|
using Context = ::std::map<::std::string, ::std::string>;
|
68
69
|
|
70
|
+
/**
|
71
|
+
* Determines the retry behavior an invocation in case of a (potentially) recoverable error.
|
72
|
+
*/
|
69
73
|
enum class OperationMode : unsigned char
|
70
74
|
{
|
75
|
+
/**
|
76
|
+
* Ordinary operations have <code>Normal</code> mode. These operations
|
77
|
+
* modify object state; invoking such an operation twice in a row
|
78
|
+
* has different semantics than invoking it once. The Ice run time
|
79
|
+
* guarantees that it will not violate at-most-once semantics for
|
80
|
+
* <code>Normal</code> operations.
|
81
|
+
*/
|
71
82
|
Normal,
|
83
|
+
/**
|
84
|
+
* Operations that use the Slice <code>nonmutating</code> keyword must not
|
85
|
+
* modify object state. For C++, nonmutating operations generate
|
86
|
+
* <code>const</code> member functions in the skeleton. In addition, the Ice
|
87
|
+
* run time will attempt to transparently recover from certain
|
88
|
+
* run-time errors by re-issuing a failed request and propagate
|
89
|
+
* the failure to the application only if the second attempt
|
90
|
+
* fails.
|
91
|
+
*
|
92
|
+
* <p class="Deprecated"><code>Nonmutating</code> is deprecated; Use the
|
93
|
+
* <code>idempotent</code> keyword instead. For C++, to retain the mapping
|
94
|
+
* of <code>nonmutating</code> operations to C++ <code>const</code>
|
95
|
+
* member functions, use the <code>\["cpp:const"]</code> metadata
|
96
|
+
* directive.
|
97
|
+
*/
|
72
98
|
Nonmutating,
|
99
|
+
/**
|
100
|
+
* Operations that use the Slice <code>idempotent</code> keyword can modify
|
101
|
+
* object state, but invoking an operation twice in a row must
|
102
|
+
* result in the same object state as invoking it once. For
|
103
|
+
* example, <code>x = 1</code> is an idempotent statement,
|
104
|
+
* whereas <code>x += 1</code> is not. For idempotent
|
105
|
+
* operations, the Ice run-time uses the same retry behavior
|
106
|
+
* as for nonmutating operations in case of a potentially
|
107
|
+
* recoverable error.
|
108
|
+
*/
|
73
109
|
Idempotent
|
74
110
|
};
|
75
111
|
|
112
|
+
/**
|
113
|
+
* Information about the current method invocation for servers. Each
|
114
|
+
* operation on the server has a <code>Current</code> as its implicit final
|
115
|
+
* parameter. <code>Current</code> is mostly used for Ice services. Most
|
116
|
+
* applications ignore this parameter.
|
117
|
+
* \headerfile Ice/Ice.h
|
118
|
+
*/
|
76
119
|
struct Current
|
77
120
|
{
|
121
|
+
/**
|
122
|
+
* The object adapter.
|
123
|
+
*/
|
78
124
|
::std::shared_ptr<::Ice::ObjectAdapter> adapter;
|
125
|
+
/**
|
126
|
+
* Information about the connection over which the current method
|
127
|
+
* invocation was received. If the invocation is direct due to
|
128
|
+
* collocation optimization, this value is set to null.
|
129
|
+
*/
|
79
130
|
::std::shared_ptr<::Ice::Connection> con;
|
131
|
+
/**
|
132
|
+
* The Ice object identity.
|
133
|
+
*/
|
80
134
|
::Ice::Identity id;
|
135
|
+
/**
|
136
|
+
* The facet.
|
137
|
+
*/
|
81
138
|
::std::string facet;
|
139
|
+
/**
|
140
|
+
* The operation name.
|
141
|
+
*/
|
82
142
|
::std::string operation;
|
143
|
+
/**
|
144
|
+
* The mode of the operation.
|
145
|
+
*/
|
83
146
|
::Ice::OperationMode mode;
|
147
|
+
/**
|
148
|
+
* The request context, as received from the client.
|
149
|
+
*/
|
84
150
|
::Ice::Context ctx;
|
151
|
+
/**
|
152
|
+
* The request id unless oneway (0).
|
153
|
+
*/
|
85
154
|
int requestId;
|
155
|
+
/**
|
156
|
+
* The encoding version used to encode the input and output parameters.
|
157
|
+
*/
|
86
158
|
::Ice::EncodingVersion encoding;
|
87
159
|
|
160
|
+
/**
|
161
|
+
* Obtains a tuple containing all of the struct's data members.
|
162
|
+
* @return The data members in a tuple.
|
163
|
+
*/
|
88
164
|
std::tuple<const ::std::shared_ptr<::Ice::ObjectAdapter>&, const ::std::shared_ptr<::Ice::Connection>&, const ::Ice::Identity&, const ::std::string&, const ::std::string&, const ::Ice::OperationMode&, const ::Ice::Context&, const int&, const ::Ice::EncodingVersion&> ice_tuple() const
|
89
165
|
{
|
90
166
|
return std::tie(adapter, con, id, facet, operation, mode, ctx, requestId, encoding);
|
@@ -100,6 +176,7 @@ using Ice::operator!=;
|
|
100
176
|
|
101
177
|
}
|
102
178
|
|
179
|
+
/// \cond STREAM
|
103
180
|
namespace Ice
|
104
181
|
{
|
105
182
|
|
@@ -114,36 +191,115 @@ struct StreamableTraits< ::Ice::OperationMode>
|
|
114
191
|
};
|
115
192
|
|
116
193
|
}
|
194
|
+
/// \endcond
|
117
195
|
|
118
196
|
#else // C++98 mapping
|
119
197
|
|
120
198
|
namespace Ice
|
121
199
|
{
|
122
200
|
|
201
|
+
/**
|
202
|
+
* A request context. <code>Context</code> is used to transmit metadata about a
|
203
|
+
* request from the server to the client, such as Quality-of-Service
|
204
|
+
* (QoS) parameters. Each operation on the client has a <code>Context</code> as
|
205
|
+
* its implicit final parameter.
|
206
|
+
*/
|
123
207
|
typedef ::std::map< ::std::string, ::std::string> Context;
|
124
208
|
|
209
|
+
/**
|
210
|
+
* Determines the retry behavior an invocation in case of a (potentially) recoverable error.
|
211
|
+
*/
|
125
212
|
enum OperationMode
|
126
213
|
{
|
214
|
+
/**
|
215
|
+
* Ordinary operations have <code>Normal</code> mode. These operations
|
216
|
+
* modify object state; invoking such an operation twice in a row
|
217
|
+
* has different semantics than invoking it once. The Ice run time
|
218
|
+
* guarantees that it will not violate at-most-once semantics for
|
219
|
+
* <code>Normal</code> operations.
|
220
|
+
*/
|
127
221
|
Normal,
|
222
|
+
/**
|
223
|
+
* Operations that use the Slice <code>nonmutating</code> keyword must not
|
224
|
+
* modify object state. For C++, nonmutating operations generate
|
225
|
+
* <code>const</code> member functions in the skeleton. In addition, the Ice
|
226
|
+
* run time will attempt to transparently recover from certain
|
227
|
+
* run-time errors by re-issuing a failed request and propagate
|
228
|
+
* the failure to the application only if the second attempt
|
229
|
+
* fails.
|
230
|
+
*
|
231
|
+
* <p class="Deprecated"><code>Nonmutating</code> is deprecated; Use the
|
232
|
+
* <code>idempotent</code> keyword instead. For C++, to retain the mapping
|
233
|
+
* of <code>nonmutating</code> operations to C++ <code>const</code>
|
234
|
+
* member functions, use the <code>\["cpp:const"]</code> metadata
|
235
|
+
* directive.
|
236
|
+
*/
|
128
237
|
Nonmutating,
|
238
|
+
/**
|
239
|
+
* Operations that use the Slice <code>idempotent</code> keyword can modify
|
240
|
+
* object state, but invoking an operation twice in a row must
|
241
|
+
* result in the same object state as invoking it once. For
|
242
|
+
* example, <code>x = 1</code> is an idempotent statement,
|
243
|
+
* whereas <code>x += 1</code> is not. For idempotent
|
244
|
+
* operations, the Ice run-time uses the same retry behavior
|
245
|
+
* as for nonmutating operations in case of a potentially
|
246
|
+
* recoverable error.
|
247
|
+
*/
|
129
248
|
Idempotent
|
130
249
|
};
|
131
250
|
|
251
|
+
/**
|
252
|
+
* Information about the current method invocation for servers. Each
|
253
|
+
* operation on the server has a <code>Current</code> as its implicit final
|
254
|
+
* parameter. <code>Current</code> is mostly used for Ice services. Most
|
255
|
+
* applications ignore this parameter.
|
256
|
+
* \headerfile Ice/Ice.h
|
257
|
+
*/
|
132
258
|
struct Current
|
133
259
|
{
|
260
|
+
/**
|
261
|
+
* The object adapter.
|
262
|
+
*/
|
134
263
|
::Ice::ObjectAdapterPtr adapter;
|
264
|
+
/**
|
265
|
+
* Information about the connection over which the current method
|
266
|
+
* invocation was received. If the invocation is direct due to
|
267
|
+
* collocation optimization, this value is set to null.
|
268
|
+
*/
|
135
269
|
::Ice::ConnectionPtr con;
|
270
|
+
/**
|
271
|
+
* The Ice object identity.
|
272
|
+
*/
|
136
273
|
::Ice::Identity id;
|
274
|
+
/**
|
275
|
+
* The facet.
|
276
|
+
*/
|
137
277
|
::std::string facet;
|
278
|
+
/**
|
279
|
+
* The operation name.
|
280
|
+
*/
|
138
281
|
::std::string operation;
|
282
|
+
/**
|
283
|
+
* The mode of the operation.
|
284
|
+
*/
|
139
285
|
::Ice::OperationMode mode;
|
286
|
+
/**
|
287
|
+
* The request context, as received from the client.
|
288
|
+
*/
|
140
289
|
::Ice::Context ctx;
|
290
|
+
/**
|
291
|
+
* The request id unless oneway (0).
|
292
|
+
*/
|
141
293
|
::Ice::Int requestId;
|
294
|
+
/**
|
295
|
+
* The encoding version used to encode the input and output parameters.
|
296
|
+
*/
|
142
297
|
::Ice::EncodingVersion encoding;
|
143
298
|
};
|
144
299
|
|
145
300
|
}
|
146
301
|
|
302
|
+
/// \cond STREAM
|
147
303
|
namespace Ice
|
148
304
|
{
|
149
305
|
|
@@ -158,6 +314,7 @@ struct StreamableTraits< ::Ice::OperationMode>
|
|
158
314
|
};
|
159
315
|
|
160
316
|
}
|
317
|
+
/// \endcond
|
161
318
|
|
162
319
|
#endif
|
163
320
|
|
@@ -1,13 +1,8 @@
|
|
1
|
-
// **********************************************************************
|
2
1
|
//
|
3
|
-
// Copyright (c)
|
2
|
+
// Copyright (c) ZeroC, Inc. All rights reserved.
|
4
3
|
//
|
5
|
-
// This copy of Ice is licensed to you under the terms described in the
|
6
|
-
// ICE_LICENSE file included in this distribution.
|
7
4
|
//
|
8
|
-
//
|
9
|
-
//
|
10
|
-
// Ice version 3.7.0
|
5
|
+
// Ice version 3.7.5
|
11
6
|
//
|
12
7
|
// <auto-generated>
|
13
8
|
//
|
@@ -40,10 +35,10 @@
|
|
40
35
|
# if ICE_INT_VERSION / 100 != 307
|
41
36
|
# error Ice version mismatch!
|
42
37
|
# endif
|
43
|
-
# if ICE_INT_VERSION % 100
|
38
|
+
# if ICE_INT_VERSION % 100 >= 50
|
44
39
|
# error Beta header file detected
|
45
40
|
# endif
|
46
|
-
# if ICE_INT_VERSION % 100 <
|
41
|
+
# if ICE_INT_VERSION % 100 < 5
|
47
42
|
# error Ice patch level mismatch!
|
48
43
|
# endif
|
49
44
|
#endif
|
@@ -76,22 +71,49 @@ class OpaqueEndpointInfo;
|
|
76
71
|
namespace Ice
|
77
72
|
{
|
78
73
|
|
74
|
+
/**
|
75
|
+
* Uniquely identifies TCP endpoints.
|
76
|
+
*/
|
79
77
|
constexpr short TCPEndpointType = 1;
|
80
78
|
|
79
|
+
/**
|
80
|
+
* Uniquely identifies SSL endpoints.
|
81
|
+
*/
|
81
82
|
constexpr short SSLEndpointType = 2;
|
82
83
|
|
84
|
+
/**
|
85
|
+
* Uniquely identifies UDP endpoints.
|
86
|
+
*/
|
83
87
|
constexpr short UDPEndpointType = 3;
|
84
88
|
|
89
|
+
/**
|
90
|
+
* Uniquely identifies TCP-based WebSocket endpoints.
|
91
|
+
*/
|
85
92
|
constexpr short WSEndpointType = 4;
|
86
93
|
|
94
|
+
/**
|
95
|
+
* Uniquely identifies SSL-based WebSocket endpoints.
|
96
|
+
*/
|
87
97
|
constexpr short WSSEndpointType = 5;
|
88
98
|
|
99
|
+
/**
|
100
|
+
* Uniquely identifies Bluetooth endpoints.
|
101
|
+
*/
|
89
102
|
constexpr short BTEndpointType = 6;
|
90
103
|
|
104
|
+
/**
|
105
|
+
* Uniquely identifies SSL Bluetooth endpoints.
|
106
|
+
*/
|
91
107
|
constexpr short BTSEndpointType = 7;
|
92
108
|
|
109
|
+
/**
|
110
|
+
* Uniquely identifies iAP-based endpoints.
|
111
|
+
*/
|
93
112
|
constexpr short iAPEndpointType = 8;
|
94
113
|
|
114
|
+
/**
|
115
|
+
* Uniquely identifies SSL iAP-based endpoints.
|
116
|
+
*/
|
95
117
|
constexpr short iAPSEndpointType = 9;
|
96
118
|
|
97
119
|
}
|
@@ -99,6 +121,10 @@ constexpr short iAPSEndpointType = 9;
|
|
99
121
|
namespace Ice
|
100
122
|
{
|
101
123
|
|
124
|
+
/**
|
125
|
+
* Base class providing access to the endpoint details.
|
126
|
+
* \headerfile Ice/Ice.h
|
127
|
+
*/
|
102
128
|
class ICE_CLASS(ICE_API) EndpointInfo
|
103
129
|
{
|
104
130
|
public:
|
@@ -112,24 +138,58 @@ public:
|
|
112
138
|
EndpointInfo& operator=(const EndpointInfo&) = default;
|
113
139
|
EndpointInfo& operator=(EndpointInfo&&) = default;
|
114
140
|
|
115
|
-
|
116
|
-
|
117
|
-
|
118
|
-
|
141
|
+
/**
|
142
|
+
* One-shot constructor to initialize all data members.
|
143
|
+
* @param underlying The information of the underyling endpoint of null if there's no underlying endpoint.
|
144
|
+
* @param timeout The timeout for the endpoint in milliseconds.
|
145
|
+
* @param compress Specifies whether or not compression should be used if available when using this endpoint.
|
146
|
+
*/
|
147
|
+
EndpointInfo(const ::std::shared_ptr<::Ice::EndpointInfo>& underlying, int timeout, bool compress) :
|
148
|
+
underlying(underlying),
|
149
|
+
timeout(timeout),
|
150
|
+
compress(compress)
|
119
151
|
{
|
120
152
|
}
|
121
153
|
|
122
|
-
|
123
|
-
|
124
|
-
|
125
|
-
|
126
|
-
virtual
|
127
|
-
|
154
|
+
/**
|
155
|
+
* Returns the type of the endpoint.
|
156
|
+
* @return The endpoint type.
|
157
|
+
*/
|
158
|
+
virtual short type() const noexcept = 0;
|
159
|
+
|
160
|
+
/**
|
161
|
+
* Returns true if this endpoint is a datagram endpoint.
|
162
|
+
* @return True for a datagram endpoint.
|
163
|
+
*/
|
164
|
+
virtual bool datagram() const noexcept = 0;
|
165
|
+
|
166
|
+
/**
|
167
|
+
* Returns true if this endpoint is a secure endpoint.
|
168
|
+
* @return True for a secure endpoint.
|
169
|
+
*/
|
170
|
+
virtual bool secure() const noexcept = 0;
|
171
|
+
|
172
|
+
/**
|
173
|
+
* The information of the underyling endpoint of null if there's
|
174
|
+
* no underlying endpoint.
|
175
|
+
*/
|
128
176
|
::std::shared_ptr<::Ice::EndpointInfo> underlying;
|
177
|
+
/**
|
178
|
+
* The timeout for the endpoint in milliseconds. 0 means
|
179
|
+
* non-blocking, -1 means no timeout.
|
180
|
+
*/
|
129
181
|
int timeout;
|
182
|
+
/**
|
183
|
+
* Specifies whether or not compression should be used if
|
184
|
+
* available when using this endpoint.
|
185
|
+
*/
|
130
186
|
bool compress;
|
131
187
|
};
|
132
188
|
|
189
|
+
/**
|
190
|
+
* The user-level interface to an endpoint.
|
191
|
+
* \headerfile Ice/Ice.h
|
192
|
+
*/
|
133
193
|
class ICE_CLASS(ICE_API) Endpoint
|
134
194
|
{
|
135
195
|
public:
|
@@ -139,11 +199,24 @@ public:
|
|
139
199
|
virtual bool operator==(const Endpoint&) const = 0;
|
140
200
|
virtual bool operator<(const Endpoint&) const = 0;
|
141
201
|
|
142
|
-
|
143
|
-
|
144
|
-
|
202
|
+
/**
|
203
|
+
* Return a string representation of the endpoint.
|
204
|
+
* @return The string representation of the endpoint.
|
205
|
+
*/
|
206
|
+
virtual ::std::string toString() const noexcept = 0;
|
207
|
+
|
208
|
+
/**
|
209
|
+
* Returns the endpoint information.
|
210
|
+
* @return The endpoint information class.
|
211
|
+
*/
|
212
|
+
virtual ::std::shared_ptr<::Ice::EndpointInfo> getInfo() const noexcept = 0;
|
145
213
|
};
|
146
214
|
|
215
|
+
/**
|
216
|
+
* Provides access to the address details of a IP endpoint.
|
217
|
+
* @see Endpoint
|
218
|
+
* \headerfile Ice/Ice.h
|
219
|
+
*/
|
147
220
|
class ICE_CLASS(ICE_API) IPEndpointInfo : public ::Ice::EndpointInfo
|
148
221
|
{
|
149
222
|
public:
|
@@ -157,19 +230,42 @@ public:
|
|
157
230
|
IPEndpointInfo& operator=(const IPEndpointInfo&) = default;
|
158
231
|
IPEndpointInfo& operator=(IPEndpointInfo&&) = default;
|
159
232
|
|
160
|
-
|
161
|
-
|
162
|
-
|
163
|
-
|
164
|
-
|
233
|
+
/**
|
234
|
+
* One-shot constructor to initialize all data members.
|
235
|
+
* @param underlying The information of the underyling endpoint of null if there's no underlying endpoint.
|
236
|
+
* @param timeout The timeout for the endpoint in milliseconds.
|
237
|
+
* @param compress Specifies whether or not compression should be used if available when using this endpoint.
|
238
|
+
* @param host The host or address configured with the endpoint.
|
239
|
+
* @param port The port number.
|
240
|
+
* @param sourceAddress The source IP address.
|
241
|
+
*/
|
242
|
+
IPEndpointInfo(const ::std::shared_ptr<::Ice::EndpointInfo>& underlying, int timeout, bool compress, const ::std::string& host, int port, const ::std::string& sourceAddress) :
|
243
|
+
EndpointInfo(underlying, timeout, compress),
|
244
|
+
host(host),
|
245
|
+
port(port),
|
246
|
+
sourceAddress(sourceAddress)
|
165
247
|
{
|
166
248
|
}
|
167
249
|
|
250
|
+
/**
|
251
|
+
* The host or address configured with the endpoint.
|
252
|
+
*/
|
168
253
|
::std::string host;
|
254
|
+
/**
|
255
|
+
* The port number.
|
256
|
+
*/
|
169
257
|
int port;
|
258
|
+
/**
|
259
|
+
* The source IP address.
|
260
|
+
*/
|
170
261
|
::std::string sourceAddress;
|
171
262
|
};
|
172
263
|
|
264
|
+
/**
|
265
|
+
* Provides access to a TCP endpoint information.
|
266
|
+
* @see Endpoint
|
267
|
+
* \headerfile Ice/Ice.h
|
268
|
+
*/
|
173
269
|
class ICE_CLASS(ICE_API) TCPEndpointInfo : public ::Ice::IPEndpointInfo
|
174
270
|
{
|
175
271
|
public:
|
@@ -183,12 +279,26 @@ public:
|
|
183
279
|
TCPEndpointInfo& operator=(const TCPEndpointInfo&) = default;
|
184
280
|
TCPEndpointInfo& operator=(TCPEndpointInfo&&) = default;
|
185
281
|
|
186
|
-
|
187
|
-
|
282
|
+
/**
|
283
|
+
* One-shot constructor to initialize all data members.
|
284
|
+
* @param underlying The information of the underyling endpoint of null if there's no underlying endpoint.
|
285
|
+
* @param timeout The timeout for the endpoint in milliseconds.
|
286
|
+
* @param compress Specifies whether or not compression should be used if available when using this endpoint.
|
287
|
+
* @param host The host or address configured with the endpoint.
|
288
|
+
* @param port The port number.
|
289
|
+
* @param sourceAddress The source IP address.
|
290
|
+
*/
|
291
|
+
TCPEndpointInfo(const ::std::shared_ptr<::Ice::EndpointInfo>& underlying, int timeout, bool compress, const ::std::string& host, int port, const ::std::string& sourceAddress) :
|
292
|
+
IPEndpointInfo(underlying, timeout, compress, host, port, sourceAddress)
|
188
293
|
{
|
189
294
|
}
|
190
295
|
};
|
191
296
|
|
297
|
+
/**
|
298
|
+
* Provides access to an UDP endpoint information.
|
299
|
+
* @see Endpoint
|
300
|
+
* \headerfile Ice/Ice.h
|
301
|
+
*/
|
192
302
|
class ICE_CLASS(ICE_API) UDPEndpointInfo : public ::Ice::IPEndpointInfo
|
193
303
|
{
|
194
304
|
public:
|
@@ -202,17 +312,38 @@ public:
|
|
202
312
|
UDPEndpointInfo& operator=(const UDPEndpointInfo&) = default;
|
203
313
|
UDPEndpointInfo& operator=(UDPEndpointInfo&&) = default;
|
204
314
|
|
205
|
-
|
206
|
-
|
207
|
-
|
208
|
-
|
315
|
+
/**
|
316
|
+
* One-shot constructor to initialize all data members.
|
317
|
+
* @param underlying The information of the underyling endpoint of null if there's no underlying endpoint.
|
318
|
+
* @param timeout The timeout for the endpoint in milliseconds.
|
319
|
+
* @param compress Specifies whether or not compression should be used if available when using this endpoint.
|
320
|
+
* @param host The host or address configured with the endpoint.
|
321
|
+
* @param port The port number.
|
322
|
+
* @param sourceAddress The source IP address.
|
323
|
+
* @param mcastInterface The multicast interface.
|
324
|
+
* @param mcastTtl The multicast time-to-live (or hops).
|
325
|
+
*/
|
326
|
+
UDPEndpointInfo(const ::std::shared_ptr<::Ice::EndpointInfo>& underlying, int timeout, bool compress, const ::std::string& host, int port, const ::std::string& sourceAddress, const ::std::string& mcastInterface, int mcastTtl) :
|
327
|
+
IPEndpointInfo(underlying, timeout, compress, host, port, sourceAddress),
|
328
|
+
mcastInterface(mcastInterface),
|
329
|
+
mcastTtl(mcastTtl)
|
209
330
|
{
|
210
331
|
}
|
211
332
|
|
333
|
+
/**
|
334
|
+
* The multicast interface.
|
335
|
+
*/
|
212
336
|
::std::string mcastInterface;
|
337
|
+
/**
|
338
|
+
* The multicast time-to-live (or hops).
|
339
|
+
*/
|
213
340
|
int mcastTtl;
|
214
341
|
};
|
215
342
|
|
343
|
+
/**
|
344
|
+
* Provides access to a WebSocket endpoint information.
|
345
|
+
* \headerfile Ice/Ice.h
|
346
|
+
*/
|
216
347
|
class ICE_CLASS(ICE_API) WSEndpointInfo : public ::Ice::EndpointInfo
|
217
348
|
{
|
218
349
|
public:
|
@@ -226,15 +357,30 @@ public:
|
|
226
357
|
WSEndpointInfo& operator=(const WSEndpointInfo&) = default;
|
227
358
|
WSEndpointInfo& operator=(WSEndpointInfo&&) = default;
|
228
359
|
|
229
|
-
|
230
|
-
|
231
|
-
|
360
|
+
/**
|
361
|
+
* One-shot constructor to initialize all data members.
|
362
|
+
* @param underlying The information of the underyling endpoint of null if there's no underlying endpoint.
|
363
|
+
* @param timeout The timeout for the endpoint in milliseconds.
|
364
|
+
* @param compress Specifies whether or not compression should be used if available when using this endpoint.
|
365
|
+
* @param resource The URI configured with the endpoint.
|
366
|
+
*/
|
367
|
+
WSEndpointInfo(const ::std::shared_ptr<::Ice::EndpointInfo>& underlying, int timeout, bool compress, const ::std::string& resource) :
|
368
|
+
EndpointInfo(underlying, timeout, compress),
|
369
|
+
resource(resource)
|
232
370
|
{
|
233
371
|
}
|
234
372
|
|
373
|
+
/**
|
374
|
+
* The URI configured with the endpoint.
|
375
|
+
*/
|
235
376
|
::std::string resource;
|
236
377
|
};
|
237
378
|
|
379
|
+
/**
|
380
|
+
* Provides access to the details of an opaque endpoint.
|
381
|
+
* @see Endpoint
|
382
|
+
* \headerfile Ice/Ice.h
|
383
|
+
*/
|
238
384
|
class ICE_CLASS(ICE_API) OpaqueEndpointInfo : public ::Ice::EndpointInfo
|
239
385
|
{
|
240
386
|
public:
|
@@ -248,24 +394,42 @@ public:
|
|
248
394
|
OpaqueEndpointInfo& operator=(const OpaqueEndpointInfo&) = default;
|
249
395
|
OpaqueEndpointInfo& operator=(OpaqueEndpointInfo&&) = default;
|
250
396
|
|
251
|
-
|
252
|
-
|
253
|
-
|
254
|
-
|
397
|
+
/**
|
398
|
+
* One-shot constructor to initialize all data members.
|
399
|
+
* @param underlying The information of the underyling endpoint of null if there's no underlying endpoint.
|
400
|
+
* @param timeout The timeout for the endpoint in milliseconds.
|
401
|
+
* @param compress Specifies whether or not compression should be used if available when using this endpoint.
|
402
|
+
* @param rawEncoding The encoding version of the opaque endpoint (to decode or encode the rawBytes).
|
403
|
+
* @param rawBytes The raw encoding of the opaque endpoint.
|
404
|
+
*/
|
405
|
+
OpaqueEndpointInfo(const ::std::shared_ptr<::Ice::EndpointInfo>& underlying, int timeout, bool compress, const ::Ice::EncodingVersion& rawEncoding, const ::Ice::ByteSeq& rawBytes) :
|
406
|
+
EndpointInfo(underlying, timeout, compress),
|
407
|
+
rawEncoding(rawEncoding),
|
408
|
+
rawBytes(rawBytes)
|
255
409
|
{
|
256
410
|
}
|
257
411
|
|
412
|
+
/**
|
413
|
+
* The encoding version of the opaque endpoint (to decode or
|
414
|
+
* encode the rawBytes).
|
415
|
+
*/
|
258
416
|
::Ice::EncodingVersion rawEncoding;
|
417
|
+
/**
|
418
|
+
* The raw encoding of the opaque endpoint.
|
419
|
+
*/
|
259
420
|
::Ice::ByteSeq rawBytes;
|
260
421
|
};
|
261
422
|
|
262
423
|
}
|
263
424
|
|
425
|
+
/// \cond STREAM
|
264
426
|
namespace Ice
|
265
427
|
{
|
266
428
|
|
267
429
|
}
|
430
|
+
/// \endcond
|
268
431
|
|
432
|
+
/// \cond INTERNAL
|
269
433
|
namespace Ice
|
270
434
|
{
|
271
435
|
|
@@ -284,6 +448,7 @@ using WSEndpointInfoPtr = ::std::shared_ptr<WSEndpointInfo>;
|
|
284
448
|
using OpaqueEndpointInfoPtr = ::std::shared_ptr<OpaqueEndpointInfo>;
|
285
449
|
|
286
450
|
}
|
451
|
+
/// \endcond
|
287
452
|
|
288
453
|
#else // C++98 mapping
|
289
454
|
|
@@ -291,62 +456,107 @@ namespace Ice
|
|
291
456
|
{
|
292
457
|
|
293
458
|
class EndpointInfo;
|
294
|
-
|
295
|
-
|
459
|
+
/// \cond INTERNAL
|
460
|
+
ICE_API LocalObject* upCast(EndpointInfo*);
|
461
|
+
/// \endcond
|
462
|
+
typedef ::IceInternal::Handle< EndpointInfo> EndpointInfoPtr;
|
296
463
|
|
297
464
|
class Endpoint;
|
298
|
-
|
299
|
-
|
465
|
+
/// \cond INTERNAL
|
466
|
+
ICE_API LocalObject* upCast(Endpoint*);
|
467
|
+
/// \endcond
|
468
|
+
typedef ::IceInternal::Handle< Endpoint> EndpointPtr;
|
300
469
|
|
301
470
|
class IPEndpointInfo;
|
302
|
-
|
303
|
-
|
471
|
+
/// \cond INTERNAL
|
472
|
+
ICE_API LocalObject* upCast(IPEndpointInfo*);
|
473
|
+
/// \endcond
|
474
|
+
typedef ::IceInternal::Handle< IPEndpointInfo> IPEndpointInfoPtr;
|
304
475
|
|
305
476
|
class TCPEndpointInfo;
|
306
|
-
|
307
|
-
|
477
|
+
/// \cond INTERNAL
|
478
|
+
ICE_API LocalObject* upCast(TCPEndpointInfo*);
|
479
|
+
/// \endcond
|
480
|
+
typedef ::IceInternal::Handle< TCPEndpointInfo> TCPEndpointInfoPtr;
|
308
481
|
|
309
482
|
class UDPEndpointInfo;
|
310
|
-
|
311
|
-
|
483
|
+
/// \cond INTERNAL
|
484
|
+
ICE_API LocalObject* upCast(UDPEndpointInfo*);
|
485
|
+
/// \endcond
|
486
|
+
typedef ::IceInternal::Handle< UDPEndpointInfo> UDPEndpointInfoPtr;
|
312
487
|
|
313
488
|
class WSEndpointInfo;
|
314
|
-
|
315
|
-
|
489
|
+
/// \cond INTERNAL
|
490
|
+
ICE_API LocalObject* upCast(WSEndpointInfo*);
|
491
|
+
/// \endcond
|
492
|
+
typedef ::IceInternal::Handle< WSEndpointInfo> WSEndpointInfoPtr;
|
316
493
|
|
317
494
|
class OpaqueEndpointInfo;
|
318
|
-
|
319
|
-
|
495
|
+
/// \cond INTERNAL
|
496
|
+
ICE_API LocalObject* upCast(OpaqueEndpointInfo*);
|
497
|
+
/// \endcond
|
498
|
+
typedef ::IceInternal::Handle< OpaqueEndpointInfo> OpaqueEndpointInfoPtr;
|
320
499
|
|
321
500
|
}
|
322
501
|
|
323
502
|
namespace Ice
|
324
503
|
{
|
325
504
|
|
326
|
-
|
505
|
+
/**
|
506
|
+
* Uniquely identifies TCP endpoints.
|
507
|
+
*/
|
508
|
+
const Short TCPEndpointType = 1;
|
327
509
|
|
328
|
-
|
510
|
+
/**
|
511
|
+
* Uniquely identifies SSL endpoints.
|
512
|
+
*/
|
513
|
+
const Short SSLEndpointType = 2;
|
329
514
|
|
330
|
-
|
515
|
+
/**
|
516
|
+
* Uniquely identifies UDP endpoints.
|
517
|
+
*/
|
518
|
+
const Short UDPEndpointType = 3;
|
331
519
|
|
332
|
-
|
520
|
+
/**
|
521
|
+
* Uniquely identifies TCP-based WebSocket endpoints.
|
522
|
+
*/
|
523
|
+
const Short WSEndpointType = 4;
|
333
524
|
|
334
|
-
|
525
|
+
/**
|
526
|
+
* Uniquely identifies SSL-based WebSocket endpoints.
|
527
|
+
*/
|
528
|
+
const Short WSSEndpointType = 5;
|
335
529
|
|
336
|
-
|
530
|
+
/**
|
531
|
+
* Uniquely identifies Bluetooth endpoints.
|
532
|
+
*/
|
533
|
+
const Short BTEndpointType = 6;
|
337
534
|
|
338
|
-
|
535
|
+
/**
|
536
|
+
* Uniquely identifies SSL Bluetooth endpoints.
|
537
|
+
*/
|
538
|
+
const Short BTSEndpointType = 7;
|
339
539
|
|
340
|
-
|
540
|
+
/**
|
541
|
+
* Uniquely identifies iAP-based endpoints.
|
542
|
+
*/
|
543
|
+
const Short iAPEndpointType = 8;
|
341
544
|
|
342
|
-
|
545
|
+
/**
|
546
|
+
* Uniquely identifies SSL iAP-based endpoints.
|
547
|
+
*/
|
548
|
+
const Short iAPSEndpointType = 9;
|
343
549
|
|
344
550
|
}
|
345
551
|
|
346
552
|
namespace Ice
|
347
553
|
{
|
348
554
|
|
349
|
-
|
555
|
+
/**
|
556
|
+
* Base class providing access to the endpoint details.
|
557
|
+
* \headerfile Ice/Ice.h
|
558
|
+
*/
|
559
|
+
class ICE_API EndpointInfo : public virtual LocalObject
|
350
560
|
{
|
351
561
|
public:
|
352
562
|
|
@@ -358,35 +568,71 @@ public:
|
|
358
568
|
{
|
359
569
|
}
|
360
570
|
|
361
|
-
|
362
|
-
|
363
|
-
|
364
|
-
|
571
|
+
/**
|
572
|
+
* One-shot constructor to initialize all data members.
|
573
|
+
* @param underlying The information of the underyling endpoint of null if there's no underlying endpoint.
|
574
|
+
* @param timeout The timeout for the endpoint in milliseconds.
|
575
|
+
* @param compress Specifies whether or not compression should be used if available when using this endpoint.
|
576
|
+
*/
|
577
|
+
EndpointInfo(const ::Ice::EndpointInfoPtr& underlying, ::Ice::Int timeout, bool compress) :
|
578
|
+
underlying(underlying),
|
579
|
+
timeout(timeout),
|
580
|
+
compress(compress)
|
365
581
|
{
|
366
582
|
}
|
367
583
|
|
368
|
-
|
369
|
-
|
370
|
-
|
371
|
-
|
372
|
-
virtual
|
373
|
-
|
584
|
+
/**
|
585
|
+
* Returns the type of the endpoint.
|
586
|
+
* @return The endpoint type.
|
587
|
+
*/
|
588
|
+
virtual Short type() const ICE_NOEXCEPT = 0;
|
589
|
+
|
590
|
+
/**
|
591
|
+
* Returns true if this endpoint is a datagram endpoint.
|
592
|
+
* @return True for a datagram endpoint.
|
593
|
+
*/
|
594
|
+
virtual bool datagram() const ICE_NOEXCEPT = 0;
|
595
|
+
|
596
|
+
/**
|
597
|
+
* Returns true if this endpoint is a secure endpoint.
|
598
|
+
* @return True for a secure endpoint.
|
599
|
+
*/
|
600
|
+
virtual bool secure() const ICE_NOEXCEPT = 0;
|
601
|
+
|
602
|
+
/**
|
603
|
+
* The information of the underyling endpoint of null if there's
|
604
|
+
* no underlying endpoint.
|
605
|
+
*/
|
374
606
|
::Ice::EndpointInfoPtr underlying;
|
607
|
+
/**
|
608
|
+
* The timeout for the endpoint in milliseconds. 0 means
|
609
|
+
* non-blocking, -1 means no timeout.
|
610
|
+
*/
|
375
611
|
::Ice::Int timeout;
|
612
|
+
/**
|
613
|
+
* Specifies whether or not compression should be used if
|
614
|
+
* available when using this endpoint.
|
615
|
+
*/
|
376
616
|
bool compress;
|
377
617
|
};
|
378
618
|
|
619
|
+
/// \cond INTERNAL
|
379
620
|
inline bool operator==(const EndpointInfo& lhs, const EndpointInfo& rhs)
|
380
621
|
{
|
381
|
-
return static_cast<const
|
622
|
+
return static_cast<const LocalObject&>(lhs) == static_cast<const LocalObject&>(rhs);
|
382
623
|
}
|
383
624
|
|
384
625
|
inline bool operator<(const EndpointInfo& lhs, const EndpointInfo& rhs)
|
385
626
|
{
|
386
|
-
return static_cast<const
|
627
|
+
return static_cast<const LocalObject&>(lhs) < static_cast<const LocalObject&>(rhs);
|
387
628
|
}
|
629
|
+
/// \endcond
|
388
630
|
|
389
|
-
|
631
|
+
/**
|
632
|
+
* The user-level interface to an endpoint.
|
633
|
+
* \headerfile Ice/Ice.h
|
634
|
+
*/
|
635
|
+
class ICE_API Endpoint : public virtual LocalObject
|
390
636
|
{
|
391
637
|
public:
|
392
638
|
|
@@ -394,22 +640,37 @@ public:
|
|
394
640
|
|
395
641
|
virtual ~Endpoint();
|
396
642
|
|
397
|
-
|
398
|
-
|
399
|
-
|
643
|
+
/**
|
644
|
+
* Return a string representation of the endpoint.
|
645
|
+
* @return The string representation of the endpoint.
|
646
|
+
*/
|
647
|
+
virtual ::std::string toString() const ICE_NOEXCEPT = 0;
|
648
|
+
|
649
|
+
/**
|
650
|
+
* Returns the endpoint information.
|
651
|
+
* @return The endpoint information class.
|
652
|
+
*/
|
653
|
+
virtual EndpointInfoPtr getInfo() const ICE_NOEXCEPT = 0;
|
400
654
|
};
|
401
655
|
|
656
|
+
/// \cond INTERNAL
|
402
657
|
inline bool operator==(const Endpoint& lhs, const Endpoint& rhs)
|
403
658
|
{
|
404
|
-
return static_cast<const
|
659
|
+
return static_cast<const LocalObject&>(lhs) == static_cast<const LocalObject&>(rhs);
|
405
660
|
}
|
406
661
|
|
407
662
|
inline bool operator<(const Endpoint& lhs, const Endpoint& rhs)
|
408
663
|
{
|
409
|
-
return static_cast<const
|
664
|
+
return static_cast<const LocalObject&>(lhs) < static_cast<const LocalObject&>(rhs);
|
410
665
|
}
|
666
|
+
/// \endcond
|
411
667
|
|
412
|
-
|
668
|
+
/**
|
669
|
+
* Provides access to the address details of a IP endpoint.
|
670
|
+
* @see Endpoint
|
671
|
+
* \headerfile Ice/Ice.h
|
672
|
+
*/
|
673
|
+
class ICE_API IPEndpointInfo : public EndpointInfo
|
413
674
|
{
|
414
675
|
public:
|
415
676
|
|
@@ -421,30 +682,55 @@ public:
|
|
421
682
|
{
|
422
683
|
}
|
423
684
|
|
424
|
-
|
425
|
-
|
426
|
-
|
427
|
-
|
428
|
-
|
685
|
+
/**
|
686
|
+
* One-shot constructor to initialize all data members.
|
687
|
+
* @param underlying The information of the underyling endpoint of null if there's no underlying endpoint.
|
688
|
+
* @param timeout The timeout for the endpoint in milliseconds.
|
689
|
+
* @param compress Specifies whether or not compression should be used if available when using this endpoint.
|
690
|
+
* @param host The host or address configured with the endpoint.
|
691
|
+
* @param port The port number.
|
692
|
+
* @param sourceAddress The source IP address.
|
693
|
+
*/
|
694
|
+
IPEndpointInfo(const ::Ice::EndpointInfoPtr& underlying, ::Ice::Int timeout, bool compress, const ::std::string& host, ::Ice::Int port, const ::std::string& sourceAddress) :
|
695
|
+
::Ice::EndpointInfo(underlying, timeout, compress),
|
696
|
+
host(host),
|
697
|
+
port(port),
|
698
|
+
sourceAddress(sourceAddress)
|
429
699
|
{
|
430
700
|
}
|
431
701
|
|
702
|
+
/**
|
703
|
+
* The host or address configured with the endpoint.
|
704
|
+
*/
|
432
705
|
::std::string host;
|
706
|
+
/**
|
707
|
+
* The port number.
|
708
|
+
*/
|
433
709
|
::Ice::Int port;
|
710
|
+
/**
|
711
|
+
* The source IP address.
|
712
|
+
*/
|
434
713
|
::std::string sourceAddress;
|
435
714
|
};
|
436
715
|
|
716
|
+
/// \cond INTERNAL
|
437
717
|
inline bool operator==(const IPEndpointInfo& lhs, const IPEndpointInfo& rhs)
|
438
718
|
{
|
439
|
-
return static_cast<const
|
719
|
+
return static_cast<const LocalObject&>(lhs) == static_cast<const LocalObject&>(rhs);
|
440
720
|
}
|
441
721
|
|
442
722
|
inline bool operator<(const IPEndpointInfo& lhs, const IPEndpointInfo& rhs)
|
443
723
|
{
|
444
|
-
return static_cast<const
|
724
|
+
return static_cast<const LocalObject&>(lhs) < static_cast<const LocalObject&>(rhs);
|
445
725
|
}
|
726
|
+
/// \endcond
|
446
727
|
|
447
|
-
|
728
|
+
/**
|
729
|
+
* Provides access to a TCP endpoint information.
|
730
|
+
* @see Endpoint
|
731
|
+
* \headerfile Ice/Ice.h
|
732
|
+
*/
|
733
|
+
class ICE_API TCPEndpointInfo : public IPEndpointInfo
|
448
734
|
{
|
449
735
|
public:
|
450
736
|
|
@@ -456,23 +742,39 @@ public:
|
|
456
742
|
{
|
457
743
|
}
|
458
744
|
|
459
|
-
|
460
|
-
|
745
|
+
/**
|
746
|
+
* One-shot constructor to initialize all data members.
|
747
|
+
* @param underlying The information of the underyling endpoint of null if there's no underlying endpoint.
|
748
|
+
* @param timeout The timeout for the endpoint in milliseconds.
|
749
|
+
* @param compress Specifies whether or not compression should be used if available when using this endpoint.
|
750
|
+
* @param host The host or address configured with the endpoint.
|
751
|
+
* @param port The port number.
|
752
|
+
* @param sourceAddress The source IP address.
|
753
|
+
*/
|
754
|
+
TCPEndpointInfo(const ::Ice::EndpointInfoPtr& underlying, ::Ice::Int timeout, bool compress, const ::std::string& host, ::Ice::Int port, const ::std::string& sourceAddress) :
|
755
|
+
::Ice::IPEndpointInfo(underlying, timeout, compress, host, port, sourceAddress)
|
461
756
|
{
|
462
757
|
}
|
463
758
|
};
|
464
759
|
|
760
|
+
/// \cond INTERNAL
|
465
761
|
inline bool operator==(const TCPEndpointInfo& lhs, const TCPEndpointInfo& rhs)
|
466
762
|
{
|
467
|
-
return static_cast<const
|
763
|
+
return static_cast<const LocalObject&>(lhs) == static_cast<const LocalObject&>(rhs);
|
468
764
|
}
|
469
765
|
|
470
766
|
inline bool operator<(const TCPEndpointInfo& lhs, const TCPEndpointInfo& rhs)
|
471
767
|
{
|
472
|
-
return static_cast<const
|
768
|
+
return static_cast<const LocalObject&>(lhs) < static_cast<const LocalObject&>(rhs);
|
473
769
|
}
|
770
|
+
/// \endcond
|
474
771
|
|
475
|
-
|
772
|
+
/**
|
773
|
+
* Provides access to an UDP endpoint information.
|
774
|
+
* @see Endpoint
|
775
|
+
* \headerfile Ice/Ice.h
|
776
|
+
*/
|
777
|
+
class ICE_API UDPEndpointInfo : public IPEndpointInfo
|
476
778
|
{
|
477
779
|
public:
|
478
780
|
|
@@ -484,28 +786,51 @@ public:
|
|
484
786
|
{
|
485
787
|
}
|
486
788
|
|
487
|
-
|
488
|
-
|
489
|
-
|
490
|
-
|
789
|
+
/**
|
790
|
+
* One-shot constructor to initialize all data members.
|
791
|
+
* @param underlying The information of the underyling endpoint of null if there's no underlying endpoint.
|
792
|
+
* @param timeout The timeout for the endpoint in milliseconds.
|
793
|
+
* @param compress Specifies whether or not compression should be used if available when using this endpoint.
|
794
|
+
* @param host The host or address configured with the endpoint.
|
795
|
+
* @param port The port number.
|
796
|
+
* @param sourceAddress The source IP address.
|
797
|
+
* @param mcastInterface The multicast interface.
|
798
|
+
* @param mcastTtl The multicast time-to-live (or hops).
|
799
|
+
*/
|
800
|
+
UDPEndpointInfo(const ::Ice::EndpointInfoPtr& underlying, ::Ice::Int timeout, bool compress, const ::std::string& host, ::Ice::Int port, const ::std::string& sourceAddress, const ::std::string& mcastInterface, ::Ice::Int mcastTtl) :
|
801
|
+
::Ice::IPEndpointInfo(underlying, timeout, compress, host, port, sourceAddress),
|
802
|
+
mcastInterface(mcastInterface),
|
803
|
+
mcastTtl(mcastTtl)
|
491
804
|
{
|
492
805
|
}
|
493
806
|
|
807
|
+
/**
|
808
|
+
* The multicast interface.
|
809
|
+
*/
|
494
810
|
::std::string mcastInterface;
|
811
|
+
/**
|
812
|
+
* The multicast time-to-live (or hops).
|
813
|
+
*/
|
495
814
|
::Ice::Int mcastTtl;
|
496
815
|
};
|
497
816
|
|
817
|
+
/// \cond INTERNAL
|
498
818
|
inline bool operator==(const UDPEndpointInfo& lhs, const UDPEndpointInfo& rhs)
|
499
819
|
{
|
500
|
-
return static_cast<const
|
820
|
+
return static_cast<const LocalObject&>(lhs) == static_cast<const LocalObject&>(rhs);
|
501
821
|
}
|
502
822
|
|
503
823
|
inline bool operator<(const UDPEndpointInfo& lhs, const UDPEndpointInfo& rhs)
|
504
824
|
{
|
505
|
-
return static_cast<const
|
825
|
+
return static_cast<const LocalObject&>(lhs) < static_cast<const LocalObject&>(rhs);
|
506
826
|
}
|
827
|
+
/// \endcond
|
507
828
|
|
508
|
-
|
829
|
+
/**
|
830
|
+
* Provides access to a WebSocket endpoint information.
|
831
|
+
* \headerfile Ice/Ice.h
|
832
|
+
*/
|
833
|
+
class ICE_API WSEndpointInfo : public EndpointInfo
|
509
834
|
{
|
510
835
|
public:
|
511
836
|
|
@@ -517,26 +842,43 @@ public:
|
|
517
842
|
{
|
518
843
|
}
|
519
844
|
|
520
|
-
|
521
|
-
|
522
|
-
|
845
|
+
/**
|
846
|
+
* One-shot constructor to initialize all data members.
|
847
|
+
* @param underlying The information of the underyling endpoint of null if there's no underlying endpoint.
|
848
|
+
* @param timeout The timeout for the endpoint in milliseconds.
|
849
|
+
* @param compress Specifies whether or not compression should be used if available when using this endpoint.
|
850
|
+
* @param resource The URI configured with the endpoint.
|
851
|
+
*/
|
852
|
+
WSEndpointInfo(const ::Ice::EndpointInfoPtr& underlying, ::Ice::Int timeout, bool compress, const ::std::string& resource) :
|
853
|
+
::Ice::EndpointInfo(underlying, timeout, compress),
|
854
|
+
resource(resource)
|
523
855
|
{
|
524
856
|
}
|
525
857
|
|
858
|
+
/**
|
859
|
+
* The URI configured with the endpoint.
|
860
|
+
*/
|
526
861
|
::std::string resource;
|
527
862
|
};
|
528
863
|
|
864
|
+
/// \cond INTERNAL
|
529
865
|
inline bool operator==(const WSEndpointInfo& lhs, const WSEndpointInfo& rhs)
|
530
866
|
{
|
531
|
-
return static_cast<const
|
867
|
+
return static_cast<const LocalObject&>(lhs) == static_cast<const LocalObject&>(rhs);
|
532
868
|
}
|
533
869
|
|
534
870
|
inline bool operator<(const WSEndpointInfo& lhs, const WSEndpointInfo& rhs)
|
535
871
|
{
|
536
|
-
return static_cast<const
|
872
|
+
return static_cast<const LocalObject&>(lhs) < static_cast<const LocalObject&>(rhs);
|
537
873
|
}
|
874
|
+
/// \endcond
|
538
875
|
|
539
|
-
|
876
|
+
/**
|
877
|
+
* Provides access to the details of an opaque endpoint.
|
878
|
+
* @see Endpoint
|
879
|
+
* \headerfile Ice/Ice.h
|
880
|
+
*/
|
881
|
+
class ICE_API OpaqueEndpointInfo : public EndpointInfo
|
540
882
|
{
|
541
883
|
public:
|
542
884
|
|
@@ -548,33 +890,52 @@ public:
|
|
548
890
|
{
|
549
891
|
}
|
550
892
|
|
551
|
-
|
552
|
-
|
553
|
-
|
554
|
-
|
893
|
+
/**
|
894
|
+
* One-shot constructor to initialize all data members.
|
895
|
+
* @param underlying The information of the underyling endpoint of null if there's no underlying endpoint.
|
896
|
+
* @param timeout The timeout for the endpoint in milliseconds.
|
897
|
+
* @param compress Specifies whether or not compression should be used if available when using this endpoint.
|
898
|
+
* @param rawEncoding The encoding version of the opaque endpoint (to decode or encode the rawBytes).
|
899
|
+
* @param rawBytes The raw encoding of the opaque endpoint.
|
900
|
+
*/
|
901
|
+
OpaqueEndpointInfo(const ::Ice::EndpointInfoPtr& underlying, ::Ice::Int timeout, bool compress, const ::Ice::EncodingVersion& rawEncoding, const ::Ice::ByteSeq& rawBytes) :
|
902
|
+
::Ice::EndpointInfo(underlying, timeout, compress),
|
903
|
+
rawEncoding(rawEncoding),
|
904
|
+
rawBytes(rawBytes)
|
555
905
|
{
|
556
906
|
}
|
557
907
|
|
908
|
+
/**
|
909
|
+
* The encoding version of the opaque endpoint (to decode or
|
910
|
+
* encode the rawBytes).
|
911
|
+
*/
|
558
912
|
::Ice::EncodingVersion rawEncoding;
|
913
|
+
/**
|
914
|
+
* The raw encoding of the opaque endpoint.
|
915
|
+
*/
|
559
916
|
::Ice::ByteSeq rawBytes;
|
560
917
|
};
|
561
918
|
|
919
|
+
/// \cond INTERNAL
|
562
920
|
inline bool operator==(const OpaqueEndpointInfo& lhs, const OpaqueEndpointInfo& rhs)
|
563
921
|
{
|
564
|
-
return static_cast<const
|
922
|
+
return static_cast<const LocalObject&>(lhs) == static_cast<const LocalObject&>(rhs);
|
565
923
|
}
|
566
924
|
|
567
925
|
inline bool operator<(const OpaqueEndpointInfo& lhs, const OpaqueEndpointInfo& rhs)
|
568
926
|
{
|
569
|
-
return static_cast<const
|
927
|
+
return static_cast<const LocalObject&>(lhs) < static_cast<const LocalObject&>(rhs);
|
570
928
|
}
|
929
|
+
/// \endcond
|
571
930
|
|
572
931
|
}
|
573
932
|
|
933
|
+
/// \cond STREAM
|
574
934
|
namespace Ice
|
575
935
|
{
|
576
936
|
|
577
937
|
}
|
938
|
+
/// \endcond
|
578
939
|
|
579
940
|
#endif
|
580
941
|
|