zeroc-ice 3.7.10 → 3.8.0

data/ext/ice/cpp/src/IceSSL/ConnectorI.cpp

@@ -1,102 +0,0 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
-
-#include <IceSSL/ConnectorI.h>
-#include <IceSSL/Instance.h>
-
-#include <IceSSL/EndpointI.h>
-#include <IceSSL/Util.h>
-#include <IceSSL/SSLEngine.h>
-#include <Ice/Communicator.h>
-#include <Ice/LocalException.h>
-#include <Ice/StreamSocket.h>
-#include <Ice/LoggerUtil.h>
-#include <Ice/NetworkProxy.h>
-
-using namespace std;
-using namespace Ice;
-using namespace IceSSL;
-
-IceInternal::TransceiverPtr
-IceSSL::ConnectorI::connect()
-{
-    //
-    // The plug-in may not be initialized.
-    //
-    if(!_instance->initialized())
-    {
-        throw PluginInitializationException(__FILE__, __LINE__, "IceSSL: plug-in is not initialized");
-    }
-
-    return _instance->engine()->createTransceiver(_instance, _delegate->connect(), _host, false);
-}
-
-Short
-IceSSL::ConnectorI::type() const
-{
-    return _delegate->type();
-}
-
-string
-IceSSL::ConnectorI::toString() const
-{
-    return _delegate->toString();
-}
-
-bool
-IceSSL::ConnectorI::operator==(const IceInternal::Connector& r) const
-{
-    const ConnectorI* p = dynamic_cast<const ConnectorI*>(&r);
-    if(!p)
-    {
-        return false;
-    }
-
-    if(this == p)
-    {
-        return true;
-    }
-
-    if(_delegate != p->_delegate)
-    {
-        return false;
-    }
-
-    return true;
-}
-
-bool
-IceSSL::ConnectorI::operator<(const IceInternal::Connector& r) const
-{
-    const ConnectorI* p = dynamic_cast<const ConnectorI*>(&r);
-    if(!p)
-    {
-        return type() < r.type();
-    }
-
-    if(this == p)
-    {
-        return false;
-    }
-
-    if(_delegate < p->_delegate)
-    {
-        return true;
-    }
-    else if(p->_delegate < _delegate)
-    {
-        return false;
-    }
-
-    return false;
-}
-
-IceSSL::ConnectorI::ConnectorI(const InstancePtr& instance, const IceInternal::ConnectorPtr& del, const string& h) :
-    _instance(instance), _delegate(del), _host(h)
-{
-}
-
-IceSSL::ConnectorI::~ConnectorI()
-{
-}

data/ext/ice/cpp/src/IceSSL/ConnectorI.h

@@ -1,44 +0,0 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
-
-#ifndef ICESSL_CONNECTOR_I_H
-#define ICESSL_CONNECTOR_I_H
-
-#include <Ice/TransceiverF.h>
-#include <Ice/Connector.h>
-#include <Ice/Network.h>
-
-#include <IceSSL/InstanceF.h>
-
-namespace IceSSL
-{
-
-class EndpointI;
-
-class ConnectorI : public IceInternal::Connector
-{
-public:
-
-    virtual IceInternal::TransceiverPtr connect();
-
-    virtual Ice::Short type() const;
-    virtual std::string toString() const;
-
-    virtual bool operator==(const IceInternal::Connector&) const;
-    virtual bool operator<(const IceInternal::Connector&) const;
-
-private:
-
-    ConnectorI(const InstancePtr&, const IceInternal::ConnectorPtr&, const std::string&);
-    virtual ~ConnectorI();
-    friend class EndpointI;
-
-    const InstancePtr _instance;
-    const IceInternal::ConnectorPtr _delegate;
-    const std::string _host;
-};
-
-} // IceSSL namespace end
-
-#endif

data/ext/ice/cpp/src/IceSSL/EndpointI.cpp

