zeroc-ice 3.6.5 → 3.7.0

data/ext/ice/cpp/src/Ice/HttpParser.cpp

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 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.
@@ -9,7 +9,6 @@
 
 #include <IceUtil/Config.h>
 #include <Ice/HttpParser.h>
-#include <Ice/BasicStream.h>
 #include <Ice/LocalException.h>
 #include <IceUtil/StringUtil.h>
 

data/ext/ice/cpp/src/Ice/HttpParser.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 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.

data/ext/ice/cpp/src/Ice/IPEndpointI.cpp

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 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.
@@ -18,6 +18,7 @@
 #include <IceUtil/MutexPtrLock.h>
 
 using namespace std;
+using namespace Ice;
 using namespace Ice::Instrumentation;
 using namespace IceInternal;
 
@@ -46,7 +47,9 @@ Init init;
 
 }
 
+#ifndef ICE_CPP11_MAPPING
 IceUtil::Shared* IceInternal::upCast(IPEndpointI* p) { return p; }
+#endif
 IceUtil::Shared* IceInternal::upCast(EndpointHostResolver* p) { return p; }
 
 IceInternal::IPEndpointInfoI::IPEndpointInfoI(const EndpointIPtr& endpoint) : _endpoint(endpoint)
@@ -78,12 +81,11 @@ IceInternal::IPEndpointInfoI::secure() const
 Ice::EndpointInfoPtr
 IceInternal::IPEndpointI::getInfo() const
 {
-    Ice::IPEndpointInfoPtr info = new IPEndpointInfoI(const_cast<IPEndpointI*>(this));
+    Ice::IPEndpointInfoPtr info = ICE_MAKE_SHARED(IPEndpointInfoI, ICE_SHARED_FROM_CONST_THIS(IPEndpointI));
     fillEndpointInfo(info.get());
     return info;
 }
 
-
 Ice::Short
 IceInternal::IPEndpointI::type() const
 {
@@ -103,11 +105,10 @@ IceInternal::IPEndpointI::secure() const
 }
 
 void
-IceInternal::IPEndpointI::streamWrite(BasicStream* s) const
+IceInternal::IPEndpointI::streamWriteImpl(OutputStream* s) const
 {
-    s->startWriteEncaps();
-    streamWriteImpl(s);
-    s->endWriteEncaps();
+    s->write(_host, false);
+    s->write(_port);
 }
 
 const string&
@@ -121,7 +122,7 @@ IceInternal::IPEndpointI::connectionId(const string& connectionId) const
 {
     if(connectionId == _connectionId)
     {
-        return const_cast<IPEndpointI*>(this);
+        return ICE_SHARED_FROM_CONST_THIS(IPEndpointI);
     }
     else
     {
@@ -129,32 +130,20 @@ IceInternal::IPEndpointI::connectionId(const string& connectionId) const
     }
 }
 
-const std::string&
-IceInternal::IPEndpointI::host() const
-{
-    return _host;
-}
-
-int
-IceInternal::IPEndpointI::port() const
-{
-    return _port;
-}
-
 void
 IceInternal::IPEndpointI::connectors_async(Ice::EndpointSelectionType selType, const EndpointI_connectorsPtr& cb) const
 {
-    _instance->resolve(_host, _port, selType, const_cast<IPEndpointI*>(this), cb);
+    _instance->resolve(_host, _port, selType, ICE_SHARED_FROM_CONST_THIS(IPEndpointI), cb);
 }
 
 vector<EndpointIPtr>
