zeroc-ice 3.7.11 → 3.8.1

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

@@ -1,55 +1,46 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
+// Copyright (c) ZeroC, Inc.
 
-#include <Ice/Config.h>
+#include "Ice/Config.h"
 
 #if !defined(__APPLE__) || TARGET_OS_IPHONE == 0
 
-#include <Ice/TcpAcceptor.h>
-#include <Ice/TcpTransceiver.h>
-#include <Ice/TcpEndpointI.h>
-#include <Ice/ProtocolInstance.h>
-#include <Ice/LoggerUtil.h>
-#include <Ice/LocalException.h>
-#include <Ice/Properties.h>
-#include <Ice/StreamSocket.h>
-#include <IceUtil/StringUtil.h>
-
-#if defined(ICE_USE_IOCP)
-#  include <Mswsock.h>
-#endif
+#    include "Ice/LocalExceptions.h"
+#    include "Ice/LoggerUtil.h"
+#    include "Ice/Properties.h"
+#    include "Ice/StringUtil.h"
+#    include "ProtocolInstance.h"
+#    include "StreamSocket.h"
+#    include "TcpAcceptor.h"
 
-//
-// Use the system default for the listen() backlog or 511 if not defined.
-//
-#ifndef SOMAXCONN
-#  define SOMAXCONN 511
-#endif
+#    include "TcpEndpointI.h"
+#    include "TcpTransceiver.h"
+#    include <utility>
+
+#    if defined(ICE_USE_IOCP)
+#        include <Mswsock.h>
+#    endif
 
 using namespace std;
 using namespace Ice;
 using namespace IceInternal;
 
-IceUtil::Shared* IceInternal::upCast(TcpAcceptor* p) { return p; }
-
 NativeInfoPtr
 IceInternal::TcpAcceptor::getNativeInfo()
 {
-    return this;
+    return shared_from_this();
 }
 
 void
 IceInternal::TcpAcceptor::close()
 {
-#if defined(ICE_USE_IOCP)
-    if(_acceptFd != INVALID_SOCKET)
+#    if defined(ICE_USE_IOCP)
+    if (_acceptFd != INVALID_SOCKET)
     {
         closeSocketNoThrow(_acceptFd);
         _acceptFd = INVALID_SOCKET;
     }
-#endif
-    if(_fd != INVALID_SOCKET)
+#    endif
+    if (_fd != INVALID_SOCKET)
     {
         closeSocketNoThrow(_fd);
         _fd = INVALID_SOCKET;
@@ -64,16 +55,16 @@ IceInternal::TcpAcceptor::listen()
         const_cast<Address&>(_addr) = doBind(_fd, _addr);
         doListen(_fd, _backlog);
     }
-    catch(...)
+    catch (...)
     {
         _fd = INVALID_SOCKET;
         throw;
     }
-    _endpoint = _endpoint->endpoint(this);
+    _endpoint = _endpoint->endpoint(shared_from_this());
     return _endpoint;
 }
 
-#if defined(ICE_USE_IOCP)
+#    if defined(ICE_USE_IOCP)
 
 AsyncInfo*
 IceInternal::TcpAcceptor::getAsyncInfo(SocketOperation)
