zeroc-ice 3.7.10 → 3.8.0

data/ext/ice/cpp/src/IceDiscovery/LookupI.h

@@ -1,228 +0,0 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
-
-#ifndef LOOKUPI_H
-#define LOOKUPI_H
-
-#include <IceDiscovery/IceDiscovery.h>
-#include <IceDiscovery/LocatorI.h>
-
-#include <IceUtil/Timer.h>
-#include <Ice/Properties.h>
-#include <Ice/Comparable.h>
-
-#include <set>
-
-namespace IceDiscovery
-{
-
-class LookupI;
-
-class Request : public IceUtil::TimerTask
-{
-public:
-
-    Request(const LookupIPtr&, int);
-
-    virtual bool retry();
-    void invoke(const std::string&, const std::vector<std::pair<LookupPrxPtr, LookupReplyPrxPtr> >&);
-    bool exception();
-    std::string getRequestId() const;
-
-    virtual void finished(const Ice::ObjectPrxPtr&) = 0;
-
-protected:
-
-    virtual void invokeWithLookup(const std::string&, const LookupPrxPtr&, const LookupReplyPrxPtr&) = 0;
-
-    LookupIPtr _lookup;
-    const std::string _requestId;
-    int _retryCount;
-    size_t _lookupCount;
-    size_t _failureCount;
-};
-ICE_DEFINE_PTR(RequestPtr, Request);
-
-template<class T, class CB> class RequestT : public Request
-{
-public:
-
-    RequestT(const LookupIPtr& lookup, T id, int retryCount) : Request(lookup, retryCount), _id(id)
-    {
-    }
-
-    T getId() const
-    {
-        return _id;
-    }
-
-    bool addCallback(const CB& cb)
-    {
-        _callbacks.push_back(cb);
-        return _callbacks.size() == 1;
-    }
-
-    virtual void finished(const Ice::ObjectPrxPtr& proxy)
-    {
-        for(typename std::vector<CB>::const_iterator p = _callbacks.begin(); p != _callbacks.end(); ++p)
-        {
-#ifdef ICE_CPP11_MAPPING
-            p->first(proxy);
-#else
-            (*p)->ice_response(proxy);
-#endif
-        }
-        _callbacks.clear();
-    }
-
-protected:
-
-    const T _id;
-    std::vector<CB> _callbacks;
-};
-
-#ifdef ICE_CPP11_MAPPING
-typedef std::pair<std::function<void(const std::shared_ptr<::Ice::ObjectPrx>&)>,
-                  std::function<void(std::exception_ptr)>> ObjectCB;
-typedef std::pair<std::function<void(const std::shared_ptr<::Ice::ObjectPrx>&)>,
-                  std::function<void(std::exception_ptr)>> AdapterCB;
-#else
-typedef Ice::AMD_Locator_findObjectByIdPtr ObjectCB;
-typedef Ice::AMD_Locator_findAdapterByIdPtr AdapterCB;
-#endif
-
-class ObjectRequest : public RequestT<Ice::Identity, ObjectCB>
-#ifdef ICE_CPP11_MAPPING
-                      , public std::enable_shared_from_this<ObjectRequest>
-#endif
-{
-public:
-
-    ObjectRequest(const LookupIPtr&, const Ice::Identity&, int);
-
-    void response(const Ice::ObjectPrxPtr&);
-
-private:
-
-    virtual void invokeWithLookup(const std::string&, const LookupPrxPtr&, const LookupReplyPrxPtr&);
-    virtual void runTimerTask();
-};
-ICE_DEFINE_PTR(ObjectRequestPtr, ObjectRequest);
-
-class AdapterRequest : public RequestT<std::string, AdapterCB>
-#ifdef ICE_CPP11_MAPPING
-                      , public std::enable_shared_from_this<AdapterRequest>
-#endif
-{
-public:
-
-    AdapterRequest(const LookupIPtr&, const std::string&, int);
-
-    bool response(const Ice::ObjectPrxPtr&, bool);
-
-    virtual bool retry();
-    virtual void finished(const Ice::ObjectPrxPtr&);
-
-private:
-
-    virtual void invokeWithLookup(const std::string&, const LookupPrxPtr&, const LookupReplyPrxPtr&);
-    virtual void runTimerTask();
-
-    //
-    // We use a set because the same IceDiscovery plugin might return multiple times
-    // the same proxy if it's accessible through multiple network interfaces and if we
-    // also sent the request to multiple interfaces.
-    //
-#ifdef ICE_CPP11_MAPPING
-    std::set<std::shared_ptr<Ice::ObjectPrx>, Ice::TargetCompare<std::shared_ptr<Ice::ObjectPrx>, std::less>> _proxies;
-#else
-    std::set<Ice::ObjectPrx> _proxies;
-#endif
-    IceUtil::Time _start;
-    IceUtil::Time _latency;
-};
-ICE_DEFINE_PTR(AdapterRequestPtr, AdapterRequest);
-
-class LookupI : public Lookup,
-                private IceUtil::Mutex
-#ifdef ICE_CPP11_MAPPING
-              , public std::enable_shared_from_this<LookupI>
-#endif
-{
-public:
-
-    LookupI(const LocatorRegistryIPtr&, const LookupPrxPtr&, const Ice::PropertiesPtr&);
-    virtual ~LookupI();
-
-    void destroy();
-
-    void setLookupReply(const LookupReplyPrxPtr&);
-
-    virtual void findObjectById(ICE_IN(std::string), ICE_IN(Ice::Identity), ICE_IN(IceDiscovery::LookupReplyPrxPtr),
-                                const Ice::Current&);
-    virtual void findAdapterById(ICE_IN(std::string), ICE_IN(std::string), ICE_IN(IceDiscovery::LookupReplyPrxPtr),
-                                 const Ice::Current&);
-    void findObject(const ObjectCB&, const Ice::Identity&);
-    void findAdapter(const AdapterCB&, const std::string&);
-
-    void foundObject(const Ice::Identity&, const std::string&, const Ice::ObjectPrxPtr&);
-    void foundAdapter(const std::string&, const std::string&, const Ice::ObjectPrxPtr&, bool);
-
-    void adapterRequestTimedOut(const AdapterRequestPtr&);
-    void adapterRequestException(const AdapterRequestPtr&, const Ice::LocalException&);
-    void objectRequestTimedOut(const ObjectRequestPtr&);
-    void objectRequestException(const ObjectRequestPtr&, const Ice::LocalException&);
-
-    const IceUtil::TimerPtr&
-    timer()
-    {
-        return _timer;
-    }
-
-    int
-    latencyMultiplier()
-    {
-        return _latencyMultiplier;
-    }
-
-private:
-
-    LocatorRegistryIPtr _registry;
-    LookupPrxPtr _lookup;
-    std::vector<std::pair<LookupPrxPtr, LookupReplyPrxPtr> > _lookups;
-    const IceUtil::Time _timeout;
-    const int _retryCount;
-    const int _latencyMultiplier;
-    const std::string _domainId;
-
-    IceUtil::TimerPtr _timer;
-    Ice::ObjectPrxPtr _wellKnownProxy;
-    bool _warnOnce;
-
-    std::map<Ice::Identity, ObjectRequestPtr> _objectRequests;
-    std::map<std::string, AdapterRequestPtr> _adapterRequests;
-};
-
-class LookupReplyI : public LookupReply
-{
-public:
-
-    LookupReplyI(const LookupIPtr&);
-
-#ifdef ICE_CPP11_MAPPING
-    virtual void foundObjectById(Ice::Identity, std::shared_ptr<Ice::ObjectPrx>, const Ice::Current&);
-    virtual void foundAdapterById(std::string, std::shared_ptr<Ice::ObjectPrx>, bool, const Ice::Current&);
-#else
-    virtual void foundObjectById(const Ice::Identity&, const Ice::ObjectPrx&, const Ice::Current&);
-    virtual void foundAdapterById(const std::string&, const Ice::ObjectPrx&, bool, const Ice::Current&);
-#endif
-
-private:
-
-    const LookupIPtr _lookup;
-};
-
-};
-
-#endif