@@ -1,372 +0,0 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
-
-#include <IceSSL/EndpointI.h>
-#include <IceSSL/AcceptorI.h>
-#include <IceSSL/ConnectorI.h>
-#include <IceSSL/Instance.h>
-#include <Ice/OutputStream.h>
-#include <Ice/InputStream.h>
-#include <Ice/LocalException.h>
-#include <Ice/DefaultsAndOverrides.h>
-#include <Ice/Object.h>
-#include <Ice/HashUtil.h>
-#include <Ice/Comparable.h>
-
-using namespace std;
-using namespace Ice;
-using namespace IceSSL;
-
-namespace
-{
-
-Ice::IPEndpointInfoPtr
-getIPEndpointInfo(const Ice::EndpointInfoPtr& info)
-{
-    for(Ice::EndpointInfoPtr p = info; p; p = p->underlying)
-    {
-        Ice::IPEndpointInfoPtr ipInfo = ICE_DYNAMIC_CAST(Ice::IPEndpointInfo, p);
-        if(ipInfo)
-        {
-            return ipInfo;
-        }
-    }
-    return ICE_NULLPTR;
-}
-
-}
-
-#ifndef ICE_CPP11_MAPPING
-IceUtil::Shared* IceSSL::upCast(EndpointI* p) { return p; }
-#endif
-
-IceSSL::EndpointI::EndpointI(const InstancePtr& instance, const IceInternal::EndpointIPtr& del) :
-    _instance(instance), _delegate(del)
-{
-}
-
-void
-IceSSL::EndpointI::streamWriteImpl(Ice::OutputStream* stream) const
-{
-    _delegate->streamWriteImpl(stream);
-}
-
-Ice::EndpointInfoPtr
-IceSSL::EndpointI::getInfo() const ICE_NOEXCEPT
-{
-    EndpointInfoPtr info = ICE_MAKE_SHARED(IceInternal::InfoI<EndpointInfo>, ICE_SHARED_FROM_CONST_THIS(EndpointI));
-    info->underlying = _delegate->getInfo();
-    info->compress = info->underlying->compress;
-    info->timeout = info->underlying->timeout;
-    return info;
-}
-
-Ice::Short
-IceSSL::EndpointI::type() const
-{
-    return _delegate->type();
-}
-
-const std::string&
-IceSSL::EndpointI::protocol() const
-{
-    return _delegate->protocol();
-}
-
-Int
-IceSSL::EndpointI::timeout() const
-{
-    return _delegate->timeout();
-}
-
-IceInternal::EndpointIPtr
-IceSSL::EndpointI::timeout(Int timeout) const
-{
-    if(timeout == _delegate->timeout())
-    {
-        return ICE_SHARED_FROM_CONST_THIS(EndpointI);
-    }
-    else
-    {
-        return ICE_MAKE_SHARED(EndpointI, _instance, _delegate->timeout(timeout));
-    }
-}
-
-const string&
-IceSSL::EndpointI::connectionId() const
-{
-    return _delegate->connectionId();
-}
-
-IceInternal::EndpointIPtr
-IceSSL::EndpointI::connectionId(const string& connectionId) const
-{
-    if(connectionId == _delegate->connectionId())
-    {
-        return ICE_SHARED_FROM_CONST_THIS(EndpointI);
-    }
-    else
-    {
-        return ICE_MAKE_SHARED(EndpointI, _instance, _delegate->connectionId(connectionId));
-    }
-}
-
-bool
-IceSSL::EndpointI::compress() const
-{
-    return _delegate->compress();
-}
-
-IceInternal::EndpointIPtr
-IceSSL::EndpointI::compress(bool compress) const
-{
-    if(compress == _delegate->compress())
-    {
-        return ICE_SHARED_FROM_CONST_THIS(EndpointI);
-    }
-    else
-    {
-        return ICE_MAKE_SHARED(EndpointI, _instance, _delegate->compress(compress));
-    }
-}
-
-bool
-IceSSL::EndpointI::datagram() const
-{
-    return _delegate->datagram();
-}
-
-bool
-IceSSL::EndpointI::secure() const
-{
-    return _delegate->secure();
-}
-
-IceInternal::TransceiverPtr
-IceSSL::EndpointI::transceiver() const
-{
-    return 0;
-}
-
-void
-IceSSL::EndpointI::connectors_async(Ice::EndpointSelectionType selType,
-                                    const IceInternal::EndpointI_connectorsPtr& callback) const
-{
-    class CallbackI : public IceInternal::EndpointI_connectors
-    {
-    public:
-
-        CallbackI(const IceInternal::EndpointI_connectorsPtr& callback, const InstancePtr& instance,
-                  const string& host) :
-            _callback(callback), _instance(instance), _host(host)
-        {
-        }
-
-        virtual void connectors(const vector<IceInternal::ConnectorPtr>& c)
-        {
-            vector<IceInternal::ConnectorPtr> connectors = c;
-            for(vector<IceInternal::ConnectorPtr>::iterator p = connectors.begin(); p != connectors.end(); ++p)
-            {
-                *p = new ConnectorI(_instance, *p, _host);
-            }
-            _callback->connectors(connectors);
-        }
-
-        virtual void exception(const Ice::LocalException& ex)
-        {
-            _callback->exception(ex);
-        }
-
-    private:
-
-        const IceInternal::EndpointI_connectorsPtr _callback;
-        const InstancePtr _instance;
-        const string _host;
-    };
-
-    IPEndpointInfoPtr info = getIPEndpointInfo(_delegate->getInfo());
-    _delegate->connectors_async(selType, ICE_MAKE_SHARED(CallbackI, callback, _instance, info ? info->host : string()));
-}
-
-IceInternal::AcceptorPtr
-IceSSL::EndpointI::acceptor(const string& adapterName) const
-{
-    return new AcceptorI(ICE_SHARED_FROM_CONST_THIS(EndpointI), _instance, _delegate->acceptor(adapterName), adapterName);
-}
-
-EndpointIPtr
-IceSSL::EndpointI::endpoint(const IceInternal::EndpointIPtr& delEndp) const
-{
-    if(delEndp.get() == _delegate.get())
-    {
-        return ICE_DYNAMIC_CAST(EndpointI, ICE_SHARED_FROM_CONST_THIS(EndpointI));
-    }
-    else
-    {
-        return ICE_MAKE_SHARED(EndpointI, _instance, delEndp);
-    }
-}
-
-vector<IceInternal::EndpointIPtr>
-IceSSL::EndpointI::expandIfWildcard() const
-{
-    vector<IceInternal::EndpointIPtr> endps = _delegate->expandIfWildcard();
-    for(vector<IceInternal::EndpointIPtr>::iterator p = endps.begin(); p != endps.end(); ++p)
-    {
-        if(p->get() == _delegate.get())
-        {
-            *p = ICE_SHARED_FROM_CONST_THIS(EndpointI);
-        }
-        else
-        {
-            *p = ICE_MAKE_SHARED(EndpointI, _instance, *p);
-        }
-    }
-    return endps;
-}
-
-vector<IceInternal::EndpointIPtr>
-IceSSL::EndpointI::expandHost(IceInternal::EndpointIPtr& publish) const
-{
-    vector<IceInternal::EndpointIPtr> endps = _delegate->expandHost(publish);
-    if(publish.get() == _delegate.get())
-    {
-        publish = ICE_SHARED_FROM_CONST_THIS(EndpointI);
-    }
-    else if(publish.get())
-    {
-        publish = ICE_MAKE_SHARED(EndpointI, _instance, publish);
-    }
-    for(vector<IceInternal::EndpointIPtr>::iterator p = endps.begin(); p != endps.end(); ++p)
-    {
-        if(p->get() == _delegate.get())
-        {
-            *p = ICE_SHARED_FROM_CONST_THIS(EndpointI);
-        }
-        else
-        {
-            *p = ICE_MAKE_SHARED(EndpointI, _instance, *p);
-        }
-    }
-    return endps;
-}
-
-bool
-IceSSL::EndpointI::equivalent(const IceInternal::EndpointIPtr& endpoint) const
-{
-    const EndpointI* endpointI = dynamic_cast<const EndpointI*>(endpoint.get());
-    if(!endpointI)
-    {
-        return false;
-    }
-    return _delegate->equivalent(endpointI->_delegate);
-}
-
-Ice::Int
-IceSSL::EndpointI::hash() const
-{
-    return _delegate->hash();
-}
-
-string
-IceSSL::EndpointI::options() const
-{
-    return _delegate->options();
-}
-
-bool
-#ifdef ICE_CPP11_MAPPING
-IceSSL::EndpointI::operator==(const Ice::Endpoint& r) const
-#else
-IceSSL::EndpointI::operator==(const Ice::LocalObject& r) const
-#endif
-{
-    const EndpointI* p = dynamic_cast<const EndpointI*>(&r);
-    if(!p)
-    {
-        return false;
-    }
-
-    if(this == p)
-    {
-        return true;
-    }
-
-    if(!Ice::targetEqualTo(_delegate, p->_delegate))
-    {
-        return false;
-    }
-
-    return true;
-}
-
-bool
-#ifdef ICE_CPP11_MAPPING
-IceSSL::EndpointI::operator<(const Ice::Endpoint& r) const
-#else
-IceSSL::EndpointI::operator<(const Ice::LocalObject& r) const
-#endif
-{
-    const EndpointI* p = dynamic_cast<const EndpointI*>(&r);
-    if(!p)
-    {
-        const IceInternal::EndpointI* e = dynamic_cast<const IceInternal::EndpointI*>(&r);
-        if(!e)
-        {
-            return false;
-        }
-        return type() < e->type();
-    }
-
-    if(this == p)
-    {
-        return false;
-    }
-
-    if(Ice::targetLess(_delegate, p->_delegate))
-    {
-        return true;
-    }
-    else if (Ice::targetLess(p->_delegate, _delegate))
-    {
-        return false;
-    }
-
-    return false;
-}
-
-bool
-IceSSL::EndpointI::checkOption(const string& /*option*/, const string& /*argument*/, const string& /*endpoint*/)
-{
-    return false;
-}
-
-IceSSL::EndpointFactoryI::EndpointFactoryI(const InstancePtr& instance, Short type) :
-    IceInternal::EndpointFactoryWithUnderlying(instance, type), _sslInstance(instance.get())
-{
-}
-
-void
-IceSSL::EndpointFactoryI::destroy()
-{
-    _sslInstance = 0;
-}
-
-IceInternal::EndpointFactoryPtr
-IceSSL::EndpointFactoryI::cloneWithUnderlying(const IceInternal::ProtocolInstancePtr& instance, Short underlying) const
-{
-    return new EndpointFactoryI(new Instance(_sslInstance->engine(), instance->type(), instance->protocol()), underlying);
-}
-
-IceInternal::EndpointIPtr
-IceSSL::EndpointFactoryI::createWithUnderlying(const IceInternal::EndpointIPtr& underlying, vector<string>&, bool) const
-{
-    return ICE_MAKE_SHARED(EndpointI, _sslInstance, underlying);
-}
-
-IceInternal::EndpointIPtr
-IceSSL::EndpointFactoryI::readWithUnderlying(const IceInternal::EndpointIPtr& underlying, Ice::InputStream*) const
-{
-    return ICE_MAKE_SHARED(EndpointI, _sslInstance, underlying);
-}

