zeroc-ice 3.6b1 → 3.6.0

data/ext/ice/cpp/include/IceSSL/Config.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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.
@@ -12,6 +12,24 @@
 
 #include <Ice/Config.h>
 
+//
+// Automatically link IceSSL[D].lib with Visual C++
+//
+
+#if !defined(ICE_BUILDING_ICE_SSL) && defined(ICE_SSL_API_EXPORTS)
+#   define ICE_BUILDING_ICE_SSL
+#endif
+
+#if defined(_MSC_VER)
+#   if !defined(ICE_BUILDING_ICE_SSL)
+#      if defined(_DEBUG) && !defined(ICE_OS_WINRT)
+#          pragma comment(lib, "IceSSLD.lib")
+#      else
+#          pragma comment(lib, "IceSSL.lib")
+#      endif
+#   endif
+#endif
+
 #if defined(__APPLE__)
 #  define ICE_USE_SECURE_TRANSPORT 1
 #elif defined(_WIN32)

data/ext/ice/cpp/include/IceSSL/ConnectionInfo.h

@@ -1,13 +1,13 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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.
 //
 // **********************************************************************
 //
-// Ice version 3.6b
+// Ice version 3.6.0
 //
 // <auto-generated>
 //
@@ -35,14 +35,22 @@
 #include <IceUtil/UndefSysMacros.h>
 
 #ifndef ICE_IGNORE_VERSION
-#   if ICE_INT_VERSION  != 30651
-#       error Ice version mismatch: an exact match is required for beta generated code
+#   if ICE_INT_VERSION / 100 != 306
+#       error Ice version mismatch!
+#   endif
+#   if ICE_INT_VERSION % 100 > 50
+#       error Beta header file detected
+#   endif
+#   if ICE_INT_VERSION % 100 < 0
+#       error Ice patch level mismatch!
 #   endif
 #endif
 
 #ifndef ICE_SSL_API
 #   ifdef ICE_SSL_API_EXPORTS
 #       define ICE_SSL_API ICE_DECLSPEC_EXPORT
+#   elif defined(ICE_STATIC_LIBS)
+#       define ICE_SSL_API /**/
 #   else
 #       define ICE_SSL_API ICE_DECLSPEC_IMPORT
 #   endif
@@ -57,6 +65,12 @@ bool operator<(const ConnectionInfo&, const ConnectionInfo&);
 ICE_SSL_API ::Ice::LocalObject* upCast(::IceSSL::ConnectionInfo*);
 typedef ::IceInternal::Handle< ::IceSSL::ConnectionInfo> ConnectionInfoPtr;
 
+class WSSConnectionInfo;
+bool operator==(const WSSConnectionInfo&, const WSSConnectionInfo&);
+bool operator<(const WSSConnectionInfo&, const WSSConnectionInfo&);
+ICE_SSL_API ::Ice::LocalObject* upCast(::IceSSL::WSSConnectionInfo*);
+typedef ::IceInternal::Handle< ::IceSSL::WSSConnectionInfo> WSSConnectionInfoPtr;
+
 }
 
 namespace IceSSL
@@ -72,11 +86,12 @@ public:
     {
     }
 
-    ConnectionInfo(bool __ice_incoming, const ::std::string& __ice_adapterName, const ::std::string& __ice_connectionId, const ::std::string& __ice_localAddress, ::Ice::Int __ice_localPort, const ::std::string& __ice_remoteAddress, ::Ice::Int __ice_remotePort, const ::std::string& __ice_cipher, const ::Ice::StringSeq& __ice_certs) :
-        ::Ice::IPConnectionInfo(__ice_incoming, __ice_adapterName, __ice_connectionId, __ice_localAddress, __ice_localPort, __ice_remoteAddress, __ice_remotePort)
+    ConnectionInfo(bool __ice_incoming, const ::std::string& __ice_adapterName, const ::std::string& __ice_connectionId, ::Ice::Int __ice_rcvSize, ::Ice::Int __ice_sndSize, const ::std::string& __ice_localAddress, ::Ice::Int __ice_localPort, const ::std::string& __ice_remoteAddress, ::Ice::Int __ice_remotePort, const ::std::string& __ice_cipher, const ::Ice::StringSeq& __ice_certs, bool __ice_verified) :
+        ::Ice::IPConnectionInfo(__ice_incoming, __ice_adapterName, __ice_connectionId, __ice_rcvSize, __ice_sndSize, __ice_localAddress, __ice_localPort, __ice_remoteAddress, __ice_remotePort)
         ,
         cipher(__ice_cipher),
