zeroc-ice 3.6.0 → 3.6.1

data/ext/ice/cpp/src/Ice/UdpTransceiver.cpp

@@ -17,8 +17,6 @@
 #include <Ice/Properties.h>
 #include <IceUtil/StringUtil.h>
 
-#include <IceUtil/DisableWarnings.h>
-
 #ifdef ICE_OS_WINRT
 #   include <ppltasks.h> // For Concurrency::task
 #endif
@@ -126,6 +124,7 @@ IceInternal::UdpTransceiver::close()
         _readPending = false;
     }
     _received.clear();
+    _completedHandler = nullptr;
 #endif
 
     assert(_fd != INVALID_SOCKET);
@@ -391,6 +390,7 @@ IceInternal::UdpTransceiver::startWrite(Buffer& buf)
                 auto operation = safe_cast<DatagramSocket^>(_fd)->ConnectAsync(_addr.host, _addr.port);
                 if(!checkIfErrorOrCompleted(SocketOperationConnect, operation))
                 {
+                    SocketOperationCompletedHandler^ completed = _completedHandler;
                     operation->Completed = ref new AsyncActionCompletedHandler(
                         [=] (IAsyncAction^ info, Windows::Foundation::AsyncStatus status)
                         {
@@ -404,7 +404,7 @@ IceInternal::UdpTransceiver::startWrite(Buffer& buf)
                                 _write.count = 0;
                                 _writer = ref new DataWriter(safe_cast<DatagramSocket^>(_fd)->OutputStream);
                             }
-                            _completedHandler(SocketOperationConnect);
+                            completed(SocketOperationConnect);
                         });
                 }
                 else
@@ -418,6 +418,7 @@ IceInternal::UdpTransceiver::startWrite(Buffer& buf)
                 auto operation = safe_cast<DatagramSocket^>(_fd)->GetOutputStreamAsync(_addr.host, _addr.port);
                 if(!checkIfErrorOrCompleted(SocketOperationConnect, operation))
                 {
+                    SocketOperationCompletedHandler^ completed = _completedHandler;
                     operation->Completed = ref new AsyncOperationCompletedHandler<IOutputStream^>(
                         [=] (IAsyncOperation<IOutputStream^>^ info, Windows::Foundation::AsyncStatus status)
                         {
@@ -435,7 +436,7 @@ IceInternal::UdpTransceiver::startWrite(Buffer& buf)
                             {
                                 setMcastGroup(_fd, _mcastAddr, "");
                             }
-                            _completedHandler(SocketOperationConnect);
+                            completed(SocketOperationConnect);
                         });
                 }
                 else
@@ -459,6 +460,7 @@ IceInternal::UdpTransceiver::startWrite(Buffer& buf)
     {
         try
         {
+            SocketOperationCompletedHandler^ completed = _completedHandler;
             DatagramSocket^ fd = safe_cast<DatagramSocket^>(_fd);
             concurrency::create_task(fd->GetOutputStreamAsync(_peerAddr.host, _peerAddr.port)).then(
                 [=,&buf](concurrency::task<IOutputStream^> task)
@@ -480,7 +482,7 @@ IceInternal::UdpTransceiver::startWrite(Buffer& buf)
                             // completed callback.
                             //
                             _write.count = operation->GetResults();
-                            _completedHandler(SocketOperationWrite);
+                            completed(SocketOperationWrite);
                         }
                         else if(status == Windows::Foundation::AsyncStatus::Started)
                         {
@@ -502,7 +504,7 @@ IceInternal::UdpTransceiver::startWrite(Buffer& buf)
                     {
                         _write.count = SOCKET_ERROR;
                         _write.error = pex->HResult;
-                        _completedHandler(SocketOperationWrite);
+                        completed(SocketOperationWrite);
                     }
                 });
         }