@@ -84,18 +75,19 @@ IceInternal::TcpAcceptor::getAsyncInfo(SocketOperation)
 void
 IceInternal::TcpAcceptor::startAccept()
 {
-    LPFN_ACCEPTEX AcceptEx = ICE_NULLPTR; // a pointer to the 'AcceptEx()' function
+    LPFN_ACCEPTEX AcceptEx = nullptr;   // a pointer to the 'AcceptEx()' function
     GUID GuidAcceptEx = WSAID_ACCEPTEX; // The Guid
     DWORD dwBytes;
-    if(WSAIoctl(_fd,
-                SIO_GET_EXTENSION_FUNCTION_POINTER,
-                &GuidAcceptEx,
-                sizeof(GuidAcceptEx),
-                &AcceptEx,
-                sizeof(AcceptEx),
-                &dwBytes,
-                ICE_NULLPTR,
-                ICE_NULLPTR) == SOCKET_ERROR)
+    if (WSAIoctl(
+            _fd,
+            SIO_GET_EXTENSION_FUNCTION_POINTER,
+            &GuidAcceptEx,
+            sizeof(GuidAcceptEx),
+            &AcceptEx,
+            sizeof(AcceptEx),
+            &dwBytes,
+            nullptr,
+            nullptr) == SOCKET_ERROR)
     {
         throw SocketException(__FILE__, __LINE__, getSocketErrno());
     }
@@ -104,9 +96,9 @@ IceInternal::TcpAcceptor::startAccept()
     _acceptFd = createSocket(false, _addr);
     const int sz = static_cast<int>(_acceptBuf.size() / 2);
     _info.error = ERROR_SUCCESS;
-    if(!AcceptEx(_fd, _acceptFd, &_acceptBuf[0], 0, sz, sz, &_info.count, &_info))
+    if (!AcceptEx(_fd, _acceptFd, &_acceptBuf[0], 0, sz, sz, &_info.count, &_info))
     {
-        if(!wouldBlock())
+        if (!wouldBlock())
         {
             throw SocketException(__FILE__, __LINE__, getSocketErrno());
         }
@@ -116,7 +108,7 @@ IceInternal::TcpAcceptor::startAccept()
 void
 IceInternal::TcpAcceptor::finishAccept()
 {
-    if(_info.error != ERROR_SUCCESS || _fd == INVALID_SOCKET)
+    if (_info.error != ERROR_SUCCESS || _fd == INVALID_SOCKET)
     {
         closeSocketNoThrow(_acceptFd);
         _acceptFd = INVALID_SOCKET;
@@ -127,12 +119,12 @@ IceInternal::TcpAcceptor::finishAccept()
 TransceiverPtr
 IceInternal::TcpAcceptor::accept()
 {
-    if(_acceptFd == INVALID_SOCKET)
+    if (_acceptFd == INVALID_SOCKET)
     {
         throw SocketException(__FILE__, __LINE__, _acceptError);
     }
-    if(setsockopt(_acceptFd, SOL_SOCKET, SO_UPDATE_ACCEPT_CONTEXT, (char*)&_acceptFd, sizeof(_acceptFd)) ==
-       SOCKET_ERROR)
+    if (setsockopt(_acceptFd, SOL_SOCKET, SO_UPDATE_ACCEPT_CONTEXT, (char*)&_acceptFd, sizeof(_acceptFd)) ==
+        SOCKET_ERROR)
     {
         closeSocketNoThrow(_acceptFd);
         _acceptFd = INVALID_SOCKET;
@@ -141,17 +133,17 @@ IceInternal::TcpAcceptor::accept()
 
     SOCKET fd = _acceptFd;
     _acceptFd = INVALID_SOCKET;
-    return new TcpTransceiver(_instance, new StreamSocket(_instance, fd));
+    return make_shared<TcpTransceiver>(_instance, make_shared<StreamSocket>(_instance, fd));
 }
-#else
+#    else
 
 TransceiverPtr
 IceInternal::TcpAcceptor::accept()
 {
-    return new TcpTransceiver(_instance, new StreamSocket(_instance, doAccept(_fd)));
+    return make_shared<TcpTransceiver>(_instance, make_shared<StreamSocket>(_instance, doAccept(_fd)));
 }
 
-#endif
+#    endif
 
 string
 IceInternal::TcpAcceptor::protocol() const
@@ -170,12 +162,6 @@ IceInternal::TcpAcceptor::toDetailedString() const
 {
     ostringstream os;
     os << "local address = " << toString();
-    vector<string> intfs = getHostsForEndpointExpand(inetAddrToString(_addr), _instance->protocolSupport(), true);
-    if(!intfs.empty())
-    {
-        os << "\nlocal interfaces = ";
-        os << IceUtilInternal::joinString(intfs, ", ");
-    }
     return os.str();
 }
 
@@ -185,50 +171,43 @@ IceInternal::TcpAcceptor::effectivePort() const
     return getPort(_addr);
 }
 
-IceInternal::TcpAcceptor::TcpAcceptor(const TcpEndpointIPtr& endpoint,
-                                      const ProtocolInstancePtr& instance,
-                                      const string& host,
-                                      int port) :
-    _endpoint(endpoint),
-    _instance(instance),
-    _addr(getAddressForServer(host, port, _instance->protocolSupport(), instance->preferIPv6(), true))
-#ifdef ICE_USE_IOCP
-    , _acceptFd(INVALID_SOCKET), _info(SocketOperationRead)
-#endif
+IceInternal::TcpAcceptor::TcpAcceptor(
+    TcpEndpointIPtr endpoint,
+    const ProtocolInstancePtr& instance,
+    const string& host,
+    int port)
+    : _endpoint(std::move(endpoint)),
+      _instance(instance),
+      _addr(getAddressForServer(host, port, _instance->protocolSupport(), instance->preferIPv6(), true))
+#    ifdef ICE_USE_IOCP
+      ,
+      _acceptFd(INVALID_SOCKET),
+      _info(SocketOperationRead)
+#    endif
 {
-    _backlog = instance->properties()->getPropertyAsIntWithDefault("Ice.TCP.Backlog", SOMAXCONN);
+    _backlog = instance->properties()->getIcePropertyAsInt("Ice.TCP.Backlog");
     _fd = createServerSocket(false, _addr, instance->protocolSupport());
 
-#ifdef ICE_USE_IOCP
+#    ifdef ICE_USE_IOCP
     _acceptBuf.resize((sizeof(sockaddr_storage) + 16) * 2);
-#endif
+#    endif
 
     setBlock(_fd, false);
     setTcpBufSize(_fd, _instance);
 
-#ifndef _WIN32
-    //
-    // Enable SO_REUSEADDR on Unix platforms to allow re-using the
-    // socket even if it's in the TIME_WAIT state. On Windows,
-    // this doesn't appear to be necessary and enabling
-    // SO_REUSEADDR would actually not be a good thing since it
-    // allows a second process to bind to an address even it's
-    // already bound by another process.
-    //
-    // TODO: using SO_EXCLUSIVEADDRUSE on Windows would probably
-    // be better but it's only supported by recent Windows
-    // versions (XP SP2, Windows Server 2003).
-    //
+#    ifndef _WIN32
+    // Set SO_REUSEADDR socket option on Unix platforms to allow re-using the address even if the socket remains in
+    // the TIME_WAIT state. On Windows this isn't necessary.
     setReuseAddress(_fd, true);
-#endif
+#    endif
 }
 
 IceInternal::TcpAcceptor::~TcpAcceptor()
 {
     assert(_fd == INVALID_SOCKET);
-#ifdef ICE_USE_IOCP
+#    ifdef ICE_USE_IOCP
     assert(_acceptFd == INVALID_SOCKET);
-#endif
+#    endif
 }
 
 #endif

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

@@ -1,61 +1,55 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
+// Copyright (c) ZeroC, Inc.
 
 #ifndef ICE_TCP_ACCEPTOR_H
 #define ICE_TCP_ACCEPTOR_H
 
-#include <Ice/TransceiverF.h>
-#include <Ice/ProtocolInstanceF.h>
-#include <Ice/Acceptor.h>
-#include <Ice/Network.h>
+#include "Acceptor.h"
+#include "Network.h"
+#include "ProtocolInstanceF.h"
+#include "TransceiverF.h"
 
 namespace IceInternal
 {
-
-class TcpEndpoint;
-
-class TcpAcceptor : public Acceptor, public NativeInfo
-{
-public:
-
-    virtual NativeInfoPtr getNativeInfo();
+    class TcpEndpoint;
+
+    class TcpAcceptor final : public Acceptor, public NativeInfo, public std::enable_shared_from_this<TcpAcceptor>
+    {
+    public:
+        TcpAcceptor(TcpEndpointIPtr, const ProtocolInstancePtr&, const std::string&, int);
+        ~TcpAcceptor() override;
+        NativeInfoPtr getNativeInfo() final;
 #if defined(ICE_USE_IOCP)
-    virtual AsyncInfo* getAsyncInfo(SocketOperation);
+        AsyncInfo* getAsyncInfo(SocketOperation) final;
 #endif
 
-    virtual void close();
-    virtual EndpointIPtr listen();
+        void close() final;
+        EndpointIPtr listen() final;
 #if defined(ICE_USE_IOCP)
-    virtual void startAccept();
-    virtual void finishAccept();
+        void startAccept() final;
+        void finishAccept() final;
 #endif
 
-    virtual TransceiverPtr accept();
-    virtual std::string protocol() const;
-    virtual std::string toString() const;
-    virtual std::string toDetailedString() const;
-
-    int effectivePort() const;
+        TransceiverPtr accept() final;
+        [[nodiscard]] std::string protocol() const final;
+        [[nodiscard]] std::string toString() const final;
+        [[nodiscard]] std::string toDetailedString() const final;
 
-private:
+        [[nodiscard]] int effectivePort() const;
 
-    TcpAcceptor(const TcpEndpointIPtr&, const ProtocolInstancePtr&, const std::string&, int);
-    virtual ~TcpAcceptor();
-    friend class TcpEndpointI;
+    private:
+        friend class TcpEndpointI;
 
-    TcpEndpointIPtr _endpoint;
-    const ProtocolInstancePtr _instance;
-    const Address _addr;
+        TcpEndpointIPtr _endpoint;
+        const ProtocolInstancePtr _instance;
+        const Address _addr;
 
-    int _backlog;
+        int _backlog;
 #if defined(ICE_USE_IOCP)
-    SOCKET _acceptFd;
-    int _acceptError;
-    std::vector<char> _acceptBuf;
-    AsyncInfo _info;
+        SOCKET _acceptFd;
+        int _acceptError;
+        std::vector<char> _acceptBuf;
+        AsyncInfo _info;
 #endif
-};
-
+    };
 }
 #endif

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

@@ -1,20 +1,19 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
+// Copyright (c) ZeroC, Inc.
 
-#include <Ice/Config.h>
+#include "Ice/Config.h"
 
 #if !defined(__APPLE__) || TARGET_OS_IPHONE == 0
 
-#include <Ice/TcpConnector.h>
-#include <Ice/TcpTransceiver.h>
-#include <Ice/TcpEndpointI.h>
-#include <Ice/ProtocolInstance.h>
-#include <Ice/LoggerUtil.h>
-#include <Ice/Network.h>
-#include <Ice/NetworkProxy.h>
-#include <Ice/StreamSocket.h>
-#include <Ice/Exception.h>
+#    include "Ice/LoggerUtil.h"
+#    include "Network.h"
+#    include "NetworkProxy.h"
+#    include "ProtocolInstance.h"
+#    include "StreamSocket.h"
+#    include "TcpConnector.h"
+
+#    include "TcpEndpointI.h"
+#    include "TcpTransceiver.h"
+#    include <utility>
 
 using namespace std;
 using namespace Ice;
@@ -23,10 +22,10 @@ using namespace IceInternal;
 TransceiverPtr
 IceInternal::TcpConnector::connect()
 {
-    return new TcpTransceiver(_instance, new StreamSocket(_instance, _proxy, _addr, _sourceAddr));
+    return make_shared<TcpTransceiver>(_instance, make_shared<StreamSocket>(_instance, _proxy, _addr, _sourceAddr));
 }
 
-Short
+int16_t
 IceInternal::TcpConnector::type() const
 {
     return _instance->type();
@@ -41,28 +40,28 @@ IceInternal::TcpConnector::toString() const
 bool
 IceInternal::TcpConnector::operator==(const Connector& r) const
 {
-    const TcpConnector* p = dynamic_cast<const TcpConnector*>(&r);
-    if(!p)
+    const auto* p = dynamic_cast<const TcpConnector*>(&r);
+    if (!p)
     {
         return false;
     }
 
-    if(compareAddress(_addr, p->_addr) != 0)
+    if (compareAddress(_addr, p->_addr) != 0)
     {
         return false;
     }
 
-    if(_timeout != p->_timeout)
+    if (_timeout != p->_timeout)
     {
         return false;
     }
 
-    if(compareAddress(_sourceAddr, p->_sourceAddr) != 0)
+    if (compareAddress(_sourceAddr, p->_sourceAddr) != 0)
     {
         return false;
     }
 
-    if(_connectionId != p->_connectionId)
+    if (_connectionId != p->_connectionId)
     {
         return false;
     }
@@ -73,55 +72,57 @@ IceInternal::TcpConnector::operator==(const Connector& r) const
 bool
 IceInternal::TcpConnector::operator<(const Connector& r) const
 {
-    const TcpConnector* p = dynamic_cast<const TcpConnector*>(&r);
-    if(!p)
+    const auto* p = dynamic_cast<const TcpConnector*>(&r);
+    if (!p)
     {
         return type() < r.type();
     }
 
-    if(_timeout < p->_timeout)
+    if (_timeout < p->_timeout)
     {
         return true;
     }
-    else if(p->_timeout < _timeout)
+    else if (p->_timeout < _timeout)
     {
         return false;
     }
 
     int rc = compareAddress(_sourceAddr, p->_sourceAddr);
-    if(rc < 0)
+    if (rc < 0)
     {
         return true;
     }
-    else if(rc > 0)
+    else if (rc > 0)
     {
         return false;
     }
 
-    if(_connectionId < p->_connectionId)
+    if (_connectionId < p->_connectionId)
     {
         return true;
     }
-    else if(p->_connectionId < _connectionId)
+    else if (p->_connectionId < _connectionId)
     {
         return false;
     }
     return compareAddress(_addr, p->_addr) < 0;
 }
 
-IceInternal::TcpConnector::TcpConnector(const ProtocolInstancePtr& instance, const Address& addr,
-                                        const NetworkProxyPtr& proxy, const Address& sourceAddr,
-                                        Ice::Int timeout, const string& connectionId) :
-    _instance(instance),
-    _addr(addr),
-    _proxy(proxy),
-    _sourceAddr(sourceAddr),
-    _timeout(timeout),
-    _connectionId(connectionId)
+IceInternal::TcpConnector::TcpConnector(
+    ProtocolInstancePtr instance,
+    const Address& addr,
+    NetworkProxyPtr proxy,
+    const Address& sourceAddr,
+    int32_t timeout,
+    string connectionId)
+    : _instance(std::move(instance)),
+      _addr(addr),
+      _proxy(std::move(proxy)),
+      _sourceAddr(sourceAddr),
+      _timeout(timeout),
+      _connectionId(std::move(connectionId))
 {
 }
 
-IceInternal::TcpConnector::~TcpConnector()
-{
-}
+IceInternal::TcpConnector::~TcpConnector() = default;
 #endif

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

@@ -1,45 +1,36 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
+// Copyright (c) ZeroC, Inc.
 
 #ifndef ICE_TCP_CONNECTOR_H
 #define ICE_TCP_CONNECTOR_H
 
-#include <Ice/TransceiverF.h>
-#include <Ice/ProtocolInstanceF.h>
-#include <Ice/Connector.h>
-#include <Ice/Network.h>
+#include "Connector.h"
+#include "Network.h"
+#include "ProtocolInstanceF.h"
+#include "TransceiverF.h"
 
 namespace IceInternal
 {
-
-class TcpConnector : public Connector
-{
-public:
-
-    virtual TransceiverPtr connect();
-
-    virtual Ice::Short type() const;
-    virtual std::string toString() const;
-
-    virtual bool operator==(const Connector&) const;
-    virtual bool operator<(const Connector&) const;
-
-private:
-
-    TcpConnector(const ProtocolInstancePtr&, const Address&, const NetworkProxyPtr&, const Address&, Ice::Int,
-                 const std::string&);
-    virtual ~TcpConnector();
-    friend class TcpEndpointI;
-
-    const ProtocolInstancePtr _instance;
-    const Address _addr;
-    const NetworkProxyPtr _proxy;
-    const Address _sourceAddr;
-    const Ice::Int _timeout;
-    const std::string _connectionId;
-};
-
+    class TcpConnector final : public Connector
+    {
+    public:
+        TcpConnector(ProtocolInstancePtr, const Address&, NetworkProxyPtr, const Address&, std::int32_t, std::string);
+        ~TcpConnector() override;
+        TransceiverPtr connect() final;
+
+        [[nodiscard]] std::int16_t type() const final;
+        [[nodiscard]] std::string toString() const final;
+
+        bool operator==(const Connector&) const final;
+        bool operator<(const Connector&) const final;
+
+    private:
+        const ProtocolInstancePtr _instance;
+        const Address _addr;
+        const NetworkProxyPtr _proxy;
+        const Address _sourceAddr;
+        const std::int32_t _timeout;
+        const std::string _connectionId;
+    };
 }
 
 #endif