Add SslContext abstraction

Builds/VisualStudio2012/beast.vcxproj

@@ -75,7 +75,7 @@
     <ClInclude Include="..\..\modules\beast_asio\sockets\beast_SocketBase.h" />
     <ClInclude Include="..\..\modules\beast_asio\sockets\beast_SocketInterface.h" />
     <ClInclude Include="..\..\modules\beast_asio\sockets\beast_SocketWrapper.h" />
-    <ClInclude Include="..\..\modules\beast_asio\sockets\beast_SocketWrapperBase.h" />
+    <ClInclude Include="..\..\modules\beast_asio\sockets\beast_SslContext.h" />
     <ClInclude Include="..\..\modules\beast_asio\system\beast_BoostIncludes.h" />
     <ClInclude Include="..\..\modules\beast_basics\beast_basics.h" />
     <ClInclude Include="..\..\modules\beast_basics\events\beast_DeadlineTimer.h" />
@@ -279,6 +279,12 @@
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\modules\beast_asio\beast_asio.cpp" />
+    <ClCompile Include="..\..\modules\beast_asio\sockets\beast_SslContext.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="..\..\modules\beast_basics\beast_basics.cpp" />
     <ClCompile Include="..\..\modules\beast_basics\events\beast_DeadlineTimer.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>

Builds/VisualStudio2012/beast.vcxproj.filters

@@ -752,9 +752,6 @@
     <ClInclude Include="..\..\modules\beast_asio\sockets\beast_SocketBase.h">
       <Filter>beast_asio\sockets</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_asio\sockets\beast_SocketWrapperBase.h">
-      <Filter>beast_asio\sockets</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\modules\beast_asio\sockets\beast_SocketWrapper.h">
       <Filter>beast_asio\sockets</Filter>
     </ClInclude>
@@ -770,6 +767,9 @@
     <ClInclude Include="..\..\modules\beast_asio\system\beast_BoostIncludes.h">
       <Filter>beast_asio\system</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\modules\beast_asio\sockets\beast_SslContext.h">
+      <Filter>beast_asio\sockets</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\modules\beast_core\beast_core.cpp">
@@ -1189,6 +1189,9 @@
     <ClCompile Include="..\..\modules\beast_asio\beast_asio.cpp">
       <Filter>beast_asio</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\modules\beast_asio\sockets\beast_SslContext.cpp">
+      <Filter>beast_asio\sockets</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <Text Include="..\..\TODO.txt" />

modules/beast_asio/beast_asio.cpp

@@ -24,4 +24,6 @@
 namespace beast
 {
 
+#include "sockets/beast_SslContext.cpp"
+
 }

modules/beast_asio/beast_asio.h

@@ -51,9 +51,9 @@ namespace beast
 #include "sockets/beast_SocketBase.h"
 #include "sockets/beast_Socket.h"
 #include "sockets/beast_SocketInterface.h"
-#include "sockets/beast_SocketWrapperBase.h"
 #include "sockets/beast_SocketWrapper.h"
 #include "sockets/beast_SharedSocket.h"
+#include "sockets/beast_SslContext.h"
 
 }
 

modules/beast_asio/sockets/beast_SocketInterface.h

@@ -34,7 +34,7 @@ struct SocketInterface
     struct SyncStream { };
     struct AsyncStream { };
     struct Stream : SyncStream, AsyncStream { };
-    
+
     /** Tags for compatibility with asio::ssl::stream
         http://www.boost.org/doc/libs/1_54_0/doc/html/boost_asio/reference/ssl__stream.html
     */
@@ -43,6 +43,82 @@ struct SocketInterface
     struct AsyncHandshake { };
     struct AsyncBufferedHandshake : AsyncHandshake{ };
     struct Handshake : SyncBufferedHandshake, AsyncBufferedHandshake { };
+
+protected:
+    //--------------------------------------------------------------------------
+
+    /** Template specialization to determine available interfaces. */
+    template <typename Object>
+    struct InterfacesOf
+    {
+        /** Intrusive tag support.
+
+            To use this, add a struct called SocketInterfaces to your
+            class and derive it from the interfaces that you support.
+            For example:
+
+            @code
+
+            struct MyHandshakingStream
+            {
+                struct SocketInterfaces
+                    : SocketInterface::Stream
+                    , SocketInterface::Handshake
+                {
+                };
+            }
+
+            @endcode
+        */
+        typedef typename Object::SocketInterfaces type;
+        typedef type value;
+    };
+
+    // Specialization for boost::asio::basic_socket
+    template <typename Protocol, typename SocketService>
+    struct InterfacesOf <boost::asio::basic_socket <Protocol, SocketService> >
+    {
+        struct value : SocketInterface::Socket { };
+        typedef value type;
+    };
+
+    // Specialization for boost::asio::basic_stream_socket
+    template <typename Protocol, typename SocketService>
+    struct InterfacesOf <boost::asio::basic_stream_socket <Protocol, SocketService> >
+    {
+        struct value : SocketInterface::Socket, SocketInterface::Stream { };
+        typedef value type;
+    };
+
+    // Specialization for boost::asio::ssl::stream
+    template <typename Stream>
+    struct InterfacesOf <boost::asio::ssl::stream <Stream> >
+    {
+        struct value : SocketInterface::Stream , SocketInterface::Handshake { };
+        typedef value type;
+    };
+
+#if 1
+    // Less elegant, but works.
+    // Determines if Object supports the specified Interface
+    template <typename Object, typename Interface, class Enable = void>
+    struct HasInterface : boost::false_type { };
+
+    template <typename Object, typename Interface>
+    struct HasInterface <Object, Interface,
+        typename boost::enable_if <boost::is_base_of <
+        Interface, typename InterfacesOf <Object>::type> >::type >
+        : boost::true_type { };
+#else
+    // This should work, but doesn't.
+    // K-ballo from #boost suggested it.
+    //
+    // Determines if Object supports the specified Interface
+    template <typename Object, typename Interface>
+    struct HasInterface : boost::is_base_of <Interface, typename InterfacesOf <Object> >
+    {
+    };
+#endif
 };
 
 #endif

