zeroc-ice 3.7.11 → 3.8.1

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

@@ -1,84 +1,71 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
+// Copyright (c) ZeroC, Inc.
 
-#include <Ice/NetworkProxy.h>
-#include <Ice/HttpParser.h>
-#include <Ice/LocalException.h>
-#include <Ice/Properties.h>
+#include "NetworkProxy.h"
+#include "HttpParser.h"
+#include "Ice/LocalExceptions.h"
+#include "Ice/Properties.h"
+
+#include <sstream>
 
 using namespace std;
 using namespace IceInternal;
 
-IceUtil::Shared* IceInternal::upCast(NetworkProxy* p) { return p; }
-
-NetworkProxy::~NetworkProxy()
-{
-    // Out of line to avoid weak vtable
-}
+NetworkProxy::~NetworkProxy() = default; // Out of line to avoid weak vtable
 
 namespace
 {
-
-class SOCKSNetworkProxy : public NetworkProxy
-{
-public:
-
-    SOCKSNetworkProxy(const string&, int);
-    SOCKSNetworkProxy(const Address&);
-
-    virtual void beginWrite(const Address&, Buffer&);
-    virtual SocketOperation endWrite(Buffer&);
-    virtual void beginRead(Buffer&);
-    virtual SocketOperation endRead(Buffer&);
-    virtual void finish(Buffer&, Buffer&);
-    virtual NetworkProxyPtr resolveHost(ProtocolSupport) const;
-    virtual Address getAddress() const;
-    virtual string getName() const;
-    virtual ProtocolSupport getProtocolSupport() const;
-
-private:
-
-    string _host;
-    int _port;
-    Address _address;
-};
-
-class HTTPNetworkProxy : public NetworkProxy
-{
-public:
-
-    HTTPNetworkProxy(const string&, int);
-    HTTPNetworkProxy(const Address&, ProtocolSupport);
-
-    virtual void beginWrite(const Address&, Buffer&);
-    virtual SocketOperation endWrite(Buffer&);
-    virtual void beginRead(Buffer&);
-    virtual SocketOperation endRead(Buffer&);
-    virtual void finish(Buffer&, Buffer&);
-    virtual NetworkProxyPtr resolveHost(ProtocolSupport) const;
-    virtual Address getAddress() const;
-    virtual string getName() const;
-    virtual ProtocolSupport getProtocolSupport() const;
-
-private:
-
-    string _host;
-    int _port;
-    Address _address;
-    ProtocolSupport _protocol;
-};
-
+    class SOCKSNetworkProxy final : public NetworkProxy
+    {
+    public:
+        SOCKSNetworkProxy(string, int);
+        SOCKSNetworkProxy(const Address&);
+
+        void beginWrite(const Address&, Buffer&) final;
+        SocketOperation endWrite(Buffer&) final;
+        void beginRead(Buffer&) final;
+        SocketOperation endRead(Buffer&) final;
+        void finish(Buffer&, Buffer&) final;
+        [[nodiscard]] NetworkProxyPtr resolveHost(ProtocolSupport) const final;
+        [[nodiscard]] Address getAddress() const final;
+        [[nodiscard]] string getName() const final;
+        [[nodiscard]] ProtocolSupport getProtocolSupport() const final;
+
+    private:
+        string _host;
+        int _port;
+        Address _address;
+    };
+
+    class HTTPNetworkProxy final : public NetworkProxy
+    {
+    public:
+        HTTPNetworkProxy(string, int);
+        HTTPNetworkProxy(const Address&, ProtocolSupport);
+
+        void beginWrite(const Address&, Buffer&) final;
+        SocketOperation endWrite(Buffer&) final;
+        void beginRead(Buffer&) final;
+        SocketOperation endRead(Buffer&) final;
+        void finish(Buffer&, Buffer&) final;
+        [[nodiscard]] NetworkProxyPtr resolveHost(ProtocolSupport) const final;
+        [[nodiscard]] Address getAddress() const final;
+        [[nodiscard]] string getName() const final;
+        [[nodiscard]] ProtocolSupport getProtocolSupport() const final;
+
+    private:
+        string _host;
+        int _port;
+        Address _address;
+        ProtocolSupport _protocol;
+    };
 }
 
-SOCKSNetworkProxy::SOCKSNetworkProxy(const string& host, int port) : _host(host), _port(port)
+SOCKSNetworkProxy::SOCKSNetworkProxy(string host, int port) : _host(std::move(host)), _port(port)
 {
-    assert(!host.empty());
+    assert(!_host.empty());
 }
 
