zeroc-ice 3.6.5 → 3.7.4

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

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 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.
-//
-// **********************************************************************
 
 #ifndef LOOKUPI_H
 #define LOOKUPI_H
@@ -15,6 +10,9 @@
 
 #include <IceUtil/Timer.h>
 #include <Ice/Properties.h>
+#include <Ice/Comparable.h>
+
+#include <set>
 
 namespace IceDiscovery
 {
@@ -28,21 +26,29 @@ 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;
 
-    const 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;
-    int _nRetry;
     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(LookupI* lookup, T id, int retryCount) : Request(lookup, retryCount), _id(id)
+    RequestT(const LookupIPtr& lookup, T id, int retryCount) : Request(lookup, retryCount), _id(id)
     {
     }
 
@@ -51,17 +57,21 @@ public:
         return _id;
     }
 
-    bool addCallback(CB cb)
+    bool addCallback(const CB& cb)
     {
         _callbacks.push_back(cb);
         return _callbacks.size() == 1;
     }
 
-    virtual void finished(const Ice::ObjectPrx& proxy)
+    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();
     }
@@ -72,71 +82,97 @@ protected:
     std::vector<CB> _callbacks;
 };
 
-class ObjectRequest : public RequestT<Ice::Identity, Ice::AMD_Locator_findObjectByIdPtr>
+#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(LookupI* lookup, const Ice::Identity& id, int retryCount) :
-        RequestT<Ice::Identity, Ice::AMD_Locator_findObjectByIdPtr>(lookup, id, retryCount)
-    {
-    }
+    ObjectRequest(const LookupIPtr&, const Ice::Identity&, int);
 
-    void response(const Ice::ObjectPrx&);
+    void response(const Ice::ObjectPrxPtr&);
 
 private:
 
+    virtual void invokeWithLookup(const std::string&, const LookupPrxPtr&, const LookupReplyPrxPtr&);
     virtual void runTimerTask();
 };
-typedef IceUtil::Handle<ObjectRequest> ObjectRequestPtr;
+ICE_DEFINE_PTR(ObjectRequestPtr, ObjectRequest);
 
-class AdapterRequest : public RequestT<std::string, Ice::AMD_Locator_findAdapterByIdPtr>
+class AdapterRequest : public RequestT<std::string, AdapterCB>
+#ifdef ICE_CPP11_MAPPING
+                      , public std::enable_shared_from_this<AdapterRequest>
+#endif
 {
 public:
 
-    AdapterRequest(LookupI* lookup, const std::string& adapterId, int retryCount) :
-        RequestT<std::string, Ice::AMD_Locator_findAdapterByIdPtr>(lookup, adapterId, retryCount),
-        _start(IceUtil::Time::now())
-    {
-    }
+    AdapterRequest(const LookupIPtr&, const std::string&, int);
 
-    bool response(const Ice::ObjectPrx&, bool);
+    bool response(const Ice::ObjectPrxPtr&, bool);
 
     virtual bool retry();
-    virtual void finished(const Ice::ObjectPrx&);
+    virtual void finished(const Ice::ObjectPrxPtr&);
 
 private:
 
+    virtual void invokeWithLookup(const std::string&, const LookupPrxPtr&, const LookupReplyPrxPtr&);
     virtual void runTimerTask();
-    std::vector<Ice::ObjectPrx> _proxies;
+
+    //
+    // 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;
 };
-typedef IceUtil::Handle<AdapterRequest> AdapterRequestPtr;
+ICE_DEFINE_PTR(AdapterRequestPtr, AdapterRequest);
 