-IceInternal::IPEndpointI::expand() const
+IceInternal::IPEndpointI::expandIfWildcard() const
 {
     vector<EndpointIPtr> endps;
     vector<string> hosts = getHostsForEndpointExpand(_host, _instance->protocolSupport(), false);
     if(hosts.empty())
     {
-        endps.push_back(const_cast<IPEndpointI*>(this));
+        endps.push_back(ICE_SHARED_FROM_CONST_THIS(IPEndpointI));
     }
     else
     {
@@ -166,6 +155,55 @@ IceInternal::IPEndpointI::expand() const
     return endps;
 }
 
+vector<EndpointIPtr>
+IceInternal::IPEndpointI::expandHost(EndpointIPtr& publish) const
+{
+    //
+    // If this endpoint has an empty host (wildcard address), don't expand, just return
+    // this endpoint.
+    //
+    if(_host.empty())
+    {
+        vector<EndpointIPtr> endpoints;
+        endpoints.push_back(ICE_SHARED_FROM_CONST_THIS(IPEndpointI));
+        return endpoints;
+    }
+
+    //
+    // If using a fixed port, this endpoint can be used as the published endpoint to
+    // access the returned endpoints. Otherwise, we'll publish each individual expanded
+    // endpoint.
+    //
+    if(_port > 0)
+    {
+        publish = ICE_SHARED_FROM_CONST_THIS(IPEndpointI);
+    }
+
+    vector<Address> addrs = getAddresses(_host,
+                                         _port,
+                                         _instance->protocolSupport(),
+                                         Ice::ICE_ENUM(EndpointSelectionType, Ordered),
+                                         _instance->preferIPv6(),
+                                         true);
+
+    vector<EndpointIPtr> endpoints;
+    if(addrs.size() == 1)
+    {
+        endpoints.push_back(ICE_SHARED_FROM_CONST_THIS(IPEndpointI));
+    }
+    else
+    {
+        for(vector<Address>::const_iterator p = addrs.begin(); p != addrs.end(); ++p)
+        {
+            string host;
+            int port;
+            addrToAddressAndPort(*p, host, port);
+            endpoints.push_back(createEndpoint(host, port, _connectionId));
+        }
+    }
+    return endpoints;
+}
+
 bool
 IceInternal::IPEndpointI::equivalent(const EndpointIPtr& endpoint) const
 {
@@ -229,7 +267,11 @@ IceInternal::IPEndpointI::options() const
 }
 
 bool
+#ifdef ICE_CPP11_MAPPING
+IceInternal::IPEndpointI::operator==(const Endpoint& r) const
+#else
 IceInternal::IPEndpointI::operator==(const LocalObject& r) const
+#endif
 {
     const IPEndpointI* p = dynamic_cast<const IPEndpointI*>(&r);
     if(!p)
@@ -261,12 +303,15 @@ IceInternal::IPEndpointI::operator==(const LocalObject& r) const
     {
         return false;
     }
-
     return true;
 }
 
 bool
+#ifdef ICE_CPP11_MAPPING
+IceInternal::IPEndpointI::operator<(const Endpoint& r) const
+#else
 IceInternal::IPEndpointI::operator<(const LocalObject& r) const
+#endif
 {
     const IPEndpointI* p = dynamic_cast<const IPEndpointI*>(&r);
     if(!p)
@@ -344,13 +389,6 @@ IceInternal::IPEndpointI::connectors(const vector<Address>& addresses, const Net
     return connectors;
 }
 
-void
-IceInternal::IPEndpointI::streamWriteImpl(BasicStream* s) const
-{
-    s->write(_host, false);
-    s->write(_port);
-}
-
 void
 IceInternal::IPEndpointI::hashInit(Ice::Int& h) const
 {
@@ -452,7 +490,7 @@ IceInternal::IPEndpointI::checkOption(const string& option, const string& argume
             ex.str = "no argument provided for --sourceAddress option in endpoint " + endpoint;
             throw ex;
         }
-#ifndef ICE_OS_WINRT
+#ifndef ICE_OS_UWP
         const_cast<Address&>(_sourceAddr) = getNumericAddress(argument);
         if(!isAddressValid(_sourceAddr))
         {
@@ -487,7 +525,7 @@ IceInternal::IPEndpointI::IPEndpointI(const ProtocolInstancePtr& instance) :
 {
 }
 
-IceInternal::IPEndpointI::IPEndpointI(const ProtocolInstancePtr& instance, BasicStream* s) :
+IceInternal::IPEndpointI::IPEndpointI(const ProtocolInstancePtr& instance, InputStream* s) :
     _instance(instance),
     _port(0),
     _hashInitialized(false)
@@ -496,7 +534,7 @@ IceInternal::IPEndpointI::IPEndpointI(const ProtocolInstancePtr& instance, Basic
     s->read(const_cast<Ice::Int&>(_port));
 }
 
-#ifndef ICE_OS_WINRT
+#ifndef ICE_OS_UWP
 
 IceInternal::EndpointHostResolver::EndpointHostResolver(const InstancePtr& instance) :
     IceUtil::Thread("Ice.HostResolver"),
@@ -617,7 +655,7 @@ IceInternal::EndpointHostResolver::run()
 
         if(threadObserver)
         {
-            threadObserver->stateChanged(ThreadStateIdle, ThreadStateInUseForOther);
+            threadObserver->stateChanged(ICE_ENUM(ThreadState, ThreadStateIdle), ICE_ENUM(ThreadState, ThreadStateInUseForOther));
         }
 
         try
@@ -633,33 +671,32 @@ IceInternal::EndpointHostResolver::run()
                 }
             }
 
-            r.callback->connectors(r.endpoint->connectors(getAddresses(r.host,
-                                                                       r.port,
-                                                                       protocol,
-                                                                       r.selType,
-                                                                       _preferIPv6,
-                                                                       true),
-                                                          networkProxy));
-
-            if(threadObserver)
+            vector<Address> addresses = getAddresses(r.host, r.port, protocol, r.selType, _preferIPv6, true);
+            if(r.observer)
             {
-                threadObserver->stateChanged(ThreadStateInUseForOther, ThreadStateIdle);
+                r.observer->detach();
+                r.observer = 0;
             }
 
-            if(r.observer)
+            r.callback->connectors(r.endpoint->connectors(addresses, networkProxy));
+
+            if(threadObserver)
             {
-                r.observer->detach();
+                threadObserver->stateChanged(ICE_ENUM(ThreadState, ThreadStateInUseForOther),
+                                             ICE_ENUM(ThreadState, ThreadStateIdle));
             }
+
         }
         catch(const Ice::LocalException& ex)
         {
             if(threadObserver)
             {
-                threadObserver->stateChanged(ThreadStateInUseForOther, ThreadStateIdle);
+                threadObserver->stateChanged(ICE_ENUM(ThreadState, ThreadStateInUseForOther),
+                                             ICE_ENUM(ThreadState, ThreadStateIdle));
             }
             if(r.observer)
             {
-                r.observer->failed(ex.ice_name());
+                r.observer->failed(ex.ice_id());
                 r.observer->detach();
             }
             r.callback->exception(ex);
@@ -671,7 +708,7 @@ IceInternal::EndpointHostResolver::run()
         Ice::CommunicatorDestroyedException ex(__FILE__, __LINE__);
         if(p->observer)
         {
-            p->observer->failed(ex.ice_name());
+            p->observer->failed(ex.ice_id());
             p->observer->detach();
         }
         p->callback->exception(ex);
@@ -691,7 +728,10 @@ IceInternal::EndpointHostResolver::updateObserver()
     const CommunicatorObserverPtr& obsv = _instance->initializationData().observer;
     if(obsv)
     {
-        _observer.attach(obsv->getThreadObserver("Communicator", name(), ThreadStateIdle, _observer.get()));
+        _observer.attach(obsv->getThreadObserver("Communicator",
+                                                 name(),
+                                                 ICE_ENUM(ThreadState, ThreadStateIdle),
+                                                 _observer.get()));
     }
 }
 
@@ -702,7 +742,6 @@ IceInternal::EndpointHostResolver::EndpointHostResolver(const InstancePtr& insta
 {
 }
 
-
 void
 IceInternal::EndpointHostResolver::resolve(const string& host,
                                            int port,
@@ -711,7 +750,7 @@ IceInternal::EndpointHostResolver::resolve(const string& host,
                                            const EndpointI_connectorsPtr& callback)
 {
     //
-    // No DNS lookup support with WinRT.
+    // No DNS lookup support with UWP.
     //
     callback->connectors(endpoint->connectors(getAddresses(host, port,
                                                            _instance->protocolSupport(),

data/ext/ice/cpp/src/Ice/IPEndpointI.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 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.
@@ -20,7 +20,7 @@
 #include <Ice/ProtocolInstanceF.h>
 #include <Ice/ObserverHelper.h>
 
-#ifndef ICE_OS_WINRT
+#ifndef ICE_OS_UWP
 #   include <deque>
 #endif
 
@@ -44,32 +44,39 @@ private:
 };
 
 class ICE_API IPEndpointI : public EndpointI
+#ifdef ICE_CPP11_MAPPING
+                          , public std::enable_shared_from_this<IPEndpointI>
+#endif
 {
 public:
 
+    virtual void streamWriteImpl(Ice::OutputStream*) const;
+
     virtual Ice::EndpointInfoPtr getInfo() const;
     virtual Ice::Short type() const;
     virtual const std::string& protocol() const;
     virtual bool secure() const;
-    virtual void streamWrite(BasicStream*) const;
 
     virtual const std::string& connectionId() const;
     virtual EndpointIPtr connectionId(const ::std::string&) const;
 
     virtual void connectors_async(Ice::EndpointSelectionType, const EndpointI_connectorsPtr&) const;
-    virtual std::vector<EndpointIPtr> expand() const;
+    virtual std::vector<EndpointIPtr> expandIfWildcard() const;
+    virtual std::vector<EndpointIPtr> expandHost(EndpointIPtr&) const;
     virtual bool equivalent(const EndpointIPtr&) const;
     virtual ::Ice::Int hash() const;
     virtual std::string options() 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
 
     virtual std::vector<ConnectorPtr> connectors(const std::vector<Address>&, const NetworkProxyPtr&) const;
-    const std::string& host() const;
-    int port() const;
 
-    virtual void streamWriteImpl(BasicStream*) const;
     virtual void hashInit(Ice::Int&) const;
     virtual void fillEndpointInfo(Ice::IPEndpointInfo*) const;
 
@@ -88,7 +95,7 @@ protected:
 
     IPEndpointI(const ProtocolInstancePtr&, const std::string&, int, const Address&, const std::string&);
     IPEndpointI(const ProtocolInstancePtr&);
-    IPEndpointI(const ProtocolInstancePtr&, BasicStream*);
+    IPEndpointI(const ProtocolInstancePtr&, Ice::InputStream*);
 
     const ProtocolInstancePtr _instance;
     const std::string _host;
@@ -102,7 +109,7 @@ private:
     mutable Ice::Int _hashValue;
 };
 
-#ifndef ICE_OS_WINRT
+#ifndef ICE_OS_UWP
 class ICE_API EndpointHostResolver : public IceUtil::Thread, public IceUtil::Monitor<IceUtil::Mutex>
 #else
 class ICE_API EndpointHostResolver : public IceUtil::Shared
@@ -121,7 +128,7 @@ public:
 
 private:
 
-#ifndef ICE_OS_WINRT
+#ifndef ICE_OS_UWP
     struct ResolveEntry
     {
         std::string host;
@@ -143,6 +150,7 @@ private:
 #endif
 };
 
+#ifndef ICE_CPP11_MAPPING
 inline bool operator==(const IPEndpointI& l, const IPEndpointI& r)
 {
     return static_cast<const ::Ice::LocalObject&>(l) == static_cast<const ::Ice::LocalObject&>(r);
@@ -152,6 +160,7 @@ inline bool operator<(const IPEndpointI& l, const IPEndpointI& r)
 {
     return static_cast<const ::Ice::LocalObject&>(l) < static_cast<const ::Ice::LocalObject&>(r);
 }
+#endif
 
 }
 

data/ext/ice/cpp/src/Ice/IPEndpointIF.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 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.
@@ -17,13 +17,17 @@ namespace IceInternal
 {
 
 class IPEndpointI;
+
+#ifdef ICE_CPP11_MAPPING
+using IPEndpointIPtr = ::std::shared_ptr<IPEndpointI>;
+#else
 ICE_API IceUtil::Shared* upCast(IPEndpointI*);
 typedef Handle<IPEndpointI> IPEndpointIPtr;
+#endif
 
 class EndpointHostResolver;
 ICE_API IceUtil::Shared* upCast(EndpointHostResolver*);
 typedef Handle<EndpointHostResolver> EndpointHostResolverPtr;
-
 }
 
 #endif