@@ -954,10 +956,19 @@ IceInternal::UdpTransceiver::UdpTransceiver(const ProtocolInstancePtr& instance,
     }
 #else
     DatagramSocket^ socket = safe_cast<DatagramSocket^>(_fd);
+    IceUtil::Handle<UdpTransceiver> self(this);
+# if _WIN32_WINNT >= 0x0A00
+    // On Windows 10, it's necessary to set this property to allow Win32 applications to
+    // bind to the same multicast address
+    if(isMulticast(_addr))
+    {
+        socket->Control->MulticastOnly = true;
+    }
+# endif
     socket->MessageReceived += ref new TypedEventHandler<DatagramSocket^, DatagramSocketMessageReceivedEventArgs^>(
         [=](DatagramSocket^ fd, DatagramSocketMessageReceivedEventArgs^ args)
         {
-            this->appendMessage(args);
+            self->appendMessage(args);
         });
 #endif
 
@@ -1001,10 +1012,19 @@ IceInternal::UdpTransceiver::UdpTransceiver(const UdpEndpointIPtr& endpoint, con
     _mcastAddr.saStorage.ss_family = AF_UNSPEC;
 #else
     DatagramSocket^ socket = safe_cast<DatagramSocket^>(_fd);
+# if _WIN32_WINNT >= 0x0A00
+    // On Windows 10, it's necessary to set this property to allow Win32 applications to
+    // bind to the same multicast address
+    if(isMulticast(_addr))
+    {
+        socket->Control->MulticastOnly = true;
+    }
+# endif
+    IceUtil::Handle<UdpTransceiver> self(this);
     socket->MessageReceived += ref new TypedEventHandler<DatagramSocket^, DatagramSocketMessageReceivedEventArgs^>(
         [=](DatagramSocket^ fd, DatagramSocketMessageReceivedEventArgs^ args)
         {
-            this->appendMessage(args);
+            self->appendMessage(args);
         });
 #endif
 }

data/ext/ice/cpp/src/Ice/Version.cpp

@@ -7,7 +7,7 @@
 //
 // **********************************************************************
 //
-// Ice version 3.6.0
+// Ice version 3.6.1
 //
 // <auto-generated>
 //
@@ -34,7 +34,7 @@
 #   if ICE_INT_VERSION % 100 > 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 0
+#   if ICE_INT_VERSION % 100 < 1
 #       error Ice patch level mismatch!
 #   endif
 #endif

data/ext/ice/cpp/src/Ice/WSTransceiver.cpp

@@ -21,8 +21,6 @@
 #include <IceUtil/SHA1.h>
 #include <IceUtil/StringUtil.h>
 
-#include <IceUtil/DisableWarnings.h>
-
 // Python 2.7 under Windows.
 #if _MSC_VER == 1500
 typedef unsigned short uint16_t;
@@ -480,6 +478,18 @@ IceInternal::WSTransceiver::close()
 {
     _delegate->close();
     _state = StateClosed;
+
+    //
+    // Clear the buffers now instead of waiting for destruction.
+    //
+    if(!_writePending)
+    {
+        _writeBuffer.b.clear();
+    }
+    if(!_readPending)
+    {
+        _readBuffer.b.clear();
+    }
 }
 
 SocketOperation
@@ -673,6 +683,7 @@ void
 IceInternal::WSTransceiver::finishWrite(Buffer& buf)
 {
     _writePending = false;
+
     if(_state < StateOpened)
     {
         if(_state < StateConnected)
@@ -696,6 +707,12 @@ IceInternal::WSTransceiver::finishWrite(Buffer& buf)
         _delegate->finishWrite(buf);
     }
 
+    if(_state == StateClosed)
+    {
+        _writeBuffer.b.clear();
+        return;
+    }
+
     postWrite(buf);
 }
 
@@ -778,6 +795,13 @@ IceInternal::WSTransceiver::finishRead(Buffer& buf, bool& hasMoreData)
     {
         _delegate->finishRead(_readBuffer, hasMoreData);
     }
