zeroc-ice 3.6b1 → 3.6.0

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

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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.

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

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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.

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

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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.

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

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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.

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

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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.

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

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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.
@@ -16,18 +16,19 @@ using namespace IceInternal;
 StreamSocket::StreamSocket(const ProtocolInstancePtr& instance,
                            const NetworkProxyPtr& proxy,
                            const Address& addr,
-                           const Address& sourceAddr) : 
+                           const Address& sourceAddr) :
     NativeInfo(createSocket(false, proxy ? proxy->getAddress() : addr)),
-    _proxy(proxy), 
-    _addr(addr), 
-    _sourceAddr(sourceAddr), 
+    _instance(instance),
+    _proxy(proxy),
+    _addr(addr),
+    _sourceAddr(sourceAddr),
     _state(StateNeedConnect)
 #ifdef ICE_USE_IOCP
     , _read(SocketOperationRead),
     _write(SocketOperationWrite)
 #endif
 {
-    init(instance);
+    init();
 #ifndef ICE_USE_IOCP
     if(doConnect(_fd, _proxy ? _proxy->getAddress() : _addr, sourceAddr))
     {
@@ -37,15 +38,16 @@ StreamSocket::StreamSocket(const ProtocolInstancePtr& instance,
     _desc = fdToString(_fd, _proxy, _addr);
 }
 
-StreamSocket::StreamSocket(const ProtocolInstancePtr& instance, SOCKET fd) : 
+StreamSocket::StreamSocket(const ProtocolInstancePtr& instance, SOCKET fd) :
     NativeInfo(fd),
+    _instance(instance),
     _state(StateConnected)
 #ifdef ICE_USE_IOCP
     , _read(SocketOperationRead),
     _write(SocketOperationWrite)
 #endif
 {
-    init(instance);
+    init();
     _desc = fdToString(fd);
 }
 
@@ -54,7 +56,7 @@ StreamSocket::~StreamSocket()
     assert(_fd == INVALID_SOCKET);
 }
 
-SocketOperation 
+SocketOperation
 StreamSocket::connect(Buffer& readBuffer, Buffer& writeBuffer)
 {
     if(_state == StateNeedConnect)
@@ -100,7 +102,7 @@ StreamSocket::connect(Buffer& readBuffer, Buffer& writeBuffer)
     return IceInternal::SocketOperationNone;
 }
 
-bool 
+bool
 StreamSocket::isConnected()
 {
     return _state == StateConnected;
@@ -116,7 +118,7 @@ StreamSocket::getSendPacketSize(size_t length)
 #endif
 }
 
-size_t 
+size_t
 StreamSocket::getRecvPacketSize(size_t length)
 {
 #ifdef ICE_USE_IOCP
@@ -126,6 +128,12 @@ StreamSocket::getRecvPacketSize(size_t length)
 #endif
 }
 
+void
+StreamSocket::setBufferSize(int rcvSize, int sndSize)
+{
+    setTcpBufSize(_fd, rcvSize, sndSize, _instance);
+}
+
 SocketOperation
 StreamSocket::read(Buffer& buf)
 {
@@ -145,7 +153,7 @@ StreamSocket::read(Buffer& buf)
                 return SocketOperationNone;
             }
         }
-    }    
+    }
     buf.i += read(reinterpret_cast<char*>(&*buf.i), buf.b.end() - buf.i);
     return buf.i != buf.b.end() ? SocketOperationRead : SocketOperationNone;
 }
@@ -173,7 +181,7 @@ StreamSocket::write(Buffer& buf)
     buf.i += write(reinterpret_cast<const char*>(&*buf.i), buf.b.end() - buf.i);
     return buf.i != buf.b.end() ? SocketOperationWrite : SocketOperationNone;
 }
