zeroc-ice 3.7.0 → 3.7.5

data/ext/ice/cpp/src/Ice/TransceiverF.h

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_TRANSCEIVER_F_H
 #define ICE_TRANSCEIVER_F_H
@@ -30,8 +25,8 @@ ICE_API IceUtil::Shared* upCast(UdpTransceiver*);
 typedef Handle<UdpTransceiver> UdpTransceiverPtr;
 
 class WSTransceiver;
-ICE_API IceUtil::Shared* upCast(Transceiver*);
-typedef Handle<Transceiver> TransceiverPtr;
+ICE_API IceUtil::Shared* upCast(WSTransceiver*);
+typedef Handle<WSTransceiver> WSTransceiverPtr;
 
 }
 

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

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/UdpConnector.h>
 #include <Ice/ProtocolInstance.h>
@@ -131,6 +126,9 @@ IceInternal::UdpConnector::UdpConnector(const ProtocolInstancePtr& instance, con
     _mcastTtl(mcastTtl),
     _connectionId(connectionId)
 {
+#ifdef ICE_OS_UWP
+    UNREFERENCED_PARAMETER(sourceAddr);
+#endif
 }
 
 IceInternal::UdpConnector::~UdpConnector()

data/ext/ice/cpp/src/Ice/UdpConnector.h

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_UDP_CONNECTOR_H
 #define ICE_UDP_CONNECTOR_H

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

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/UdpEndpointI.h>
 #include <Ice/Network.h>
@@ -111,7 +106,7 @@ IceInternal::UdpEndpointI::streamWriteImpl(OutputStream* s) const
 }
 
 EndpointInfoPtr
-IceInternal::UdpEndpointI::getInfo() const
+IceInternal::UdpEndpointI::getInfo() const ICE_NOEXCEPT
 {
     Ice::UDPEndpointInfoPtr info = ICE_MAKE_SHARED(InfoI<Ice::UDPEndpointInfo>,
                                                    ICE_DYNAMIC_CAST(UdpEndpointI, ICE_SHARED_FROM_CONST_THIS(UdpEndpointI)));
@@ -198,9 +193,8 @@ IceInternal::UdpEndpointI::initWithOptions(vector<string>& args, bool oaEndpoint
         }
         else
         {
-            Ice::EndpointParseException ex(__FILE__, __LINE__);
-            ex.str = "`--interface *' not valid for proxy endpoint `" + toString() + "'";
-            throw ex;
+            throw EndpointParseException(__FILE__, __LINE__, "`--interface *' not valid for proxy endpoint `" +
+                                         toString() + "'");
         }
     }
 }
@@ -220,7 +214,17 @@ IceInternal::UdpEndpointI::options() const
 
     if(_mcastInterface.length() > 0)
     {
-        s << " --interface " << _mcastInterface;
+        s << " --interface ";
+        bool addQuote = _mcastInterface.find(':') != string::npos;
+        if(addQuote)
+        {
+            s << "\"";
+        }
+        s << _mcastInterface;
+        if(addQuote)
+        {
+            s << "\"";
+        }
     }
 
     if(_mcastTtl != -1)
