zeroc-ice 3.6.5 → 3.7.4
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +5 -5
- data/ICE_LICENSE +17 -17
- data/LICENSE +12 -12
- data/bin/slice2rb +1 -6
- data/ext/Communicator.cpp +223 -61
- data/ext/Communicator.h +1 -6
- data/ext/Config.h +23 -7
- data/ext/Connection.cpp +108 -76
- data/ext/Connection.h +4 -6
- data/ext/Endpoint.cpp +16 -54
- data/ext/Endpoint.h +1 -6
- data/ext/ImplicitContext.cpp +1 -10
- data/ext/ImplicitContext.h +1 -6
- data/ext/Init.cpp +4 -6
- data/ext/Logger.cpp +1 -6
- data/ext/Logger.h +1 -6
- data/ext/Operation.cpp +38 -54
- data/ext/Operation.h +1 -6
- data/ext/Properties.cpp +3 -8
- data/ext/Properties.h +1 -6
- data/ext/Proxy.cpp +111 -70
- data/ext/Proxy.h +1 -6
- data/ext/Slice.cpp +5 -20
- data/ext/Slice.h +1 -6
- data/ext/Types.cpp +313 -224
- data/ext/Types.h +118 -71
- data/ext/Util.cpp +69 -36
- data/ext/Util.h +117 -42
- data/ext/ValueFactoryManager.cpp +440 -0
- data/ext/ValueFactoryManager.h +95 -0
- data/ext/extconf.rb +52 -48
- data/ext/ice/cpp/include/Ice/Application.h +275 -105
- data/ext/ice/cpp/include/Ice/AsyncResult.h +124 -337
- data/ext/ice/cpp/include/Ice/AsyncResultF.h +4 -7
- data/ext/ice/cpp/include/Ice/BatchRequestInterceptor.h +39 -16
- data/ext/ice/cpp/include/Ice/BatchRequestQueueF.h +1 -6
- data/ext/ice/cpp/include/Ice/Buffer.h +10 -15
- data/ext/ice/cpp/include/Ice/CommunicatorAsync.h +56 -17
- data/ext/ice/cpp/include/Ice/Comparable.h +205 -0
- data/ext/ice/cpp/include/Ice/Config.h +16 -39
- data/ext/ice/cpp/include/Ice/ConnectionAsync.h +203 -16
- data/ext/ice/cpp/include/Ice/ConnectionIF.h +7 -6
- data/ext/ice/cpp/include/Ice/ConsoleUtil.h +23 -0
- data/ext/ice/cpp/include/Ice/DefaultValueFactory.h +57 -0
- data/ext/ice/cpp/include/Ice/DispatchInterceptor.h +20 -12
- data/ext/ice/cpp/include/Ice/Dispatcher.h +35 -19
- data/ext/ice/cpp/include/Ice/DynamicLibrary.h +7 -10
- data/ext/ice/cpp/include/Ice/DynamicLibraryF.h +1 -6
- data/ext/ice/cpp/include/Ice/Exception.h +110 -63
- data/ext/ice/cpp/include/Ice/ExceptionHelpers.h +74 -0
- data/ext/ice/cpp/include/Ice/FactoryTable.h +22 -18
- data/ext/ice/cpp/include/Ice/FactoryTableInit.h +28 -31
- data/ext/ice/cpp/include/Ice/Format.h +17 -18
- data/ext/ice/cpp/include/Ice/Functional.h +38 -38
- data/ext/ice/cpp/include/Ice/GCObject.h +9 -10
- data/ext/ice/cpp/include/Ice/Handle.h +6 -16
- data/ext/ice/cpp/include/Ice/Ice.h +9 -10
- data/ext/ice/cpp/include/Ice/IconvStringConverter.h +377 -0
- data/ext/ice/cpp/include/Ice/Incoming.h +132 -38
- data/ext/ice/cpp/include/Ice/IncomingAsync.h +109 -31
- data/ext/ice/cpp/include/Ice/IncomingAsyncF.h +7 -6
- data/ext/ice/cpp/include/Ice/Initialize.h +872 -60
- data/ext/ice/cpp/include/Ice/InputStream.h +1514 -0
- data/ext/ice/cpp/include/Ice/InstanceF.h +1 -7
- data/ext/ice/cpp/include/Ice/InterfaceByValue.h +57 -0
- data/ext/ice/cpp/include/Ice/LocalObject.h +13 -14
- data/ext/ice/cpp/include/Ice/LocalObjectF.h +1 -6
- data/ext/ice/cpp/include/Ice/LoggerUtil.h +56 -24
- data/ext/ice/cpp/include/Ice/MetricsAdminI.h +124 -71
- data/ext/ice/cpp/include/Ice/MetricsFunctional.h +25 -10
- data/ext/ice/cpp/include/Ice/MetricsObserverI.h +116 -32
- data/ext/ice/cpp/include/Ice/NativePropertiesAdmin.h +61 -30
- data/ext/ice/cpp/include/Ice/Object.h +413 -78
- data/ext/ice/cpp/include/Ice/ObjectF.h +12 -8
- data/ext/ice/cpp/include/Ice/ObserverHelper.h +18 -13
- data/ext/ice/cpp/include/Ice/Optional.h +1114 -0
- data/ext/ice/cpp/include/Ice/OutgoingAsync.h +684 -89
- data/ext/ice/cpp/include/Ice/OutgoingAsyncF.h +12 -11
- data/ext/ice/cpp/include/Ice/OutputStream.h +1092 -0
- data/ext/ice/cpp/include/Ice/Protocol.h +49 -17
- data/ext/ice/cpp/include/Ice/Proxy.h +3438 -745
- data/ext/ice/cpp/include/Ice/ProxyF.h +13 -38
- data/ext/ice/cpp/include/Ice/ProxyFactoryF.h +1 -6
- data/ext/ice/cpp/include/Ice/ProxyHandle.h +43 -55
- data/ext/ice/cpp/include/Ice/ReferenceF.h +1 -6
- data/ext/ice/cpp/include/Ice/RegisterPlugins.h +84 -12
- data/ext/ice/cpp/include/Ice/RequestHandlerF.h +10 -9
- data/ext/ice/cpp/include/Ice/ResponseHandlerF.h +6 -6
- data/ext/ice/cpp/include/Ice/SHA1.h +42 -0
- data/ext/ice/cpp/include/Ice/ServantManagerF.h +1 -6
- data/ext/ice/cpp/include/Ice/Service.h +273 -154
- data/ext/ice/cpp/include/Ice/SliceChecksums.h +5 -6
- data/ext/ice/cpp/include/Ice/SlicedData.h +121 -53
- data/ext/ice/cpp/include/Ice/SlicedDataF.h +17 -11
- data/ext/ice/cpp/include/Ice/StreamHelpers.h +453 -140
- data/ext/ice/cpp/include/Ice/StringConverter.h +78 -0
- data/ext/ice/cpp/include/Ice/ThreadPoolF.h +1 -6
- data/ext/ice/cpp/include/Ice/UUID.h +19 -0
- data/ext/ice/cpp/include/{IceUtil → Ice}/UniquePtr.h +22 -28
- data/ext/ice/cpp/include/Ice/UniqueRef.h +97 -0
- data/ext/ice/cpp/include/Ice/UserExceptionFactory.h +45 -13
- data/ext/ice/cpp/include/Ice/Value.h +139 -0
- data/ext/ice/cpp/include/Ice/ValueF.h +21 -0
- data/ext/ice/cpp/include/IceSSL/Config.h +8 -28
- data/ext/ice/cpp/include/IceSSL/IceSSL.h +17 -11
- data/ext/ice/cpp/include/IceSSL/OpenSSL.h +147 -0
- data/ext/ice/cpp/include/IceSSL/Plugin.h +461 -448
- data/ext/ice/cpp/include/IceSSL/SChannel.h +72 -0
- data/ext/ice/cpp/include/IceSSL/SecureTransport.h +72 -0
- data/ext/ice/cpp/include/IceSSL/UWP.h +62 -0
- data/ext/ice/cpp/include/IceUtil/Atomic.h +7 -14
- data/ext/ice/cpp/include/IceUtil/Cond.h +17 -23
- data/ext/ice/cpp/include/IceUtil/Config.h +166 -46
- data/ext/ice/cpp/include/IceUtil/ConsoleUtil.h +92 -0
- data/ext/ice/cpp/include/IceUtil/CountDownLatch.h +5 -10
- data/ext/ice/cpp/include/IceUtil/CtrlCHandler.h +63 -41
- data/ext/ice/cpp/include/IceUtil/DisableWarnings.h +5 -13
- data/ext/ice/cpp/include/IceUtil/Exception.h +284 -75
- data/ext/ice/cpp/include/IceUtil/FileUtil.h +143 -0
- data/ext/ice/cpp/include/IceUtil/Functional.h +4 -6
- data/ext/ice/cpp/include/IceUtil/Handle.h +11 -16
- data/ext/ice/cpp/include/IceUtil/IceUtil.h +4 -15
- data/ext/ice/cpp/include/IceUtil/InputUtil.h +3 -8
- data/ext/ice/cpp/include/IceUtil/Iterator.h +2 -7
- data/ext/ice/cpp/include/IceUtil/Lock.h +8 -15
- data/ext/ice/cpp/include/IceUtil/Monitor.h +1 -7
- data/ext/ice/cpp/include/IceUtil/Mutex.h +19 -23
- data/ext/ice/cpp/include/IceUtil/MutexProtocol.h +2 -7
- data/ext/ice/cpp/include/IceUtil/MutexPtrLock.h +4 -9
- data/ext/ice/cpp/include/IceUtil/MutexPtrTryLock.h +4 -9
- data/ext/ice/cpp/include/IceUtil/Optional.h +134 -23
- data/ext/ice/cpp/include/IceUtil/Options.h +17 -23
- data/ext/ice/cpp/include/IceUtil/OutputUtil.h +61 -37
- data/ext/ice/cpp/include/IceUtil/PopDisableWarnings.h +6 -11
- data/ext/ice/cpp/include/IceUtil/PushDisableWarnings.h +18 -15
- data/ext/ice/cpp/include/IceUtil/Random.h +39 -8
- data/ext/ice/cpp/include/IceUtil/RecMutex.h +7 -13
- data/ext/ice/cpp/include/IceUtil/ResourceConfig.h +53 -0
- data/ext/ice/cpp/include/IceUtil/ScannerConfig.h +10 -15
- data/ext/ice/cpp/include/IceUtil/ScopedArray.h +8 -7
- data/ext/ice/cpp/include/IceUtil/Shared.h +5 -12
- data/ext/ice/cpp/{src → include}/IceUtil/StopWatch.h +2 -7
- data/ext/ice/cpp/include/IceUtil/StringConverter.h +146 -126
- data/ext/ice/cpp/include/IceUtil/StringUtil.h +32 -26
- data/ext/ice/cpp/include/IceUtil/Thread.h +10 -17
- data/ext/ice/cpp/include/IceUtil/ThreadException.h +33 -47
- data/ext/ice/cpp/include/IceUtil/Time.h +3 -8
- data/ext/ice/cpp/include/IceUtil/Timer.h +18 -18
- data/ext/ice/cpp/include/IceUtil/UUID.h +6 -7
- data/ext/ice/cpp/include/IceUtil/UndefSysMacros.h +1 -6
- data/ext/ice/cpp/include/generated/Ice/BuiltinSequences.h +170 -0
- data/ext/ice/cpp/include/generated/Ice/Communicator.h +1156 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/CommunicatorF.h +51 -16
- data/ext/ice/cpp/include/generated/Ice/Connection.h +1660 -0
- data/ext/ice/cpp/include/generated/Ice/ConnectionF.h +119 -0
- data/ext/ice/cpp/include/generated/Ice/Current.h +322 -0
- data/ext/ice/cpp/include/generated/Ice/Endpoint.h +943 -0
- data/ext/ice/cpp/include/generated/Ice/EndpointF.h +166 -0
- data/ext/ice/cpp/include/generated/Ice/EndpointTypes.h +118 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/FacetMap.h +31 -15
- data/ext/ice/cpp/include/generated/Ice/Identity.h +264 -0
- data/ext/ice/cpp/include/generated/Ice/ImplicitContext.h +278 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/ImplicitContextF.h +51 -16
- data/ext/ice/cpp/include/generated/Ice/Instrumentation.h +1143 -0
- data/ext/ice/cpp/include/generated/Ice/InstrumentationF.h +128 -0
- data/ext/ice/cpp/include/generated/Ice/LocalException.h +7041 -0
- data/ext/ice/cpp/include/generated/Ice/Locator.h +3850 -0
- data/ext/ice/cpp/include/generated/Ice/LocatorF.h +147 -0
- data/ext/ice/cpp/include/generated/Ice/Logger.h +231 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/LoggerF.h +51 -16
- data/ext/ice/cpp/include/generated/Ice/Metrics.h +4717 -0
- data/ext/ice/cpp/include/generated/Ice/ObjectAdapter.h +1175 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/ObjectAdapterF.h +51 -16
- data/ext/ice/cpp/include/generated/Ice/ObjectFactory.h +197 -0
- data/ext/ice/cpp/include/generated/Ice/Plugin.h +306 -0
- data/ext/ice/cpp/include/generated/Ice/PluginF.h +110 -0
- data/ext/ice/cpp/include/generated/Ice/Process.h +971 -0
- data/ext/ice/cpp/include/generated/Ice/ProcessF.h +125 -0
- data/ext/ice/cpp/include/generated/Ice/Properties.h +446 -0
- data/ext/ice/cpp/include/generated/Ice/PropertiesAdmin.h +1360 -0
- data/ext/ice/cpp/include/generated/Ice/PropertiesF.h +134 -0
- data/ext/ice/cpp/include/generated/Ice/RemoteLogger.h +2689 -0
- data/ext/ice/cpp/include/generated/Ice/Router.h +1838 -0
- data/ext/ice/cpp/include/generated/Ice/RouterF.h +125 -0
- data/ext/ice/cpp/include/generated/Ice/ServantLocator.h +299 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/ServantLocatorF.h +51 -16
- data/ext/ice/cpp/include/{Ice → generated/Ice}/SliceChecksumDict.h +34 -14
- data/ext/ice/cpp/include/generated/Ice/ValueFactory.h +318 -0
- data/ext/ice/cpp/include/generated/Ice/Version.h +357 -0
- data/ext/ice/cpp/include/generated/IceSSL/ConnectionInfo.h +223 -0
- data/ext/ice/cpp/include/generated/IceSSL/ConnectionInfoF.h +101 -0
- data/ext/ice/cpp/include/generated/IceSSL/EndpointInfo.h +181 -0
- data/ext/ice/cpp/src/Ice/ACM.cpp +38 -27
- data/ext/ice/cpp/src/Ice/ACM.h +9 -7
- data/ext/ice/cpp/src/Ice/ACMF.h +30 -0
- data/ext/ice/cpp/src/Ice/Acceptor.cpp +6 -6
- data/ext/ice/cpp/src/Ice/Acceptor.h +4 -8
- data/ext/ice/cpp/src/Ice/AcceptorF.h +1 -6
- data/ext/ice/cpp/src/Ice/ArgVector.cpp +59 -0
- data/ext/ice/cpp/src/Ice/ArgVector.h +36 -0
- data/ext/ice/cpp/src/Ice/AsyncResult.cpp +15 -544
- data/ext/ice/cpp/src/Ice/Base64.cpp +22 -28
- data/ext/ice/cpp/src/Ice/Base64.h +1 -6
- data/ext/ice/cpp/src/Ice/BatchRequestQueue.cpp +41 -18
- data/ext/ice/cpp/src/Ice/BatchRequestQueue.h +15 -15
- data/ext/ice/cpp/src/Ice/Buffer.cpp +75 -18
- data/ext/ice/cpp/src/Ice/BuiltinSequences.cpp +21 -12
- data/ext/ice/cpp/src/Ice/CollocatedRequestHandler.cpp +86 -197
- data/ext/ice/cpp/src/Ice/CollocatedRequestHandler.h +17 -23
- data/ext/ice/cpp/src/Ice/Communicator.cpp +43 -15
- data/ext/ice/cpp/src/Ice/CommunicatorF.cpp +28 -11
- data/ext/ice/cpp/src/Ice/CommunicatorI.cpp +318 -117
- data/ext/ice/cpp/src/Ice/CommunicatorI.h +95 -40
- data/ext/ice/cpp/src/{IceUtil → Ice}/Cond.cpp +3 -8
- data/ext/ice/cpp/src/Ice/ConnectRequestHandler.cpp +55 -122
- data/ext/ice/cpp/src/Ice/ConnectRequestHandler.h +15 -31
- data/ext/ice/cpp/src/Ice/ConnectRequestHandlerF.h +6 -7
- data/ext/ice/cpp/src/Ice/Connection.cpp +111 -20
- data/ext/ice/cpp/src/Ice/ConnectionF.cpp +28 -11
- data/ext/ice/cpp/src/Ice/ConnectionFactory.cpp +300 -107
- data/ext/ice/cpp/src/Ice/ConnectionFactory.h +44 -28
- data/ext/ice/cpp/src/Ice/ConnectionFactoryF.h +30 -0
- data/ext/ice/cpp/src/Ice/ConnectionI.cpp +785 -713
- data/ext/ice/cpp/src/Ice/ConnectionI.h +105 -80
- data/ext/ice/cpp/src/Ice/ConnectionRequestHandler.cpp +2 -20
- data/ext/ice/cpp/src/Ice/ConnectionRequestHandler.h +5 -9
- data/ext/ice/cpp/src/Ice/Connector.cpp +6 -6
- data/ext/ice/cpp/src/Ice/Connector.h +4 -8
- data/ext/ice/cpp/src/Ice/ConnectorF.h +1 -6
- data/ext/ice/cpp/src/{IceUtil → Ice}/CountDownLatch.cpp +4 -9
- data/ext/ice/cpp/src/Ice/Current.cpp +30 -12
- data/ext/ice/cpp/src/Ice/DefaultsAndOverrides.cpp +10 -16
- data/ext/ice/cpp/src/Ice/DefaultsAndOverrides.h +1 -6
- data/ext/ice/cpp/src/Ice/DefaultsAndOverridesF.h +1 -6
- data/ext/ice/cpp/src/Ice/DispatchInterceptor.cpp +13 -25
- data/ext/ice/cpp/src/Ice/DynamicLibrary.cpp +34 -28
- data/ext/ice/cpp/src/Ice/Endpoint.cpp +107 -19
- data/ext/ice/cpp/src/Ice/EndpointF.cpp +28 -11
- data/ext/ice/cpp/src/Ice/EndpointFactory.cpp +152 -6
- data/ext/ice/cpp/src/Ice/EndpointFactory.h +72 -11
- data/ext/ice/cpp/src/Ice/EndpointFactoryF.h +1 -6
- data/ext/ice/cpp/src/Ice/EndpointFactoryManager.cpp +41 -36
- data/ext/ice/cpp/src/Ice/EndpointFactoryManager.h +10 -9
- data/ext/ice/cpp/src/Ice/EndpointFactoryManagerF.h +1 -6
- data/ext/ice/cpp/src/Ice/EndpointI.cpp +18 -7
- data/ext/ice/cpp/src/Ice/EndpointI.h +39 -18
- data/ext/ice/cpp/src/Ice/EndpointIF.h +18 -10
- data/ext/ice/cpp/src/Ice/EndpointTypes.cpp +19 -12
- data/ext/ice/cpp/src/Ice/EventHandler.cpp +6 -9
- data/ext/ice/cpp/src/Ice/EventHandler.h +13 -13
- data/ext/ice/cpp/src/Ice/EventHandlerF.h +5 -7
- data/ext/ice/cpp/src/Ice/Exception.cpp +102 -98
- data/ext/ice/cpp/src/Ice/FacetMap.cpp +21 -12
- data/ext/ice/cpp/src/Ice/FactoryTable.cpp +37 -33
- data/ext/ice/cpp/src/Ice/FactoryTableInit.cpp +2 -9
- data/ext/ice/cpp/src/Ice/GCObject.cpp +29 -31
- data/ext/ice/cpp/src/Ice/HashUtil.h +3 -9
- data/ext/ice/cpp/src/Ice/HttpParser.cpp +1 -7
- data/ext/ice/cpp/src/Ice/HttpParser.h +1 -6
- data/ext/ice/cpp/src/Ice/IPEndpointI.cpp +128 -111
- data/ext/ice/cpp/src/Ice/IPEndpointI.h +23 -19
- data/ext/ice/cpp/src/Ice/IPEndpointIF.h +6 -7
- data/ext/ice/cpp/src/Ice/IconvStringConverter.cpp +51 -0
- data/ext/ice/cpp/src/Ice/Identity.cpp +25 -16
- data/ext/ice/cpp/src/Ice/ImplicitContext.cpp +41 -13
- data/ext/ice/cpp/src/Ice/ImplicitContextF.cpp +28 -11
- data/ext/ice/cpp/src/Ice/ImplicitContextI.cpp +11 -28
- data/ext/ice/cpp/src/Ice/ImplicitContextI.h +7 -10
- data/ext/ice/cpp/src/Ice/Incoming.cpp +284 -255
- data/ext/ice/cpp/src/Ice/IncomingAsync.cpp +104 -214
- data/ext/ice/cpp/src/Ice/IncomingRequest.h +5 -9
- data/ext/ice/cpp/src/Ice/Initialize.cpp +309 -193
- data/ext/ice/cpp/src/Ice/InputStream.cpp +2726 -0
- data/ext/ice/cpp/src/Ice/Instance.cpp +243 -262
- data/ext/ice/cpp/src/Ice/Instance.h +30 -23
- data/ext/ice/cpp/src/Ice/Instrumentation.cpp +137 -23
- data/ext/ice/cpp/src/Ice/InstrumentationF.cpp +28 -11
- data/ext/ice/cpp/src/Ice/InstrumentationI.cpp +118 -105
- data/ext/ice/cpp/src/Ice/InstrumentationI.h +30 -36
- data/ext/ice/cpp/src/Ice/LocalException.cpp +1191 -422
- data/ext/ice/cpp/src/Ice/LocalObject.cpp +1 -7
- data/ext/ice/cpp/src/Ice/Locator.cpp +1282 -1222
- data/ext/ice/cpp/src/Ice/LocatorF.cpp +30 -12
- data/ext/ice/cpp/src/Ice/LocatorInfo.cpp +150 -186
- data/ext/ice/cpp/src/Ice/LocatorInfo.h +31 -36
- data/ext/ice/cpp/src/Ice/LocatorInfoF.h +1 -6
- data/ext/ice/cpp/src/Ice/Logger.cpp +39 -12
- data/ext/ice/cpp/src/Ice/LoggerAdminI.cpp +182 -88
- data/ext/ice/cpp/src/Ice/LoggerAdminI.h +4 -9
- data/ext/ice/cpp/src/Ice/LoggerF.cpp +28 -11
- data/ext/ice/cpp/src/Ice/LoggerI.cpp +26 -55
- data/ext/ice/cpp/src/Ice/LoggerI.h +7 -18
- data/ext/ice/cpp/src/Ice/LoggerUtil.cpp +10 -17
- data/ext/ice/cpp/src/Ice/Metrics.cpp +1280 -1107
- data/ext/ice/cpp/src/Ice/MetricsAdminI.cpp +58 -33
- data/ext/ice/cpp/src/Ice/MetricsObserverI.cpp +1 -7
- data/ext/ice/cpp/src/Ice/Network.cpp +753 -408
- data/ext/ice/cpp/src/Ice/Network.h +99 -36
- data/ext/ice/cpp/src/Ice/NetworkF.h +2 -7
- data/ext/ice/cpp/src/Ice/NetworkProxy.cpp +20 -19
- data/ext/ice/cpp/src/Ice/NetworkProxy.h +5 -7
- data/ext/ice/cpp/src/Ice/NetworkProxyF.h +1 -6
- data/ext/ice/cpp/src/Ice/OSLogLoggerI.cpp +57 -0
- data/ext/ice/cpp/src/Ice/OSLogLoggerI.h +40 -0
- data/ext/ice/cpp/src/Ice/Object.cpp +227 -232
- data/ext/ice/cpp/src/Ice/ObjectAdapter.cpp +45 -13
- data/ext/ice/cpp/src/Ice/ObjectAdapterF.cpp +28 -11
- data/ext/ice/cpp/src/Ice/ObjectAdapterFactory.cpp +83 -33
- data/ext/ice/cpp/src/Ice/ObjectAdapterFactory.h +13 -12
- data/ext/ice/cpp/src/Ice/ObjectAdapterFactoryF.h +25 -0
- data/ext/ice/cpp/src/Ice/ObjectAdapterI.cpp +298 -191
- data/ext/ice/cpp/src/Ice/ObjectAdapterI.h +44 -39
- data/ext/ice/cpp/src/Ice/ObjectFactory.cpp +41 -13
- data/ext/ice/cpp/src/Ice/ObserverHelper.cpp +9 -37
- data/ext/ice/cpp/src/Ice/OpaqueEndpointI.cpp +67 -67
- data/ext/ice/cpp/src/Ice/OpaqueEndpointI.h +15 -11
- data/ext/ice/cpp/src/Ice/OutgoingAsync.cpp +801 -366
- data/ext/ice/cpp/src/Ice/OutputStream.cpp +1367 -0
- data/ext/ice/cpp/src/Ice/Plugin.cpp +52 -14
- data/ext/ice/cpp/src/Ice/PluginF.cpp +28 -11
- data/ext/ice/cpp/src/Ice/PluginManagerI.cpp +27 -51
- data/ext/ice/cpp/src/Ice/PluginManagerI.h +7 -13
- data/ext/ice/cpp/src/Ice/Process.cpp +294 -128
- data/ext/ice/cpp/src/Ice/ProcessF.cpp +30 -12
- data/ext/ice/cpp/src/Ice/Properties.cpp +42 -15
- data/ext/ice/cpp/src/Ice/PropertiesAdmin.cpp +382 -340
- data/ext/ice/cpp/src/Ice/PropertiesAdminI.cpp +83 -24
- data/ext/ice/cpp/src/Ice/PropertiesAdminI.h +29 -10
- data/ext/ice/cpp/src/Ice/PropertiesF.cpp +30 -12
- data/ext/ice/cpp/src/Ice/PropertiesI.cpp +46 -57
- data/ext/ice/cpp/src/Ice/PropertiesI.h +18 -26
- data/ext/ice/cpp/src/Ice/PropertyNames.cpp +112 -19
- data/ext/ice/cpp/src/Ice/PropertyNames.h +4 -7
- data/ext/ice/cpp/src/Ice/Protocol.cpp +6 -19
- data/ext/ice/cpp/src/Ice/ProtocolInstance.cpp +37 -7
- data/ext/ice/cpp/src/Ice/ProtocolInstance.h +9 -25
- data/ext/ice/cpp/src/Ice/ProtocolInstanceF.h +1 -6
- data/ext/ice/cpp/src/Ice/ProtocolPluginFacade.cpp +6 -6
- data/ext/ice/cpp/src/Ice/ProtocolPluginFacade.h +3 -6
- data/ext/ice/cpp/src/Ice/ProtocolPluginFacadeF.h +1 -6
- data/ext/ice/cpp/src/Ice/Proxy.cpp +729 -957
- data/ext/ice/cpp/src/Ice/ProxyFactory.cpp +33 -38
- data/ext/ice/cpp/src/Ice/ProxyFactory.h +16 -16
- data/ext/ice/cpp/src/Ice/Reference.cpp +190 -106
- data/ext/ice/cpp/src/Ice/Reference.h +39 -28
- data/ext/ice/cpp/src/Ice/ReferenceFactory.cpp +69 -118
- data/ext/ice/cpp/src/Ice/ReferenceFactory.h +12 -17
- data/ext/ice/cpp/src/Ice/ReferenceFactoryF.h +1 -6
- data/ext/ice/cpp/src/Ice/RegisterPluginsInit.cpp +19 -9
- data/ext/ice/cpp/src/Ice/RegisterPluginsInit.h +1 -6
- data/ext/ice/cpp/src/Ice/RemoteLogger.cpp +766 -565
- data/ext/ice/cpp/src/Ice/ReplyStatus.h +1 -6
- data/ext/ice/cpp/src/Ice/RequestHandler.cpp +5 -8
- data/ext/ice/cpp/src/Ice/RequestHandler.h +10 -18
- data/ext/ice/cpp/src/Ice/RequestHandlerFactory.cpp +10 -11
- data/ext/ice/cpp/src/Ice/RequestHandlerFactory.h +2 -7
- data/ext/ice/cpp/src/Ice/ResponseHandler.cpp +3 -11
- data/ext/ice/cpp/src/Ice/ResponseHandler.h +16 -12
- data/ext/ice/cpp/src/Ice/RetryQueue.cpp +12 -20
- data/ext/ice/cpp/src/Ice/RetryQueue.h +7 -11
- data/ext/ice/cpp/src/Ice/RetryQueueF.h +1 -6
- data/ext/ice/cpp/src/Ice/Router.cpp +614 -492
- data/ext/ice/cpp/src/Ice/RouterF.cpp +30 -12
- data/ext/ice/cpp/src/Ice/RouterInfo.cpp +93 -99
- data/ext/ice/cpp/src/Ice/RouterInfo.h +42 -38
- data/ext/ice/cpp/src/Ice/RouterInfoF.h +1 -6
- data/ext/ice/cpp/src/{IceUtil → Ice}/SHA1.cpp +23 -28
- data/ext/ice/cpp/src/Ice/Selector.cpp +948 -855
- data/ext/ice/cpp/src/Ice/Selector.h +100 -152
- data/ext/ice/cpp/src/Ice/ServantLocator.cpp +41 -13
- data/ext/ice/cpp/src/Ice/ServantLocatorF.cpp +28 -11
- data/ext/ice/cpp/src/Ice/ServantManager.cpp +24 -45
- data/ext/ice/cpp/src/Ice/ServantManager.h +1 -6
- data/ext/ice/cpp/src/Ice/SharedContext.h +2 -7
- data/ext/ice/cpp/src/Ice/SliceChecksumDict.cpp +21 -12
- data/ext/ice/cpp/src/Ice/SliceChecksums.cpp +2 -7
- data/ext/ice/cpp/src/Ice/SlicedData.cpp +72 -25
- data/ext/ice/cpp/src/Ice/StreamSocket.cpp +208 -76
- data/ext/ice/cpp/src/Ice/StreamSocket.h +13 -9
- data/ext/ice/cpp/src/Ice/StringConverterPlugin.cpp +57 -22
- data/ext/ice/cpp/src/Ice/StringUtil.h +30 -0
- data/ext/ice/cpp/src/Ice/SysLoggerI.cpp +6 -7
- data/ext/ice/cpp/src/Ice/SysLoggerI.h +2 -8
- data/ext/ice/cpp/src/Ice/SystemdJournalI.cpp +66 -0
- data/ext/ice/cpp/src/Ice/SystemdJournalI.h +39 -0
- data/ext/ice/cpp/src/Ice/TcpAcceptor.cpp +169 -49
- data/ext/ice/cpp/src/Ice/TcpAcceptor.h +12 -10
- data/ext/ice/cpp/src/Ice/TcpConnector.cpp +6 -12
- data/ext/ice/cpp/src/Ice/TcpConnector.h +1 -7
- data/ext/ice/cpp/src/Ice/TcpEndpointI.cpp +51 -46
- data/ext/ice/cpp/src/Ice/TcpEndpointI.h +12 -14
- data/ext/ice/cpp/src/Ice/TcpTransceiver.cpp +17 -32
- data/ext/ice/cpp/src/Ice/TcpTransceiver.h +7 -15
- data/ext/ice/cpp/src/{IceUtil → Ice}/Thread.cpp +41 -54
- data/ext/ice/cpp/src/Ice/ThreadPool.cpp +242 -274
- data/ext/ice/cpp/src/Ice/ThreadPool.h +46 -48
- data/ext/ice/cpp/src/{IceUtil → Ice}/Timer.cpp +38 -26
- data/ext/ice/cpp/src/Ice/TraceLevels.cpp +2 -7
- data/ext/ice/cpp/src/Ice/TraceLevels.h +1 -6
- data/ext/ice/cpp/src/Ice/TraceLevelsF.h +2 -7
- data/ext/ice/cpp/src/Ice/TraceUtil.cpp +53 -36
- data/ext/ice/cpp/src/Ice/TraceUtil.h +13 -11
- data/ext/ice/cpp/src/Ice/Transceiver.cpp +1 -7
- data/ext/ice/cpp/src/Ice/Transceiver.h +8 -12
- data/ext/ice/cpp/src/Ice/TransceiverF.h +3 -8
- data/ext/ice/cpp/src/Ice/UdpConnector.cpp +5 -13
- data/ext/ice/cpp/src/Ice/UdpConnector.h +1 -7
- data/ext/ice/cpp/src/Ice/UdpEndpointI.cpp +118 -60
- data/ext/ice/cpp/src/Ice/UdpEndpointI.h +13 -10
- data/ext/ice/cpp/src/Ice/UdpTransceiver.cpp +177 -236
- data/ext/ice/cpp/src/Ice/UdpTransceiver.h +15 -22
- data/ext/ice/cpp/src/Ice/Value.cpp +76 -0
- data/ext/ice/cpp/src/Ice/ValueFactory.cpp +83 -0
- data/ext/ice/cpp/src/Ice/ValueFactoryManagerI.cpp +61 -0
- data/ext/ice/cpp/src/Ice/ValueFactoryManagerI.h +37 -0
- data/ext/ice/cpp/src/Ice/Version.cpp +25 -20
- data/ext/ice/cpp/src/Ice/VirtualShared.h +38 -0
- data/ext/ice/cpp/src/Ice/WSAcceptor.cpp +3 -14
- data/ext/ice/cpp/src/Ice/WSAcceptor.h +3 -12
- data/ext/ice/cpp/src/Ice/WSConnector.cpp +5 -16
- data/ext/ice/cpp/src/Ice/WSConnector.h +3 -11
- data/ext/ice/cpp/src/Ice/WSEndpoint.cpp +188 -89
- data/ext/ice/cpp/src/Ice/WSEndpoint.h +22 -37
- data/ext/ice/cpp/src/Ice/WSTransceiver.cpp +65 -66
- data/ext/ice/cpp/src/Ice/WSTransceiver.h +7 -27
- data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.cpp +596 -281
- data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.h +1383 -543
- data/ext/ice/cpp/src/IceDiscovery/LocatorI.cpp +89 -32
- data/ext/ice/cpp/src/IceDiscovery/LocatorI.h +59 -28
- data/ext/ice/cpp/src/IceDiscovery/LookupI.cpp +315 -66
- data/ext/ice/cpp/src/IceDiscovery/LookupI.h +83 -41
- data/ext/ice/cpp/src/IceDiscovery/PluginI.cpp +57 -64
- data/ext/ice/cpp/src/IceDiscovery/PluginI.h +3 -8
- data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.cpp +450 -172
- data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.h +863 -406
- data/ext/ice/cpp/src/IceLocatorDiscovery/Plugin.h +47 -0
- data/ext/ice/cpp/src/IceLocatorDiscovery/PluginI.cpp +636 -144
- data/ext/ice/cpp/src/IceSSL/AcceptorI.cpp +20 -173
- data/ext/ice/cpp/src/IceSSL/AcceptorI.h +8 -22
- data/ext/ice/cpp/src/IceSSL/CertificateI.cpp +279 -0
- data/ext/ice/cpp/src/IceSSL/CertificateI.h +64 -0
- data/ext/ice/cpp/src/IceSSL/ConnectionInfo.cpp +42 -17
- data/ext/ice/cpp/src/IceSSL/ConnectionInfoF.cpp +61 -0
- data/ext/ice/cpp/src/IceSSL/ConnectorI.cpp +15 -64
- data/ext/ice/cpp/src/IceSSL/ConnectorI.h +6 -18
- data/ext/ice/cpp/src/IceSSL/EndpointI.cpp +207 -204
- data/ext/ice/cpp/src/IceSSL/EndpointI.h +43 -40
- data/ext/ice/cpp/src/IceSSL/EndpointInfo.cpp +42 -16
- data/ext/ice/cpp/src/IceSSL/Instance.cpp +1 -11
- data/ext/ice/cpp/src/IceSSL/Instance.h +7 -12
- data/ext/ice/cpp/src/IceSSL/InstanceF.h +11 -12
- data/ext/ice/cpp/src/IceSSL/OpenSSLCertificateI.cpp +583 -0
- data/ext/ice/cpp/src/IceSSL/OpenSSLEngine.cpp +134 -115
- data/ext/ice/cpp/src/IceSSL/OpenSSLEngine.h +59 -0
- data/ext/ice/cpp/src/IceSSL/OpenSSLEngineF.h +27 -0
- data/ext/ice/cpp/src/IceSSL/OpenSSLPluginI.cpp +127 -0
- data/ext/ice/cpp/src/IceSSL/OpenSSLTransceiverI.cpp +477 -182
- data/ext/ice/cpp/src/IceSSL/OpenSSLTransceiverI.h +32 -26
- data/ext/ice/cpp/src/IceSSL/OpenSSLUtil.cpp +286 -0
- data/ext/ice/cpp/src/IceSSL/OpenSSLUtil.h +58 -0
- data/ext/ice/cpp/src/IceSSL/PluginI.cpp +71 -46
- data/ext/ice/cpp/src/IceSSL/PluginI.h +13 -23
- data/ext/ice/cpp/src/IceSSL/RFC2253.cpp +9 -60
- data/ext/ice/cpp/src/IceSSL/RFC2253.h +7 -12
- data/ext/ice/cpp/src/IceSSL/SChannelCertificateI.cpp +580 -0
- data/ext/ice/cpp/src/IceSSL/SChannelEngine.cpp +523 -74
- data/ext/ice/cpp/src/IceSSL/SChannelEngine.h +123 -0
- data/ext/ice/cpp/src/IceSSL/SChannelEngineF.h +31 -0
- data/ext/ice/cpp/src/IceSSL/SChannelPluginI.cpp +73 -0
- data/ext/ice/cpp/src/IceSSL/SChannelTransceiverI.cpp +187 -221
- data/ext/ice/cpp/src/IceSSL/SChannelTransceiverI.h +24 -26
- data/ext/ice/cpp/src/IceSSL/SSLEngine.cpp +97 -94
- data/ext/ice/cpp/src/IceSSL/SSLEngine.h +26 -192
- data/ext/ice/cpp/src/IceSSL/SSLEngineF.h +4 -24
- data/ext/ice/cpp/src/IceSSL/SecureTransportCertificateI.cpp +868 -0
- data/ext/ice/cpp/src/IceSSL/SecureTransportEngine.cpp +69 -201
- data/ext/ice/cpp/src/IceSSL/SecureTransportEngine.h +59 -0
- data/ext/ice/cpp/src/IceSSL/SecureTransportEngineF.h +29 -0
- data/ext/ice/cpp/src/IceSSL/SecureTransportPluginI.cpp +75 -0
- data/ext/ice/cpp/src/IceSSL/SecureTransportTransceiverI.cpp +174 -161
- data/ext/ice/cpp/src/IceSSL/SecureTransportTransceiverI.h +29 -33
- data/ext/ice/cpp/src/IceSSL/SecureTransportUtil.cpp +864 -0
- data/ext/ice/cpp/src/IceSSL/SecureTransportUtil.h +45 -0
- data/ext/ice/cpp/src/IceSSL/TrustManager.cpp +12 -22
- data/ext/ice/cpp/src/IceSSL/TrustManager.h +4 -9
- data/ext/ice/cpp/src/IceSSL/TrustManagerF.h +3 -8
- data/ext/ice/cpp/src/IceSSL/UWPCertificateI.cpp +266 -0
- data/ext/ice/cpp/src/IceSSL/UWPEngine.cpp +338 -0
- data/ext/ice/cpp/src/IceSSL/UWPEngine.h +41 -0
- data/ext/ice/cpp/src/IceSSL/UWPEngineF.h +26 -0
- data/ext/ice/cpp/src/IceSSL/UWPPluginI.cpp +89 -0
- data/ext/ice/cpp/src/IceSSL/UWPTransceiverI.cpp +383 -0
- data/ext/ice/cpp/src/IceSSL/UWPTransceiverI.h +71 -0
- data/ext/ice/cpp/src/IceSSL/Util.cpp +71 -1260
- data/ext/ice/cpp/src/IceSSL/Util.h +48 -142
- data/ext/ice/cpp/src/IceUtil/ConsoleUtil.cpp +157 -0
- data/ext/ice/cpp/src/IceUtil/ConvertUTF.cpp +22 -27
- data/ext/ice/cpp/src/IceUtil/ConvertUTF.h +34 -31
- data/ext/ice/cpp/src/IceUtil/CtrlCHandler.cpp +22 -36
- data/ext/ice/cpp/src/IceUtil/FileUtil.cpp +30 -126
- data/ext/ice/cpp/src/IceUtil/InputUtil.cpp +1 -6
- data/ext/ice/cpp/src/IceUtil/MutexProtocol.cpp +1 -6
- data/ext/ice/cpp/src/IceUtil/Options.cpp +20 -33
- data/ext/ice/cpp/src/IceUtil/OutputUtil.cpp +47 -21
- data/ext/ice/cpp/src/IceUtil/Random.cpp +15 -20
- data/ext/ice/cpp/src/IceUtil/RecMutex.cpp +4 -19
- data/ext/ice/cpp/src/IceUtil/Shared.cpp +8 -8
- data/ext/ice/cpp/src/IceUtil/StringConverter.cpp +501 -269
- data/ext/ice/cpp/src/IceUtil/StringUtil.cpp +582 -244
- data/ext/ice/cpp/src/IceUtil/ThreadException.cpp +37 -79
- data/ext/ice/cpp/src/IceUtil/Time.cpp +6 -11
- data/ext/ice/cpp/src/IceUtil/UUID.cpp +17 -22
- data/ext/ice/cpp/src/IceUtil/Unicode.cpp +97 -101
- data/ext/ice/cpp/src/IceUtil/Unicode.h +21 -40
- data/ext/ice/cpp/src/IceUtil/UtilException.cpp +839 -0
- data/ext/ice/cpp/src/Slice/CPlusPlusUtil.cpp +894 -234
- data/ext/ice/cpp/src/Slice/CPlusPlusUtil.h +72 -0
- data/ext/ice/cpp/src/Slice/Checksum.cpp +2 -7
- data/ext/ice/cpp/src/Slice/Checksum.h +21 -0
- data/ext/ice/cpp/src/Slice/FileTracker.cpp +25 -83
- data/ext/ice/cpp/{include → src}/Slice/FileTracker.h +9 -14
- data/ext/ice/cpp/src/Slice/Grammar.cpp +1981 -1944
- data/ext/ice/cpp/src/Slice/Grammar.h +39 -19
- data/ext/ice/cpp/src/Slice/GrammarUtil.h +14 -20
- data/ext/ice/cpp/src/Slice/JavaUtil.cpp +2752 -1948
- data/ext/ice/cpp/src/Slice/JavaUtil.h +398 -0
- data/ext/ice/cpp/src/Slice/MD5.cpp +1 -6
- data/ext/ice/cpp/src/Slice/MD5.h +1 -6
- data/ext/ice/cpp/src/Slice/MD5I.cpp +8 -1
- data/ext/ice/cpp/src/Slice/MD5I.h +1 -1
- data/ext/ice/cpp/src/Slice/PHPUtil.cpp +17 -20
- data/ext/ice/cpp/src/Slice/PHPUtil.h +36 -0
- data/ext/ice/cpp/src/Slice/Parser.cpp +1190 -426
- data/ext/ice/cpp/{include → src}/Slice/Parser.h +143 -91
- data/ext/ice/cpp/src/Slice/Preprocessor.cpp +67 -36
- data/ext/ice/cpp/{include → src}/Slice/Preprocessor.h +8 -18
- data/ext/ice/cpp/src/Slice/Python.cpp +218 -111
- data/ext/ice/cpp/src/Slice/PythonUtil.cpp +787 -699
- data/ext/ice/cpp/src/Slice/PythonUtil.h +70 -0
- data/ext/ice/cpp/src/Slice/Ruby.cpp +42 -43
- data/ext/ice/cpp/src/Slice/RubyUtil.cpp +175 -445
- data/ext/ice/cpp/{include → src}/Slice/RubyUtil.h +6 -11
- data/ext/ice/cpp/src/Slice/Scanner.cpp +390 -399
- data/ext/ice/cpp/src/Slice/{Util.cpp → SliceUtil.cpp} +36 -69
- data/ext/ice/cpp/src/Slice/StringLiteralUtil.cpp +456 -0
- data/ext/ice/cpp/src/Slice/Util.h +50 -0
- data/ice.gemspec +2 -9
- data/lib/Glacier2.rb +1 -6
- data/lib/Glacier2/Metrics.rb +6 -50
- data/lib/Glacier2/PermissionsVerifier.rb +23 -99
- data/lib/Glacier2/PermissionsVerifierF.rb +2 -7
- data/lib/Glacier2/Router.rb +31 -78
- data/lib/Glacier2/RouterF.rb +2 -7
- data/lib/Glacier2/SSLInfo.rb +3 -11
- data/lib/Glacier2/Session.rb +87 -311
- data/lib/Ice.rb +84 -58
- data/lib/Ice/BuiltinSequences.rb +3 -8
- data/lib/Ice/Communicator.rb +54 -61
- data/lib/Ice/CommunicatorF.rb +2 -7
- data/lib/Ice/Connection.rb +152 -166
- data/lib/Ice/ConnectionF.rb +2 -7
- data/lib/Ice/Current.rb +3 -15
- data/lib/Ice/Endpoint.rb +56 -137
- data/lib/Ice/EndpointF.rb +2 -7
- data/lib/Ice/EndpointTypes.rb +2 -11
- data/lib/Ice/FacetMap.rb +3 -8
- data/lib/Ice/Identity.rb +4 -12
- data/lib/Ice/ImplicitContext.rb +4 -38
- data/lib/Ice/ImplicitContextF.rb +2 -7
- data/lib/Ice/Instrumentation.rb +22 -279
- data/lib/Ice/InstrumentationF.rb +2 -7
- data/lib/Ice/LocalException.rb +94 -145
- data/lib/Ice/Locator.rb +50 -169
- data/lib/Ice/LocatorF.rb +2 -7
- data/lib/Ice/Logger.rb +4 -38
- data/lib/Ice/LoggerF.rb +2 -7
- data/lib/Ice/Metrics.rb +60 -420
- data/lib/Ice/ObjectAdapter.rb +29 -0
- data/lib/Ice/ObjectAdapterF.rb +2 -7
- data/lib/Ice/ObjectFactory.rb +4 -34
- data/lib/Ice/Plugin.rb +6 -64
- data/lib/Ice/PluginF.rb +2 -7
- data/lib/Ice/Process.rb +15 -56
- data/lib/Ice/ProcessF.rb +2 -7
- data/lib/Ice/Properties.rb +4 -45
- data/lib/Ice/PropertiesAdmin.rb +18 -60
- data/lib/Ice/PropertiesF.rb +2 -7
- data/lib/Ice/RemoteLogger.rb +33 -119
- data/lib/Ice/Router.rb +28 -105
- data/lib/Ice/RouterF.rb +2 -7
- data/lib/Ice/ServantLocator.rb +26 -0
- data/lib/Ice/ServantLocatorF.rb +24 -0
- data/lib/Ice/SliceChecksumDict.rb +2 -7
- data/lib/Ice/ValueFactory.rb +28 -0
- data/lib/Ice/Version.rb +4 -15
- data/lib/IceBox.rb +1 -6
- data/lib/IceBox/IceBox.rb +43 -152
- data/lib/IceGrid.rb +1 -9
- data/lib/IceGrid/Admin.rb +550 -431
- data/lib/IceGrid/Descriptor.rb +61 -533
- data/lib/IceGrid/Exception.rb +23 -49
- data/lib/IceGrid/FileParser.rb +13 -54
- data/lib/IceGrid/PluginFacade.rb +35 -0
- data/lib/IceGrid/Registry.rb +150 -62
- data/lib/IceGrid/Session.rb +24 -68
- data/lib/IceGrid/UserAccountMapper.rb +13 -54
- data/lib/IcePatch2.rb +1 -6
- data/lib/IcePatch2/FileInfo.rb +4 -15
- data/lib/IcePatch2/FileServer.rb +32 -80
- data/lib/IceStorm.rb +1 -6
- data/lib/IceStorm/IceStorm.rb +78 -210
- data/lib/IceStorm/Metrics.rb +10 -93
- data/slice/Glacier2/Metrics.ice +20 -10
- data/slice/Glacier2/PermissionsVerifier.ice +19 -12
- data/slice/Glacier2/PermissionsVerifierF.ice +16 -9
- data/slice/Glacier2/Router.ice +19 -13
- data/slice/Glacier2/RouterF.ice +16 -9
- data/slice/Glacier2/SSLInfo.ice +17 -10
- data/slice/Glacier2/Session.ice +24 -18
- data/slice/Ice/BuiltinSequences.ice +18 -9
- data/slice/Ice/Communicator.ice +180 -64
- data/slice/Ice/CommunicatorF.ice +18 -9
- data/slice/Ice/Connection.ice +208 -75
- data/slice/Ice/ConnectionF.ice +18 -9
- data/slice/Ice/Current.ice +37 -28
- data/slice/Ice/Endpoint.ice +73 -21
- data/slice/Ice/EndpointF.ice +19 -10
- data/slice/Ice/EndpointTypes.ice +21 -13
- data/slice/Ice/FacetMap.ice +19 -10
- data/slice/Ice/Identity.ice +24 -10
- data/slice/Ice/ImplicitContext.ice +41 -33
- data/slice/Ice/ImplicitContextF.ice +17 -9
- data/slice/Ice/Instrumentation.ice +37 -30
- data/slice/Ice/InstrumentationF.ice +19 -10
- data/slice/Ice/LocalException.ice +118 -112
- data/slice/Ice/Locator.ice +28 -21
- data/slice/Ice/LocatorF.ice +18 -9
- data/slice/Ice/Logger.ice +26 -18
- data/slice/Ice/LoggerF.ice +18 -9
- data/slice/Ice/Metrics.ice +42 -30
- data/slice/Ice/ObjectAdapter.ice +88 -53
- data/slice/Ice/ObjectAdapterF.ice +18 -9
- data/slice/Ice/ObjectFactory.ice +28 -17
- data/slice/Ice/Plugin.ice +25 -13
- data/slice/Ice/PluginF.ice +22 -9
- data/slice/Ice/Process.ice +20 -11
- data/slice/Ice/ProcessF.ice +18 -9
- data/slice/Ice/Properties.ice +42 -28
- data/slice/Ice/PropertiesAdmin.ice +20 -10
- data/slice/Ice/PropertiesF.ice +18 -9
- data/slice/Ice/RemoteLogger.ice +23 -19
- data/slice/Ice/Router.ice +28 -13
- data/slice/Ice/RouterF.ice +18 -9
- data/slice/Ice/ServantLocator.ice +40 -29
- data/slice/Ice/ServantLocatorF.ice +18 -9
- data/slice/Ice/SliceChecksumDict.ice +18 -9
- data/slice/Ice/ValueFactory.ice +132 -0
- data/slice/Ice/Version.ice +20 -10
- data/slice/IceBT/ConnectionInfo.ice +58 -0
- data/slice/IceBT/EndpointInfo.ice +56 -0
- data/slice/IceBT/Types.ice +44 -0
- data/slice/IceBox/IceBox.ice +45 -27
- data/slice/IceDiscovery/IceDiscovery.ice +75 -10
- data/slice/IceGrid/Admin.ice +410 -44
- data/slice/IceGrid/Descriptor.ice +47 -34
- data/slice/IceGrid/Exception.ice +43 -32
- data/slice/IceGrid/FileParser.ice +21 -12
- data/slice/IceGrid/PluginFacade.ice +26 -18
- data/slice/IceGrid/Registry.ice +150 -21
- data/slice/IceGrid/Session.ice +25 -17
- data/slice/IceGrid/UserAccountMapper.ice +23 -14
- data/slice/IceIAP/ConnectionInfo.ice +73 -0
- data/slice/IceIAP/EndpointInfo.ice +67 -0
- data/slice/IceLocatorDiscovery/IceLocatorDiscovery.ice +19 -12
- data/slice/IcePatch2/FileInfo.ice +19 -13
- data/slice/IcePatch2/FileServer.ice +27 -18
- data/slice/IceSSL/ConnectionInfo.ice +27 -23
- data/slice/IceSSL/ConnectionInfoF.ice +30 -0
- data/slice/IceSSL/EndpointInfo.ice +21 -36
- data/slice/IceStorm/IceStorm.ice +33 -24
- data/slice/IceStorm/Metrics.ice +19 -11
- metadata +148 -120
- data/ext/ObjectFactory.cpp +0 -140
- data/ext/ObjectFactory.h +0 -50
- data/ext/ice/cpp/include/Ice/ACMF.h +0 -30
- data/ext/ice/cpp/include/Ice/BasicStream.h +0 -1335
- data/ext/ice/cpp/include/Ice/BuiltinSequences.h +0 -82
- data/ext/ice/cpp/include/Ice/Communicator.h +0 -200
- data/ext/ice/cpp/include/Ice/Connection.h +0 -497
- data/ext/ice/cpp/include/Ice/ConnectionF.h +0 -74
- data/ext/ice/cpp/include/Ice/ConnectionFactoryF.h +0 -30
- data/ext/ice/cpp/include/Ice/Current.h +0 -102
- data/ext/ice/cpp/include/Ice/DefaultObjectFactory.h +0 -48
- data/ext/ice/cpp/include/Ice/DeprecatedStringConverter.h +0 -62
- data/ext/ice/cpp/include/Ice/Endpoint.h +0 -341
- data/ext/ice/cpp/include/Ice/EndpointF.h +0 -93
- data/ext/ice/cpp/include/Ice/EndpointTypes.h +0 -82
- data/ext/ice/cpp/include/Ice/Identity.h +0 -168
- data/ext/ice/cpp/include/Ice/ImplicitContext.h +0 -102
- data/ext/ice/cpp/include/Ice/Instrumentation.h +0 -365
- data/ext/ice/cpp/include/Ice/InstrumentationF.h +0 -75
- data/ext/ice/cpp/include/Ice/LocalException.h +0 -1030
- data/ext/ice/cpp/include/Ice/Locator.h +0 -2193
- data/ext/ice/cpp/include/Ice/LocatorF.h +0 -93
- data/ext/ice/cpp/include/Ice/Logger.h +0 -100
- data/ext/ice/cpp/include/Ice/Metrics.h +0 -2974
- data/ext/ice/cpp/include/Ice/ObjectAdapter.h +0 -168
- data/ext/ice/cpp/include/Ice/ObjectAdapterFactoryF.h +0 -26
- data/ext/ice/cpp/include/Ice/ObjectFactory.h +0 -92
- data/ext/ice/cpp/include/Ice/ObjectFactoryF.h +0 -66
- data/ext/ice/cpp/include/Ice/ObjectFactoryManagerF.h +0 -26
- data/ext/ice/cpp/include/Ice/Outgoing.h +0 -225
- data/ext/ice/cpp/include/Ice/Plugin.h +0 -125
- data/ext/ice/cpp/include/Ice/PluginF.h +0 -70
- data/ext/ice/cpp/include/Ice/Process.h +0 -574
- data/ext/ice/cpp/include/Ice/ProcessF.h +0 -83
- data/ext/ice/cpp/include/Ice/Properties.h +0 -136
- data/ext/ice/cpp/include/Ice/PropertiesAdmin.h +0 -830
- data/ext/ice/cpp/include/Ice/PropertiesF.h +0 -87
- data/ext/ice/cpp/include/Ice/RemoteLogger.h +0 -1500
- data/ext/ice/cpp/include/Ice/Router.h +0 -1159
- data/ext/ice/cpp/include/Ice/RouterF.h +0 -83
- data/ext/ice/cpp/include/Ice/ServantLocator.h +0 -96
- data/ext/ice/cpp/include/Ice/Stream.h +0 -447
- data/ext/ice/cpp/include/Ice/StreamF.h +0 -30
- data/ext/ice/cpp/include/Ice/Version.h +0 -262
- data/ext/ice/cpp/include/IceSSL/ConnectionInfo.h +0 -158
- data/ext/ice/cpp/include/IceSSL/EndpointInfo.h +0 -142
- data/ext/ice/cpp/include/IceUtil/AbstractMutex.h +0 -119
- data/ext/ice/cpp/include/IceUtil/Cache.h +0 -362
- data/ext/ice/cpp/include/IceUtil/IconvStringConverter.h +0 -302
- data/ext/ice/cpp/include/IceUtil/SHA1.h +0 -47
- data/ext/ice/cpp/include/Slice/CPlusPlusUtil.h +0 -65
- data/ext/ice/cpp/include/Slice/Checksum.h +0 -26
- data/ext/ice/cpp/include/Slice/CsUtil.h +0 -92
- data/ext/ice/cpp/include/Slice/DotNetNames.h +0 -34
- data/ext/ice/cpp/include/Slice/JavaUtil.h +0 -279
- data/ext/ice/cpp/include/Slice/ObjCUtil.h +0 -127
- data/ext/ice/cpp/include/Slice/PHPUtil.h +0 -50
- data/ext/ice/cpp/include/Slice/PythonUtil.h +0 -64
- data/ext/ice/cpp/include/Slice/Util.h +0 -56
- data/ext/ice/cpp/src/Ice/BasicStream.cpp +0 -3428
- data/ext/ice/cpp/src/Ice/DeprecatedStringConverter.cpp +0 -62
- data/ext/ice/cpp/src/Ice/ObjectFactoryF.cpp +0 -44
- data/ext/ice/cpp/src/Ice/ObjectFactoryManager.cpp +0 -139
- data/ext/ice/cpp/src/Ice/ObjectFactoryManager.h +0 -43
- data/ext/ice/cpp/src/Ice/Outgoing.cpp +0 -694
- data/ext/ice/cpp/src/Ice/Stream.cpp +0 -53
- data/ext/ice/cpp/src/Ice/StreamI.cpp +0 -832
- data/ext/ice/cpp/src/Ice/StreamI.h +0 -198
- data/ext/ice/cpp/src/IceSSL/Certificate.cpp +0 -1336
- data/ext/ice/cpp/src/IceUtil/ArgVector.cpp +0 -64
- data/ext/ice/cpp/src/IceUtil/ArgVector.h +0 -41
- data/ext/ice/cpp/src/IceUtil/Exception.cpp +0 -792
- data/ext/ice/cpp/src/IceUtil/FileUtil.h +0 -185
- data/ext/ice/cpp/src/Slice/CsUtil.cpp +0 -2660
- data/ext/ice/cpp/src/Slice/DotNetNames.cpp +0 -146
- data/ext/ice/cpp/src/Slice/ObjCUtil.cpp +0 -1310
- data/lib/Ice/ObjectFactoryF.rb +0 -29
- data/lib/IceGrid/Locator.rb +0 -106
- data/lib/IceGrid/Observer.rb +0 -572
- data/lib/IceGrid/Query.rb +0 -169
- data/slice/Freeze/BackgroundSaveEvictor.ice +0 -111
- data/slice/Freeze/CatalogData.ice +0 -49
- data/slice/Freeze/Connection.ice +0 -121
- data/slice/Freeze/ConnectionF.ice +0 -20
- data/slice/Freeze/DB.ice +0 -37
- data/slice/Freeze/Evictor.ice +0 -346
- data/slice/Freeze/EvictorF.ice +0 -22
- data/slice/Freeze/EvictorStorage.ice +0 -72
- data/slice/Freeze/Exception.ice +0 -100
- data/slice/Freeze/Transaction.ice +0 -58
- data/slice/Freeze/TransactionalEvictor.ice +0 -50
- data/slice/Ice/ObjectFactoryF.ice +0 -21
- data/slice/IceGrid/Locator.ice +0 -57
- data/slice/IceGrid/Observer.ice +0 -395
- data/slice/IceGrid/Query.ice +0 -131
@@ -1,17 +1,13 @@
|
|
1
|
-
// **********************************************************************
|
2
1
|
//
|
3
|
-
// Copyright (c)
|
2
|
+
// Copyright (c) ZeroC, Inc. All rights reserved.
|
4
3
|
//
|
5
|
-
// This copy of Ice is licensed to you under the terms described in the
|
6
|
-
// ICE_LICENSE file included in this distribution.
|
7
|
-
//
|
8
|
-
// **********************************************************************
|
9
4
|
|
10
5
|
#include <Ice/UdpEndpointI.h>
|
11
6
|
#include <Ice/Network.h>
|
12
7
|
#include <Ice/UdpConnector.h>
|
13
8
|
#include <Ice/UdpTransceiver.h>
|
14
|
-
#include <Ice/
|
9
|
+
#include <Ice/OutputStream.h>
|
10
|
+
#include <Ice/InputStream.h>
|
15
11
|
#include <Ice/LocalException.h>
|
16
12
|
#include <Ice/Protocol.h>
|
17
13
|
#include <Ice/ProtocolInstance.h>
|
@@ -22,7 +18,9 @@ using namespace std;
|
|
22
18
|
using namespace Ice;
|
23
19
|
using namespace IceInternal;
|
24
20
|
|
21
|
+
#ifndef ICE_CPP11_MAPPING
|
25
22
|
IceUtil::Shared* IceInternal::upCast(UdpEndpointI* p) { return p; }
|
23
|
+
#endif
|
26
24
|
|
27
25
|
extern "C"
|
28
26
|
{
|
@@ -35,6 +33,26 @@ createIceUDP(const CommunicatorPtr& c, const string&, const StringSeq&)
|
|
35
33
|
|
36
34
|
}
|
37
35
|
|
36
|
+
namespace Ice
|
37
|
+
{
|
38
|
+
|
39
|
+
ICE_API void
|
40
|
+
registerIceUDP(bool loadOnInitialize)
|
41
|
+
{
|
42
|
+
Ice::registerPluginFactory("IceUDP", createIceUDP, loadOnInitialize);
|
43
|
+
}
|
44
|
+
|
45
|
+
}
|
46
|
+
|
47
|
+
//
|
48
|
+
// Objective-C function to allow Objective-C programs to register plugin.
|
49
|
+
//
|
50
|
+
extern "C" ICE_API void
|
51
|
+
ICEregisterIceUDP(bool loadOnInitialize)
|
52
|
+
{
|
53
|
+
Ice::registerIceUDP(loadOnInitialize);
|
54
|
+
}
|
55
|
+
|
38
56
|
IceInternal::UdpEndpointI::UdpEndpointI(const ProtocolInstancePtr& instance, const string& host, Int port,
|
39
57
|
const Address& sourceAddr, const string& mcastInterface, Int mttl, bool conn,
|
40
58
|
const string& conId, bool co) :
|
@@ -54,13 +72,13 @@ IceInternal::UdpEndpointI::UdpEndpointI(const ProtocolInstancePtr& instance) :
|
|
54
72
|
{
|
55
73
|
}
|
56
74
|
|
57
|
-
IceInternal::UdpEndpointI::UdpEndpointI(const ProtocolInstancePtr& instance,
|
75
|
+
IceInternal::UdpEndpointI::UdpEndpointI(const ProtocolInstancePtr& instance, InputStream* s) :
|
58
76
|
IPEndpointI(instance, s),
|
59
77
|
_mcastTtl(-1),
|
60
78
|
_connect(false),
|
61
79
|
_compress(false)
|
62
80
|
{
|
63
|
-
if(s->
|
81
|
+
if(s->getEncoding() == Ice::Encoding_1_0)
|
64
82
|
{
|
65
83
|
Ice::Byte b;
|
66
84
|
s->read(b);
|
@@ -73,10 +91,25 @@ IceInternal::UdpEndpointI::UdpEndpointI(const ProtocolInstancePtr& instance, Bas
|
|
73
91
|
s->read(const_cast<bool&>(_compress));
|
74
92
|
}
|
75
93
|
|
94
|
+
void
|
95
|
+
IceInternal::UdpEndpointI::streamWriteImpl(OutputStream* s) const
|
96
|
+
{
|
97
|
+
IPEndpointI::streamWriteImpl(s);
|
98
|
+
if(s->getEncoding() == Ice::Encoding_1_0)
|
99
|
+
{
|
100
|
+
s->write(Ice::Protocol_1_0);
|
101
|
+
s->write(Ice::Encoding_1_0);
|
102
|
+
}
|
103
|
+
// Not transmitted.
|
104
|
+
//s->write(_connect);
|
105
|
+
s->write(_compress);
|
106
|
+
}
|
107
|
+
|
76
108
|
EndpointInfoPtr
|
77
|
-
IceInternal::UdpEndpointI::getInfo() const
|
109
|
+
IceInternal::UdpEndpointI::getInfo() const ICE_NOEXCEPT
|
78
110
|
{
|
79
|
-
Ice::UDPEndpointInfoPtr info =
|
111
|
+
Ice::UDPEndpointInfoPtr info = ICE_MAKE_SHARED(InfoI<Ice::UDPEndpointInfo>,
|
112
|
+
ICE_DYNAMIC_CAST(UdpEndpointI, ICE_SHARED_FROM_CONST_THIS(UdpEndpointI)));
|
80
113
|
fillEndpointInfo(info.get());
|
81
114
|
return info;
|
82
115
|
}
|
@@ -90,7 +123,7 @@ IceInternal::UdpEndpointI::timeout() const
|
|
90
123
|
EndpointIPtr
|
91
124
|
IceInternal::UdpEndpointI::timeout(Int) const
|
92
125
|
{
|
93
|
-
return
|
126
|
+
return ICE_SHARED_FROM_CONST_THIS(UdpEndpointI);
|
94
127
|
}
|
95
128
|
|
96
129
|
bool
|
@@ -104,12 +137,12 @@ IceInternal::UdpEndpointI::compress(bool compress) const
|
|
104
137
|
{
|
105
138
|
if(compress == _compress)
|
106
139
|
{
|
107
|
-
return
|
140
|
+
return ICE_SHARED_FROM_CONST_THIS(UdpEndpointI);
|
108
141
|
}
|
109
142
|
else
|
110
143
|
{
|
111
|
-
return
|
112
|
-
|
144
|
+
return ICE_MAKE_SHARED(UdpEndpointI, _instance, _host, _port, _sourceAddr, _mcastInterface, _mcastTtl,
|
145
|
+
_connect, _connectionId, compress);
|
113
146
|
}
|
114
147
|
}
|
115
148
|
|
@@ -122,7 +155,8 @@ IceInternal::UdpEndpointI::datagram() const
|
|
122
155
|
TransceiverPtr
|
123
156
|
IceInternal::UdpEndpointI::transceiver() const
|
124
157
|
{
|
125
|
-
return new UdpTransceiver(
|
158
|
+
return new UdpTransceiver(ICE_DYNAMIC_CAST(UdpEndpointI, ICE_SHARED_FROM_CONST_THIS(UdpEndpointI)), _instance,
|
159
|
+
_host, _port, _mcastInterface, _connect);
|
126
160
|
}
|
127
161
|
|
128
162
|
AcceptorPtr
|
@@ -134,8 +168,35 @@ IceInternal::UdpEndpointI::acceptor(const string&) const
|
|
134
168
|
UdpEndpointIPtr
|
135
169
|
IceInternal::UdpEndpointI::endpoint(const UdpTransceiverPtr& transceiver) const
|
136
170
|
{
|
137
|
-
|
138
|
-
|
171
|
+
int port = transceiver->effectivePort();
|
172
|
+
if(port == _port)
|
173
|
+
{
|
174
|
+
return ICE_DYNAMIC_CAST(UdpEndpointI, ICE_SHARED_FROM_CONST_THIS(UdpEndpointI));
|
175
|
+
}
|
176
|
+
else
|
177
|
+
{
|
178
|
+
return ICE_MAKE_SHARED(UdpEndpointI, _instance, _host, port, _sourceAddr, _mcastInterface,_mcastTtl, _connect,
|
179
|
+
_connectionId, _compress);
|
180
|
+
}
|
181
|
+
}
|
182
|
+
|
183
|
+
void
|
184
|
+
IceInternal::UdpEndpointI::initWithOptions(vector<string>& args, bool oaEndpoint)
|
185
|
+
{
|
186
|
+
IPEndpointI::initWithOptions(args, oaEndpoint);
|
187
|
+
|
188
|
+
if(_mcastInterface == "*")
|
189
|
+
{
|
190
|
+
if(oaEndpoint)
|
191
|
+
{
|
192
|
+
const_cast<string&>(_mcastInterface) = string();
|
193
|
+
}
|
194
|
+
else
|
195
|
+
{
|
196
|
+
throw EndpointParseException(__FILE__, __LINE__, "`--interface *' not valid for proxy endpoint `" +
|
197
|
+
toString() + "'");
|
198
|
+
}
|
199
|
+
}
|
139
200
|
}
|
140
201
|
|
141
202
|
string
|
@@ -153,7 +214,17 @@ IceInternal::UdpEndpointI::options() const
|
|
153
214
|
|
154
215
|
if(_mcastInterface.length() > 0)
|
155
216
|
{
|
156
|
-
s << " --interface "
|
217
|
+
s << " --interface ";
|
218
|
+
bool addQuote = _mcastInterface.find(':') != string::npos;
|
219
|
+
if(addQuote)
|
220
|
+
{
|
221
|
+
s << "\"";
|
222
|
+
}
|
223
|
+
s << _mcastInterface;
|
224
|
+
if(addQuote)
|
225
|
+
{
|
226
|
+
s << "\"";
|
227
|
+
}
|
157
228
|
}
|
158
229
|
|
159
230
|
if(_mcastTtl != -1)
|
@@ -175,7 +246,11 @@ IceInternal::UdpEndpointI::options() const
|
|
175
246
|
}
|
176
247
|
|
177
248
|
bool
|
249
|
+
#ifdef ICE_CPP11_MAPPING
|
250
|
+
IceInternal::UdpEndpointI::operator==(const Endpoint& r) const
|
251
|
+
#else
|
178
252
|
IceInternal::UdpEndpointI::operator==(const LocalObject& r) const
|
253
|
+
#endif
|
179
254
|
{
|
180
255
|
if(!IPEndpointI::operator==(r))
|
181
256
|
{
|
@@ -217,7 +292,11 @@ IceInternal::UdpEndpointI::operator==(const LocalObject& r) const
|
|
217
292
|
}
|
218
293
|
|
219
294
|
bool
|
295
|
+
#ifdef ICE_CPP11_MAPPING
|
296
|
+
IceInternal::UdpEndpointI::operator<(const Endpoint& r) const
|
297
|
+
#else
|
220
298
|
IceInternal::UdpEndpointI::operator<(const LocalObject& r) const
|
299
|
+
#endif
|
221
300
|
{
|
222
301
|
const UdpEndpointI* p = dynamic_cast<const UdpEndpointI*>(&r);
|
223
302
|
if(!p)
|
@@ -274,20 +353,6 @@ IceInternal::UdpEndpointI::operator<(const LocalObject& r) const
|
|
274
353
|
return IPEndpointI::operator<(r);
|
275
354
|
}
|
276
355
|
|
277
|
-
void
|
278
|
-
IceInternal::UdpEndpointI::streamWriteImpl(BasicStream* s) const
|
279
|
-
{
|
280
|
-
IPEndpointI::streamWriteImpl(s);
|
281
|
-
if(s->getWriteEncoding() == Ice::Encoding_1_0)
|
282
|
-
{
|
283
|
-
s->write(Ice::Protocol_1_0);
|
284
|
-
s->write(Ice::Encoding_1_0);
|
285
|
-
}
|
286
|
-
// Not transmitted.
|
287
|
-
//s->write(_connect);
|
288
|
-
s->write(_compress);
|
289
|
-
}
|
290
|
-
|
291
356
|
void
|
292
357
|
IceInternal::UdpEndpointI::hashInit(Ice::Int& h) const
|
293
358
|
{
|
@@ -324,9 +389,8 @@ IceInternal::UdpEndpointI::checkOption(const string& option, const string& argum
|
|
324
389
|
{
|
325
390
|
if(!argument.empty())
|
326
391
|
{
|
327
|
-
EndpointParseException
|
328
|
-
|
329
|
-
throw ex;
|
392
|
+
throw EndpointParseException(__FILE__, __LINE__, "unexpected argument `" + argument +
|
393
|
+
"' provided for -c option in " + endpoint);
|
330
394
|
}
|
331
395
|
const_cast<bool&>(_connect) = true;
|
332
396
|
}
|
@@ -334,9 +398,8 @@ IceInternal::UdpEndpointI::checkOption(const string& option, const string& argum
|
|
334
398
|
{
|
335
399
|
if(!argument.empty())
|
336
400
|
{
|
337
|
-
EndpointParseException
|
338
|
-
|
339
|
-
throw ex;
|
401
|
+
throw EndpointParseException(__FILE__, __LINE__, "unexpected argument `" + argument +
|
402
|
+
"' provided for -z option in " + endpoint);
|
340
403
|
}
|
341
404
|
const_cast<bool&>(_compress) = true;
|
342
405
|
}
|
@@ -344,9 +407,8 @@ IceInternal::UdpEndpointI::checkOption(const string& option, const string& argum
|
|
344
407
|
{
|
345
408
|
if(argument.empty())
|
346
409
|
{
|
347
|
-
EndpointParseException
|
348
|
-
|
349
|
-
throw ex;
|
410
|
+
throw EndpointParseException(__FILE__, __LINE__, "no argument provided for " + option +
|
411
|
+
" option in endpoint " + endpoint);
|
350
412
|
}
|
351
413
|
try
|
352
414
|
{
|
@@ -357,20 +419,18 @@ IceInternal::UdpEndpointI::checkOption(const string& option, const string& argum
|
|
357
419
|
_instance->logger()->warning("deprecated udp endpoint option: " + option);
|
358
420
|
}
|
359
421
|
}
|
360
|
-
catch(const VersionParseException&
|
422
|
+
catch(const VersionParseException& ex)
|
361
423
|
{
|
362
|
-
EndpointParseException
|
363
|
-
|
364
|
-
throw ex;
|
424
|
+
throw EndpointParseException(__FILE__, __LINE__, "invalid version `" + argument + "' in endpoint " +
|
425
|
+
endpoint + ":\n" + ex.str);
|
365
426
|
}
|
366
427
|
}
|
367
428
|
else if(option == "--interface")
|
368
429
|
{
|
369
430
|
if(argument.empty())
|
370
431
|
{
|
371
|
-
EndpointParseException
|
372
|
-
|
373
|
-
throw ex;
|
432
|
+
throw EndpointParseException(__FILE__, __LINE__, "no argument provided for --interface option in endpoint "
|
433
|
+
+ endpoint);
|
374
434
|
}
|
375
435
|
const_cast<string&>(_mcastInterface) = argument;
|
376
436
|
}
|
@@ -378,16 +438,14 @@ IceInternal::UdpEndpointI::checkOption(const string& option, const string& argum
|
|
378
438
|
{
|
379
439
|
if(argument.empty())
|
380
440
|
{
|
381
|
-
EndpointParseException
|
382
|
-
|
383
|
-
throw ex;
|
441
|
+
throw EndpointParseException(__FILE__, __LINE__, "no argument provided for --ttl option in endpoint " +
|
442
|
+
endpoint);
|
384
443
|
}
|
385
444
|
istringstream p(argument);
|
386
445
|
if(!(p >> const_cast<Int&>(_mcastTtl)) || !p.eof())
|
387
446
|
{
|
388
|
-
EndpointParseException
|
389
|
-
|
390
|
-
throw ex;
|
447
|
+
throw EndpointParseException(__FILE__, __LINE__, "invalid TTL value `" + argument + "' in endpoint " +
|
448
|
+
endpoint);
|
391
449
|
}
|
392
450
|
}
|
393
451
|
else
|
@@ -406,8 +464,8 @@ IceInternal::UdpEndpointI::createConnector(const Address& address, const Network
|
|
406
464
|
IPEndpointIPtr
|
407
465
|
IceInternal::UdpEndpointI::createEndpoint(const string& host, int port, const string& connectionId) const
|
408
466
|
{
|
409
|
-
return
|
410
|
-
|
467
|
+
return ICE_MAKE_SHARED(UdpEndpointI, _instance, host, port, _sourceAddr, _mcastInterface, _mcastTtl, _connect,
|
468
|
+
connectionId, _compress);
|
411
469
|
}
|
412
470
|
|
413
471
|
IceInternal::UdpEndpointFactory::UdpEndpointFactory(const ProtocolInstancePtr& instance) : _instance(instance)
|
@@ -433,15 +491,15 @@ IceInternal::UdpEndpointFactory::protocol() const
|
|
433
491
|
EndpointIPtr
|
434
492
|
IceInternal::UdpEndpointFactory::create(vector<string>& args, bool oaEndpoint) const
|
435
493
|
{
|
436
|
-
IPEndpointIPtr endpt =
|
494
|
+
IPEndpointIPtr endpt = ICE_MAKE_SHARED(UdpEndpointI, _instance);
|
437
495
|
endpt->initWithOptions(args, oaEndpoint);
|
438
496
|
return endpt;
|
439
497
|
}
|
440
498
|
|
441
499
|
EndpointIPtr
|
442
|
-
IceInternal::UdpEndpointFactory::read(
|
500
|
+
IceInternal::UdpEndpointFactory::read(InputStream* s) const
|
443
501
|
{
|
444
|
-
return
|
502
|
+
return ICE_MAKE_SHARED(UdpEndpointI, _instance, s);
|
445
503
|
}
|
446
504
|
|
447
505
|
void
|
@@ -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 ICE_UDP_ENDPOINT_I_H
|
11
6
|
#define ICE_UDP_ENDPOINT_I_H
|
@@ -25,9 +20,11 @@ public:
|
|
25
20
|
UdpEndpointI(const ProtocolInstancePtr&, const std::string&, Ice::Int, const Address&, const std::string&,
|
26
21
|
Ice::Int, bool, const std::string&, bool);
|
27
22
|
UdpEndpointI(const ProtocolInstancePtr&);
|
28
|
-
UdpEndpointI(const ProtocolInstancePtr&,
|
23
|
+
UdpEndpointI(const ProtocolInstancePtr&, Ice::InputStream*);
|
24
|
+
|
25
|
+
virtual void streamWriteImpl(Ice::OutputStream*) const;
|
29
26
|
|
30
|
-
virtual Ice::EndpointInfoPtr getInfo() const;
|
27
|
+
virtual Ice::EndpointInfoPtr getInfo() const ICE_NOEXCEPT;
|
31
28
|
|
32
29
|
virtual Ice::Int timeout() const;
|
33
30
|
virtual EndpointIPtr timeout(Ice::Int) const;
|
@@ -39,16 +36,22 @@ public:
|
|
39
36
|
virtual AcceptorPtr acceptor(const std::string&) const;
|
40
37
|
virtual std::string options() const;
|
41
38
|
|
39
|
+
#ifdef ICE_CPP11_MAPPING
|
40
|
+
virtual bool operator==(const Ice::Endpoint&) const;
|
41
|
+
virtual bool operator<(const Ice::Endpoint&) const;
|
42
|
+
#else
|
42
43
|
virtual bool operator==(const Ice::LocalObject&) const;
|
43
44
|
virtual bool operator<(const Ice::LocalObject&) const;
|
45
|
+
#endif
|
44
46
|
|
45
47
|
UdpEndpointIPtr endpoint(const UdpTransceiverPtr&) const;
|
46
48
|
|
47
49
|
using IPEndpointI::connectionId;
|
48
50
|
|
51
|
+
virtual void initWithOptions(std::vector<std::string>&, bool);
|
52
|
+
|
49
53
|
protected:
|
50
54
|
|
51
|
-
virtual void streamWriteImpl(BasicStream*) const;
|
52
55
|
virtual void hashInit(Ice::Int&) const;
|
53
56
|
virtual void fillEndpointInfo(Ice::IPEndpointInfo*) const;
|
54
57
|
virtual bool checkOption(const std::string&, const std::string&, const std::string&);
|
@@ -77,7 +80,7 @@ public:
|
|
77
80
|
virtual Ice::Short type() const;
|
78
81
|
virtual std::string protocol() const;
|
79
82
|
virtual EndpointIPtr create(std::vector<std::string>&, bool) const;
|
80
|
-
virtual EndpointIPtr read(
|
83
|
+
virtual EndpointIPtr read(Ice::InputStream*) const;
|
81
84
|
virtual void destroy();
|
82
85
|
|
83
86
|
virtual EndpointFactoryPtr clone(const ProtocolInstancePtr&) const;
|
@@ -1,11 +1,6 @@
|
|
1
|
-
// **********************************************************************
|
2
1
|
//
|
3
|
-
// Copyright (c)
|
2
|
+
// Copyright (c) ZeroC, Inc. All rights reserved.
|
4
3
|
//
|
5
|
-
// This copy of Ice is licensed to you under the terms described in the
|
6
|
-
// ICE_LICENSE file included in this distribution.
|
7
|
-
//
|
8
|
-
// **********************************************************************
|
9
4
|
|
10
5
|
#include <Ice/UdpTransceiver.h>
|
11
6
|
#include <Ice/UdpEndpointI.h>
|
@@ -17,14 +12,14 @@
|
|
17
12
|
#include <Ice/Properties.h>
|
18
13
|
#include <IceUtil/StringUtil.h>
|
19
14
|
|
20
|
-
#ifdef
|
15
|
+
#ifdef ICE_OS_UWP
|
21
16
|
# include <ppltasks.h> // For Concurrency::task
|
22
17
|
#endif
|
23
18
|
|
24
19
|
using namespace std;
|
25
20
|
using namespace Ice;
|
26
21
|
using namespace IceInternal;
|
27
|
-
#ifdef
|
22
|
+
#ifdef ICE_OS_UWP
|
28
23
|
using namespace Platform;
|
29
24
|
using namespace Windows::Foundation;
|
30
25
|
using namespace Windows::Storage::Streams;
|
@@ -40,11 +35,11 @@ IceInternal::UdpTransceiver::getNativeInfo()
|
|
40
35
|
return this;
|
41
36
|
}
|
42
37
|
|
43
|
-
|
44
|
-
#if defined(ICE_USE_IOCP)
|
38
|
+
#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP)
|
45
39
|
AsyncInfo*
|
46
40
|
IceInternal::UdpTransceiver::getAsyncInfo(SocketOperation status)
|
47
41
|
{
|
42
|
+
#if defined(ICE_USE_IOCP)
|
48
43
|
switch(status)
|
49
44
|
{
|
50
45
|
case SocketOperationRead:
|
@@ -55,31 +50,15 @@ IceInternal::UdpTransceiver::getAsyncInfo(SocketOperation status)
|
|
55
50
|
assert(false);
|
56
51
|
return 0;
|
57
52
|
}
|
58
|
-
|
59
|
-
|
60
|
-
|
61
|
-
|
62
|
-
{
|
63
|
-
_completedHandler = handler;
|
64
|
-
_writeOperationCompletedHandler = ref new AsyncOperationCompletedHandler<unsigned int>(
|
65
|
-
[=] (IAsyncOperation<unsigned int>^ operation, Windows::Foundation::AsyncStatus status)
|
66
|
-
{
|
67
|
-
if(status != Windows::Foundation::AsyncStatus::Completed)
|
68
|
-
{
|
69
|
-
_write.count = SOCKET_ERROR;
|
70
|
-
_write.error = operation->ErrorCode.Value;
|
71
|
-
}
|
72
|
-
else
|
73
|
-
{
|
74
|
-
_write.count = static_cast<int>(operation->GetResults());
|
75
|
-
}
|
76
|
-
_completedHandler(SocketOperationWrite);
|
77
|
-
});
|
53
|
+
#elif defined(ICE_OS_UWP)
|
54
|
+
UNREFERENCED_PARAMETER(status);
|
55
|
+
return &_write;
|
56
|
+
#endif
|
78
57
|
}
|
79
58
|
#endif
|
80
59
|
|
81
60
|
SocketOperation
|
82
|
-
IceInternal::UdpTransceiver::initialize(Buffer& /*readBuffer*/, Buffer& /*writeBuffer
|
61
|
+
IceInternal::UdpTransceiver::initialize(Buffer& /*readBuffer*/, Buffer& /*writeBuffer*/)
|
83
62
|
{
|
84
63
|
if(_state == StateNeedConnect)
|
85
64
|
{
|
@@ -90,10 +69,18 @@ IceInternal::UdpTransceiver::initialize(Buffer& /*readBuffer*/, Buffer& /*writeB
|
|
90
69
|
{
|
91
70
|
#if defined(ICE_USE_IOCP)
|
92
71
|
doFinishConnectAsync(_fd, _write);
|
93
|
-
#elif defined(
|
94
|
-
if(_write.
|
72
|
+
#elif defined(ICE_OS_UWP)
|
73
|
+
if(_write.error != ERROR_SUCCESS)
|
95
74
|
{
|
96
|
-
|
75
|
+
try
|
76
|
+
{
|
77
|
+
checkConnectErrorCode(__FILE__, __LINE__, _write.error);
|
78
|
+
}
|
79
|
+
catch(Ice::DNSException& ex)
|
80
|
+
{
|
81
|
+
ex.host = wstringToString(_addr.host->RawName->Data(), Ice::getProcessStringConverter());
|
82
|
+
throw;
|
83
|
+
}
|
97
84
|
}
|
98
85
|
#else
|
99
86
|
doFinishConnect(_fd);
|
@@ -115,16 +102,15 @@ IceInternal::UdpTransceiver::closing(bool, const Ice::LocalException&)
|
|
115
102
|
void
|
116
103
|
IceInternal::UdpTransceiver::close()
|
117
104
|
{
|
118
|
-
#ifdef
|
105
|
+
#ifdef ICE_OS_UWP
|
119
106
|
IceUtil::Mutex::Lock lock(_mutex);
|
120
107
|
if(_readPending)
|
121
108
|
{
|
122
109
|
assert(_received.empty());
|
123
|
-
|
110
|
+
completed(SocketOperationRead);
|
124
111
|
_readPending = false;
|
125
112
|
}
|
126
113
|
_received.clear();
|
127
|
-
_completedHandler = nullptr;
|
128
114
|
#endif
|
129
115
|
|
130
116
|
assert(_fd != INVALID_SOCKET);
|
@@ -149,10 +135,10 @@ IceInternal::UdpTransceiver::bind()
|
|
149
135
|
// address won't be the multicast address and the client will
|
150
136
|
// therefore reject the datagram.
|
151
137
|
//
|
152
|
-
const_cast<Address&>(_addr) = getAddressForServer("", _port, getProtocolSupport(_addr), false);
|
138
|
+
const_cast<Address&>(_addr) = getAddressForServer("", _port, getProtocolSupport(_addr), false, false);
|
153
139
|
#endif
|
154
140
|
|
155
|
-
const_cast<Address&>(_addr) = doBind(_fd, _addr);
|
141
|
+
const_cast<Address&>(_addr) = doBind(_fd, _addr, _mcastInterface);
|
156
142
|
if(getPort(_mcastAddr) == 0)
|
157
143
|
{
|
158
144
|
setPort(_mcastAddr, getPort(_addr));
|
@@ -192,7 +178,7 @@ IceInternal::UdpTransceiver::write(Buffer& buf)
|
|
192
178
|
{
|
193
179
|
return SocketOperationNone;
|
194
180
|
}
|
195
|
-
#ifdef
|
181
|
+
#ifdef ICE_OS_UWP
|
196
182
|
return SocketOperationWrite;
|
197
183
|
#else
|
198
184
|
assert(buf.i == buf.b.begin());
|
@@ -226,9 +212,7 @@ repeat:
|
|
226
212
|
else
|
227
213
|
{
|
228
214
|
// No peer has sent a datagram yet.
|
229
|
-
SocketException
|
230
|
-
ex.error = 0;
|
231
|
-
throw ex;
|
215
|
+
throw SocketException(__FILE__, __LINE__, 0);
|
232
216
|
}
|
233
217
|
|
234
218
|
# ifdef _WIN32
|
@@ -252,9 +236,7 @@ repeat:
|
|
252
236
|
return SocketOperationWrite;
|
253
237
|
}
|
254
238
|
|
255
|
-
SocketException
|
256
|
-
ex.error = getSocketErrno();
|
257
|
-
throw ex;
|
239
|
+
throw SocketException(__FILE__, __LINE__, getSocketErrno());
|
258
240
|
}
|
259
241
|
|
260
242
|
assert(ret == static_cast<ssize_t>(buf.b.size()));
|
@@ -264,26 +246,34 @@ repeat:
|
|
264
246
|
}
|
265
247
|
|
266
248
|
SocketOperation
|
267
|
-
IceInternal::UdpTransceiver::read(Buffer& buf
|
249
|
+
IceInternal::UdpTransceiver::read(Buffer& buf)
|
268
250
|
{
|
269
251
|
if(buf.i == buf.b.end())
|
270
252
|
{
|
271
253
|
return SocketOperationNone;
|
272
254
|
}
|
273
|
-
#ifdef
|
255
|
+
#ifdef ICE_OS_UWP
|
274
256
|
return SocketOperationRead;
|
275
257
|
#else
|
276
258
|
|
277
259
|
assert(buf.i == buf.b.begin());
|
278
260
|
assert(_fd != INVALID_SOCKET);
|
279
261
|
|
280
|
-
|
262
|
+
#ifdef _WIN32
|
263
|
+
int packetSize = min(_maxPacketSize, _rcvSize - _udpOverhead);
|
264
|
+
#else
|
265
|
+
const size_t packetSize = static_cast<size_t>(min(_maxPacketSize, _rcvSize - _udpOverhead));
|
266
|
+
#endif
|
281
267
|
buf.b.resize(packetSize);
|
282
268
|
buf.i = buf.b.begin();
|
283
269
|
|
284
270
|
repeat:
|
285
271
|
|
272
|
+
#ifdef _WIN32
|
273
|
+
int ret;
|
274
|
+
#else
|
286
275
|
ssize_t ret;
|
276
|
+
#endif
|
287
277
|
if(_state == StateConnected)
|
288
278
|
{
|
289
279
|
ret = ::recv(_fd, reinterpret_cast<char*>(&buf.b[0]), packetSize, 0);
|
@@ -328,15 +318,11 @@ repeat:
|
|
328
318
|
|
329
319
|
if(connectionLost())
|
330
320
|
{
|
331
|
-
ConnectionLostException
|
332
|
-
ex.error = getSocketErrno();
|
333
|
-
throw ex;
|
321
|
+
throw ConnectionLostException(__FILE__, __LINE__, getSocketErrno());
|
334
322
|
}
|
335
323
|
else
|
336
324
|
{
|
337
|
-
SocketException
|
338
|
-
ex.error = getSocketErrno();
|
339
|
-
throw ex;
|
325
|
+
throw SocketException(__FILE__, __LINE__, getSocketErrno());
|
340
326
|
}
|
341
327
|
}
|
342
328
|
}
|
@@ -363,13 +349,13 @@ repeat:
|
|
363
349
|
}
|
364
350
|
}
|
365
351
|
|
366
|
-
buf.b.resize(ret);
|
352
|
+
buf.b.resize(static_cast<size_t>(ret));
|
367
353
|
buf.i = buf.b.end();
|
368
354
|
return SocketOperationNone;
|
369
355
|
#endif
|
370
356
|
}
|
371
357
|
|
372
|
-
#if defined(ICE_USE_IOCP) || defined(
|
358
|
+
#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP)
|
373
359
|
bool
|
374
360
|
IceInternal::UdpTransceiver::startWrite(Buffer& buf)
|
375
361
|
{
|
@@ -379,7 +365,7 @@ IceInternal::UdpTransceiver::startWrite(Buffer& buf)
|
|
379
365
|
assert(min(_maxPacketSize, _sndSize - _udpOverhead) >= static_cast<int>(buf.b.size()));
|
380
366
|
assert(_fd != INVALID_SOCKET);
|
381
367
|
|
382
|
-
#ifdef
|
368
|
+
#ifdef ICE_OS_UWP
|
383
369
|
if(_state < StateConnected)
|
384
370
|
{
|
385
371
|
try
|
@@ -388,60 +374,46 @@ IceInternal::UdpTransceiver::startWrite(Buffer& buf)
|
|
388
374
|
if(!multicast)
|
389
375
|
{
|
390
376
|
auto operation = safe_cast<DatagramSocket^>(_fd)->ConnectAsync(_addr.host, _addr.port);
|
391
|
-
if(!checkIfErrorOrCompleted(SocketOperationConnect, operation))
|
377
|
+
if(!checkIfErrorOrCompleted(SocketOperationConnect, operation, operation->Status))
|
392
378
|
{
|
393
|
-
SocketOperationCompletedHandler^ completed = _completedHandler;
|
394
379
|
operation->Completed = ref new AsyncActionCompletedHandler(
|
395
|
-
[
|
380
|
+
[this] (IAsyncAction^ info, Windows::Foundation::AsyncStatus status)
|
396
381
|
{
|
397
|
-
|
398
|
-
|
399
|
-
|
400
|
-
|
401
|
-
|
402
|
-
|
403
|
-
{
|
404
|
-
_write.count = 0;
|
405
|
-
_writer = ref new DataWriter(safe_cast<DatagramSocket^>(_fd)->OutputStream);
|
406
|
-
}
|
407
|
-
completed(SocketOperationConnect);
|
382
|
+
//
|
383
|
+
// COMPILERFIX with v141 using operator!= and operator== inside
|
384
|
+
// a lambda callback triggers a compiler bug, we move the code to
|
385
|
+
// a seperate private method to workaround the issue.
|
386
|
+
//
|
387
|
+
connectCompleted(info, status);
|
408
388
|
});
|
409
389
|
}
|
410
390
|
else
|
411
391
|
{
|
412
392
|
_write.count = 0;
|
393
|
+
_write.error = ERROR_SUCCESS;
|
413
394
|
_writer = ref new DataWriter(safe_cast<DatagramSocket^>(_fd)->OutputStream);
|
414
395
|
}
|
415
396
|
}
|
416
397
|
else
|
417
398
|
{
|
418
399
|
auto operation = safe_cast<DatagramSocket^>(_fd)->GetOutputStreamAsync(_addr.host, _addr.port);
|
419
|
-
if(!checkIfErrorOrCompleted(SocketOperationConnect, operation))
|
400
|
+
if(!checkIfErrorOrCompleted(SocketOperationConnect, operation, operation->Status))
|
420
401
|
{
|
421
|
-
SocketOperationCompletedHandler^ completed = _completedHandler;
|
422
402
|
operation->Completed = ref new AsyncOperationCompletedHandler<IOutputStream^>(
|
423
|
-
[=]
|
403
|
+
[=](IAsyncOperation<IOutputStream^>^ info, Windows::Foundation::AsyncStatus status)
|
424
404
|
{
|
425
|
-
|
426
|
-
|
427
|
-
|
428
|
-
|
429
|
-
|
430
|
-
|
431
|
-
{
|
432
|
-
_write.count = 0;
|
433
|
-
_writer = ref new DataWriter(info->GetResults());
|
434
|
-
}
|
435
|
-
if(_mcastAddr.host != nullptr)
|
436
|
-
{
|
437
|
-
setMcastGroup(_fd, _mcastAddr, "");
|
438
|
-
}
|
439
|
-
completed(SocketOperationConnect);
|
405
|
+
//
|
406
|
+
// COMPILERFIX with v141 using operator!= and operator== inside
|
407
|
+
// a lambda callback triggers a compiler bug, we move the code to
|
408
|
+
// a seperate private method to workaround the issue.
|
409
|
+
//
|
410
|
+
getOutputStreamMcastCompleted(info, status);
|
440
411
|
});
|
441
412
|
}
|
442
413
|
else
|
443
414
|
{
|
444
415
|
_write.count = 0;
|
416
|
+
_write.error = ERROR_SUCCESS;
|
445
417
|
_writer = ref new DataWriter(operation->GetResults());
|
446
418
|
if(_mcastAddr.host != nullptr)
|
447
419
|
{
|
@@ -452,7 +424,7 @@ IceInternal::UdpTransceiver::startWrite(Buffer& buf)
|
|
452
424
|
}
|
453
425
|
catch(Platform::Exception^ ex)
|
454
426
|
{
|
455
|
-
checkConnectErrorCode(__FILE__, __LINE__, ex->HResult
|
427
|
+
checkConnectErrorCode(__FILE__, __LINE__, ex->HResult);
|
456
428
|
}
|
457
429
|
return false;
|
458
430
|
}
|
@@ -460,52 +432,16 @@ IceInternal::UdpTransceiver::startWrite(Buffer& buf)
|
|
460
432
|
{
|
461
433
|
try
|
462
434
|
{
|
463
|
-
SocketOperationCompletedHandler^ completed = _completedHandler;
|
464
435
|
DatagramSocket^ fd = safe_cast<DatagramSocket^>(_fd);
|
465
436
|
concurrency::create_task(fd->GetOutputStreamAsync(_peerAddr.host, _peerAddr.port)).then(
|
466
|
-
[
|
437
|
+
[=, &buf](concurrency::task<IOutputStream^> task)
|
467
438
|
{
|
468
|
-
|
469
|
-
|
470
|
-
|
471
|
-
|
472
|
-
|
473
|
-
|
474
|
-
Windows::Foundation::AsyncStatus status = operation->Status;
|
475
|
-
if(status == Windows::Foundation::AsyncStatus::Completed)
|
476
|
-
{
|
477
|
-
//
|
478
|
-
// NOTE: unlike other methods, it's important to modify _write.count
|
479
|
-
// _before_ calling checkIfErrorOrCompleted since this isn't called
|
480
|
-
// with the connection mutex but from a Windows thread pool thread.
|
481
|
-
// So we can't modify the _write structure after calling the
|
482
|
-
// completed callback.
|
483
|
-
//
|
484
|
-
_write.count = operation->GetResults();
|
485
|
-
completed(SocketOperationWrite);
|
486
|
-
}
|
487
|
-
else if(status == Windows::Foundation::AsyncStatus::Started)
|
488
|
-
{
|
489
|
-
operation->Completed = _writeOperationCompletedHandler;
|
490
|
-
}
|
491
|
-
else
|
492
|
-
{
|
493
|
-
if(_state < StateConnected)
|
494
|
-
{
|
495
|
-
checkConnectErrorCode(__FILE__, __LINE__, operation->ErrorCode.Value, _addr.host);
|
496
|
-
}
|
497
|
-
else
|
498
|
-
{
|
499
|
-
checkErrorCode(__FILE__, __LINE__, operation->ErrorCode.Value);
|
500
|
-
}
|
501
|
-
}
|
502
|
-
}
|
503
|
-
catch(Platform::Exception^ pex)
|
504
|
-
{
|
505
|
-
_write.count = SOCKET_ERROR;
|
506
|
-
_write.error = pex->HResult;
|
507
|
-
completed(SocketOperationWrite);
|
508
|
-
}
|
439
|
+
//
|
440
|
+
// COMPILERFIX with v141 using operator!= and operator== inside
|
441
|
+
// a lambda callback triggers a compiler bug, we move the code to
|
442
|
+
// a seperate private method to workaround the issue.
|
443
|
+
//
|
444
|
+
getOutputStreamCompleted(task, buf);
|
509
445
|
});
|
510
446
|
}
|
511
447
|
catch(Platform::Exception^ ex)
|
@@ -519,15 +455,7 @@ IceInternal::UdpTransceiver::startWrite(Buffer& buf)
|
|
519
455
|
try
|
520
456
|
{
|
521
457
|
_writer->WriteBytes(ref new Array<unsigned char>(&*buf.i, static_cast<int>(buf.b.size())));
|
522
|
-
|
523
|
-
if(checkIfErrorOrCompleted(SocketOperationWrite, operation))
|
524
|
-
{
|
525
|
-
_write.count = operation->GetResults();
|
526
|
-
}
|
527
|
-
else
|
528
|
-
{
|
529
|
-
operation->Completed = _writeOperationCompletedHandler;
|
530
|
-
}
|
458
|
+
queueOperation(SocketOperationWrite, _writer->StoreAsync());
|
531
459
|
}
|
532
460
|
catch(Platform::Exception^ ex)
|
533
461
|
{
|
@@ -538,10 +466,11 @@ IceInternal::UdpTransceiver::startWrite(Buffer& buf)
|
|
538
466
|
#else
|
539
467
|
_write.buf.len = static_cast<int>(buf.b.size());
|
540
468
|
_write.buf.buf = reinterpret_cast<char*>(&*buf.i);
|
469
|
+
_write.error = ERROR_SUCCESS;
|
541
470
|
int err;
|
542
471
|
if(_state == StateConnected)
|
543
472
|
{
|
544
|
-
err = WSASend(_fd, &_write.buf, 1, &_write.count, 0, &_write,
|
473
|
+
err = WSASend(_fd, &_write.buf, 1, &_write.count, 0, &_write, ICE_NULLPTR);
|
545
474
|
}
|
546
475
|
else
|
547
476
|
{
|
@@ -557,12 +486,9 @@ IceInternal::UdpTransceiver::startWrite(Buffer& buf)
|
|
557
486
|
else
|
558
487
|
{
|
559
488
|
// No peer has sent a datagram yet.
|
560
|
-
SocketException
|
561
|
-
ex.error = 0;
|
562
|
-
throw ex;
|
489
|
+
throw SocketException(__FILE__, __LINE__, 0);
|
563
490
|
}
|
564
|
-
err = WSASendTo(_fd, &_write.buf, 1, &_write.count, 0, &_peerAddr.sa,
|
565
|
-
len, &_write, NULL);
|
491
|
+
err = WSASendTo(_fd, &_write.buf, 1, &_write.count, 0, &_peerAddr.sa, len, &_write, ICE_NULLPTR);
|
566
492
|
}
|
567
493
|
|
568
494
|
if(err == SOCKET_ERROR)
|
@@ -571,52 +497,103 @@ IceInternal::UdpTransceiver::startWrite(Buffer& buf)
|
|
571
497
|
{
|
572
498
|
if(connectionLost())
|
573
499
|
{
|
574
|
-
ConnectionLostException
|
575
|
-
ex.error = getSocketErrno();
|
576
|
-
throw ex;
|
500
|
+
throw ConnectionLostException(__FILE__, __LINE__, getSocketErrno());
|
577
501
|
}
|
578
502
|
else
|
579
503
|
{
|
580
|
-
SocketException
|
581
|
-
ex.error = getSocketErrno();
|
582
|
-
throw ex;
|
504
|
+
throw SocketException(__FILE__, __LINE__, getSocketErrno());
|
583
505
|
}
|
584
506
|
}
|
585
507
|
}
|
586
|
-
#endif
|
587
508
|
return true;
|
509
|
+
#endif
|
588
510
|
}
|
589
511
|
|
512
|
+
#ifdef ICE_OS_UWP
|
513
|
+
void
|
514
|
+
IceInternal::UdpTransceiver::connectCompleted(Windows::Foundation::IAsyncAction^ action,
|
515
|
+
Windows::Foundation::AsyncStatus status)
|
516
|
+
{
|
517
|
+
if(status != Windows::Foundation::AsyncStatus::Completed)
|
518
|
+
{
|
519
|
+
_write.error = action->ErrorCode.Value;
|
520
|
+
}
|
521
|
+
else
|
522
|
+
{
|
523
|
+
_write.error = ERROR_SUCCESS;
|
524
|
+
_writer = ref new DataWriter(safe_cast<DatagramSocket^>(_fd)->OutputStream);
|
525
|
+
}
|
526
|
+
_write.count = 0;
|
527
|
+
completed(SocketOperationConnect);
|
528
|
+
}
|
529
|
+
|
530
|
+
void
|
531
|
+
IceInternal::UdpTransceiver::getOutputStreamMcastCompleted(IAsyncOperation<IOutputStream^>^ operation,
|
532
|
+
Windows::Foundation::AsyncStatus status)
|
533
|
+
{
|
534
|
+
if(status != Windows::Foundation::AsyncStatus::Completed)
|
535
|
+
{
|
536
|
+
_write.error = operation->ErrorCode.Value;
|
537
|
+
}
|
538
|
+
else
|
539
|
+
{
|
540
|
+
_write.error = ERROR_SUCCESS;
|
541
|
+
_writer = ref new DataWriter(operation->GetResults());
|
542
|
+
}
|
543
|
+
_write.count = 0;
|
544
|
+
if(_mcastAddr.host != nullptr)
|
545
|
+
{
|
546
|
+
setMcastGroup(_fd, _mcastAddr, "");
|
547
|
+
}
|
548
|
+
completed(SocketOperationConnect);
|
549
|
+
}
|
550
|
+
|
551
|
+
void
|
552
|
+
IceInternal::UdpTransceiver::getOutputStreamCompleted(concurrency::task<IOutputStream^> task, Buffer& buf)
|
553
|
+
{
|
554
|
+
try
|
555
|
+
{
|
556
|
+
DataWriter^ writer = ref new DataWriter(task.get());
|
557
|
+
writer->WriteBytes(ref new Array<unsigned char>(&*buf.i, static_cast<int>(buf.b.size())));
|
558
|
+
DataWriterStoreOperation^ operation = writer->StoreAsync();
|
559
|
+
queueOperation(SocketOperationWrite, operation);
|
560
|
+
}
|
561
|
+
catch(Platform::Exception^ pex)
|
562
|
+
{
|
563
|
+
_write.count = 0;
|
564
|
+
_write.error = pex->HResult;
|
565
|
+
completed(SocketOperationWrite);
|
566
|
+
}
|
567
|
+
}
|
568
|
+
|
569
|
+
#endif
|
570
|
+
|
590
571
|
void
|
591
572
|
IceInternal::UdpTransceiver::finishWrite(Buffer& buf)
|
592
573
|
{
|
593
|
-
if(_state < StateConnected)
|
574
|
+
if(_fd == INVALID_SOCKET || _state < StateConnected)
|
594
575
|
{
|
595
576
|
return;
|
596
577
|
}
|
597
578
|
|
598
|
-
if(
|
579
|
+
if(_write.error != ERROR_SUCCESS)
|
599
580
|
{
|
600
|
-
#ifndef
|
581
|
+
#ifndef ICE_OS_UWP
|
601
582
|
WSASetLastError(_write.error);
|
602
583
|
if(connectionLost())
|
603
584
|
{
|
604
|
-
ConnectionLostException
|
605
|
-
ex.error = getSocketErrno();
|
606
|
-
throw ex;
|
585
|
+
throw ConnectionLostException(__FILE__, __LINE__ ,getSocketErrno());
|
607
586
|
}
|
608
587
|
else
|
609
588
|
{
|
610
|
-
SocketException
|
611
|
-
ex.error = getSocketErrno();
|
612
|
-
throw ex;
|
589
|
+
throw SocketException(__FILE__, __LINE__, getSocketErrno());
|
613
590
|
}
|
614
591
|
#else
|
615
592
|
checkErrorCode(__FILE__, __LINE__, _write.error);
|
616
593
|
#endif
|
617
594
|
}
|
618
595
|
|
619
|
-
assert(_write.count == buf.b.size());
|
596
|
+
assert(static_cast<size_t>(_write.count) == buf.b.size());
|
620
597
|
buf.i = buf.b.end();
|
621
598
|
}
|
622
599
|
|
@@ -627,21 +604,22 @@ IceInternal::UdpTransceiver::startRead(Buffer& buf)
|
|
627
604
|
buf.b.resize(packetSize);
|
628
605
|
buf.i = buf.b.begin();
|
629
606
|
assert(!buf.b.empty() && buf.i != buf.b.end());
|
630
|
-
#ifndef
|
607
|
+
#ifndef ICE_OS_UWP
|
631
608
|
_read.buf.len = packetSize;
|
632
609
|
_read.buf.buf = reinterpret_cast<char*>(&*buf.i);
|
610
|
+
_read.error = ERROR_SUCCESS;
|
633
611
|
int err;
|
634
612
|
if(_state == StateConnected)
|
635
613
|
{
|
636
|
-
err = WSARecv(_fd, &_read.buf, 1, &_read.count, &_read.flags, &_read,
|
614
|
+
err = WSARecv(_fd, &_read.buf, 1, &_read.count, &_read.flags, &_read, ICE_NULLPTR);
|
637
615
|
}
|
638
616
|
else
|
639
617
|
{
|
640
618
|
memset(&_readAddr.saStorage, 0, sizeof(struct sockaddr_storage));
|
641
619
|
_readAddrLen = static_cast<socklen_t>(sizeof(sockaddr_storage));
|
642
620
|
|
643
|
-
err = WSARecvFrom(_fd, &_read.buf, 1, &_read.count, &_read.flags,
|
644
|
-
|
621
|
+
err = WSARecvFrom(_fd, &_read.buf, 1, &_read.count, &_read.flags, &_readAddr.sa, &_readAddrLen, &_read,
|
622
|
+
ICE_NULLPTR);
|
645
623
|
}
|
646
624
|
|
647
625
|
if(err == SOCKET_ERROR)
|
@@ -654,15 +632,11 @@ IceInternal::UdpTransceiver::startRead(Buffer& buf)
|
|
654
632
|
{
|
655
633
|
if(connectionLost())
|
656
634
|
{
|
657
|
-
ConnectionLostException
|
658
|
-
ex.error = getSocketErrno();
|
659
|
-
throw ex;
|
635
|
+
throw ConnectionLostException(__FILE__, __LINE__, getSocketErrno());
|
660
636
|
}
|
661
637
|
else
|
662
638
|
{
|
663
|
-
SocketException
|
664
|
-
ex.error = getSocketErrno();
|
665
|
-
throw ex;
|
639
|
+
throw SocketException(__FILE__, __LINE__, getSocketErrno());
|
666
640
|
}
|
667
641
|
}
|
668
642
|
}
|
@@ -671,7 +645,7 @@ IceInternal::UdpTransceiver::startRead(Buffer& buf)
|
|
671
645
|
assert(!_readPending);
|
672
646
|
if(!_received.empty())
|
673
647
|
{
|
674
|
-
|
648
|
+
completed(SocketOperationRead);
|
675
649
|
}
|
676
650
|
else
|
677
651
|
{
|
@@ -681,9 +655,9 @@ IceInternal::UdpTransceiver::startRead(Buffer& buf)
|
|
681
655
|
}
|
682
656
|
|
683
657
|
void
|
684
|
-
IceInternal::UdpTransceiver::finishRead(Buffer& buf
|
658
|
+
IceInternal::UdpTransceiver::finishRead(Buffer& buf)
|
685
659
|
{
|
686
|
-
#ifdef
|
660
|
+
#ifdef ICE_OS_UWP
|
687
661
|
IceUtil::Mutex::Lock lock(_mutex);
|
688
662
|
assert(!_readPending && (!_received.empty() || _fd == INVALID_SOCKET));
|
689
663
|
if(_fd == INVALID_SOCKET)
|
@@ -694,7 +668,7 @@ IceInternal::UdpTransceiver::finishRead(Buffer& buf, bool&)
|
|
694
668
|
DatagramSocketMessageReceivedEventArgs^ args = _received.front();
|
695
669
|
_received.pop_front();
|
696
670
|
|
697
|
-
int ret;
|
671
|
+
int ret = 0;
|
698
672
|
try
|
699
673
|
{
|
700
674
|
DataReader^ reader = args->GetDataReader();
|
@@ -715,7 +689,7 @@ IceInternal::UdpTransceiver::finishRead(Buffer& buf, bool&)
|
|
715
689
|
checkErrorCode(__FILE__, __LINE__, ex->HResult);
|
716
690
|
}
|
717
691
|
#else
|
718
|
-
if(
|
692
|
+
if(_read.error != ERROR_SUCCESS)
|
719
693
|
{
|
720
694
|
WSASetLastError(_read.error);
|
721
695
|
|
@@ -730,15 +704,11 @@ IceInternal::UdpTransceiver::finishRead(Buffer& buf, bool&)
|
|
730
704
|
{
|
731
705
|
if(connectionLost())
|
732
706
|
{
|
733
|
-
ConnectionLostException
|
734
|
-
ex.error = getSocketErrno();
|
735
|
-
throw ex;
|
707
|
+
throw ConnectionLostException(__FILE__, __LINE__, getSocketErrno());
|
736
708
|
}
|
737
709
|
else
|
738
710
|
{
|
739
|
-
SocketException
|
740
|
-
ex.error = getSocketErrno();
|
741
|
-
throw ex;
|
711
|
+
throw SocketException(__FILE__, __LINE__, getSocketErrno());
|
742
712
|
}
|
743
713
|
}
|
744
714
|
}
|
@@ -787,7 +757,7 @@ IceInternal::UdpTransceiver::toString() const
|
|
787
757
|
}
|
788
758
|
else
|
789
759
|
{
|
790
|
-
#ifndef
|
760
|
+
#ifndef ICE_OS_UWP
|
791
761
|
s << fdToString(_fd);
|
792
762
|
#else
|
793
763
|
Address localAddr;
|
@@ -809,7 +779,15 @@ IceInternal::UdpTransceiver::toDetailedString() const
|
|
809
779
|
{
|
810
780
|
ostringstream os;
|
811
781
|
os << toString();
|
812
|
-
vector<string> intfs
|
782
|
+
vector<string> intfs;
|
783
|
+
if(isAddressValid(_mcastAddr))
|
784
|
+
{
|
785
|
+
intfs = getInterfacesForMulticast(_mcastInterface, getProtocolSupport(_mcastAddr));
|
786
|
+
}
|
787
|
+
else
|
788
|
+
{
|
789
|
+
intfs = getHostsForEndpointExpand(inetAddrToString(_addr), _instance->protocolSupport(), true);
|
790
|
+
}
|
813
791
|
if(!intfs.empty())
|
814
792
|
{
|
815
793
|
os << "\nlocal interfaces = ";
|
@@ -821,8 +799,8 @@ IceInternal::UdpTransceiver::toDetailedString() const
|
|
821
799
|
Ice::ConnectionInfoPtr
|
822
800
|
IceInternal::UdpTransceiver::getInfo() const
|
823
801
|
{
|
824
|
-
Ice::UDPConnectionInfoPtr info =
|
825
|
-
#if defined(
|
802
|
+
Ice::UDPConnectionInfoPtr info = ICE_MAKE_SHARED(Ice::UDPConnectionInfo);
|
803
|
+
#if defined(ICE_OS_UWP)
|
826
804
|
if(isMulticast(_addr) || isAddressValid(_mcastAddr))
|
827
805
|
{
|
828
806
|
info->remotePort = 0;
|
@@ -897,7 +875,7 @@ IceInternal::UdpTransceiver::effectivePort() const
|
|
897
875
|
|
898
876
|
IceInternal::UdpTransceiver::UdpTransceiver(const ProtocolInstancePtr& instance,
|
899
877
|
const Address& addr,
|
900
|
-
#ifdef
|
878
|
+
#ifdef ICE_OS_UWP
|
901
879
|
const Address&,
|
902
880
|
const string&,
|
903
881
|
int
|
@@ -915,7 +893,7 @@ IceInternal::UdpTransceiver::UdpTransceiver(const ProtocolInstancePtr& instance,
|
|
915
893
|
#if defined(ICE_USE_IOCP)
|
916
894
|
, _read(SocketOperationRead),
|
917
895
|
_write(SocketOperationWrite)
|
918
|
-
#elif defined(
|
896
|
+
#elif defined(ICE_OS_UWP)
|
919
897
|
, _readPending(false)
|
920
898
|
#endif
|
921
899
|
{
|
@@ -923,7 +901,7 @@ IceInternal::UdpTransceiver::UdpTransceiver(const ProtocolInstancePtr& instance,
|
|
923
901
|
setBufSize(-1, -1);
|
924
902
|
setBlock(_fd, false);
|
925
903
|
|
926
|
-
#ifndef
|
904
|
+
#ifndef ICE_OS_UWP
|
927
905
|
_mcastAddr.saStorage.ss_family = AF_UNSPEC;
|
928
906
|
_peerAddr.saStorage.ss_family = AF_UNSPEC; // Not initialized yet.
|
929
907
|
|
@@ -972,7 +950,6 @@ IceInternal::UdpTransceiver::UdpTransceiver(const ProtocolInstancePtr& instance,
|
|
972
950
|
});
|
973
951
|
#endif
|
974
952
|
|
975
|
-
|
976
953
|
#ifdef ICE_USE_IOCP
|
977
954
|
//
|
978
955
|
// On Windows when using IOCP, we must make sure that the socket is connected without
|
@@ -990,11 +967,11 @@ IceInternal::UdpTransceiver::UdpTransceiver(const UdpEndpointIPtr& endpoint, con
|
|
990
967
|
_instance(instance),
|
991
968
|
_incoming(true),
|
992
969
|
_bound(false),
|
993
|
-
_addr(getAddressForServer(host, port, instance->protocolSupport(), instance->preferIPv6())),
|
970
|
+
_addr(getAddressForServer(host, port, instance->protocolSupport(), instance->preferIPv6(), true)),
|
994
971
|
_mcastInterface(mcastInterface),
|
995
972
|
_port(port),
|
996
973
|
_state(connect ? StateNeedConnect : StateNotConnected)
|
997
|
-
#ifdef
|
974
|
+
#ifdef ICE_OS_UWP
|
998
975
|
, _readPending(false)
|
999
976
|
#elif defined(ICE_USE_IOCP)
|
1000
977
|
, _read(SocketOperationRead),
|
@@ -1005,7 +982,7 @@ IceInternal::UdpTransceiver::UdpTransceiver(const UdpEndpointIPtr& endpoint, con
|
|
1005
982
|
setBufSize(-1, -1);
|
1006
983
|
setBlock(_fd, false);
|
1007
984
|
|
1008
|
-
#ifndef
|
985
|
+
#ifndef ICE_OS_UWP
|
1009
986
|
memset(&_mcastAddr.saStorage, 0, sizeof(sockaddr_storage));
|
1010
987
|
memset(&_peerAddr.saStorage, 0, sizeof(sockaddr_storage));
|
1011
988
|
_peerAddr.saStorage.ss_family = AF_UNSPEC;
|
@@ -1142,43 +1119,7 @@ IceInternal::UdpTransceiver::setBufSize(int rcvSize, int sndSize)
|
|
1142
1119
|
}
|
1143
1120
|
}
|
1144
1121
|
|
1145
|
-
#ifdef
|
1146
|
-
bool
|
1147
|
-
IceInternal::UdpTransceiver::checkIfErrorOrCompleted(SocketOperation op, IAsyncInfo^ info)
|
1148
|
-
{
|
1149
|
-
//
|
1150
|
-
// NOTE: It's important to only check for info->Status once as it
|
1151
|
-
// might change during the checks below (the Status can be changed
|
1152
|
-
// by the Windows thread pool concurrently).
|
1153
|
-
//
|
1154
|
-
// We consider that a canceled async status is the same as an
|
1155
|
-
// error. A canceled async status can occur if there's a timeout
|
1156
|
-
// and the socket is closed.
|
1157
|
-
//
|
1158
|
-
Windows::Foundation::AsyncStatus status = info->Status;
|
1159
|
-
if(status == Windows::Foundation::AsyncStatus::Completed)
|
1160
|
-
{
|
1161
|
-
_completedHandler(op);
|
1162
|
-
return true;
|
1163
|
-
}
|
1164
|
-
else if(status == Windows::Foundation::AsyncStatus::Started)
|
1165
|
-
{
|
1166
|
-
return false;
|
1167
|
-
}
|
1168
|
-
else
|
1169
|
-
{
|
1170
|
-
if(_state < StateConnected)
|
1171
|
-
{
|
1172
|
-
checkConnectErrorCode(__FILE__, __LINE__, info->ErrorCode.Value, _addr.host);
|
1173
|
-
}
|
1174
|
-
else
|
1175
|
-
{
|
1176
|
-
checkErrorCode(__FILE__, __LINE__, info->ErrorCode.Value);
|
1177
|
-
}
|
1178
|
-
return true; // Prevent compiler warning.
|
1179
|
-
}
|
1180
|
-
}
|
1181
|
-
|
1122
|
+
#ifdef ICE_OS_UWP
|
1182
1123
|
void
|
1183
1124
|
IceInternal::UdpTransceiver::appendMessage(DatagramSocketMessageReceivedEventArgs^ args)
|
1184
1125
|
{
|
@@ -1198,7 +1139,7 @@ IceInternal::UdpTransceiver::appendMessage(DatagramSocketMessageReceivedEventArg
|
|
1198
1139
|
//
|
1199
1140
|
if(_readPending)
|
1200
1141
|
{
|
1201
|
-
|
1142
|
+
completed(SocketOperationRead);
|
1202
1143
|
_readPending = false;
|
1203
1144
|
}
|
1204
1145
|
}
|