+
+    if(_state == StateClosed)
+    {
+        _readBuffer.b.clear();
+        return;
+    }
+
     postRead(buf);
 }
 #endif

data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.cpp

@@ -7,7 +7,7 @@
 //
 // **********************************************************************
 //
-// Ice version 3.6.0
+// Ice version 3.6.1
 //
 // <auto-generated>
 //
@@ -35,7 +35,7 @@
 #   if ICE_INT_VERSION % 100 > 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 0
+#   if ICE_INT_VERSION % 100 < 1
 #       error Ice patch level mismatch!
 #   endif
 #endif

data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.h

@@ -7,7 +7,7 @@
 //
 // **********************************************************************
 //
-// Ice version 3.6.0
+// Ice version 3.6.1
 //
 // <auto-generated>
 //
@@ -44,7 +44,7 @@
 #   if ICE_INT_VERSION % 100 > 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 0
+#   if ICE_INT_VERSION % 100 < 1
 #       error Ice patch level mismatch!
 #   endif
 #endif

data/ext/ice/cpp/src/IceDiscovery/PluginI.cpp

@@ -39,6 +39,17 @@ createIceDiscovery(const Ice::CommunicatorPtr& communicator, const string&, cons
 
 }
 
+namespace Ice
+{
+
+ICE_DISCOVERY_API void
+registerIceDiscovery(bool loadOnInitialize)
+{
+    Ice::registerPluginFactory("IceDiscovery", createIceDiscovery, loadOnInitialize);
+}
+
+}
+
 PluginI::PluginI(const Ice::CommunicatorPtr& communicator) : _communicator(communicator)
 {
 }

data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.cpp

@@ -7,7 +7,7 @@
 //
 // **********************************************************************
 //
-// Ice version 3.6.0
+// Ice version 3.6.1
 //
 // <auto-generated>
 //
@@ -35,7 +35,7 @@
 #   if ICE_INT_VERSION % 100 > 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 0
+#   if ICE_INT_VERSION % 100 < 1
 #       error Ice patch level mismatch!
 #   endif
 #endif

data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.h

@@ -7,7 +7,7 @@
 //
 // **********************************************************************
 //
-// Ice version 3.6.0
+// Ice version 3.6.1
 //
 // <auto-generated>
 //
@@ -46,7 +46,7 @@
 #   if ICE_INT_VERSION % 100 > 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 0
+#   if ICE_INT_VERSION % 100 < 1
 #       error Ice patch level mismatch!
 #   endif
 #endif

data/ext/ice/cpp/src/IceLocatorDiscovery/PluginI.cpp

@@ -38,6 +38,17 @@ createIceLocatorDiscovery(const Ice::CommunicatorPtr& communicator, const string
 
 }
 
