zeroc-ice 3.6.5 → 3.7.4

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

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 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_WS_ENDPOINT_I_H
 #define ICE_WS_ENDPOINT_I_H
@@ -20,29 +15,22 @@
 namespace IceInternal
 {
 
-//
-// Delegate interface implemented by TcpEndpoint or IceSSL::Endpoint or any endpoint that WS can
-// delegate to.
-//
-class ICE_API WSEndpointDelegate : virtual public IceUtil::Shared
-{
-public:
-
-    virtual Ice::EndpointInfoPtr getWSInfo(const std::string&) const = 0;
-};
-
 class WSEndpoint : public EndpointI
+#ifdef ICE_CPP11_MAPPING
+                 , public std::enable_shared_from_this<WSEndpoint>
+#endif
 {
 public:
 
     WSEndpoint(const ProtocolInstancePtr&, const EndpointIPtr&, const std::string&);
     WSEndpoint(const ProtocolInstancePtr&, const EndpointIPtr&, std::vector<std::string>&);
-    WSEndpoint(const ProtocolInstancePtr&, const EndpointIPtr&, BasicStream*);
+    WSEndpoint(const ProtocolInstancePtr&, const EndpointIPtr&, Ice::InputStream*);
+
+    virtual void streamWriteImpl(Ice::OutputStream*) const;
 
-    virtual Ice::EndpointInfoPtr getInfo() const;
+    virtual Ice::EndpointInfoPtr getInfo() const ICE_NOEXCEPT;
     virtual Ice::Short type() const;
     virtual const std::string& protocol() const;
-    virtual void streamWrite(BasicStream*) const;
 
     virtual Ice::Int timeout() const;
     virtual EndpointIPtr timeout(Ice::Int) const;
@@ -56,17 +44,21 @@ public:
     virtual TransceiverPtr transceiver() const;
     virtual void connectors_async(Ice::EndpointSelectionType, const EndpointI_connectorsPtr&) const;
     virtual AcceptorPtr acceptor(const std::string&) const;
-
-    virtual std::vector<EndpointIPtr> expand() const;
+    virtual std::vector<EndpointIPtr> expandIfWildcard() const;
+    virtual std::vector<EndpointIPtr> expandHost(EndpointIPtr&) const;
     virtual bool equivalent(const EndpointIPtr&) const;
     virtual ::Ice::Int hash() const;
     virtual std::string options() const;
 
-    EndpointIPtr delegate() const;
     WSEndpointPtr endpoint(const EndpointIPtr&) const;
 
+#ifdef ICE_CPP11_MAPPING
+    virtual bool operator==(const Ice::Endpoint&) const;
+    virtual bool operator<(const Ice::Endpoint&) const;
+#else
     virtual bool operator==(const Ice::LocalObject&) const;
     virtual bool operator<(const Ice::LocalObject&) const;
+#endif
 
 protected:
 
@@ -78,29 +70,22 @@ private:
     // All members are const, because endpoints are immutable.
     //
     const ProtocolInstancePtr _instance;
-    const IPEndpointIPtr _delegate;
+    const EndpointIPtr _delegate;
     const std::string _resource;
 };
 
-class ICE_API WSEndpointFactory : public EndpointFactory
+class ICE_API WSEndpointFactory : public EndpointFactoryWithUnderlying
 {
 public:
 
-    WSEndpointFactory(const ProtocolInstancePtr&, const EndpointFactoryPtr&);
-    virtual ~WSEndpointFactory();
+    WSEndpointFactory(const ProtocolInstancePtr&, Ice::Short);
 
-    virtual Ice::Short type() const;
-    virtual std::string protocol() const;
-    virtual EndpointIPtr create(std::vector<std::string>&, bool) const;
-    virtual EndpointIPtr read(BasicStream*) const;
-    virtual void destroy();
-
-    virtual EndpointFactoryPtr clone(const ProtocolInstancePtr&) const;
+    virtual EndpointFactoryPtr cloneWithUnderlying(const ProtocolInstancePtr&, Ice::Short) const;
 
-private:
+protected:
 
-    ProtocolInstancePtr _instance;
-    const EndpointFactoryPtr _delegate;
+    virtual EndpointIPtr createWithUnderlying(const EndpointIPtr&, std::vector<std::string>&, bool) const;
+    virtual EndpointIPtr readWithUnderlying(const EndpointIPtr&, Ice::InputStream*) const;
 };
 
 }

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

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 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/WSTransceiver.h>
 #include <Ice/Endpoint.h>