-        certs(__ice_certs)
+        certs(__ice_certs),
+        verified(__ice_verified)
     {
     }
 
@@ -87,6 +102,8 @@ public:
 
     ::Ice::StringSeq certs;
 
+    bool verified;
+
 protected:
 
     virtual ~ConnectionInfo() {}
@@ -113,6 +130,43 @@ inline bool operator<(const ConnectionInfo& l, const ConnectionInfo& r)
     return static_cast<const ::Ice::LocalObject&>(l) < static_cast<const ::Ice::LocalObject&>(r);
 }
 
+class ICE_SSL_API WSSConnectionInfo : public ::IceSSL::ConnectionInfo
+{
+public:
+
+    typedef WSSConnectionInfoPtr PointerType;
+
+    WSSConnectionInfo()
+    {
+    }
+
+    WSSConnectionInfo(bool __ice_incoming, const ::std::string& __ice_adapterName, const ::std::string& __ice_connectionId, ::Ice::Int __ice_rcvSize, ::Ice::Int __ice_sndSize, const ::std::string& __ice_localAddress, ::Ice::Int __ice_localPort, const ::std::string& __ice_remoteAddress, ::Ice::Int __ice_remotePort, const ::std::string& __ice_cipher, const ::Ice::StringSeq& __ice_certs, bool __ice_verified, const ::Ice::HeaderDict& __ice_headers) :
+        ::IceSSL::ConnectionInfo(__ice_incoming, __ice_adapterName, __ice_connectionId, __ice_rcvSize, __ice_sndSize, __ice_localAddress, __ice_localPort, __ice_remoteAddress, __ice_remotePort, __ice_cipher, __ice_certs, __ice_verified)
+        ,
+        headers(__ice_headers)
+    {
+    }
+
+
+public:
+
+    ::Ice::HeaderDict headers;
+
+protected:
+
+    virtual ~WSSConnectionInfo() {}
+};
+
+inline bool operator==(const WSSConnectionInfo& l, const WSSConnectionInfo& r)
+{
+    return static_cast<const ::Ice::LocalObject&>(l) == static_cast<const ::Ice::LocalObject&>(r);
+}
+
+inline bool operator<(const WSSConnectionInfo& l, const WSSConnectionInfo& r)
+{
+    return static_cast<const ::Ice::LocalObject&>(l) < static_cast<const ::Ice::LocalObject&>(r);
+}
+
 }
 
 #include <IceUtil/PopDisableWarnings.h>

data/ext/ice/cpp/include/IceSSL/EndpointInfo.h

@@ -1,13 +1,13 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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.
 //
 // **********************************************************************
 //
-// Ice version 3.6b
+// Ice version 3.6.0
 //
 // <auto-generated>
 //
@@ -33,14 +33,22 @@
 #include <IceUtil/UndefSysMacros.h>
 
 #ifndef ICE_IGNORE_VERSION
-#   if ICE_INT_VERSION  != 30651
-#       error Ice version mismatch: an exact match is required for beta generated code
+#   if ICE_INT_VERSION / 100 != 306
+#       error Ice version mismatch!
+#   endif
+#   if ICE_INT_VERSION % 100 > 50
+#       error Beta header file detected
+#   endif
+#   if ICE_INT_VERSION % 100 < 0
+#       error Ice patch level mismatch!
 #   endif
 #endif
 
 #ifndef ICE_SSL_API
 #   ifdef ICE_SSL_API_EXPORTS
 #       define ICE_SSL_API ICE_DECLSPEC_EXPORT
+#   elif defined(ICE_STATIC_LIBS)
+#       define ICE_SSL_API /**/
 #   else
 #       define ICE_SSL_API ICE_DECLSPEC_IMPORT
 #   endif
@@ -55,12 +63,18 @@ bool operator<(const EndpointInfo&, const EndpointInfo&);
 ICE_SSL_API ::Ice::LocalObject* upCast(::IceSSL::EndpointInfo*);
 typedef ::IceInternal::Handle< ::IceSSL::EndpointInfo> EndpointInfoPtr;
 