-class LookupI : public Lookup, private IceUtil::Mutex
+class LookupI : public Lookup,
+                private IceUtil::Mutex
+#ifdef ICE_CPP11_MAPPING
+              , public std::enable_shared_from_this<LookupI>
+#endif
 {
 public:
 
-    LookupI(const LocatorRegistryIPtr&, const LookupPrx&, const Ice::PropertiesPtr&);
+    LookupI(const LocatorRegistryIPtr&, const LookupPrxPtr&, const Ice::PropertiesPtr&);
     virtual ~LookupI();
 
     void destroy();
 
-    void setLookupReply(const LookupReplyPrx&);
+    void setLookupReply(const LookupReplyPrxPtr&);
 
-    virtual void findObjectById(const std::string&, const Ice::Identity&, const IceDiscovery::LookupReplyPrx&,
+    virtual void findObjectById(ICE_IN(std::string), ICE_IN(Ice::Identity), ICE_IN(IceDiscovery::LookupReplyPrxPtr),
                                 const Ice::Current&);
-    virtual void findAdapterById(const std::string&, const std::string&, const IceDiscovery::LookupReplyPrx&,
+    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 findObject(const Ice::AMD_Locator_findObjectByIdPtr&, const Ice::Identity&);
-    void findAdapter(const Ice::AMD_Locator_findAdapterByIdPtr&, const std::string&);
-
-    void foundObject(const Ice::Identity&, const std::string&, const Ice::ObjectPrx&);
-    void foundAdapter(const std::string&, const std::string&, const Ice::ObjectPrx&, bool);
+    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()
@@ -153,15 +189,16 @@ public:
 private:
 
     LocatorRegistryIPtr _registry;
-    const LookupPrx _lookup;
-    LookupReplyPrx _lookupReply;
+    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::ObjectPrx _wellKnownProxy;
+    Ice::ObjectPrxPtr _wellKnownProxy;
+    bool _warnOnce;
 
     std::map<Ice::Identity, ObjectRequestPtr> _objectRequests;
     std::map<std::string, AdapterRequestPtr> _adapterRequests;
@@ -173,8 +210,13 @@ 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:
 

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

@@ -1,14 +1,10 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 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.
-//
-// **********************************************************************
 
 #include <IceUtil/IceUtil.h>
 #include <Ice/Ice.h>
+#include <Ice/Network.h> // For getInterfacesForMulticast
 
 #include <IceDiscovery/PluginI.h>
 #include <IceDiscovery/LocatorI.h>
@@ -28,17 +24,12 @@ using namespace IceDiscovery;
 //
 // Plugin factory function.
 //
-extern "C"
-{
-
-ICE_DISCOVERY_API Ice::Plugin*
+extern "C" ICE_DISCOVERY_API Ice::Plugin*
 createIceDiscovery(const Ice::CommunicatorPtr& communicator, const string&, const Ice::StringSeq&)
 {
     return new PluginI(communicator);
 }
 
-}
-
 namespace Ice
 {
 
@@ -46,10 +37,26 @@ 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)
 {
 }
@@ -71,31 +78,48 @@ PluginI::initialize()
         address = properties->getPropertyWithDefault("IceDiscovery.Address", "ff15::1");
     }
     int port = properties->getPropertyAsIntWithDefault("IceDiscovery.Port", 4061);
-    string interface = properties->getProperty("IceDiscovery.Interface");
+    string intf = properties->getProperty("IceDiscovery.Interface");
 
     if(properties->getProperty("IceDiscovery.Multicast.Endpoints").empty())
     {
         ostringstream os;
         os << "udp -h \"" << address << "\" -p " << port;
-        if(!interface.empty())
+        if(!intf.empty())
         {
-            os << " --interface \"" << interface << "\"";
+            os << " --interface \"" << intf << "\"";
         }
         properties->setProperty("IceDiscovery.Multicast.Endpoints", os.str());
     }
-    if(properties->getProperty("IceDiscovery.Reply.Endpoints").empty())
+
+    string lookupEndpoints = properties->getProperty("IceDiscovery.Lookup");
+    if(lookupEndpoints.empty())
     {
-        ostringstream os;
-        os << "udp";
-        if(!interface.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)
         {
-            os << " -h \"" << interface << "\"";
+            if(p != interfaces.begin())
+            {
+                lookup << ":";
+            }
+            lookup << "udp -h \"" << address << "\" -p " << port << " --interface \"" << *p << "\"";
         }
-        properties->setProperty("IceDiscovery.Reply.Endpoints", os.str());
+        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", IceUtil::generateUUID());
+        properties->setProperty("IceDiscovery.Locator.AdapterId", Ice::generateUUID());
     }
 
     _multicastAdapter = _communicator->createObjectAdapter("IceDiscovery.Multicast");
@@ -105,62 +129,31 @@ PluginI::initialize()
     //
     // Setup locatory registry.
     //
-    LocatorRegistryIPtr locatorRegistry = new LocatorRegistryI(_communicator);
-    Ice::LocatorRegistryPrx locatorRegistryPrx =
-        Ice::LocatorRegistryPrx::uncheckedCast(_locatorAdapter->addWithUUID(locatorRegistry));
-
-    string lookupEndpoints = properties->getProperty("IceDiscovery.Lookup");
-    if(lookupEndpoints.empty())
-    {
-        ostringstream os;
-        os << "udp -h \"" << address << "\" -p " << port;
-        if(!interface.empty())
-        {
-            os << " --interface \"" << interface << "\"";
-        }
-        lookupEndpoints = os.str();
-    }
+    LocatorRegistryIPtr locatorRegistry = ICE_MAKE_SHARED(LocatorRegistryI, _communicator);
+    Ice::LocatorRegistryPrxPtr locatorRegistryPrx =
+        ICE_UNCHECKED_CAST(Ice::LocatorRegistryPrx, _locatorAdapter->addWithUUID(locatorRegistry));
 
-    Ice::ObjectPrx lookupPrx = _communicator->stringToProxy("IceDiscovery/Lookup -d:" + lookupEndpoints);
+    Ice::ObjectPrxPtr lookupPrx = _communicator->stringToProxy("IceDiscovery/Lookup -d:" + lookupEndpoints);
     // No collocation optimization for the multicast proxy!
-    lookupPrx = lookupPrx->ice_collocationOptimized(false)->ice_router(0);
-    try
-    {
-        // Ensure we can establish a connection to the multicast proxy
-        // but don't block.
-        Ice::AsyncResultPtr result = lookupPrx->begin_ice_getConnection();
-        if(result->sentSynchronously())
-        {
-            lookupPrx->end_ice_getConnection(result);
-        }
-    }
-    catch(const Ice::LocalException& ex)
-    {
-        ostringstream os;
-        os << "IceDiscovery is unable to establish a multicast connection:\n";
-        os << "proxy = " << lookupPrx << '\n';
-        os << ex;
-        throw Ice::PluginInitializationException(__FILE__, __LINE__, os.str());
-    }
+    lookupPrx = lookupPrx->ice_collocationOptimized(false)->ice_router(ICE_NULLPTR);
 
     //
     // Add lookup and lookup reply Ice objects
     //
-    _lookup = new LookupI(locatorRegistry, LookupPrx::uncheckedCast(lookupPrx), properties);
-    _multicastAdapter->add(_lookup, _communicator->stringToIdentity("IceDiscovery/Lookup"));
+    _lookup = ICE_MAKE_SHARED(LookupI, locatorRegistry, ICE_UNCHECKED_CAST(LookupPrx, lookupPrx), properties);
+    _multicastAdapter->add(_lookup, Ice::stringToIdentity("IceDiscovery/Lookup"));
 
-    _replyAdapter->addDefaultServant(new LookupReplyI(_lookup), "");
+    _replyAdapter->addDefaultServant(ICE_MAKE_SHARED(LookupReplyI, _lookup), "");
     Ice::Identity id;
     id.name = "dummy";
-    _lookup->setLookupReply(LookupReplyPrx::uncheckedCast(_replyAdapter->createProxy(id)->ice_datagram()));
-
+    _lookup->setLookupReply(ICE_UNCHECKED_CAST(LookupReplyPrx, _replyAdapter->createProxy(id)->ice_datagram()));
 
     //
     // Setup locator on the communicator.
     //
-    Ice::ObjectPrx loc = _locatorAdapter->addWithUUID(new LocatorI(_lookup, locatorRegistryPrx));
+    Ice::ObjectPrxPtr loc = _locatorAdapter->addWithUUID(ICE_MAKE_SHARED(LocatorI, _lookup, locatorRegistryPrx));
     _defaultLocator = _communicator->getDefaultLocator();
-    _locator = Ice::LocatorPrx::uncheckedCast(loc);
+    _locator = ICE_UNCHECKED_CAST(Ice::LocatorPrx, loc);
     _communicator->setDefaultLocator(_locator);
 
     _multicastAdapter->activate();

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

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 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.
-//
-// **********************************************************************
 
 #ifndef PLUGIN_I_H
 #define PLUGIN_I_H
@@ -32,8 +27,8 @@ private:
     Ice::ObjectAdapterPtr _replyAdapter;
     Ice::ObjectAdapterPtr _locatorAdapter;
     LookupIPtr _lookup;
-    Ice::LocatorPrx _locator;
-    Ice::LocatorPrx _defaultLocator;
+    Ice::LocatorPrxPtr _locator;
+    Ice::LocatorPrxPtr _defaultLocator;
 };
 
 };