@@ -18,7 +13,7 @@
 #include <Ice/LocalException.h>
 #include <Ice/Base64.h>
 #include <IceUtil/Random.h>
-#include <IceUtil/SHA1.h>
+#include <Ice/SHA1.h>
 #include <IceUtil/StringUtil.h>
 
 // Python 2.7 under Windows.
@@ -133,7 +128,7 @@ Long ice_nlltoh(const Byte* src)
     return v;
 }
 
-#if defined(ICE_OS_WINRT)
+#if defined(ICE_OS_UWP)
 Short htons(Short v)
 {
     Short result;
@@ -184,29 +179,23 @@ IceInternal::WSTransceiver::getNativeInfo()
     return _delegate->getNativeInfo();
 }
 
-#if defined(ICE_USE_IOCP)
+#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP)
 AsyncInfo*
 IceInternal::WSTransceiver::getAsyncInfo(SocketOperation status)
 {
     return _delegate->getNativeInfo()->getAsyncInfo(status);
 }
-#elif defined(ICE_OS_WINRT)
-void
-IceInternal::WSTransceiver::setCompletedHandler(IceInternal::SocketOperationCompletedHandler^ handler)
-{
-    _delegate->getNativeInfo()->setCompletedHandler(handler);
-}
 #endif
 
 SocketOperation