data/ext/ice/cpp/src/IceDiscovery/PluginI.cpp

@@ -1,176 +0,0 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
-
-#include <IceUtil/IceUtil.h>
-#include <Ice/Ice.h>
-#include <Ice/Network.h> // For getInterfacesForMulticast
-
-#include <IceDiscovery/PluginI.h>
-#include <IceDiscovery/LocatorI.h>
-#include <IceDiscovery/LookupI.h>
-
-using namespace std;
-using namespace IceDiscovery;
-
-#ifndef ICE_DISCOVERY_API
-#   ifdef ICE_DISCOVERY_API_EXPORTS
-#       define ICE_DISCOVERY_API ICE_DECLSPEC_EXPORT
-#   else
-#       define ICE_DISCOVERY_API /**/
-#   endif
-#endif
-
-//
-// Plugin factory function.
-//
-extern "C" ICE_DISCOVERY_API Ice::Plugin*
-createIceDiscovery(const Ice::CommunicatorPtr& communicator, const string&, const Ice::StringSeq&)
-{
-    return new PluginI(communicator);
-}
-
-namespace Ice
-{
-
-ICE_DISCOVERY_API void
-registerIceDiscovery(bool loadOnInitialize)
-{
-    Ice::registerPluginFactory("IceDiscovery", createIceDiscovery, loadOnInitialize);
-
-#ifdef ICE_STATIC_LIBS
-    //
-    // Also register the UDP plugin with static builds to ensure the UDP transport is loaded.
-    //
-    registerIceUDP(true);
-#endif
-}
-
-}
-
-//
-// Objective-C function to allow Objective-C programs to register plugin.
-//
-extern "C" ICE_DISCOVERY_API void
-ICEregisterIceDiscovery(bool loadOnInitialize)
-{
-    Ice::registerIceDiscovery(loadOnInitialize);
-}
-
-PluginI::PluginI(const Ice::CommunicatorPtr& communicator) : _communicator(communicator)
-{
-}
-
-void
-PluginI::initialize()
-{
-    Ice::PropertiesPtr properties = _communicator->getProperties();
-
-    bool ipv4 = properties->getPropertyAsIntWithDefault("Ice.IPv4", 1) > 0;
-    bool preferIPv6 = properties->getPropertyAsInt("Ice.PreferIPv6Address") > 0;
-    string address;
-    if(ipv4 && !preferIPv6)
-    {
-        address = properties->getPropertyWithDefault("IceDiscovery.Address", "239.255.0.1");
-    }
-    else
-    {
-        address = properties->getPropertyWithDefault("IceDiscovery.Address", "ff15::1");
-    }
-    int port = properties->getPropertyAsIntWithDefault("IceDiscovery.Port", 4061);
-    string intf = properties->getProperty("IceDiscovery.Interface");
-
-    if(properties->getProperty("IceDiscovery.Multicast.Endpoints").empty())
-    {
-        ostringstream os;
-        os << "udp -h \"" << address << "\" -p " << port;
-        if(!intf.empty())
-        {
-            os << " --interface \"" << intf << "\"";
-        }
-        properties->setProperty("IceDiscovery.Multicast.Endpoints", os.str());
-    }
-
-    string lookupEndpoints = properties->getProperty("IceDiscovery.Lookup");
-    if(lookupEndpoints.empty())
-    {
-        //
-        // If no lookup endpoints are specified, we get all the network interfaces and create
-        // an endpoint for each of them. We'll send UDP multicast packages on each interface.
-        //
-        IceInternal::ProtocolSupport protocol = ipv4 && !preferIPv6 ? IceInternal::EnableIPv4 : IceInternal::EnableIPv6;
-        vector<string> interfaces = IceInternal::getInterfacesForMulticast(intf, protocol);
-        ostringstream lookup;
-        for(vector<string>::const_iterator p = interfaces.begin(); p != interfaces.end(); ++p)
-        {
-            if(p != interfaces.begin())
-            {
-                lookup << ":";
-            }
-            lookup << "udp -h \"" << address << "\" -p " << port << " --interface \"" << *p << "\"";
-        }
-        lookupEndpoints = lookup.str();
-    }
-
-    if(properties->getProperty("IceDiscovery.Reply.Endpoints").empty())
-    {
-        properties->setProperty("IceDiscovery.Reply.Endpoints", "udp -h " + (intf.empty() ? "*" : "\"" + intf + "\""));
-    }
-
-    if(properties->getProperty("IceDiscovery.Locator.Endpoints").empty())
-    {
-        properties->setProperty("IceDiscovery.Locator.AdapterId", Ice::generateUUID());
-    }
-
-    _multicastAdapter = _communicator->createObjectAdapter("IceDiscovery.Multicast");
-    _replyAdapter = _communicator->createObjectAdapter("IceDiscovery.Reply");
-    _locatorAdapter = _communicator->createObjectAdapter("IceDiscovery.Locator");
-
-    //
-    // Setup locatory registry.
-    //
-    LocatorRegistryIPtr locatorRegistry = ICE_MAKE_SHARED(LocatorRegistryI, _communicator);
-    Ice::LocatorRegistryPrxPtr locatorRegistryPrx =
-        ICE_UNCHECKED_CAST(Ice::LocatorRegistryPrx, _locatorAdapter->addWithUUID(locatorRegistry));
-
-    Ice::ObjectPrxPtr lookupPrx = _communicator->stringToProxy("IceDiscovery/Lookup -d:" + lookupEndpoints);
-    // No collocation optimization for the multicast proxy!
-    lookupPrx = lookupPrx->ice_collocationOptimized(false)->ice_router(ICE_NULLPTR);
-
-    //
-    // Add lookup and lookup reply Ice objects
-    //
-    _lookup = ICE_MAKE_SHARED(LookupI, locatorRegistry, ICE_UNCHECKED_CAST(LookupPrx, lookupPrx), properties);
-    _multicastAdapter->add(_lookup, Ice::stringToIdentity("IceDiscovery/Lookup"));
-
-    _replyAdapter->addDefaultServant(ICE_MAKE_SHARED(LookupReplyI, _lookup), "");
-    Ice::Identity id;
-    id.name = "dummy";
-    _lookup->setLookupReply(ICE_UNCHECKED_CAST(LookupReplyPrx, _replyAdapter->createProxy(id)->ice_datagram()));
-
-    //
-    // Setup locator on the communicator.
-    //
-    Ice::ObjectPrxPtr loc = _locatorAdapter->addWithUUID(ICE_MAKE_SHARED(LocatorI, _lookup, locatorRegistryPrx));
-    _defaultLocator = _communicator->getDefaultLocator();
-    _locator = ICE_UNCHECKED_CAST(Ice::LocatorPrx, loc);
-    _communicator->setDefaultLocator(_locator);
-
-    _multicastAdapter->activate();
-    _replyAdapter->activate();
-    _locatorAdapter->activate();
-}
-
-void
-PluginI::destroy()
-{
-    _multicastAdapter->destroy();
-    _replyAdapter->destroy();
-    _locatorAdapter->destroy();
-    _lookup->destroy();
-    // Restore original default locator proxy, if the user didn't change it in the meantime.
-    if(_communicator->getDefaultLocator() == _locator)
-    {
-        _communicator->setDefaultLocator(_defaultLocator);
-    }
-}

data/ext/ice/cpp/src/IceDiscovery/PluginI.h

@@ -1,36 +0,0 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
-
-#ifndef PLUGIN_I_H
-#define PLUGIN_I_H
-
-#include <Ice/Plugin.h>
-#include <IceDiscovery/LookupI.h>
-
-namespace IceDiscovery
-{
-
-class PluginI : public Ice::Plugin
-{
-public:
-
-    PluginI(const Ice::CommunicatorPtr&);
-
-    virtual void initialize();
-    virtual void destroy();
-
-private:
-
-    const Ice::CommunicatorPtr _communicator;
-    Ice::ObjectAdapterPtr _multicastAdapter;
-    Ice::ObjectAdapterPtr _replyAdapter;
-    Ice::ObjectAdapterPtr _locatorAdapter;
-    LookupIPtr _lookup;
-    Ice::LocatorPrxPtr _locator;
-    Ice::LocatorPrxPtr _defaultLocator;
-};
-
-};
-
-#endif