-   
+
 ssize_t
 StreamSocket::read(char* buf, size_t length)
 {
@@ -230,7 +238,7 @@ StreamSocket::read(char* buf, size_t length)
         buf += ret;
         read += ret;
         length -= ret;
-        
+
         if(packetSize > length)
         {
             packetSize = length;
@@ -239,11 +247,11 @@ StreamSocket::read(char* buf, size_t length)
     return read;
 }
 
-ssize_t 
+ssize_t
 StreamSocket::write(const char* buf, size_t length)
 {
     assert(_fd != INVALID_SOCKET);
-    
+
 #ifdef ICE_USE_IOCP
     //
     // On Windows, limiting the buffer size is important to prevent
@@ -314,7 +322,7 @@ StreamSocket::write(const char* buf, size_t length)
 }
 
 #ifdef ICE_USE_IOCP
-AsyncInfo* 
+AsyncInfo*
 StreamSocket::getAsyncInfo(SocketOperation op)
 {
     switch(op)
@@ -463,7 +471,7 @@ StreamSocket::finishRead(Buffer& buf)
 }
 #endif
 
-void 
+void
 StreamSocket::close()
 {
     assert(_fd != INVALID_SOCKET);
@@ -479,17 +487,17 @@ StreamSocket::close()
     }
 }
 
-const std::string& 
+const std::string&
 StreamSocket::toString() const
 {
     return _desc;
 }
 
-void    
-StreamSocket::init(const ProtocolInstancePtr& instance)
+void
+StreamSocket::init()
 {
     setBlock(_fd, false);
-    setTcpBufSize(_fd, instance->properties(), instance->logger());
+    setTcpBufSize(_fd, _instance);
 
 #ifdef ICE_USE_IOCP
     //

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

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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.
@@ -25,15 +25,17 @@ public:
     StreamSocket(const ProtocolInstancePtr&, const NetworkProxyPtr&, const Address&, const Address&);
     StreamSocket(const ProtocolInstancePtr&, SOCKET);
     virtual ~StreamSocket();
-    
+
     SocketOperation connect(Buffer&, Buffer&);
     bool isConnected();
     size_t getSendPacketSize(size_t);
     size_t getRecvPacketSize(size_t);
 
+    void setBufferSize(int rcvSize, int sndSize);
+
     SocketOperation read(Buffer&);
     SocketOperation write(Buffer&);
-    
+
     ssize_t read(char*, size_t);
     ssize_t write(const char*, size_t);
 
@@ -50,7 +52,7 @@ public:
 
 private:
 
-    void init(const ProtocolInstancePtr&);
+    void init();
 
     enum State
     {
@@ -63,6 +65,7 @@ private:
     };
     State toState(SocketOperation) const;
 
+    const ProtocolInstancePtr _instance;
     const NetworkProxyPtr _proxy;
     const Address _addr;
     const Address _sourceAddr;

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

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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.

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

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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.

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

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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.

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

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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.
@@ -49,18 +49,19 @@ IceInternal::TcpAcceptor::getAsyncInfo(SocketOperation)
 void
 IceInternal::TcpAcceptor::close()
 {
-    SOCKET fd = _fd;
-    _fd = INVALID_SOCKET;
-    closeSocket(fd);
+    if(_fd != INVALID_SOCKET)
+    {
+        closeSocketNoThrow(_fd);
+        _fd = INVALID_SOCKET;
+    }
 }
 
 EndpointIPtr
 IceInternal::TcpAcceptor::listen()
 {
-    const_cast<Address&>(_addr) = doBind(_fd, _addr);
-
     try
     {
+        const_cast<Address&>(_addr) = doBind(_fd, _addr);
         doListen(_fd, _backlog);
     }
     catch(...)
@@ -68,7 +69,6 @@ IceInternal::TcpAcceptor::listen()
         _fd = INVALID_SOCKET;
         throw;
     }
-
     _endpoint = _endpoint->endpoint(this);
     return _endpoint;
 }