-SOCKSNetworkProxy::SOCKSNetworkProxy(const Address& addr) : _port(0), _address(addr)
-{
-}
+SOCKSNetworkProxy::SOCKSNetworkProxy(const Address& addr) : _port(0), _address(addr) {}
 
 void
 SOCKSNetworkProxy::beginWrite(const Address& addr, Buffer& buf)
@@ -88,29 +75,29 @@ SOCKSNetworkProxy::beginWrite(const Address& addr, Buffer& buf)
     //
     buf.b.resize(9);
     buf.i = buf.b.begin();
-    Ice::Byte* dest = &buf.b[0];
-    *dest++ = 0x04; // SOCKS version 4.
-    *dest++ = 0x01; // Command, establish a TCP/IP stream connection
+    byte* dest = &buf.b[0];
+    *dest++ = byte{0x04}; // SOCKS version 4.
+    *dest++ = byte{0x01}; // Command, establish a TCP/IP stream connection
 
-    const Ice::Byte* src;
+    const byte* src;
 
     //
     // Port (already in big-endian order)
     //
-    src = reinterpret_cast<const Ice::Byte*>(&addr.saIn.sin_port);
+    src = reinterpret_cast<const byte*>(&addr.saIn.sin_port);
     *dest++ = *src++;
     *dest++ = *src;
 
     //
     // IPv4 address (already in big-endian order)
     //
-    src = reinterpret_cast<const Ice::Byte*>(&addr.saIn.sin_addr.s_addr);
+    src = reinterpret_cast<const byte*>(&addr.saIn.sin_addr.s_addr);
     *dest++ = *src++;
     *dest++ = *src++;
     *dest++ = *src++;
     *dest++ = *src;
 
-    *dest = 0x00; // User ID.
+    *dest = byte{0x00}; // User ID.
 }
 
 SocketOperation
@@ -142,17 +129,20 @@ SOCKSNetworkProxy::finish(Buffer& readBuffer, Buffer&)
 {
     readBuffer.i = readBuffer.b.begin();
 
-    if(readBuffer.b.end() - readBuffer.i < 2)
+    if (readBuffer.b.end() - readBuffer.i < 2)
     {
-        throw Ice::UnmarshalOutOfBoundsException(__FILE__, __LINE__);
+        throw Ice::MarshalException{__FILE__, __LINE__, "attempting to unmarshal past the end of the buffer"};
     }
 
-    const Ice::Byte* src = &(*readBuffer.i);
-    const Ice::Byte b1 = *src++;
-    const Ice::Byte b2 = *src++;
-    if(b1 != 0x00 || b2 != 0x5a)
+    const byte* src = &(*readBuffer.i);
+    const byte b1 = *src++;
+    const byte b2 = *src++;
+    if (b1 != byte{0x00} || b2 != byte{0x5a})
     {
-        throw Ice::ConnectFailedException(__FILE__, __LINE__);
+        throw Ice::ConnectFailedException{
+            __FILE__,
+            __LINE__,
+            "connection establishment failed due to an HTTP proxy error"};
     }
 }
 
@@ -160,7 +150,7 @@ NetworkProxyPtr
 SOCKSNetworkProxy::resolveHost(ProtocolSupport protocol) const
 {
     assert(!_host.empty());
-    return new SOCKSNetworkProxy(getAddresses(_host, _port, protocol, Ice::ICE_ENUM(EndpointSelectionType, Random), false, true)[0]);
+    return make_shared<SOCKSNetworkProxy>(getAddresses(_host, _port, protocol, false, true)[0]);
 }
 
 Address
@@ -182,14 +172,15 @@ SOCKSNetworkProxy::getProtocolSupport() const
     return EnableIPv4;
 }
 
-HTTPNetworkProxy::HTTPNetworkProxy(const string& host, int port) :
-    _host(host), _port(port), _protocol(EnableBoth)
+HTTPNetworkProxy::HTTPNetworkProxy(string host, int port) : _host(std::move(host)), _port(port), _protocol(EnableBoth)
 {
-    assert(!host.empty());
+    assert(!_host.empty());
 }
 
-HTTPNetworkProxy::HTTPNetworkProxy(const Address& addr, ProtocolSupport protocol) :
-    _port(0), _address(addr), _protocol(protocol)
+HTTPNetworkProxy::HTTPNetworkProxy(const Address& addr, ProtocolSupport protocol)
+    : _port(0),
+      _address(addr),
+      _protocol(protocol)
 {
 }
 