-IceInternal::WSTransceiver::initialize(Buffer& readBuffer, Buffer& writeBuffer, bool& hasMoreData)
+IceInternal::WSTransceiver::initialize(Buffer& readBuffer, Buffer& writeBuffer)
 {
     //
     // Delegate logs exceptions that occur during initialize(), so there's no need to trap them here.
     //
     if(_state == StateInitializeDelegate)
     {
-        SocketOperation op = _delegate->initialize(readBuffer, writeBuffer, hasMoreData);
+        SocketOperation op = _delegate->initialize(readBuffer, writeBuffer);
         if(op != SocketOperationNone)
         {
             return op;
@@ -236,7 +225,7 @@ IceInternal::WSTransceiver::initialize(Buffer& readBuffer, Buffer& writeBuffer,
                 //
                 ostringstream out;
                 out << "GET " << _resource << " HTTP/1.1\r\n"
-                    << "Host: " << _host << ":" << _port << "\r\n"
+                    << "Host: " << _host << "\r\n"
                     << "Upgrade: websocket\r\n"
                     << "Connection: Upgrade\r\n"
                     << "Sec-WebSocket-Protocol: " << _iceProtocol << "\r\n"
@@ -280,7 +269,7 @@ IceInternal::WSTransceiver::initialize(Buffer& readBuffer, Buffer& writeBuffer,
         {
             if(_readBuffer.i < _readBuffer.b.end())
             {
-                SocketOperation s = _delegate->read(_readBuffer, hasMoreData);
+                SocketOperation s = _delegate->read(_readBuffer);
                 if(s == SocketOperationWrite || _readBuffer.i == _readBuffer.b.begin())
                 {
                     return s;
@@ -384,7 +373,10 @@ IceInternal::WSTransceiver::initialize(Buffer& readBuffer, Buffer& writeBuffer,
         _state = StateOpened;
         _nextState = StateOpened;
 
-        hasMoreData |= _readI < _readBuffer.i;
+        if(_readI < _readBuffer.i)
+        {
+            _delegate->getNativeInfo()->ready(SocketOperationRead, true);
+        }
     }
     catch(const Ice::LocalException& ex)
     {
@@ -443,6 +435,7 @@ IceInternal::WSTransceiver::closing(bool initiator, const Ice::LocalException& r
     }
 
     _closingInitiator = initiator;
+
     if(dynamic_cast<const Ice::CloseConnectionException*>(&reason))
     {
         _closingReason = CLOSURE_NORMAL;
@@ -544,7 +537,7 @@ IceInternal::WSTransceiver::write(Buffer& buf)
 }
 
 SocketOperation
-IceInternal::WSTransceiver::read(Buffer& buf, bool& hasMoreData)
+IceInternal::WSTransceiver::read(Buffer& buf)
 {
     if(_readPending)
     {
@@ -555,11 +548,11 @@ IceInternal::WSTransceiver::read(Buffer& buf, bool& hasMoreData)
     {
         if(_state < StateConnected)
         {
-            return _delegate->read(buf, hasMoreData);
+            return _delegate->read(buf);
         }
         else
         {
-            if(_delegate->read(_readBuffer, hasMoreData) == SocketOperationWrite)
+            if(_delegate->read(_readBuffer) == SocketOperationWrite)
             {
                 return SocketOperationWrite;
             }
@@ -576,7 +569,10 @@ IceInternal::WSTransceiver::read(Buffer& buf, bool& hasMoreData)
     //
     if(buf.i == buf.b.end())
     {
-        hasMoreData |= _readI < _readBuffer.i;
+        if(_readI < _readBuffer.i)
+        {
+            _delegate->getNativeInfo()->ready(SocketOperationRead, true);
+        }
         return SocketOperationNone;
     }
 
@@ -592,22 +588,22 @@ IceInternal::WSTransceiver::read(Buffer& buf, bool& hasMoreData)
                 // no more than the payload length. The remaining of the buffer will be
                 // sent over in another frame.
                 //
-                size_t readSz = _readPayloadLength - (buf.i - _readStart); // Already read
+                size_t readSz = _readPayloadLength - static_cast<size_t>(buf.i - _readStart); // Already read
                 if(static_cast<size_t>(buf.b.end() - buf.i) > readSz)
                 {
                     size_t size = buf.b.size();
-                    buf.b.resize(buf.i - buf.b.begin() + readSz);
-                    s = _delegate->read(buf, hasMoreData);
+                    buf.b.resize(static_cast<size_t>(buf.i - buf.b.begin()) + readSz);
+                    s = _delegate->read(buf);
                     buf.b.resize(size);
                 }
                 else
                 {
-                    s = _delegate->read(buf, hasMoreData);
+                    s = _delegate->read(buf);
                 }
             }
             else
             {
-                s = _delegate->read(_readBuffer, hasMoreData);
+                s = _delegate->read(_readBuffer);
             }
 
             if(s == SocketOperationWrite)
@@ -621,12 +617,15 @@ IceInternal::WSTransceiver::read(Buffer& buf, bool& hasMoreData)
 
     if(buf.i == buf.b.end())
     {
-        hasMoreData |= _readI < _readBuffer.i;
+        if(_readI < _readBuffer.i)
+        {
+            _delegate->getNativeInfo()->ready(SocketOperationRead, true);
+        }
         s = SocketOperationNone;
     }
     else
     {
-        hasMoreData = false;
+        _delegate->getNativeInfo()->ready(SocketOperationRead, false);
         s = SocketOperationRead;
     }
 
@@ -642,7 +641,7 @@ IceInternal::WSTransceiver::read(Buffer& buf, bool& hasMoreData)
     return s;
 }
 
-#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT)
+#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP)
 bool
 IceInternal::WSTransceiver::startWrite(Buffer& buf)
 {
@@ -663,7 +662,10 @@ IceInternal::WSTransceiver::startWrite(Buffer& buf)
     {
         if(_writeBuffer.i < _writeBuffer.b.end())
         {
-            _delegate->startWrite(_writeBuffer);
+            if(_delegate->startWrite(_writeBuffer))
+            {
+                return buf.b.size() == _writePayloadLength; // Return true only if we've written the whole buffer.
+            }
             return false;
         }
         else
@@ -767,18 +769,18 @@ IceInternal::WSTransceiver::startRead(Buffer& buf)
 }
 
 void
-IceInternal::WSTransceiver::finishRead(Buffer& buf, bool& hasMoreData)
+IceInternal::WSTransceiver::finishRead(Buffer& buf)
 {
     _readPending = false;
     if(_state < StateOpened)
     {
         if(_state < StateConnected)
         {
-            _delegate->finishRead(buf, hasMoreData);
+            _delegate->finishRead(buf);
         }
         else
         {
-            _delegate->finishRead(_readBuffer, hasMoreData);
+            _delegate->finishRead(_readBuffer);
         }
         return;
     }
@@ -789,11 +791,11 @@ IceInternal::WSTransceiver::finishRead(Buffer& buf, bool& hasMoreData)
     }
     else if(_readState == ReadStatePayload)
     {
-        _delegate->finishRead(buf, hasMoreData);
+        _delegate->finishRead(buf);
     }
     else
     {
-        _delegate->finishRead(_readBuffer, hasMoreData);
+        _delegate->finishRead(_readBuffer);
     }
 
     if(_state == StateClosed)
@@ -827,8 +829,10 @@ IceInternal::WSTransceiver::toDetailedString() const
 Ice::ConnectionInfoPtr
 IceInternal::WSTransceiver::getInfo() const
 {
-    assert(dynamic_cast<WSTransceiverDelegate*>(_delegate.get()));
-    return dynamic_cast<WSTransceiverDelegate*>(_delegate.get())->getWSInfo(_parser->getHeaders());
+    WSConnectionInfoPtr info = ICE_MAKE_SHARED(WSConnectionInfo);
+    info->underlying = _delegate->getInfo();
+    info->headers = _parser->getHeaders();
+    return info;
 }
 
 void
@@ -844,11 +848,10 @@ IceInternal::WSTransceiver::setBufferSize(int rcvSize, int sndSize)
 }
 
 IceInternal::WSTransceiver::WSTransceiver(const ProtocolInstancePtr& instance, const TransceiverPtr& del,
-                                          const string& host, int port, const string& resource) :
+                                          const string& host, const string& resource) :
     _instance(instance),
     _delegate(del),
     _host(host),
-    _port(port),
     _resource(resource),
     _incoming(false),
     _state(StateInitializeDelegate),
@@ -878,7 +881,6 @@ IceInternal::WSTransceiver::WSTransceiver(const ProtocolInstancePtr& instance, c
 IceInternal::WSTransceiver::WSTransceiver(const ProtocolInstancePtr& instance, const TransceiverPtr& del) :
     _instance(instance),
     _delegate(del),
-    _port(-1),
     _incoming(true),
     _state(StateInitializeDelegate),
     _parser(new HttpParser),
@@ -1024,7 +1026,7 @@ IceInternal::WSTransceiver::handleRequest(Buffer& responseBuffer)
     out << "Sec-WebSocket-Accept: ";
     string input = key + _wsUUID;
     vector<unsigned char> hash;
-    IceUtilInternal::sha1(reinterpret_cast<const unsigned char*>(&input[0]), input.size(), hash);
+    sha1(reinterpret_cast<const unsigned char*>(&input[0]), input.size(), hash);
     out << IceInternal::Base64::encode(hash) << "\r\n" << "\r\n"; // EOM
 
     string str = out.str();
@@ -1122,7 +1124,7 @@ IceInternal::WSTransceiver::handleResponse()
     }
     string input = _key + _wsUUID;
     vector<unsigned char> hash;
-    IceUtilInternal::sha1(reinterpret_cast<const unsigned char*>(&input[0]), input.size(), hash);
+    sha1(reinterpret_cast<const unsigned char*>(&input[0]), input.size(), hash);
     if(val != IceInternal::Base64::encode(hash))
     {
         throw WebSocketException("invalid value `" + val + "' for Sec-WebSocket-Accept");
@@ -1311,9 +1313,7 @@ IceInternal::WSTransceiver::preRead(Buffer& buf)
                 }
                 else
                 {
-                    ConnectionLostException ex(__FILE__, __LINE__);
-                    ex.error = 0;
-                    throw ex;
+                    throw ConnectionLostException(__FILE__, __LINE__, 0);
                 }
             }
             case OP_PING:
@@ -1394,7 +1394,7 @@ IceInternal::WSTransceiver::preRead(Buffer& buf)
                 return false;
             }
 
-            size_t n = min(_readBuffer.i - _readI, buf.b.end() - buf.i);
+            size_t n = min(static_cast<size_t>(_readBuffer.i - _readI), static_cast<size_t>(buf.b.end() - buf.i));
 
             if(n > _readPayloadLength)
             {
@@ -1435,13 +1435,13 @@ IceInternal::WSTransceiver::postRead(Buffer& buf)
         // Unmask the data we just read.
         //
         IceInternal::Buffer::Container::iterator p = _readStart;
-        for(size_t n = _readStart - _readFrameStart; p < buf.i; ++p, ++n)
+        for(size_t n = static_cast<size_t>(_readStart - _readFrameStart); p < buf.i; ++p, ++n)
         {
             *p ^= _readMask[n % 4];
         }
     }
 
-    _readPayloadLength -= buf.i - _readStart;
+    _readPayloadLength -= static_cast<size_t>(buf.i - _readStart);
     _readStart = buf.i;
     if(_readPayloadLength == 0)
     {
@@ -1465,7 +1465,7 @@ IceInternal::WSTransceiver::preWrite(Buffer& buf)
                 return false;
             }
 
-            assert(buf.i = buf.b.begin());
+            assert(buf.i == buf.b.begin());
             prepareWriteHeader(OP_DATA, buf.b.size());
 
             _writeState = WriteStatePayload;
@@ -1474,7 +1474,7 @@ IceInternal::WSTransceiver::preWrite(Buffer& buf)
         {
             prepareWriteHeader(OP_PING, 0); // Don't send any payload
 
-            _writeBuffer.b.resize(_writeBuffer.i - _writeBuffer.b.begin());
+            _writeBuffer.b.resize(static_cast<size_t>(_writeBuffer.i - _writeBuffer.b.begin()));
             _writeState = WriteStateControlFrame;
             _writeBuffer.i = _writeBuffer.b.begin();
         }
@@ -1483,7 +1483,7 @@ IceInternal::WSTransceiver::preWrite(Buffer& buf)
             prepareWriteHeader(OP_PONG, _pingPayload.size());
             if(_pingPayload.size() > static_cast<size_t>(_writeBuffer.b.end() - _writeBuffer.i))
             {
-                size_t pos = _writeBuffer.i - _writeBuffer.b.begin();
+                size_t pos = static_cast<size_t>(_writeBuffer.i - _writeBuffer.b.begin());
                 _writeBuffer.b.resize(pos + _pingPayload.size());
                 _writeBuffer.i = _writeBuffer.b.begin() + pos;
             }
@@ -1491,7 +1491,7 @@ IceInternal::WSTransceiver::preWrite(Buffer& buf)
             _writeBuffer.i += _pingPayload.size();
             _pingPayload.clear();
 
-            _writeBuffer.b.resize(_writeBuffer.i - _writeBuffer.b.begin());
+            _writeBuffer.b.resize(static_cast<size_t>(_writeBuffer.i - _writeBuffer.b.begin()));
             _writeState = WriteStateControlFrame;
             _writeBuffer.i = _writeBuffer.b.begin();
         }
@@ -1513,7 +1513,7 @@ IceInternal::WSTransceiver::preWrite(Buffer& buf)
             }
 
             _writeState = WriteStateControlFrame;
-            _writeBuffer.b.resize(_writeBuffer.i - _writeBuffer.b.begin());
+            _writeBuffer.b.resize(static_cast<size_t>(_writeBuffer.i - _writeBuffer.b.begin()));
             _writeBuffer.i = _writeBuffer.b.begin();
         }
         else
@@ -1531,7 +1531,7 @@ IceInternal::WSTransceiver::preWrite(Buffer& buf)
         // For an outgoing connection, each message must be masked with a random
         // 32-bit value, so we copy the entire message into the internal buffer
         // for writing. For incoming connections, we just copy the start of the
-        // message in the internal buffer after the hedaer. If the message is
+        // message in the internal buffer after the header. If the message is
         // larger, the reminder is sent directly from the message buffer to avoid
         // copying.
         //
@@ -1543,7 +1543,7 @@ IceInternal::WSTransceiver::preWrite(Buffer& buf)
                 _writeBuffer.i = _writeBuffer.b.begin();
             }
 
-            size_t n = buf.i - buf.b.begin();
+            size_t n = static_cast<size_t>(buf.i - buf.b.begin());
             for(; n < buf.b.size() && _writeBuffer.i < _writeBuffer.b.end(); ++_writeBuffer.i, ++n)
             {
                 *_writeBuffer.i = buf.b[n] ^ _writeMask[n % 4];
@@ -1551,20 +1551,21 @@ IceInternal::WSTransceiver::preWrite(Buffer& buf)
             _writePayloadLength = n;
             if(_writeBuffer.i < _writeBuffer.b.end())
             {
-                _writeBuffer.b.resize(_writeBuffer.i - _writeBuffer.b.begin());
+                _writeBuffer.b.resize(static_cast<size_t>(_writeBuffer.i - _writeBuffer.b.begin()));
             }
             _writeBuffer.i = _writeBuffer.b.begin();
         }
         else if(_writePayloadLength == 0)
         {
-            size_t n = min(_writeBuffer.b.end() - _writeBuffer.i, buf.b.end() - buf.i);
+            size_t n = min(static_cast<size_t>(_writeBuffer.b.end() - _writeBuffer.i),
+                           static_cast<size_t>(buf.b.end() - buf.i));
             memcpy(_writeBuffer.i, buf.i, n);
             _writeBuffer.i += n;
             buf.i += n;
             _writePayloadLength = n;
             if(_writeBuffer.i < _writeBuffer.b.end())
             {
-                _writeBuffer.b.resize(_writeBuffer.i - _writeBuffer.b.begin());
+                _writeBuffer.b.resize(static_cast<size_t>(_writeBuffer.i - _writeBuffer.b.begin()));
             }
             _writeBuffer.i = _writeBuffer.b.begin();
         }
@@ -1616,9 +1617,7 @@ IceInternal::WSTransceiver::postWrite(Buffer& buf)
                 }
                 else
                 {
-                    ConnectionLostException ex(__FILE__, __LINE__);
-                    ex.error = 0;
-                    throw ex;
+                    throw ConnectionLostException(__FILE__, __LINE__, 0);
                 }
             }
             else if(_state == StateClosed)
@@ -1672,7 +1671,7 @@ IceInternal::WSTransceiver::readBuffered(IceInternal::Buffer::Container::size_ty
     }
     else
     {
-        IceInternal::Buffer::Container::size_type available = _readBuffer.i - _readI;
+        size_t available = static_cast<size_t>(_readBuffer.i - _readI);
         if(available < sz)
         {
             if(_readI != &_readBuffer.b[0])
@@ -1730,7 +1729,7 @@ IceInternal::WSTransceiver::prepareWriteHeader(Byte opCode, IceInternal::Buffer:
         // Use an extra 64 bits to encode the payload length.
         //
         *_writeBuffer.i++ = static_cast<Byte>(127);
-        ice_htonll(payloadLength, _writeBuffer.i);
+        ice_htonll(static_cast<Long>(payloadLength), _writeBuffer.i);
         _writeBuffer.i += 8;
     }