@@ -207,7 +207,7 @@ IceInternal::TcpAcceptor::TcpAcceptor(const TcpEndpointIPtr& endpoint,
 #endif
 
     setBlock(_fd, false);
-    setTcpBufSize(_fd, _instance->properties(), _instance->logger());
+    setTcpBufSize(_fd, _instance);
 #ifndef _WIN32
     //
     // Enable SO_REUSEADDR on Unix platforms to allow re-using the

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

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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.

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

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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.

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

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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.

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

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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.
@@ -23,6 +23,17 @@ using namespace IceInternal;
 
 IceUtil::Shared* IceInternal::upCast(TcpEndpointI* p) { return p; }
 
+extern "C"
+{
+
+Plugin*
+createIceTCP(const CommunicatorPtr& c, const string&, const StringSeq&)
+{
+    return new EndpointFactoryPlugin(c, new TcpEndpointFactory(new ProtocolInstance(c, TCPEndpointType, "tcp", false)));
+}
+
+}
+
 IceInternal::TcpEndpointI::TcpEndpointI(const ProtocolInstancePtr& instance, const string& host, Int port,
                                         const Address& sourceAddr, Int timeout, const string& connectionId,
                                         bool compress) :
@@ -51,39 +62,17 @@ IceInternal::TcpEndpointI::TcpEndpointI(const ProtocolInstancePtr& instance, Bas
 EndpointInfoPtr
 IceInternal::TcpEndpointI::getInfo() const
 {
-    class InfoI : public Ice::TCPEndpointInfo
-    {
-    public:
-
-        InfoI(const EndpointIPtr& endpoint) : _endpoint(endpoint)
-        {
-        }
-
-        virtual Ice::Short
-        type() const
-        {
-            return _endpoint->type();
-        }
-
-        virtual bool
-        datagram() const
-        {
-            return _endpoint->datagram();
-        }
-
-        virtual bool
-        secure() const
-        {
-            return _endpoint->secure();
-        }
-
-    private:
-
-        const EndpointIPtr _endpoint;
-    };
+    TCPEndpointInfoPtr info = new InfoI<Ice::TCPEndpointInfo>(const_cast<TcpEndpointI*>(this));
+    fillEndpointInfo(info.get());
+    return info;
+}
 
-    TCPEndpointInfoPtr info = new InfoI(const_cast<TcpEndpointI*>(this));
+EndpointInfoPtr
+IceInternal::TcpEndpointI::getWSInfo(const string& resource) const
+{
+    WSEndpointInfoPtr info = new InfoI<Ice::WSEndpointInfo>(const_cast<TcpEndpointI*>(this));
     fillEndpointInfo(info.get());
+    info->resource = resource;
     return info;
 }
 
@@ -131,12 +120,6 @@ IceInternal::TcpEndpointI::datagram() const
     return false;
 }
 
-bool
-IceInternal::TcpEndpointI::secure() const
-{
-    return false;
-}
-
 TransceiverPtr
 IceInternal::TcpEndpointI::transceiver() const
 {

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

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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.
@@ -14,11 +14,12 @@
 #include <Ice/IPEndpointI.h>
 #include <Ice/EndpointFactory.h>
 #include <Ice/Network.h> // for IceIternal::Address
+#include <Ice/WSEndpoint.h>
 
 namespace IceInternal
 {
 
-class TcpEndpointI : public IPEndpointI
+class TcpEndpointI : public IPEndpointI, public WSEndpointDelegate
 {
 public:
 
@@ -28,13 +29,13 @@ public:
     TcpEndpointI(const ProtocolInstancePtr&, BasicStream*);
 
     virtual Ice::EndpointInfoPtr getInfo() const;
+    virtual Ice::EndpointInfoPtr getWSInfo(const std::string&) const;
 
     virtual Ice::Int timeout() const;
     virtual EndpointIPtr timeout(Ice::Int) const;
     virtual bool compress() const;
     virtual EndpointIPtr compress(bool) const;
     virtual bool datagram() const;
-    virtual bool secure() const;
 
     virtual TransceiverPtr transceiver() const;
     virtual AcceptorPtr acceptor(const std::string&) const;
@@ -70,6 +71,7 @@ class TcpEndpointFactory : public EndpointFactory
 {
 public:
 
+    TcpEndpointFactory(const ProtocolInstancePtr&);
     virtual ~TcpEndpointFactory();
 
     virtual Ice::Short type() const;
@@ -82,9 +84,6 @@ public:
 
 private:
 
-    TcpEndpointFactory(const ProtocolInstancePtr&);
-    friend class Instance;
-
     ProtocolInstancePtr _instance;
 };