+class WSSEndpointInfo;
+bool operator==(const WSSEndpointInfo&, const WSSEndpointInfo&);
+bool operator<(const WSSEndpointInfo&, const WSSEndpointInfo&);
+ICE_SSL_API ::Ice::LocalObject* upCast(::IceSSL::WSSEndpointInfo*);
+typedef ::IceInternal::Handle< ::IceSSL::WSSEndpointInfo> WSSEndpointInfoPtr;
+
 }
 
 namespace IceSSL
 {
 
-const ::Ice::Short EndpointType = 2;
+const ::Ice::Short EndpointType = ::Ice::SSLEndpointType;
 
 }
 
@@ -95,6 +109,39 @@ inline bool operator<(const EndpointInfo& l, const EndpointInfo& r)
     return static_cast<const ::Ice::LocalObject&>(l) < static_cast<const ::Ice::LocalObject&>(r);
 }
 
+class ICE_SSL_API WSSEndpointInfo : public ::IceSSL::EndpointInfo
+{
+public:
+
+    typedef WSSEndpointInfoPtr PointerType;
+
+    WSSEndpointInfo()
+    {
+    }
+
+    WSSEndpointInfo(::Ice::Int __ice_timeout, bool __ice_compress, const ::std::string& __ice_host, ::Ice::Int __ice_port, const ::std::string& __ice_sourceAddress, const ::std::string& __ice_resource) :
+        ::IceSSL::EndpointInfo(__ice_timeout, __ice_compress, __ice_host, __ice_port, __ice_sourceAddress)
+        ,
+        resource(__ice_resource)
+    {
+    }
+
+
+public:
+
+    ::std::string resource;
+};
+
+inline bool operator==(const WSSEndpointInfo& l, const WSSEndpointInfo& r)
+{
+    return static_cast<const ::Ice::LocalObject&>(l) == static_cast<const ::Ice::LocalObject&>(r);
+}
+
+inline bool operator<(const WSSEndpointInfo& l, const WSSEndpointInfo& r)
+{
+    return static_cast<const ::Ice::LocalObject&>(l) < static_cast<const ::Ice::LocalObject&>(r);
+}
+
 }
 
 #include <IceUtil/PopDisableWarnings.h>

data/ext/ice/cpp/include/IceSSL/IceSSL.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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.
@@ -12,7 +12,7 @@
 
 #include <IceUtil/PushDisableWarnings.h>
 #include <IceUtil/Config.h>
-#ifndef ICE_OS_WINRT
+#if !defined(ICE_OS_WINRT) && (!defined(__APPLE__) || TARGET_OS_IPHONE == 0)
 #   include <IceSSL/Plugin.h>
 #endif
 #include <IceSSL/EndpointInfo.h>

data/ext/ice/cpp/include/IceSSL/Plugin.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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,19 +18,6 @@
 #include <vector>
 #include <list>
 
-//
-// Automatically link IceSSL[D].lib with Visual C++
-//
-#if defined(_MSC_VER) && !defined(ICE_NO_PRAGMA_COMMENT)
-#   if !defined(ICE_STATIC_LIBS) && !defined(ICE_SSL_API_EXPORTS)
-#      if defined(_DEBUG)
-#          pragma comment(lib, "IceSSLD.lib")
-#      else
-#          pragma comment(lib, "IceSSL.lib")
-#      endif
-#   endif
-#endif
-
 // For struct sockaddr_storage
 #ifdef _WIN32
 #   include <winsock2.h>
@@ -47,6 +34,8 @@
 #ifndef ICE_SSL_API
 #   ifdef ICE_SSL_API_EXPORTS
 #       define ICE_SSL_API ICE_DECLSPEC_EXPORT
+#   elif defined(ICE_STATIC_LIBS)
+#       define ICE_SSL_API /**/
 #   else
 #       define ICE_SSL_API ICE_DECLSPEC_IMPORT
 #   endif
@@ -55,14 +44,14 @@
 #ifdef ICE_USE_OPENSSL
 
 //
-// Pointer to an opaque SSL session context object. ssl_ctx_st is the 
+// Pointer to an opaque SSL session context object. ssl_ctx_st is the
 // OpenSSL type that holds configuration settings for all SSL
 // connections.
 //
 typedef struct ssl_ctx_st SSL_CTX;
 
 //
-// Pointer to an opaque certificate object. X509_st is the OpenSSL 
+// Pointer to an opaque certificate object. X509_st is the OpenSSL
 // type that represents a certificate.
 //
 typedef struct x509_st* X509CertificateRef;
@@ -185,7 +174,7 @@ class ICE_SSL_API PublicKey : public IceUtil::Shared
 public:
 
     ~PublicKey();