+namespace Ice
+{
+
+ICE_LOCATOR_DISCOVERY_API void
+registerIceLocatorDiscovery(bool loadOnInitialize)
+{
+    Ice::registerPluginFactory("IceLocatorDiscovery", createIceLocatorDiscovery, loadOnInitialize);
+}
+
+}
+
 namespace
 {
 

data/ext/ice/cpp/src/IceSSL/ConnectionInfo.cpp

@@ -7,7 +7,7 @@
 //
 // **********************************************************************
 //
-// Ice version 3.6.0
+// Ice version 3.6.1
 //
 // <auto-generated>
 //
@@ -35,7 +35,7 @@
 #   if ICE_INT_VERSION % 100 > 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 0
+#   if ICE_INT_VERSION % 100 < 1
 #       error Ice patch level mismatch!
 #   endif
 #endif

data/ext/ice/cpp/src/IceSSL/EndpointInfo.cpp

@@ -7,7 +7,7 @@
 //
 // **********************************************************************
 //
-// Ice version 3.6.0
+// Ice version 3.6.1
 //
 // <auto-generated>
 //
@@ -34,7 +34,7 @@
 #   if ICE_INT_VERSION % 100 > 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 0
+#   if ICE_INT_VERSION % 100 < 1
 #       error Ice patch level mismatch!
 #   endif
 #endif

data/ext/ice/cpp/src/IceSSL/OpenSSLTransceiverI.cpp

@@ -21,8 +21,6 @@
 #include <Ice/Buffer.h>
 #include <Ice/LocalException.h>
 
-#include <IceUtil/DisableWarnings.h>
-
 #ifdef ICE_USE_OPENSSL
 
 #include <openssl/err.h>
@@ -280,7 +278,7 @@ IceSSL::TransceiverI::initialize(IceInternal::Buffer& readBuffer, IceInternal::B
     {
         _verified = true;
     }
-    
+
     _engine->verifyPeer(_stream->fd(), _host, NativeConnectionInfoPtr::dynamicCast(getInfo()));
 
     if(_engine->securityTraceLevel() >= 1)

data/ext/ice/cpp/src/IceSSL/PluginI.cpp

@@ -34,6 +34,17 @@ createIceSSL(const CommunicatorPtr& communicator, const string& /*name*/, const
 
 }
 
+namespace Ice
+{
+
+ICE_SSL_API void
+registerIceSSL(bool loadOnInitialize)
+{
+    Ice::registerPluginFactory("IceSSL", createIceSSL, loadOnInitialize);
+}
+
+}
+
 //
 // Plugin implementation.
 //

data/ext/ice/cpp/src/IceSSL/SChannelTransceiverI.cpp

@@ -774,6 +774,13 @@ IceSSL::TransceiverI::close()
     }
 
     _stream->close();
+
+    //
+    // Clear the buffers now instead of waiting for destruction.
+    //
+    _writeBuffer.b.clear();
+    _readBuffer.b.clear();
+    _readUnprocessed.b.clear();
 }
 
 IceInternal::SocketOperation

data/ext/ice/cpp/src/IceUtil/ArgVector.cpp

@@ -8,7 +8,6 @@
 // **********************************************************************
 
 #include <IceUtil/ArgVector.h>
-#include <IceUtil/DisableWarnings.h>
 #include <cstring>
 
 IceUtilInternal::ArgVector::ArgVector(int argc, char* const argv[])

data/ext/ice/cpp/src/IceUtil/Exception.cpp

@@ -29,7 +29,8 @@
 #include <cstdlib>
 
 
-#if defined(__GNUC__) && !defined(__sun) && !defined(__FreeBSD__) && !defined(__MINGW32__)
+#if defined(__GNUC__) && !defined(__sun) && !defined(__FreeBSD__) && !defined(__MINGW32__) && \
+    !(defined(__ARMEL__) && defined(__linux))
 #  include <execinfo.h>
 #  include <cxxabi.h>
 #  define ICE_GCC_STACK_TRACES

data/ext/ice/cpp/src/Slice/FileTracker.cpp

@@ -99,6 +99,7 @@ Slice::FileTracker::setOutput(const string& output, bool error)
     _errors.insert(make_pair(_source, output));
     if(error)
     {
+        _generated.erase(_curr);
         _curr = _generated.end();
     }
 }
@@ -128,7 +129,7 @@ Slice::FileTracker::cleanup()
         {
 #ifdef _WIN32
             _unlink(p->first.c_str());
-#else       
+#else
             unlink(p->first.c_str());
 #endif
         }
@@ -136,7 +137,7 @@ Slice::FileTracker::cleanup()
         {
 #ifdef _WIN32
             _rmdir(p->first.c_str());
-#else       
+#else
             rmdir(p->first.c_str());
 #endif
         }

data/ext/ice/cpp/src/Slice/JavaUtil.cpp

@@ -13,7 +13,6 @@
 #include <Slice/Util.h>
 #include <Slice/MD5.h>
 #include <IceUtil/Functional.h>
-#include <IceUtil/DisableWarnings.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>