@@ -200,7 +191,8 @@ HTTPNetworkProxy::beginWrite(const Address& addr, Buffer& buf)
     // HTTP connect request
     //
     ostringstream out;
-    out << "CONNECT " << addrToString(addr) << " HTTP/1.1\r\n" << "Host: " << addrToString(addr) << "\r\n\r\n";
+    out << "CONNECT " << addrToString(addr) << " HTTP/1.1\r\n"
+        << "Host: " << addrToString(addr) << "\r\n\r\n";
     string str = out.str();
     buf.b.resize(str.size());
     memcpy(&buf.b[0], str.c_str(), str.size());
@@ -231,12 +223,12 @@ HTTPNetworkProxy::endRead(Buffer& buf)
     // Check if we received the full HTTP response, if not, continue
     // reading otherwise we're done.
     //
-    const Ice::Byte* end = HttpParser().isCompleteMessage(buf.b.begin(), buf.i);
-    if(!end && buf.i == buf.b.end())
+    const byte* end = HttpParser().isCompleteMessage(buf.b.begin(), buf.i);
+    if (!end && buf.i == buf.b.end())
     {
         //
         // Read one more byte, we can't easily read bytes in advance
-        // since the transport implenentation might be be able to read
+        // since the transport implementation might be be able to read
         // the data from the memory instead of the socket. This is for
         // instance the case with the OpenSSL transport (or we would
         // have to use a buffering BIO).
@@ -253,9 +245,12 @@ HTTPNetworkProxy::finish(Buffer& readBuffer, Buffer&)
 {
     HttpParser parser;
     parser.parse(readBuffer.b.begin(), readBuffer.b.end());
-    if(parser.status() != 200)
+    if (parser.status() != 200)
     {
-        throw Ice::ConnectFailedException(__FILE__, __LINE__);
+        throw Ice::ConnectFailedException{
+            __FILE__,
+            __LINE__,
+            "connection establishment failed due to an HTTP proxy error: " + to_string(parser.status())};
     }
 }
 
@@ -263,7 +258,7 @@ NetworkProxyPtr
 HTTPNetworkProxy::resolveHost(ProtocolSupport protocol) const
 {
     assert(!_host.empty());
-    return new HTTPNetworkProxy(getAddresses(_host, _port, protocol, Ice::ICE_ENUM(EndpointSelectionType, Random), false, true)[0], protocol);
+    return make_shared<HTTPNetworkProxy>(getAddresses(_host, _port, protocol, false, true)[0], protocol);
 }
 
 Address
@@ -290,22 +285,22 @@ IceInternal::createNetworkProxy(const Ice::PropertiesPtr& properties, ProtocolSu
 {
     string proxyHost;
 
-    proxyHost = properties->getProperty("Ice.SOCKSProxyHost");
-    if(!proxyHost.empty())
+    proxyHost = properties->getIceProperty("Ice.SOCKSProxyHost");
+    if (!proxyHost.empty())
     {
-        if(protocolSupport == EnableIPv6)
+        if (protocolSupport == EnableIPv6)
         {
             throw Ice::InitializationException(__FILE__, __LINE__, "IPv6 only is not supported with SOCKS4 proxies");
         }
-        int proxyPort = properties->getPropertyAsIntWithDefault("Ice.SOCKSProxyPort", 1080);
-        return new SOCKSNetworkProxy(proxyHost, proxyPort);
+        int proxyPort = properties->getIcePropertyAsInt("Ice.SOCKSProxyPort");
+        return make_shared<SOCKSNetworkProxy>(proxyHost, proxyPort);
     }
 
-    proxyHost = properties->getProperty("Ice.HTTPProxyHost");
-    if(!proxyHost.empty())
+    proxyHost = properties->getIceProperty("Ice.HTTPProxyHost");
+    if (!proxyHost.empty())
     {
-        return new HTTPNetworkProxy(proxyHost, properties->getPropertyAsIntWithDefault("Ice.HTTPProxyPort", 1080));
+        return make_shared<HTTPNetworkProxy>(proxyHost, properties->getIcePropertyAsInt("Ice.HTTPProxyPort"));
     }
 
-    return 0;
+    return nullptr;
 }

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

@@ -1,72 +1,67 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
+// Copyright (c) ZeroC, Inc.
 
 #ifndef ICE_NETWORK_PROXY_H
 #define ICE_NETWORK_PROXY_H
 
-#include <Ice/Network.h>
-#include <Ice/Buffer.h>
+#include "Ice/Buffer.h"
+#include "Network.h"
 
 namespace IceInternal
 {
+    class NetworkProxy
+    {
+    public:
+        virtual ~NetworkProxy();
 
-class ICE_API NetworkProxy : public virtual IceUtil::Shared
-{
-public:
-
-    virtual ~NetworkProxy();
-
-    //
-    // Write the connection request on the connection established
-    // with the network proxy server. This is called right after
-    // the connection establishment succeeds.
-    //
-    virtual void beginWrite(const Address&, Buffer&) = 0;
-    virtual SocketOperation endWrite(Buffer&) = 0;
-
-    //
-    // Once the connection request has been sent, this is called
-    // to prepare and read the response from the proxy server.
-    //
-    virtual void beginRead(Buffer&) = 0;
-    virtual SocketOperation endRead(Buffer&) = 0;
+        //
+        // Write the connection request on the connection established
+        // with the network proxy server. This is called right after
+        // the connection establishment succeeds.
+        //
+        virtual void beginWrite(const Address&, Buffer&) = 0;
+        virtual SocketOperation endWrite(Buffer&) = 0;
 
-    //
-    // This is called when the response from the proxy has been
-    // read. The proxy should copy the extra read data (if any) in the
-    // given byte vector.
-    //
-    virtual void finish(Buffer&, Buffer&) = 0;
+        //
+        // Once the connection request has been sent, this is called
+        // to prepare and read the response from the proxy server.
+        //
+        virtual void beginRead(Buffer&) = 0;
+        virtual SocketOperation endRead(Buffer&) = 0;
 
-    //
-    // If the proxy host needs to be resolved, this should return
-    // a new NetworkProxy containing the IP address of the proxy.
-    // This is called from the endpoint host resolver thread, so
-    // it's safe if this this method blocks.
-    //
-    virtual NetworkProxyPtr resolveHost(ProtocolSupport) const = 0;
+        //
+        // This is called when the response from the proxy has been
+        // read. The proxy should copy the extra read data (if any) in the
+        // given byte vector.
+        //
+        virtual void finish(Buffer&, Buffer&) = 0;
 
-    //
-    // Returns the IP address of the network proxy. This method
-    // must not block. It's only called on a network proxy object
-    // returned by resolveHost().
-    //
-    virtual Address getAddress() const = 0;
+        //
+        // If the proxy host needs to be resolved, this should return
+        // a new NetworkProxy containing the IP address of the proxy.
+        // This is called from the endpoint host resolver thread, so
+        // it's safe if this this method blocks.
+        //
+        [[nodiscard]] virtual NetworkProxyPtr resolveHost(ProtocolSupport) const = 0;
 
-    //
-    // Returns the name of the proxy, used for tracing purposes.
-    //
-    virtual std::string getName() const = 0;
+        //
+        // Returns the IP address of the network proxy. This method
+        // must not block. It's only called on a network proxy object
+        // returned by resolveHost().
+        //
+        [[nodiscard]] virtual Address getAddress() const = 0;
 
-    //
-    // Returns the protocols supported by the proxy.
-    //
-    virtual ProtocolSupport getProtocolSupport() const = 0;
-};
+        //
+        // Returns the name of the proxy, used for tracing purposes.
+        //
+        [[nodiscard]] virtual std::string getName() const = 0;
 
-NetworkProxyPtr createNetworkProxy(const Ice::PropertiesPtr&, ProtocolSupport);
+        //
+        // Returns the protocols supported by the proxy.
+        //
+        [[nodiscard]] virtual ProtocolSupport getProtocolSupport() const = 0;
+    };
 
+    NetworkProxyPtr createNetworkProxy(const Ice::PropertiesPtr&, ProtocolSupport);
 }
 
 #endif

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

@@ -1,21 +1,14 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
+// Copyright (c) ZeroC, Inc.
 
 #ifndef ICE_NETWORK_PROXY_F_H
 #define ICE_NETWORK_PROXY_F_H
 
-#include <IceUtil/Shared.h>
-
-#include <Ice/Handle.h>
+#include <memory>
 
 namespace IceInternal
 {
-
-class NetworkProxy;
-ICE_API IceUtil::Shared* upCast(NetworkProxy*);
-typedef Handle<NetworkProxy> NetworkProxyPtr;
-
+    class NetworkProxy;
+    using NetworkProxyPtr = std::shared_ptr<NetworkProxy>;
 }
 
 #endif

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

@@ -1,57 +1,55 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
+// Copyright (c) ZeroC, Inc.
 
-#ifdef ICE_SWIFT
+#ifdef __APPLE__
 
-#include <Ice/OSLogLoggerI.h>
-#include <os/log.h>
+#    include "OSLogLoggerI.h"
+#    include <os/log.h>
 
 using namespace std;
 using namespace Ice;
 
-Ice::OSLogLoggerI::OSLogLoggerI(const std::string& prefix) : _prefix(prefix)
+Ice::OSLogLoggerI::OSLogLoggerI(string prefix)
+    : _prefix(std::move(prefix)),
+      _subsystem(_prefix.empty() ? "com.zeroc.ice" : "com.zeroc.ice." + _prefix),
+      _log(os_log_create(_subsystem.c_str(), ""))
 {
-    const string subsystem = prefix.empty() ? "com.zeroc.ice" : "com.zeroc.ice." + prefix;
-    _log.reset(os_log_create(subsystem.c_str(), ""));
 }
 
 void
-Ice::OSLogLoggerI::print(const std::string& message)
+Ice::OSLogLoggerI::print(const string& message)
 {
     os_log_with_type(_log.get(), OS_LOG_TYPE_DEFAULT, "%{public}s.", message.c_str());
 }
 
 void
-Ice::OSLogLoggerI::trace(const std::string& category, const std::string& message)
+Ice::OSLogLoggerI::trace(const string& category, const string& message)
 {
-    const string subsystem = _prefix.empty() ? "com.zeroc.ice" : "com.zeroc.ice." + _prefix;
-    IceInternal::UniqueRef<os_log_t> log(os_log_create(subsystem.c_str(), category.c_str()));
+    IceInternal::UniqueRef<os_log_t> log(os_log_create(_subsystem.c_str(), category.c_str()));
     os_log_with_type(log.get(), OS_LOG_TYPE_INFO, "%{public}s.", message.c_str());
 }
 
 void
-Ice::OSLogLoggerI::warning(const std::string& message)
+Ice::OSLogLoggerI::warning(const string& message)
 {
     os_log_with_type(_log.get(), OS_LOG_TYPE_ERROR, "%{public}s.", message.c_str());
 }
 
 void
-Ice::OSLogLoggerI::error(const std::string& message)
+Ice::OSLogLoggerI::error(const string& message)
 {
     os_log_with_type(_log.get(), OS_LOG_TYPE_FAULT, "%{public}s.", message.c_str());
 }
 
-std::string
+string
 Ice::OSLogLoggerI::getPrefix()
 {
     return _prefix;
 }
 
 LoggerPtr
-Ice::OSLogLoggerI::cloneWithPrefix(const std::string& prefix)
+Ice::OSLogLoggerI::cloneWithPrefix(string prefix)
 {
-    return ICE_MAKE_SHARED(OSLogLoggerI, prefix);
+    return make_shared<OSLogLoggerI>(std::move(prefix));
 }
 
 #endif

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

@@ -1,38 +1,33 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
+// Copyright (c) ZeroC, Inc.
 
 #ifndef ICE_OSLOG_LOGGER_I_H
 #define ICE_OSLOG_LOGGER_I_H
 
-#ifdef ICE_SWIFT
+#ifdef __APPLE__
 
-#include <Ice/Logger.h>
-#include <Ice/UniqueRef.h>
-#include <os/log.h>
+#    include "Ice/Logger.h"
+#    include "UniqueRef.h"
+#    include <os/log.h>
 
 namespace Ice
 {
-
-class OSLogLoggerI : public Logger
-{
-public:
-
-    OSLogLoggerI(const std::string&);
-
-    virtual void print(const std::string&);
-    virtual void trace(const std::string&, const std::string&);
-    virtual void warning(const std::string&);
-    virtual void error(const std::string&);
-    virtual std::string getPrefix();
-    virtual LoggerPtr cloneWithPrefix(const std::string&);
-
-private:
-
-    const std::string _prefix;
-    IceInternal::UniqueRef<os_log_t> _log;
-};
-
+    class OSLogLoggerI final : public Logger
+    {
+    public:
+        OSLogLoggerI(std::string);
+
+        void print(const std::string&) final;
+        void trace(const std::string&, const std::string&) final;
+        void warning(const std::string&) final;
+        void error(const std::string&) final;
+        std::string getPrefix() final;
+        LoggerPtr cloneWithPrefix(std::string) final;
+
+    private:
+        const std::string _prefix;
+        const std::string _subsystem;
+        IceInternal::UniqueRef<os_log_t> _log;
+    };
 }
 
 #endif