-    
+
     //
     // Retrieve the native public key value wrapped by this object.
     //
@@ -202,7 +191,7 @@ private:
 
     CertificatePtr _cert;
     KeyRef _key;
-    
+
 };
 typedef IceUtil::Handle<PublicKey> PublicKeyPtr;
 
@@ -282,7 +271,7 @@ class ICE_SSL_API Certificate : public IceUtil::Shared
 public:
 
     //
-    // Construct a certificate using a native certificate. 
+    // Construct a certificate using a native certificate.
     //
     // The Certificate class assumes ownership of the given native
     // certificate.
@@ -321,7 +310,7 @@ public:
     // public key. Returns true if signed, false otherwise.
     //
     bool verify(const CertificatePtr&) const;
-    
+
 #ifdef ICE_USE_OPENSSL
     //
     // Verify that this certificate was signed by the given public
@@ -331,10 +320,10 @@ public:
     // engines that require a certificate and not just a public key to
     // verify the certificate signature.
     //
-    ICE_DEPRECATED_API("verify(const PublicKeyPtr&) is deprecated, use verify(const CertificatePtr&) instead") 
+    ICE_DEPRECATED_API("verify(const PublicKeyPtr&) is deprecated, use verify(const CertificatePtr&) instead")
     bool verify(const PublicKeyPtr&) const;
 #endif
-    
+
     //
     // Return a string encoding of the certificate in PEM format.
     // Raises CertificateEncodingException if an error occurs.
@@ -433,7 +422,7 @@ public:
 
     //
     // Retrieve the native X509 certificate value wrapped by this
-    // object. 
+    // object.
     //
     // The returned reference is only valid for the lifetime of this
     // object. With SecureTransport you can increment the reference
@@ -469,6 +458,23 @@ public:
 };
 typedef IceUtil::Handle<NativeConnectionInfo> NativeConnectionInfoPtr;
 
+//
+// WSSNativeConnectionInfo is an extension of IceSSL::WSSConnectionInfo
+// that provides access to native certificates.
+//
+class ICE_SSL_API WSSNativeConnectionInfo : public WSSConnectionInfo
+{
+public:
+
+    //
+    // The certificate chain. This may be empty if the peer did not
+    // supply a certificate. The peer's certificate (if any) is the
+    // first one in the chain.
+    //
+    std::vector<CertificatePtr> nativeCerts;
+};
+typedef IceUtil::Handle<WSSNativeConnectionInfo> WSSNativeConnectionInfoPtr;
+
 //
 // An application can customize the certificate verification process
 // by implementing the CertificateVerifier interface.
@@ -528,7 +534,7 @@ public:
     // the plug-in is initialized.
     //
     virtual void setPasswordPrompt(const PasswordPromptPtr&) = 0;
-    
+
 #ifdef ICE_USE_OPENSSL
     //
     // Establish the OpenSSL context. This must be done before the
@@ -539,7 +545,7 @@ public:
     // When the application supplies its own OpenSSL context, the
     // plug-in ignores configuration properties related to certificates,
     // keys, and passwords.
-    // 
+    //
     // Note that the plugin assumes ownership of the given context.
     //
     virtual void setContext(SSL_CTX*) = 0;
@@ -548,7 +554,7 @@ public:
     // Obtain the SSL context. Use caution when modifying this value.
     // Changes made to this value have no effect on existing connections.
     //
-    virtual SSL_CTX* getContext() = 0;    
+    virtual SSL_CTX* getContext() = 0;
 #endif
 };
 typedef IceUtil::Handle<Plugin> PluginPtr;

data/ext/ice/cpp/include/IceUtil/AbstractMutex.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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/include/IceUtil/Atomic.h