data/ext/ice/cpp/src/IceSSL/EndpointI.h

@@ -1,100 +0,0 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
-
-#ifndef ICESSL_ENDPOINT_I_H
-#define ICESSL_ENDPOINT_I_H
-
-#include <Ice/EndpointI.h>
-#include <Ice/IPEndpointI.h>
-#include <Ice/EndpointFactory.h>
-#include <IceSSL/InstanceF.h>
-#include <IceSSL/EndpointInfo.h>
-#include <IceSSL/SSLEngineF.h>
-#include <Ice/Network.h>
-
-namespace IceSSL
-{
-
-class EndpointI : public IceInternal::EndpointI
-#ifdef ICE_CPP11_MAPPING
-                , public std::enable_shared_from_this<EndpointI>
-#endif
-{
-public:
-
-    EndpointI(const InstancePtr&, const IceInternal::EndpointIPtr&);
-
-    virtual void streamWriteImpl(Ice::OutputStream*) const;
-
-    virtual Ice::EndpointInfoPtr getInfo() const ICE_NOEXCEPT;
-    virtual Ice::Short type() const;
-    virtual const std::string& protocol() const;
-
-    virtual Ice::Int timeout() const;
-    virtual IceInternal::EndpointIPtr timeout(Ice::Int) const;
-    virtual const std::string& connectionId() const;
-    virtual IceInternal::EndpointIPtr connectionId(const ::std::string&) const;
-    virtual bool compress() const;
-    virtual IceInternal::EndpointIPtr compress(bool) const;
-    virtual bool datagram() const;
-    virtual bool secure() const;
-
-    virtual IceInternal::TransceiverPtr transceiver() const;
-    virtual void connectors_async(Ice::EndpointSelectionType, const IceInternal::EndpointI_connectorsPtr&) const;
-    virtual IceInternal::AcceptorPtr acceptor(const std::string&) const;
-    virtual std::vector<IceInternal::EndpointIPtr> expandIfWildcard() const;
-    virtual std::vector<IceInternal::EndpointIPtr> expandHost(IceInternal::EndpointIPtr&) const;
-    virtual bool equivalent(const IceInternal::EndpointIPtr&) const;
-    virtual ::Ice::Int hash() const;
-    virtual std::string options() const;
-
-    EndpointIPtr endpoint(const IceInternal::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:
-
-    virtual bool checkOption(const std::string&, const std::string&, const std::string&);
-
-private:
-
-    //
-    // All members are const, because endpoints are immutable.
-    //
-    const InstancePtr _instance;
-    const IceInternal::EndpointIPtr _delegate;
-};
-
-class EndpointFactoryI : public IceInternal::EndpointFactoryWithUnderlying
-{
-public:
-
-    EndpointFactoryI(const InstancePtr&, Ice::Short);
-
-    virtual void destroy();
-
-    virtual IceInternal::EndpointFactoryPtr
-    cloneWithUnderlying(const IceInternal::ProtocolInstancePtr&, Ice::Short) const;
-
-protected:
-
-    virtual IceInternal::EndpointIPtr
-    createWithUnderlying(const IceInternal::EndpointIPtr&, std::vector<std::string>&, bool) const;
-    virtual IceInternal::EndpointIPtr
-    readWithUnderlying(const IceInternal::EndpointIPtr&, Ice::InputStream*) const;
-
-private:
-
-    InstancePtr _sslInstance;
-};
-
-}
-
-#endif

data/ext/ice/cpp/src/IceSSL/EndpointInfo.cpp

@@ -1,75 +0,0 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
-//
-// Ice version 3.7.10
-//
-// <auto-generated>
-//
-// Generated from file `EndpointInfo.ice'
-//
-// Warning: do not edit this file.
-//
-// </auto-generated>
-//
-
-#ifndef ICESSL_API_EXPORTS
-#   define ICESSL_API_EXPORTS
-#endif
-#include <IceSSL/EndpointInfo.h>
-#include <IceUtil/PushDisableWarnings.h>
-#include <Ice/InputStream.h>
-#include <Ice/OutputStream.h>
-#include <IceUtil/PopDisableWarnings.h>
-
-#if defined(_MSC_VER)
-#   pragma warning(disable:4458) // declaration of ... hides class member
-#elif defined(__clang__)
-#   pragma clang diagnostic ignored "-Wshadow"
-#elif defined(__GNUC__)
-#   pragma GCC diagnostic ignored "-Wshadow"
-#endif
-
-#ifndef ICE_IGNORE_VERSION
-#   if ICE_INT_VERSION / 100 != 307
-#       error Ice version mismatch!
-#   endif
-#   if ICE_INT_VERSION % 100 >= 50
-#       error Beta header file detected
-#   endif
-#   if ICE_INT_VERSION % 100 < 10
-#       error Ice patch level mismatch!
-#   endif
-#endif
-
-#ifdef ICE_CPP11_MAPPING // C++11 mapping
-
-namespace
-{
-
-}
-
-IceSSL::EndpointInfo::~EndpointInfo()
-{
-}
-
-#else // C++98 mapping
-
-namespace
-{
-
-}
-
-IceSSL::EndpointInfo::~EndpointInfo()
-{
-}
-
-/// \cond INTERNAL
-ICESSL_API ::Ice::LocalObject* IceSSL::upCast(EndpointInfo* p) { return p; }
-/// \endcond
-
-namespace Ice
-{
-}
-
-#endif

data/ext/ice/cpp/src/IceSSL/Instance.cpp

@@ -1,28 +0,0 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
-
-#include <IceSSL/Instance.h>
-#include <IceSSL/SSLEngine.h>
-
-using namespace std;
-using namespace Ice;
-using namespace IceSSL;
-
-IceUtil::Shared* IceSSL::upCast(IceSSL::Instance* p) { return p; }
-
-IceSSL::Instance::Instance(const SSLEnginePtr& engine, Short type, const string& protocol) :
-    ProtocolInstance(engine->communicator(), type, protocol, true),
-    _engine(engine)
-{
-}
-
-IceSSL::Instance::~Instance()
-{
-}
-
-bool
-IceSSL::Instance::initialized() const
-{
-    return _engine->initialized();
-}