modules/beast_asio/sockets/beast_SocketWrapper.h

@@ -34,7 +34,7 @@
 */
 template <class Object>
 class SocketWrapper
-    : public SocketWrapperBase
+    : public SocketInterface
     , public virtual Socket
 {
 public:

modules/beast_asio/sockets/beast_SocketWrapperBase.h

@@ -1,101 +0,0 @@
-//------------------------------------------------------------------------------
-/*
-    This file is part of Beast: https://github.com/vinniefalco/Beast
-    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
-
-    Permission to use, copy, modify, and/or distribute this software for any
-    purpose  with  or without fee is hereby granted, provided that the above
-    copyright notice and this permission notice appear in all copies.
-
-    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
-    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
-    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-//==============================================================================
-
-#ifndef BEAST_SOCKETWRAPPERBASE_H_INCLUDED
-#define BEAST_SOCKETWRAPPERBASE_H_INCLUDED
-
-/** Base class of wrappper provides the interface tags. */
-struct SocketWrapperBase
-{
-    /** Template specialization to determine available interfaces. */
-    template <typename Object>
-    struct InterfacesOf
-    {
-        /** Intrusive tag support.
-
-            To use this, add a struct called SocketInterfaces to your
-            class and derive it from the interfaces that you support.
-            For example:
-
-            @code
-
-            struct MyHandshakingStream
-            {
-                struct SocketInterfaces
-                    : SocketInterface::Stream
-                    , SocketInterface::Handshake
-                {
-                };
-            }
-
-            @endcode
-        */
-        typedef typename Object::SocketInterfaces type;
-        typedef type value;
-    };
-
-    // Specialization for boost::asio::basic_socket
-    template <typename Protocol, typename SocketService>
-    struct InterfacesOf <boost::asio::basic_socket <Protocol, SocketService> >
-    {
-        struct value : SocketInterface::Socket { };
-        typedef value type;
-    };
-
-    // Specialization for boost::asio::basic_stream_socket
-    template <typename Protocol, typename SocketService>
-    struct InterfacesOf <boost::asio::basic_stream_socket <Protocol, SocketService> >
-    {
-        struct value : SocketInterface::Socket, SocketInterface::Stream { };
-        typedef value type;
-    };
-
-    // Specialization for boost::asio::ssl::stream
-    template <typename Stream>
-    struct InterfacesOf <boost::asio::ssl::stream <Stream> >
-    {
-        struct value : SocketInterface::Stream , SocketInterface::Handshake { };
-        typedef value type;
-    };
-
-#if 1
-    // Less elegant, but works.
-    // Determines if Object supports the specified Interface
-    template <typename Object, typename Interface, class Enable = void>
-    struct HasInterface : boost::false_type { };
-
-    template <typename Object, typename Interface>
-    struct HasInterface <Object, Interface,
-        typename boost::enable_if <boost::is_base_of <
-        Interface, typename InterfacesOf <Object>::type> >::type >
-        : boost::true_type { };
-#else
-    // This should work, but doesn't.
-    // K-ballo from #boost suggested it.
-    //
-    // Determines if Object supports the specified Interface
-    template <typename Object, typename Interface>
-    struct HasInterface : boost::is_base_of <Interface, typename InterfacesOf <Object> >
-    {
-    };
-#endif
-
-};
-
-#endif

modules/beast_asio/sockets/beast_SslContext.cpp

@@ -0,0 +1,18 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================

modules/beast_asio/sockets/beast_SslContext.h

@@ -0,0 +1,41 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_SSLCONTEXT_H_INCLUDED
+#define BEAST_SSLCONTEXT_H_INCLUDED
+
+/** An SSL context that wraps a boost::asio::ssl::context. */
+class SslContextBase
+{
+public:
+    typedef boost::asio::ssl::context BoostContextType;
+    virtual ~SslContextBase () { }
+
+    /** Conversion to boost::asio::ssl::context
+        This lets you pass this object where the real thing is expected.
+    */
+    operator BoostContextType& ()
+    {
+        return getBoostContext ();
+    }
+
+    virtual BoostContextType& getBoostContext () noexcept = 0;
+};
+
+#endif

modules/beast_asio/system/beast_BoostIncludes.h

@@ -44,13 +44,6 @@
 #include <boost/foreach.hpp>
 #include <boost/type_traits.hpp>
 
-//#include <boost/mpl/at.hpp>
-//#include <boost/asio/io_service.hpp>
-//#include <boost/array.hpp>
-//#include <boost/bind.hpp>
-//#include <boost/unordered_map.hpp>
-//#include <boost/mpl/vector.hpp>
-
 //------------------------------------------------------------------------------
 
 // Configure some options based on the version of boost
@@ -72,10 +65,10 @@
    void_or_deduced
 # elif defined(_MSC_VER) && (_MSC_VER < 1500)
 #  define BOOST_ASIO_INITFN_RESULT_TYPE_MEMBER(h, sig) \
-   ::boost::asio::detail::async_result_type_helper<h, sig>::type
+   boost::asio::detail::async_result_type_helper<h, sig>::type
 # else
 #  define BOOST_ASIO_INITFN_RESULT_TYPE_MEMBER(h, sig) \
-   ::boost::asio::async_result <::boost::asio::handler_type<h, sig>::type>::type
+   boost::asio::async_result <boost::asio::handler_type<h, sig>::type>::type
 # endif
 #endif