@@ -385,9 +389,8 @@ IceInternal::UdpEndpointI::checkOption(const string& option, const string& argum
     {
         if(!argument.empty())
         {
-            EndpointParseException ex(__FILE__, __LINE__);
-            ex.str = "unexpected argument `" + argument + "' provided for -c option in " + endpoint;
-            throw ex;
+            throw EndpointParseException(__FILE__, __LINE__,  "unexpected argument `" + argument +
+                                         "' provided for -c option in " + endpoint);
         }
         const_cast<bool&>(_connect) = true;
     }
@@ -395,9 +398,8 @@ IceInternal::UdpEndpointI::checkOption(const string& option, const string& argum
     {
         if(!argument.empty())
         {
-            EndpointParseException ex(__FILE__, __LINE__);
-            ex.str = "unexpected argument `" + argument + "' provided for -z option in " + endpoint;
-            throw ex;
+            throw EndpointParseException(__FILE__, __LINE__, "unexpected argument `" + argument +
+                                         "' provided for -z option in " + endpoint);
         }
         const_cast<bool&>(_compress) = true;
     }
@@ -405,9 +407,8 @@ IceInternal::UdpEndpointI::checkOption(const string& option, const string& argum
     {
         if(argument.empty())
         {
-            EndpointParseException ex(__FILE__, __LINE__);
-            ex.str = "no argument provided for " + option + " option in endpoint " + endpoint;
-            throw ex;
+            throw EndpointParseException(__FILE__, __LINE__, "no argument provided for " + option +
+                                         " option in endpoint " + endpoint);
         }
         try
         {
@@ -418,20 +419,18 @@ IceInternal::UdpEndpointI::checkOption(const string& option, const string& argum
                 _instance->logger()->warning("deprecated udp endpoint option: " + option);
             }
         }
-        catch(const VersionParseException& e)
+        catch(const VersionParseException& ex)
         {
-            EndpointParseException ex(__FILE__, __LINE__);
-            ex.str = "invalid version `" + argument + "' in endpoint " + endpoint + ":\n" + e.str;
-            throw ex;
+            throw EndpointParseException(__FILE__, __LINE__, "invalid version `" + argument + "' in endpoint " +
+                                         endpoint + ":\n" + ex.str);
         }
     }
     else if(option == "--interface")
     {
         if(argument.empty())
         {
-            EndpointParseException ex(__FILE__, __LINE__);
-            ex.str = "no argument provided for --interface option in endpoint " + endpoint;
-            throw ex;
+            throw EndpointParseException(__FILE__, __LINE__, "no argument provided for --interface option in endpoint "
+                                         + endpoint);
         }
         const_cast<string&>(_mcastInterface) = argument;
     }
@@ -439,16 +438,14 @@ IceInternal::UdpEndpointI::checkOption(const string& option, const string& argum
     {
         if(argument.empty())
         {
-            EndpointParseException ex(__FILE__, __LINE__);
-            ex.str = "no argument provided for --ttl option in endpoint " + endpoint;
-            throw ex;
+            throw EndpointParseException(__FILE__, __LINE__, "no argument provided for --ttl option in endpoint " +
+                                         endpoint);
         }
         istringstream p(argument);
         if(!(p >> const_cast<Int&>(_mcastTtl)) || !p.eof())
         {
-            EndpointParseException ex(__FILE__, __LINE__);
-            ex.str = "invalid TTL value `" + argument + "' in endpoint " + endpoint;
-            throw ex;
+            throw EndpointParseException(__FILE__, __LINE__, "invalid TTL value `" + argument + "' in endpoint " +
+                                         endpoint);
         }
     }
     else

data/ext/ice/cpp/src/Ice/UdpEndpointI.h

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_UDP_ENDPOINT_I_H
 #define ICE_UDP_ENDPOINT_I_H
@@ -29,7 +24,7 @@ public:
 
     virtual void streamWriteImpl(Ice::OutputStream*) const;
 
-    virtual Ice::EndpointInfoPtr getInfo() const;
+    virtual Ice::EndpointInfoPtr getInfo() const ICE_NOEXCEPT;
 
     virtual Ice::Int timeout() const;
     virtual EndpointIPtr timeout(Ice::Int) const;

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

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/UdpTransceiver.h>
 #include <Ice/UdpEndpointI.h>
@@ -56,6 +51,7 @@ IceInternal::UdpTransceiver::getAsyncInfo(SocketOperation status)
         return 0;
     }
 #elif defined(ICE_OS_UWP)
+    UNREFERENCED_PARAMETER(status);
     return &_write;
 #endif
 }
@@ -74,7 +70,7 @@ IceInternal::UdpTransceiver::initialize(Buffer& /*readBuffer*/, Buffer& /*writeB
 #if defined(ICE_USE_IOCP)
         doFinishConnectAsync(_fd, _write);
 #elif defined(ICE_OS_UWP)
-        if(_write.count == SOCKET_ERROR)
+        if(_write.error != ERROR_SUCCESS)
         {
             try
             {
@@ -216,9 +212,7 @@ repeat:
         else
         {
             // No peer has sent a datagram yet.
-            SocketException ex(__FILE__, __LINE__);
-            ex.error = 0;
-            throw ex;
+            throw SocketException(__FILE__, __LINE__, 0);
         }
 
 #   ifdef _WIN32
@@ -242,9 +236,7 @@ repeat:
             return SocketOperationWrite;
         }
 
-        SocketException ex(__FILE__, __LINE__);
-        ex.error = getSocketErrno();
-        throw ex;
+        throw SocketException(__FILE__, __LINE__, getSocketErrno());
     }
 
     assert(ret == static_cast<ssize_t>(buf.b.size()));
@@ -267,13 +259,21 @@ IceInternal::UdpTransceiver::read(Buffer& buf)
     assert(buf.i == buf.b.begin());
     assert(_fd != INVALID_SOCKET);
 
-    const int packetSize = min(_maxPacketSize, _rcvSize - _udpOverhead);
+#ifdef _WIN32
+    int packetSize = min(_maxPacketSize, _rcvSize - _udpOverhead);
+#else
+    const size_t packetSize = static_cast<size_t>(min(_maxPacketSize, _rcvSize - _udpOverhead));
+#endif
     buf.b.resize(packetSize);
     buf.i = buf.b.begin();
 
 repeat:
 
+#ifdef _WIN32
+    int ret;
+#else
     ssize_t ret;
+#endif
     if(_state == StateConnected)
     {
         ret = ::recv(_fd, reinterpret_cast<char*>(&buf.b[0]), packetSize, 0);
@@ -318,15 +318,11 @@ repeat:
 
             if(connectionLost())
             {
-                ConnectionLostException ex(__FILE__, __LINE__);
-                ex.error = getSocketErrno();
-                throw ex;
+                throw ConnectionLostException(__FILE__, __LINE__, getSocketErrno());
             }
             else
             {
-                SocketException ex(__FILE__, __LINE__);
-                ex.error = getSocketErrno();
-                throw ex;
+                throw SocketException(__FILE__, __LINE__, getSocketErrno());
             }
         }
     }
@@ -353,7 +349,7 @@ repeat:
         }
     }
 
-    buf.b.resize(ret);
+    buf.b.resize(static_cast<size_t>(ret));
     buf.i = buf.b.end();
     return SocketOperationNone;
 #endif
@@ -378,13 +374,13 @@ IceInternal::UdpTransceiver::startWrite(Buffer& buf)
             if(!multicast)
             {
                 auto operation = safe_cast<DatagramSocket^>(_fd)->ConnectAsync(_addr.host, _addr.port);
-                if(!checkIfErrorOrCompleted(SocketOperationConnect, operation))
+                if(!checkIfErrorOrCompleted(SocketOperationConnect, operation, operation->Status))
                 {
                     operation->Completed = ref new AsyncActionCompletedHandler(
                         [this] (IAsyncAction^ info, Windows::Foundation::AsyncStatus status)
                         {
                             //
-                            // COMPILERFIX with VC141 using operator!= and operator== inside
+                            // COMPILERFIX with v141 using operator!= and operator== inside
                             // a lambda callback triggers a compiler bug, we move the code to
                             // a seperate private method to workaround the issue.
                             //
@@ -394,19 +390,20 @@ IceInternal::UdpTransceiver::startWrite(Buffer& buf)
                 else
                 {
                     _write.count = 0;
+                    _write.error = ERROR_SUCCESS;
                     _writer = ref new DataWriter(safe_cast<DatagramSocket^>(_fd)->OutputStream);
                 }
             }
             else
             {
                 auto operation = safe_cast<DatagramSocket^>(_fd)->GetOutputStreamAsync(_addr.host, _addr.port);
-                if(!checkIfErrorOrCompleted(SocketOperationConnect, operation))
+                if(!checkIfErrorOrCompleted(SocketOperationConnect, operation, operation->Status))
                 {
                     operation->Completed = ref new AsyncOperationCompletedHandler<IOutputStream^>(
                         [=](IAsyncOperation<IOutputStream^>^ info, Windows::Foundation::AsyncStatus status)
                         {
                             //
-                            // COMPILERFIX with VC141 using operator!= and operator== inside
+                            // COMPILERFIX with v141 using operator!= and operator== inside
                             // a lambda callback triggers a compiler bug, we move the code to
                             // a seperate private method to workaround the issue.
                             //
@@ -416,6 +413,7 @@ IceInternal::UdpTransceiver::startWrite(Buffer& buf)
                 else
                 {
                     _write.count = 0;
+                    _write.error = ERROR_SUCCESS;
                     _writer = ref new DataWriter(operation->GetResults());
                     if(_mcastAddr.host != nullptr)
                     {
@@ -439,7 +437,7 @@ IceInternal::UdpTransceiver::startWrite(Buffer& buf)
                 [=, &buf](concurrency::task<IOutputStream^> task)
                 {
                     //
-                    // COMPILERFIX with VC141 using operator!= and operator== inside
+                    // COMPILERFIX with v141 using operator!= and operator== inside
                     // a lambda callback triggers a compiler bug, we move the code to
                     // a seperate private method to workaround the issue.
                     //
@@ -468,6 +466,7 @@ IceInternal::UdpTransceiver::startWrite(Buffer& buf)
 #else
     _write.buf.len = static_cast<int>(buf.b.size());
     _write.buf.buf = reinterpret_cast<char*>(&*buf.i);
+    _write.error = ERROR_SUCCESS;
     int err;
     if(_state == StateConnected)
     {
@@ -487,12 +486,9 @@ IceInternal::UdpTransceiver::startWrite(Buffer& buf)
         else
         {
             // No peer has sent a datagram yet.
-            SocketException ex(__FILE__, __LINE__);
-            ex.error = 0;
-            throw ex;
+            throw SocketException(__FILE__, __LINE__, 0);
         }
-        err = WSASendTo(_fd, &_write.buf, 1, &_write.count, 0, &_peerAddr.sa,
-                        len, &_write, ICE_NULLPTR);
+        err = WSASendTo(_fd, &_write.buf, 1, &_write.count, 0, &_peerAddr.sa, len, &_write, ICE_NULLPTR);
     }
 
     if(err == SOCKET_ERROR)
@@ -501,20 +497,16 @@ IceInternal::UdpTransceiver::startWrite(Buffer& buf)
         {
             if(connectionLost())
             {
-                ConnectionLostException ex(__FILE__, __LINE__);
-                ex.error = getSocketErrno();
-                throw ex;
+                throw ConnectionLostException(__FILE__, __LINE__, getSocketErrno());
             }
             else
             {
-                SocketException ex(__FILE__, __LINE__);
-                ex.error = getSocketErrno();
-                throw ex;
+                throw SocketException(__FILE__, __LINE__, getSocketErrno());
             }
         }
     }
-#endif
     return true;
+#endif
 }
 
 #ifdef ICE_OS_UWP
@@ -524,14 +516,14 @@ IceInternal::UdpTransceiver::connectCompleted(Windows::Foundation::IAsyncAction^
 {
     if(status != Windows::Foundation::AsyncStatus::Completed)
     {
-        _write.count = SOCKET_ERROR;
         _write.error = action->ErrorCode.Value;
     }
     else
     {
-        _write.count = 0;
+        _write.error = ERROR_SUCCESS;
         _writer = ref new DataWriter(safe_cast<DatagramSocket^>(_fd)->OutputStream);
     }
+    _write.count = 0;
     completed(SocketOperationConnect);
 }
 
@@ -541,14 +533,14 @@ IceInternal::UdpTransceiver::getOutputStreamMcastCompleted(IAsyncOperation<IOutp
 {
     if(status != Windows::Foundation::AsyncStatus::Completed)
     {
-        _write.count = SOCKET_ERROR;
         _write.error = operation->ErrorCode.Value;
     }
     else
     {
-        _write.count = 0;
+        _write.error = ERROR_SUCCESS;
         _writer = ref new DataWriter(operation->GetResults());
     }
+    _write.count = 0;
     if(_mcastAddr.host != nullptr)
     {
         setMcastGroup(_fd, _mcastAddr, "");
@@ -564,22 +556,11 @@ IceInternal::UdpTransceiver::getOutputStreamCompleted(concurrency::task<IOutputS
         DataWriter^ writer = ref new DataWriter(task.get());
         writer->WriteBytes(ref new Array<unsigned char>(&*buf.i, static_cast<int>(buf.b.size())));
         DataWriterStoreOperation^ operation = writer->StoreAsync();
-        if(operation->Status == Windows::Foundation::AsyncStatus::Completed)
-        {
-            //
-            // NOTE: unlike other methods, it's important to modify _write.count
-            // _before_ calling checkIfErrorOrCompleted since this isn't called
-            // with the connection mutex but from a Windows thread pool thread.
-            // So we can't modify the _write structure after calling the
-            // completed callback.
-            //
-            _write.count = operation->GetResults();
-        }
         queueOperation(SocketOperationWrite, operation);
     }
     catch(Platform::Exception^ pex)
     {
-        _write.count = SOCKET_ERROR;
+        _write.count = 0;
         _write.error = pex->HResult;
         completed(SocketOperationWrite);
     }
@@ -590,33 +571,29 @@ IceInternal::UdpTransceiver::getOutputStreamCompleted(concurrency::task<IOutputS
 void
 IceInternal::UdpTransceiver::finishWrite(Buffer& buf)
 {
-    if(_state < StateConnected)
+    if(_fd == INVALID_SOCKET || _state < StateConnected)
     {
         return;
     }
 
-    if(static_cast<int>(_write.count) == SOCKET_ERROR)
+    if(_write.error != ERROR_SUCCESS)
     {
 #ifndef ICE_OS_UWP
         WSASetLastError(_write.error);
         if(connectionLost())
         {
-            ConnectionLostException ex(__FILE__, __LINE__);
-            ex.error = getSocketErrno();
-            throw ex;
+            throw ConnectionLostException(__FILE__, __LINE__ ,getSocketErrno());
         }
         else
         {
-            SocketException ex(__FILE__, __LINE__);
-            ex.error = getSocketErrno();
-            throw ex;
+            throw SocketException(__FILE__, __LINE__, getSocketErrno());
         }
 #else
         checkErrorCode(__FILE__, __LINE__, _write.error);
 #endif
     }
 
-    assert(_write.count == buf.b.size());
+    assert(static_cast<size_t>(_write.count) == buf.b.size());
     buf.i = buf.b.end();
 }
 
@@ -630,6 +607,7 @@ IceInternal::UdpTransceiver::startRead(Buffer& buf)
 #ifndef ICE_OS_UWP
     _read.buf.len = packetSize;
     _read.buf.buf = reinterpret_cast<char*>(&*buf.i);
+    _read.error = ERROR_SUCCESS;
     int err;
     if(_state == StateConnected)
     {
@@ -640,8 +618,8 @@ IceInternal::UdpTransceiver::startRead(Buffer& buf)
         memset(&_readAddr.saStorage, 0, sizeof(struct sockaddr_storage));
         _readAddrLen = static_cast<socklen_t>(sizeof(sockaddr_storage));
 
-        err = WSARecvFrom(_fd, &_read.buf, 1, &_read.count, &_read.flags,
-                          &_readAddr.sa, &_readAddrLen, &_read, ICE_NULLPTR);
+        err = WSARecvFrom(_fd, &_read.buf, 1, &_read.count, &_read.flags, &_readAddr.sa, &_readAddrLen, &_read,
+                          ICE_NULLPTR);
     }
 
     if(err == SOCKET_ERROR)
@@ -654,15 +632,11 @@ IceInternal::UdpTransceiver::startRead(Buffer& buf)
         {
             if(connectionLost())
             {
-                ConnectionLostException ex(__FILE__, __LINE__);
-                ex.error = getSocketErrno();
-                throw ex;
+                throw ConnectionLostException(__FILE__, __LINE__, getSocketErrno());
             }
             else
             {
-                SocketException ex(__FILE__, __LINE__);
-                ex.error = getSocketErrno();
-                throw ex;
+                throw SocketException(__FILE__, __LINE__, getSocketErrno());
             }
         }
     }
@@ -694,7 +668,7 @@ IceInternal::UdpTransceiver::finishRead(Buffer& buf)
     DatagramSocketMessageReceivedEventArgs^ args = _received.front();
     _received.pop_front();
 
-    int ret;
+    int ret = 0;
     try
     {
         DataReader^ reader = args->GetDataReader();
@@ -715,7 +689,7 @@ IceInternal::UdpTransceiver::finishRead(Buffer& buf)
         checkErrorCode(__FILE__, __LINE__, ex->HResult);
     }
 #else
-    if(static_cast<int>(_read.count) == SOCKET_ERROR)
+    if(_read.error != ERROR_SUCCESS)
     {
         WSASetLastError(_read.error);
 
@@ -730,15 +704,11 @@ IceInternal::UdpTransceiver::finishRead(Buffer& buf)
         {
             if(connectionLost())
             {
-                ConnectionLostException ex(__FILE__, __LINE__);
-                ex.error = getSocketErrno();
-                throw ex;
+                throw ConnectionLostException(__FILE__, __LINE__, getSocketErrno());
             }
             else
             {
-                SocketException ex(__FILE__, __LINE__);
-                ex.error = getSocketErrno();
-                throw ex;
+                throw SocketException(__FILE__, __LINE__, getSocketErrno());
             }
         }
     }