@@ -0,0 +1,186 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2015 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 ICE_UTIL_ATOMIC_H
+#define ICE_UTIL_ATOMIC_H
+
+#if ((defined(ICE_CPP11) && defined(_MSC_VER) && (_MSC_VER > 1600)) || \
+     (defined(ICE_CPP11) && !defined(_MSC_VER)))
+#   define ICE_CPP11_HAS_ATOMIC
+#endif
+
+#if defined(ICE_CPP11_HAS_ATOMIC)
+#   include <atomic>
+#elif defined(ICE_USE_MUTEX_SHARED)
+
+#   include <IceUtil/Mutex.h>
+
+// Using the gcc builtins requires gcc 4.1 or better. For Linux, i386
+// doesn't work. Apple is supported for all architectures. Sun only
+// supports sparc (32 and 64 bit).
+
+#elif ((defined(__GNUC__) && (((__GNUC__* 100) + __GNUC_MINOR__) >= 401)) || __clang__)  &&                         \
+        ((defined(__sun) && (defined(__sparc) || defined(__sparcv9))) || \
+         defined(__APPLE__) || \
+        (defined(__linux) && \
+                (defined(__i486) || defined(__i586) || \
+                 defined(__i686) || defined(__x86_64))))
+
+#   define ICE_HAS_GCC_BUILTINS
+
+#elif defined(_WIN32)
+// Nothing to include
+#else
+// Use a simple mutex
+#   include <IceUtil/Mutex.h>
+#endif
+
+
+namespace IceUtilInternal
+{
+
+#ifdef ICE_CPP11_HAS_ATOMIC
+typedef std::atomic<int> Atomic;
+#else
+
+#if defined(_WIN32)
+//
+// volatile here is required by InterlockedExchangeXXX
+// family functions.
+//
+#  if defined(__MINGW32__) || (defined(_MSC_VER) && (_MSC_VER <= 1500))
+typedef volatile LONG ATOMIC_T;
+#  else
+typedef unsigned int ATOMIC_T;
+#  endif
+#else
+typedef int ATOMIC_T;
+#endif
+
+
+//
+// This is temporary and very partial placeholder for std::atomic,
+// which is not yet widely available.
+//
+class ICE_UTIL_API Atomic : public IceUtil::noncopyable
+{
+public:
+
+    Atomic() :
+        _ref(0)
+    {
+    }
+
+    Atomic(int desired) :
+        _ref(desired)
+    {
+    }
+
+    inline int fetch_add(int value)
+    {
+#if defined(_WIN32)
+        return InterlockedExchangeAdd(&_ref, value);
+#elif defined(ICE_HAS_GCC_BUILTINS)
+        return __sync_fetch_and_add(&_ref, value);
+#else
+        IceUtil::Mutex::Lock sync(_mutex);
+        int tmp = _ref;
+        _ref += value;
+        return tmp;
+#endif
+    }
+
+    inline int fetch_sub(int value)
+    {
+#if defined(_WIN32)
+#  if defined(__MINGW32__) || (defined(_MSC_VER) && (_MSC_VER <= 1500))
+        return InterlockedExchangeAdd(&_ref, -value);
+#  else
+        return InterlockedExchangeSubtract(&_ref, value);
+#endif
+#elif defined(ICE_HAS_GCC_BUILTINS)
+        return __sync_fetch_and_sub(&_ref, value);
+#else
+        IceUtil::Mutex::Lock sync(_mutex);
+        ATOMIC_T tmp = _ref;
+        _ref -= value;
+        return tmp;
+#endif
+    }
+
+    inline int load() const
+    {
+#if defined(_WIN32)
+        return InterlockedExchangeAdd(const_cast<ATOMIC_T*>(&_ref), 0);
+#elif defined(ICE_HAS_GCC_BUILTINS)
+        return __sync_fetch_and_add(const_cast<ATOMIC_T*>(&_ref), 0);
+#else
+        IceUtil::Mutex::Lock sync(_mutex);
+        return _ref;
+#endif
+    }
+
+    inline int exchange(int value)
+    {
+#if defined(_WIN32)
+        return InterlockedExchange(&_ref, value);
+#elif defined(ICE_HAS_GCC_BUILTINS)
+        __sync_synchronize();
+        return __sync_lock_test_and_set(&_ref, value);
+#else
+        IceUtil::Mutex::Lock sync(_mutex);
+        int tmp = _ref;
+        _ref = value;
+        return tmp;
+#endif
+    }
+
+    inline int operator++()
+    {
+        return fetch_add(1) + 1;
+    }
+
+    inline int operator--()
+    {
+        return fetch_sub(1) - 1;
+    }
+
+    inline int operator++(int)
+    {
+        return fetch_add(1);
+    }
+
+    inline int operator--(int)
+    {
+        return fetch_sub(1);
+    }
+
+    inline operator int()
+    {
+        return load();
+    }
+
+    inline operator int() const
+    {
+        return load();
+    }
+
+private:
+
+    ATOMIC_T _ref;
+#if !defined(_WIN32) && !defined(ICE_HAS_GCC_BUILTINS)
+    IceUtil::Mutex _mutex;
+#endif
+};
+
+#endif
+
+}
+
+#endif